[chronojump] Encoder inertial capture show ecc/con vertical label while capture
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Encoder inertial capture show ecc/con vertical label while capture
- Date: Fri, 10 May 2019 17:55:15 +0000 (UTC)
commit 5483ee5c8f3c7e09a351b808afa154d14c1a30c6
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri May 10 19:52:43 2019 +0200
Encoder inertial capture show ecc/con vertical label while capture
glade/app1.glade | 30 ++++++++++++++++++++++++------
src/gui/chronojumpIcons.cs | 6 +++---
src/gui/encoder.cs | 11 +++++++++--
3 files changed, 36 insertions(+), 11 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index a08e369c..822c34f2 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1893,6 +1893,12 @@
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkLabel"
id="label_start_selector_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -20747,6 +20753,12 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -24709,27 +24721,27 @@ then click this button.</property>
</packing>
</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="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
+ <property name="angle">90</property>
</widget>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkImage"
id="image_inertial_half_rolled">
+ <widget class="GtkImage"
id="image_inertial_rolled">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
</widget>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">2</property>
</packing>
</child>
@@ -29349,6 +29361,12 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/chronojumpIcons.cs b/src/gui/chronojumpIcons.cs
index 144f1a4a..3b582e87 100644
--- a/src/gui/chronojumpIcons.cs
+++ b/src/gui/chronojumpIcons.cs
@@ -117,7 +117,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_encoder_1RM_info;
//[Widget] Gtk.Image image_encoder_exercise_close;
[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_encoder_calibrate;
[Widget] Gtk.Image image_encoder_recalibrate;
@@ -371,8 +371,8 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "inertial_rolled.png");
image_inertial_rolled.Pixbuf = pixbuf;
- pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "inertial_half_rolled.png");
- image_inertial_half_rolled.Pixbuf = pixbuf;
+ //pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "inertial_half_rolled.png");
+ //image_inertial_half_rolled.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) + "inertial_extended.png");
image_inertial_extended.Pixbuf = pixbuf;
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index e8164505..bcabc4f9 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -75,7 +75,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.VScale vscale_encoder_capture_inertial_angle_now;
[Widget] Gtk.VBox vbox_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_cont;
[Widget] Gtk.Button button_encoder_capture;
@@ -127,7 +128,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_encoder_capture_curves_best;
[Widget] Gtk.Button button_encoder_capture_curves_none;
[Widget] Gtk.Button button_encoder_capture_curves_4top;
-
+
[Widget] Gtk.Notebook notebook_analyze_results;
[Widget] Gtk.Box hbox_combo_encoder_exercise_analyze;
[Widget] Gtk.ComboBox combo_encoder_exercise_analyze;
@@ -2705,6 +2706,7 @@ public partial class ChronoJumpWindow
EncoderCaptureInertialBackgroundStatic.Abort();
eCaptureInertialBG = null;
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
@@ -6266,6 +6268,11 @@ public partial class ChronoJumpWindow
}
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
//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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]