[chronojump] Encoder: Fixed when no curves
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Encoder: Fixed when no curves
- Date: Sun, 3 Jun 2012 11:03:28 +0000 (UTC)
commit ba99bcce0e166529f32cfbb714398b6609152296
Author: Xavier de Blas <xaviblas gmail com>
Date: Sun Jun 3 13:01:44 2012 +0200
Encoder: Fixed when no curves
encoder/graph.R | 4 +++-
src/gui/encoder.cs | 29 +++++++++++++++++------------
2 files changed, 20 insertions(+), 13 deletions(-)
---
diff --git a/encoder/graph.R b/encoder/graph.R
index fd482d5..4bb50df 100644
--- a/encoder/graph.R
+++ b/encoder/graph.R
@@ -576,7 +576,8 @@ if(length(args) < 3) {
curves=findCurves(rawdata, eccon, minHeight, curvesPlot)
print(curves)
n=length(curves[,1])
-
+ quitIfNoData(n, curves, outputData1)
+
for(i in 1:n) {
curves[i,1]=reduceCurveBySpeed(eccon, i, curves[i,1],rawdata[curves[i,1]:curves[i,2]], smoothingOne)
}
@@ -670,6 +671,7 @@ if(length(args) < 3) {
par(new=F)
print(knRanges)
}
+
if(analysis=="powerBars" || analysis=="curves") {
paf = data.frame()
for(i in 1:n) {
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index d05778d..c38c13a 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -206,16 +206,20 @@ public partial class ChronoJumpWindow
private void encoderUpdateTreeView()
{
string contents = Util.ReadFile(Util.GetEncoderCurvesTempFileName());
- if (contents == null) {
+ if (contents == null || contents == "") {
encoderButtonsSensitive(encoderSensEnum.DONENOSIGNAL);
} else {
treeviewEncoderRemoveColumns();
int curvesNum = createTreeViewEncoder(contents);
- if(Util.FindOnArray(':',1,0,UtilGtk.ComboGetActive(combo_encoder_eccon),
- encoderEcconTranslation) != "Concentric")
- curvesNum = curvesNum / 2;
- spin_encoder_analyze_curve_num.SetRange(1,curvesNum);
- encoderButtonsSensitive(encoderSensEnum.DONEYESSIGNAL);
+ if(curvesNum == 0)
+ encoderButtonsSensitive(encoderSensEnum.DONENOSIGNAL);
+ else {
+ if(Util.FindOnArray(':',1,0,UtilGtk.ComboGetActive(combo_encoder_eccon),
+ encoderEcconTranslation) != "Concentric")
+ curvesNum = curvesNum / 2;
+ spin_encoder_analyze_curve_num.SetRange(1,curvesNum);
+ encoderButtonsSensitive(encoderSensEnum.DONEYESSIGNAL);
+ }
}
}
@@ -1075,7 +1079,7 @@ public partial class ChronoJumpWindow
private void on_treeview_encoder_curves_cursor_changed (object o, EventArgs args)
{
int lineNum = treeviewEncoderCurvesEventSelectedID();
- encoderButtonsSensitive(encoderSensEnum.DONEYESSIGNAL);
+ encoderButtonsSensitive(encoderSensEnum.DONENOSIGNAL);
//on ecc-con select both lines
if(ecconLast == "c") {
@@ -1135,9 +1139,10 @@ public partial class ChronoJumpWindow
//c0 button_encoder_capture
//c1 button_encoder_recalculate
//c2 button_encoder_load_signal
- //c3 button_encoder_save_all_curves && button_encoder_save_signal &&
- // label_encoder_capture_comment && entry_encoder_capture_comment
- //c4 button_encoder_delete_curve && button_encoder_save_curve
+ //c3 button_encoder_save_all_curves , button_encoder_save_signal &&
+ // label_encoder_capture_comment , entry_encoder_capture_comment
+ // and images: image_encoder_capture , image_encoder_analyze.Sensitive
+ //c4 button_encoder_delete_curve , button_encoder_save_curve
//c5 button_encoder_analyze
//c6 button_encoder_analyze_data_show_user_curves
@@ -1188,6 +1193,8 @@ public partial class ChronoJumpWindow
button_encoder_save_signal.Sensitive = Util.IntToBool(table[3]);
label_encoder_capture_comment.Sensitive = Util.IntToBool(table[3]);
entry_encoder_capture_comment.Sensitive = Util.IntToBool(table[3]);
+ image_encoder_capture.Sensitive = Util.IntToBool(table[3]);
+ image_encoder_analyze.Sensitive = Util.IntToBool(table[3]);
button_encoder_delete_curve.Sensitive = Util.IntToBool(table[4]);
button_encoder_save_curve.Sensitive = Util.IntToBool(table[4]);
@@ -1286,8 +1293,6 @@ public partial class ChronoJumpWindow
}
treeview_encoder_curves.Sensitive = true;
- image_encoder_capture.Sensitive = true;
- image_encoder_analyze.Sensitive = true;
}
/* end of thread stuff */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]