commit 46fb97c3f0da68b576e4d35323d6386a9e5dc031
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue May 8 00:46:42 2018 +0200
ForceSensorAnalyze manual: label rfd avg
glade/app1.glade | 268 ++++++++++++++++++++---------------------
src/gui/forceSensorAnalyze.cs | 15 ++-
2 files changed, 140 insertions(+), 143 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index a5a4e7a..4e25380 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -1715,6 +1715,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>
@@ -17923,22 +17929,6 @@ Concentric</property>
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkLabel" id="label356">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Force</property>
- </widget>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options"/>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
<widget class="GtkLabel"
id="label_force_sensor_ai_force_a">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -17968,19 +17958,6 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label358">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Time</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options"/>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
<widget class="GtkLabel"
id="label_force_sensor_ai_time_a">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -19297,115 +19274,6 @@ Concentric</property>
<placeholder/>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <widget class="GtkLabel" id="label362">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">RFD</property>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options"/>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
<widget class="GtkLabel"
id="label_force_sensor_ai_rfd_a">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -19475,6 +19343,124 @@ Concentric</property>
<property name="y_options"/>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="hbox284">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label358">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Time</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label363">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">(ms)</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options"/>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox287">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label356">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Force</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="label364">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">(N)</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options"/>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox289">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkLabel" id="label362">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">RFD</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label365">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">(N/s)</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="x_options"/>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -27609,6 +27595,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/forceSensorAnalyze.cs b/src/gui/forceSensorAnalyze.cs
index 5bcc500..85fe0f3 100644
--- a/src/gui/forceSensorAnalyze.cs
+++ b/src/gui/forceSensorAnalyze.cs
@@ -774,10 +774,14 @@ public partial class ChronoJumpWindow
// 8) calculate and paint max RFD
//value of count that produce the max RFD (between the previous and next value)
+
+ if(hscaleLower == 0 || hscaleHigher >= fsAI.GetLength() -1)
+ return;
+
int countRFDMax = hscaleLower;
layout_force_ai_text.SetMarkup(string.Format("RFD Max: {0:0.#} N/s",
Math.Round(fsAI.CalculateMaxRFDInRange(
- hscaleLower+1, hscaleHigher-1, //avoid having
data out of possible
+ hscaleLower, hscaleHigher,
out countRFDMax), 1) ));
layout_force_ai_text.GetPixelSize(out textWidth, out textHeight);
@@ -951,7 +955,7 @@ public partial class ChronoJumpWindow
else
label_force_sensor_ai_rfd_b.Text = "";
- if(rfdADefined && rfdBDefined)
+ if(rfdADefined && rfdBDefined && countA != countB)
{
// 0) invert counts if needed
if(countA > countB)
@@ -962,9 +966,10 @@ public partial class ChronoJumpWindow
}
// 1) diff
- label_force_sensor_ai_rfd_diff.Text = (rfdB - rfdA).ToString();
+ label_force_sensor_ai_rfd_diff.Text = Math.Round(rfdB - rfdA, 1).ToString();
- // 2) AVG TODO:
+ // 2) Average:
+ label_force_sensor_ai_rfd_average.Text = Math.Round(fsAI.CalculateRFD(countA,
countB), 1).ToString();
// 3) max
int countRFDMax = countA;
@@ -974,10 +979,10 @@ public partial class ChronoJumpWindow
label_force_sensor_ai_rfd_max.Text = rfdMax.ToString();
} else {
label_force_sensor_ai_rfd_diff.Text = "";
+ label_force_sensor_ai_rfd_average.Text = "";
label_force_sensor_ai_rfd_max.Text = "";
}
}
-
}