commit 856161e0bb865ac7ad32504fba6e551f6b3c8e43
Author: Xavier de Blas <xaviblas gmail com>
Date: Sun Nov 18 19:49:54 2012 +0100
encoder bell behaviour fixed
glade/chronojump.glade | 182 ++++++++++++++++++++++++++----------------------
src/gui/chronojump.cs | 7 ++-
src/gui/encoder.cs | 4 +-
3 files changed, 109 insertions(+), 84 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index a54dc4a..2be852c 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -11548,53 +11548,16 @@ Evaluator can use real name or nickname.</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_encoder_bells">
+ <widget class="GtkCheckButton" id="checkbutton_encoder_propulsive">
+ <property name="label" translatable="yes">Propulsive</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="receives_default">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip" translatable="yes">Bells</property>
+ <property name="tooltip" translatable="yes">On concentric evaluate only propulsive phase</property>
<property name="use_action_appearance">False</property>
- <signal name="clicked" handler="on_button_encoder_bells_clicked" swapped="no"/>
- <child>
- <widget class="GtkAlignment" id="alignment21">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <widget class="GtkHBox" id="hbox90">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkImage" id="image_encoder_bell">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon-size">2</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label86">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -11653,25 +11616,30 @@ Evaluator can use real name or nickname.</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkButton" id="button_encoder_capture">
+ <widget class="GtkButton" id="button_encoder_bells">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
<property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">Bells</property>
<property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <signal name="clicked" handler="on_button_encoder_capture_clicked" swapped="no"/>
+ <signal name="clicked" handler="on_button_encoder_bells_clicked" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox83">
+ <widget class="GtkAlignment" id="alignment21">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
<child>
- <widget class="GtkImage" id="image13">
+ <widget class="GtkHBox" id="hbox90">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-media-record</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkImage" id="image_encoder_bell">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon-size">2</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -11680,71 +11648,69 @@ Evaluator can use real name or nickname.</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label93">
+ <widget class="GtkLabel" id="label86">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Capture from encoder</property>
+ <property name="use_underline">True</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
</child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox82">
+ <widget class="GtkButton" id="button_encoder_capture">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <signal name="clicked" handler="on_button_encoder_capture_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox83">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkProgressBar" id="encoder_pulsebar_capture">
- <property name="width_request">150</property>
+ <widget class="GtkImage" id="image13">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="activity_mode">True</property>
- <property name="show_text">True</property>
- <property name="pulse_step">0.10000000149</property>
+ <property name="stock">gtk-media-record</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_encoder_capture_cancel">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip" translatable="yes">Cancel process</property>
- <property name="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <signal name="clicked" handler="on_button_encoder_cancel_clicked" swapped="no"/>
- <child>
- <widget class="GtkImage" id="image8">
+ <widget class="GtkLabel" id="label93">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-cancel</property>
- </widget>
- </child>
+ <property name="label" translatable="yes">Capture from encoder</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -11886,6 +11852,58 @@ Evaluator can use real name or nickname.</property>
<property name="position">4</property>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="hbox82">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkProgressBar" id="encoder_pulsebar_capture">
+ <property name="width_request">150</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="activity_mode">True</property>
+ <property name="show_text">True</property>
+ <property name="pulse_step">0.10000000149</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button_encoder_capture_cancel">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip" translatable="yes">Cancel process</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_button_encoder_cancel_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkImage" id="image8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-cancel</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index a54ce84..265f046 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -5065,7 +5065,12 @@ Console.WriteLine("X");
}
private void on_repetitive_conditions_closed(object o, EventArgs args) {
- encoderUpdateTreeView();
+ //treeview_encoder should be updated (to colorize some cells)
+ //only if there was data
+ //this avoids misbehaviour when bell is pressed and there's no data in treeview
+ EncoderCurve curve = treeviewEncoderCurvesGetCurve(1, false);
+ if(curve.N != null)
+ encoderUpdateTreeView();
}
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index fa32935..20605d3 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -34,6 +34,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.SpinButton spin_encoder_smooth;
[Widget] Gtk.Button button_encoder_capture;
+ [Widget] Gtk.Button button_encoder_bells;
[Widget] Gtk.Button button_encoder_capture_cancel;
[Widget] Gtk.Button button_encoder_recalculate;
[Widget] Gtk.Button button_encoder_load_signal;
@@ -1538,7 +1539,7 @@ public partial class ChronoJumpWindow
private void encoderButtonsSensitive(encoderSensEnum option) {
//columns
- //c0 button_encoder_capture
+ //c0 button_encoder_capture, button_encoder_bells
//c1 button_encoder_recalculate
//c2 button_encoder_load_signal
//c3 button_encoder_save_all_curves , button_encoder_update_signal,
@@ -1593,6 +1594,7 @@ public partial class ChronoJumpWindow
}
button_encoder_capture.Sensitive = Util.IntToBool(table[0]);
+ button_encoder_bells.Sensitive = Util.IntToBool(table[0]);
button_encoder_recalculate.Sensitive = Util.IntToBool(table[1]);
button_encoder_load_signal.Sensitive = Util.IntToBool(table[2]);