Commit 5483ee5c authored by Xavier de Blas's avatar Xavier de Blas

Encoder inertial capture show ecc/con vertical label while capture

parent 721f5753
...@@ -1893,6 +1893,12 @@ ...@@ -1893,6 +1893,12 @@
<placeholder/> <placeholder/>
</child> </child>
<child> <child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<widget class="GtkLabel" id="label_start_selector_jumps"> <widget class="GtkLabel" id="label_start_selector_jumps">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
...@@ -20747,6 +20753,12 @@ Concentric</property> ...@@ -20747,6 +20753,12 @@ Concentric</property>
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</widget> </widget>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -24709,27 +24721,27 @@ then click this button.</property> ...@@ -24709,27 +24721,27 @@ then click this button.</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkImage" id="image_inertial_rolled"> <widget class="GtkLabel" id="label_encoder_capture_inertial_eccon">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="stock">gtk-missing-image</property> <property name="angle">90</property>
</widget> </widget>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkImage" id="image_inertial_half_rolled"> <widget class="GtkImage" id="image_inertial_rolled">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="stock">gtk-missing-image</property> <property name="stock">gtk-missing-image</property>
</widget> </widget>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
...@@ -29349,6 +29361,12 @@ then click this button.</property> ...@@ -29349,6 +29361,12 @@ then click this button.</property>
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</widget> </widget>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -117,7 +117,7 @@ public partial class ChronoJumpWindow ...@@ -117,7 +117,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_encoder_1RM_info; [Widget] Gtk.Image image_encoder_1RM_info;
//[Widget] Gtk.Image image_encoder_exercise_close; //[Widget] Gtk.Image image_encoder_exercise_close;
[Widget] Gtk.Image image_inertial_rolled; [Widget] Gtk.Image image_inertial_rolled;
[Widget] Gtk.Image image_inertial_half_rolled; //[Widget] Gtk.Image image_inertial_half_rolled;
[Widget] Gtk.Image image_inertial_extended; [Widget] Gtk.Image image_inertial_extended;
[Widget] Gtk.Image image_encoder_calibrate; [Widget] Gtk.Image image_encoder_calibrate;
[Widget] Gtk.Image image_encoder_recalibrate; [Widget] Gtk.Image image_encoder_recalibrate;
...@@ -371,8 +371,8 @@ public partial class ChronoJumpWindow ...@@ -371,8 +371,8 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "inertial_rolled.png"); pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "inertial_rolled.png");
image_inertial_rolled.Pixbuf = pixbuf; image_inertial_rolled.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "inertial_half_rolled.png"); //pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "inertial_half_rolled.png");
image_inertial_half_rolled.Pixbuf = pixbuf; //image_inertial_half_rolled.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "inertial_extended.png"); pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "inertial_extended.png");
image_inertial_extended.Pixbuf = pixbuf; image_inertial_extended.Pixbuf = pixbuf;
......
...@@ -75,7 +75,8 @@ public partial class ChronoJumpWindow ...@@ -75,7 +75,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.VScale vscale_encoder_capture_inertial_angle_now; [Widget] Gtk.VScale vscale_encoder_capture_inertial_angle_now;
[Widget] Gtk.VBox vbox_angle_now; [Widget] Gtk.VBox vbox_angle_now;
[Widget] Gtk.Label label_encoder_capture_inertial_angle_now; [Widget] Gtk.Label label_encoder_capture_inertial_angle_now;
[Widget] Gtk.Label label_encoder_capture_inertial_eccon;
[Widget] Gtk.RadioButton radio_encoder_capture_1set; [Widget] Gtk.RadioButton radio_encoder_capture_1set;
[Widget] Gtk.RadioButton radio_encoder_capture_cont; [Widget] Gtk.RadioButton radio_encoder_capture_cont;
[Widget] Gtk.Button button_encoder_capture; [Widget] Gtk.Button button_encoder_capture;
...@@ -127,7 +128,7 @@ public partial class ChronoJumpWindow ...@@ -127,7 +128,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_encoder_capture_curves_best; [Widget] Gtk.Button button_encoder_capture_curves_best;
[Widget] Gtk.Button button_encoder_capture_curves_none; [Widget] Gtk.Button button_encoder_capture_curves_none;
[Widget] Gtk.Button button_encoder_capture_curves_4top; [Widget] Gtk.Button button_encoder_capture_curves_4top;
[Widget] Gtk.Notebook notebook_analyze_results; [Widget] Gtk.Notebook notebook_analyze_results;
[Widget] Gtk.Box hbox_combo_encoder_exercise_analyze; [Widget] Gtk.Box hbox_combo_encoder_exercise_analyze;
[Widget] Gtk.ComboBox combo_encoder_exercise_analyze; [Widget] Gtk.ComboBox combo_encoder_exercise_analyze;
...@@ -2705,6 +2706,7 @@ public partial class ChronoJumpWindow ...@@ -2705,6 +2706,7 @@ public partial class ChronoJumpWindow
EncoderCaptureInertialBackgroundStatic.Abort(); EncoderCaptureInertialBackgroundStatic.Abort();
eCaptureInertialBG = null; eCaptureInertialBG = null;
vscale_encoder_capture_inertial_angle_now.Value = 0; vscale_encoder_capture_inertial_angle_now.Value = 0;
label_encoder_capture_inertial_eccon.Text = "";
} }
//this is called by non gtk thread. Don't do gtk stuff here //this is called by non gtk thread. Don't do gtk stuff here
...@@ -6266,6 +6268,11 @@ public partial class ChronoJumpWindow ...@@ -6266,6 +6268,11 @@ public partial class ChronoJumpWindow
} }
int newValue = eCaptureInertialBG.AngleNow; int newValue = eCaptureInertialBG.AngleNow;
if(newValue > 0)
label_encoder_capture_inertial_eccon.Text = Catalog.GetString("Concentric");
else
label_encoder_capture_inertial_eccon.Text = Catalog.GetString("Eccentric");
//resize vscale if needed //resize vscale if needed
//0 is at the graphical top. abs(+-100) is on the bottom, but is called adjustment Upper //0 is at the graphical top. abs(+-100) is on the bottom, but is called adjustment Upper
int upper = Convert.ToInt32(vscale_encoder_capture_inertial_angle_now.Adjustment.Upper); int upper = Convert.ToInt32(vscale_encoder_capture_inertial_angle_now.Adjustment.Upper);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment