commit 8e9505c20fa42673a87efffc53c303397b29dfec
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Dec 15 11:50:16 2017 +0100
forceSensor: improved rfd messages and duration
glade/app1.glade | 53 ++++++++++++++++++++++++++++++++++-------------
src/gui/forceSensor.cs | 4 +++
2 files changed, 42 insertions(+), 15 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 878db3b..01fe82a 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1518,6 +1518,9 @@
<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>
@@ -15260,17 +15263,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_force_sensor_analyze">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_markup">True</property>
- <property name="single_line_mode">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
+ <placeholder/>
</child>
<child>
<widget class="GtkHBox" id="hbox240">
@@ -15281,7 +15274,8 @@ Concentric</property>
<widget class="GtkLabel" id="label201">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Length
of analysis:</property>
+ <property name="tooltip"
translatable="yes">Length of analysis:</property>
+ <property name="label"
translatable="yes">Length:</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -15291,7 +15285,7 @@ Concentric</property>
</child>
<child>
<widget class="GtkRadioButton"
id="radio_force_rfd_duration_percent">
- <property name="label" translatable="yes">5%
after max force</property>
+ <property name="label" translatable="yes">Until
5% decrease in max force</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
@@ -15332,12 +15326,14 @@ Concentric</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
+ <property name="width_chars">4</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
- <property name="adjustment">2 1 20 1 10
0</property>
+ <property name="adjustment">1 1 20 0.01 10
0</property>
<property name="climb_rate">1</property>
+ <property name="digits">2</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
</widget>
@@ -15374,7 +15370,24 @@ Concentric</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <widget class="GtkHBox" id="hbox231">
+ <widget class="GtkVBox" id="vbox75">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkLabel"
id="label_force_sensor_analyze">
+ <property name="can_focus">False</property>
+ <property name="use_markup">True</property>
+ <property name="single_line_mode">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox231">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -15475,6 +15488,13 @@ Concentric</property>
<property name="position">1</property>
</packing>
</child>
+ </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>
@@ -22367,6 +22387,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 a659b62..c5881e3 100644
--- a/src/gui/forceSensor.cs
+++ b/src/gui/forceSensor.cs
@@ -503,6 +503,7 @@ public partial class ChronoJumpWindow
label_force_sensor_value.Text = "0";
label_force_sensor_value_min.Text = "0";
label_force_sensor_analyze.Text = "";
+ label_force_sensor_analyze.Visible = false;
forceProcessFinish = false;
forceProcessCancel = false;
@@ -984,8 +985,11 @@ LogB.Information(" fc R ");
{
label_force_sensor_analyze.Text = Catalog.GetString("Error doing graph.") + " " +
Catalog.GetString("Probably not sustained force.");
+ label_force_sensor_analyze.Visible = true;
+
return;
}
+ label_force_sensor_analyze.Visible = false;
label_force_sensor_analyze.Text = "";
while ( ! Util.FileReadable(imagePath));