commit 811ed94c2db774380df3434b91e8169ba4d77c78
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Apr 7 20:42:17 2017 +0200
force sensor shows min/max values
glade/app1.glade | 117 +++++++++++++++++++++++++++++++++++++++++++++++-
src/gui/forceSensor.cs | 9 ++++
2 files changed, 124 insertions(+), 2 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index d5196a4..c60585e 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -10917,10 +10917,10 @@ after time</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel"
id="label_force_sensor_value">
+ <widget class="GtkLabel" id="label264">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="label">Max</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -10929,6 +10929,18 @@ after time</property>
</packing>
</child>
<child>
+ <widget class="GtkLabel"
id="label_force_sensor_value_max">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </widget>
+ <packing>
+ <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>
@@ -10938,9 +10950,38 @@ after time</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="hbox210">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label265">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Current</property>
+ </widget>
+ <packing>
+ <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">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -10948,6 +10989,75 @@ after time</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">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox211">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label269">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Min</property>
+ </widget>
+ <packing>
+ <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">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </widget>
+ <packing>
+ <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">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -20020,6 +20130,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 78cd1fe..1e7f71e 100644
--- a/src/gui/forceSensor.cs
+++ b/src/gui/forceSensor.cs
@@ -30,7 +30,9 @@ public partial class ChronoJumpWindow
{
[Widget] Gtk.HBox hbox_combo_force_sensor_ports;
[Widget] Gtk.ComboBox combo_force_sensor_ports;
+ [Widget] Gtk.Label label_force_sensor_value_max;
[Widget] Gtk.Label label_force_sensor_value;
+ [Widget] Gtk.Label label_force_sensor_value_min;
[Widget] Gtk.VScale vscale_force_sensor;
CjComboForceSensorPorts comboForceSensorPorts;
@@ -91,6 +93,9 @@ public partial class ChronoJumpWindow
event_execute_label_message.Text = "Please, wait ...";
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";
notebook_capture_graph_table.CurrentPage = 1; //"Show table"
capturingForce = forceStatus.STARTING;
@@ -207,6 +212,10 @@ public partial class ChronoJumpWindow
//B) change the value
vscale_force_sensor.Value = forceSensorLast;
label_force_sensor_value.Text = forceSensorLast.ToString();
+ if(forceSensorLast > Convert.ToDouble(label_force_sensor_value_max.Text))
+ label_force_sensor_value_max.Text = forceSensorLast.ToString();
+ if(forceSensorLast < Convert.ToDouble(label_force_sensor_value_min.Text))
+ label_force_sensor_value_min.Text = forceSensorLast.ToString();
}
Thread.Sleep (25);