commit 56a923c91959356a43f5a131dae676014d51f16f
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Sep 26 11:09:01 2019 +0200
Force sensor max/current/min labels at right of capture graph
glade/app1.glade | 177 ++++++++++++++++++++-----------------------------
src/gui/forceSensor.cs | 18 ++---
2 files changed, 81 insertions(+), 114 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 42caef3f..99e6aa3f 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -14445,7 +14445,7 @@ Inverted values</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox79">
+ <widget class="GtkVBox" id="vbox79_force_sensor">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">8</property>
@@ -14456,20 +14456,33 @@ Inverted values</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkVBox" id="vbox110">
+ <widget class="GtkDrawingArea"
id="force_capture_drawingarea">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <signal name="configure_event"
handler="on_force_capture_drawingarea_configure_event" swapped="no"/>
+ <signal name="expose_event"
handler="on_force_capture_drawingarea_expose_event" swapped="no"/>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkHBox" id="hbox232">
+ <widget class="GtkVBox" id="vbox79">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkVBox" id="vbox138">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">20</property>
<child>
- <widget class="GtkHBox" id="hbox234">
+ <widget class="GtkVBox" id="vbox72">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">8</property>
+ <property name="homogeneous">True</property>
<child>
<widget class="GtkLabel" id="label264">
<property name="visible">True</property>
@@ -14488,132 +14501,93 @@ Inverted values</property>
<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">10</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>
- <child>
- <widget class="GtkLabel" id="label266">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label">N</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
</widget>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox235">
+ <widget class="GtkVBox" id="vbox145">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">8</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>
- <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_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">10</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>
- <child>
- <widget class="GtkLabel" id="label270">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label">N</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
</widget>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox233">
+ <widget class="GtkVBox" id="vbox146">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">8</property>
<child>
- <widget class="GtkLabel" id="label265">
+ <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">Current:</property>
+ <property name="label"
translatable="yes">Min:</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_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">10</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>
- <child>
- <widget class="GtkLabel" id="label254">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label">N</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
@@ -14626,27 +14600,7 @@ Inverted values</property>
</packing>
</child>
<child>
- <widget class="GtkDrawingArea"
id="force_capture_drawingarea">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <signal name="configure_event"
handler="on_force_capture_drawingarea_configure_event" swapped="no"/>
- <signal name="expose_event"
handler="on_force_capture_drawingarea_expose_event" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox72">
+ <widget class="GtkHBox" id="hbox232">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -14690,10 +14644,17 @@ Inverted values</property>
</child>
</widget>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -21901,6 +21862,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -23849,6 +23813,18 @@ 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>
@@ -23885,18 +23861,6 @@ 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>
@@ -30798,6 +30762,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 d2c56ec3..9163b556 100644
--- a/src/gui/forceSensor.cs
+++ b/src/gui/forceSensor.cs
@@ -700,9 +700,9 @@ public partial class ChronoJumpWindow
button_force_sensor_analyze_analyze.Sensitive = false;
forceCaptureStartMark = false;
//vscale_force_sensor.Value = 0;
- label_force_sensor_value_max.Text = "0";
- label_force_sensor_value.Text = "0";
- label_force_sensor_value_min.Text = "0";
+ label_force_sensor_value_max.Text = "0 N";
+ label_force_sensor_value.Text = "0 N";
+ label_force_sensor_value_min.Text = "0 N";
label_force_sensor_analyze.Text = "";
label_force_sensor_analyze.Visible = false;
@@ -1123,9 +1123,9 @@ LogB.Information(" fs F ");
if(capturingForce == arduinoCaptureStatus.CAPTURING)
{
LogB.Information(" fs G ");
- 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();
+ label_force_sensor_value_max.Text = forceSensorValues.ForceMax.ToString() + " N";
+ label_force_sensor_value_min.Text = forceSensorValues.ForceMin.ToString() + " N";
+ label_force_sensor_value.Text = forceSensorValues.ForceLast.ToString() + " N";
LogB.Information(" fs H ");
@@ -1811,9 +1811,9 @@ LogB.Information(" fs R ");
force_capture_drawingarea.QueueDraw(); // -- refresh
- 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() + " N";
+ label_force_sensor_value_max.Text = forceSensorValues.ForceMax.ToString() + " N";
+ label_force_sensor_value_min.Text = forceSensorValues.ForceMin.ToString() + " N";
button_force_sensor_image_save_signal.Sensitive = true;
button_force_sensor_analyze_analyze.Sensitive = true;
}