commit 09df6d514807f920522946274b7101730e41747f
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Sep 24 12:19:05 2019 +0200
ForceSensor current force label at right (better for scroll)
glade/app1.glade | 72 +++++++++++++++++++++++++++-----------------------
src/gui/forceSensor.cs | 3 +--
2 files changed, 40 insertions(+), 35 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 3a523789..efc9b7aa 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -14495,25 +14495,25 @@ on capture</property>
<property name="can_focus">False</property>
<property name="spacing">20</property>
<child>
- <widget class="GtkHBox" id="hbox233">
+ <widget class="GtkHBox" id="hbox234">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label265">
+ <widget class="GtkLabel" id="label264">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label"
translatable="yes">Current:</property>
+ <property name="label"
translatable="yes">Max:</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">0</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_force_sensor_value">
+ <widget class="GtkLabel"
id="label_force_sensor_value_max">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
@@ -14526,7 +14526,7 @@ on capture</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label254">
+ <widget class="GtkLabel" id="label266">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -14546,29 +14546,29 @@ on capture</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox234">
+ <widget class="GtkHBox" id="hbox235">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label264">
+ <widget class="GtkLabel" id="label269">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label"
translatable="yes">Max:</property>
+ <property name="label"
translatable="yes">Min:</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="GtkLabel"
id="label_force_sensor_value_max">
+ <widget class="GtkLabel"
id="label_force_sensor_value_min">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="width_chars">7</property>
+ <property name="width_chars">5</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -14577,7 +14577,7 @@ on capture</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label266">
+ <widget class="GtkLabel" id="label270">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -14597,16 +14597,16 @@ on capture</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox235">
+ <widget class="GtkHBox" id="hbox233">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label269">
+ <widget class="GtkLabel" id="label265">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label"
translatable="yes">Min:</property>
+ <property name="label"
translatable="yes">Current:</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -14615,11 +14615,11 @@ on capture</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_force_sensor_value_min">
+ <widget class="GtkLabel"
id="label_force_sensor_value">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="width_chars">5</property>
+ <property name="width_chars">7</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -14628,7 +14628,7 @@ on capture</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label270">
+ <widget class="GtkLabel" id="label254">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -21921,6 +21921,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -23869,18 +23872,6 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Tests
will be filmed</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox"
id="hbox_video_encoder_capturing">
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -23917,6 +23908,18 @@ Concentric</property>
</packing>
</child>
<child>
+ <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Tests
will be filmed</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox"
id="hbox_video_encoder_no_capturing">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -30809,6 +30812,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/forceSensor.cs b/src/gui/forceSensor.cs
index 6100d7ef..4fe4efb6 100644
--- a/src/gui/forceSensor.cs
+++ b/src/gui/forceSensor.cs
@@ -1123,10 +1123,9 @@ LogB.Information(" fs F ");
if(capturingForce == arduinoCaptureStatus.CAPTURING)
{
LogB.Information(" fs G ");
-//TODO: have current value at right, better for scroll
- label_force_sensor_value.Text = forceSensorValues.ForceLast.ToString();
label_force_sensor_value_max.Text = forceSensorValues.ForceMax.ToString();
label_force_sensor_value_min.Text = forceSensorValues.ForceMin.ToString();
+ label_force_sensor_value.Text = forceSensorValues.ForceLast.ToString();
LogB.Information(" fs H ");