commit b5b221b93c4b9d88d5f9bdfde1288fd12a5e2297
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Dec 18 13:15:55 2020 +0100
Fixed force sensor analyze transl cutted: impulse, variability, feedback
glade/app1.glade | 146 +++++++++++++++----------------------
src/gui/app1/forceSensorAnalyze.cs | 16 ++--
2 files changed, 68 insertions(+), 94 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index d7ce28cf..f2489faf 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -23498,103 +23498,60 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkVBox"
id="vbox_force_sensor_ai_impulse_variability_and_feedback">
+ <widget class="GtkTable"
id="table_force_sensor_ai_impulse_variability_and_feedback">
<property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkVBox" id="vbox148">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox273">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
<child>
<widget class="GtkLabel"
id="label_force_sensor_ai_impulse">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
<property name="label"
translatable="yes">Impulse</property>
- <property name="width_chars">8</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label401">
+ <widget class="GtkLabel"
id="label_force_sensor_ai_variability">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">(N*s)</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Variability</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_force_sensor_ai_impulse_values">
- <property name="visible">True</property>
+ <widget class="GtkLabel"
id="label_force_sensor_ai_feedback">
<property name="can_focus">False</property>
- <property name="width_chars">8</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label"
translatable="yes">Feedback</property>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox149">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox283">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <widget class="GtkLabel"
id="label_force_sensor_ai_variability">
+ <widget class="GtkHBox" id="hbox273">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Variability</property>
- <property name="width_chars">8</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label411">
+ <widget class="GtkLabel"
id="label_force_sensor_ai_impulse_values">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">(N)</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -23603,10 +23560,10 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel"
id="label_force_sensor_ai_variability_values">
+ <widget class="GtkLabel" id="label401">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="width_chars">8</property>
+ <property name="label">N*s</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -23616,26 +23573,20 @@ Concentric</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkVBox"
id="vbox_force_sensor_ai_feedback">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkHBox" id="hbox297">
+ <widget class="GtkHBox" id="hbox290">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkLabel"
id="label_force_sensor_ai_feedback">
+ <widget class="GtkLabel"
id="label_force_sensor_ai_variability_values">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Feedback</property>
- <property name="width_chars">8</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -23644,10 +23595,10 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label412">
+ <widget class="GtkLabel" id="label584">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">(N)</property>
+ <property name="label">N</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -23657,16 +23608,33 @@ Concentric</property>
</child>
</widget>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox"
id="hbox_force_sensor_ai_feedback">
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel"
id="label_force_sensor_ai_feedback_values">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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_ai_feedback_values">
+ <widget class="GtkLabel" id="label585">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="width_chars">8</property>
+ <property name="label">N</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -23676,9 +23644,11 @@ Concentric</property>
</child>
</widget>
<packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options">GTK_FILL</property>
</packing>
</child>
</widget>
diff --git a/src/gui/app1/forceSensorAnalyze.cs b/src/gui/app1/forceSensorAnalyze.cs
index 6bdd1bff..4f0c57fd 100644
--- a/src/gui/app1/forceSensorAnalyze.cs
+++ b/src/gui/app1/forceSensorAnalyze.cs
@@ -128,8 +128,9 @@ public partial class ChronoJumpWindow
[Widget] Gtk.HBox hbox_force_sensor_ai_accel;
[Widget] Gtk.HBox hbox_force_sensor_ai_power;
- [Widget] Gtk.VBox vbox_force_sensor_ai_impulse_variability_and_feedback;
- [Widget] Gtk.VBox vbox_force_sensor_ai_feedback;
+ [Widget] Gtk.Table table_force_sensor_ai_impulse_variability_and_feedback;
+ [Widget] Gtk.Label label_force_sensor_ai_feedback;
+ [Widget] Gtk.HBox hbox_force_sensor_ai_feedback;
[Widget] Gtk.Label label_force_sensor_ai_impulse_values;
[Widget] Gtk.Label label_force_sensor_ai_variability_values;
[Widget] Gtk.Label label_force_sensor_ai_feedback_values;
@@ -1903,7 +1904,7 @@ public partial class ChronoJumpWindow
label_force_sensor_ai_rfd_max.Text = "";
}
- vbox_force_sensor_ai_impulse_variability_and_feedback.Visible = (countA != countB);
+ table_force_sensor_ai_impulse_variability_and_feedback.Visible = (countA != countB);
if(countA != countB)
{
@@ -1924,9 +1925,12 @@ public partial class ChronoJumpWindow
if(preferences.forceSensorCaptureFeedbackActive && feedbackF > 0)
{
label_force_sensor_ai_feedback_values.Text = Math.Round(feedbackDiff,
3).ToString();
- vbox_force_sensor_ai_feedback.Visible = true;
- } else
- vbox_force_sensor_ai_feedback.Visible = false;
+ label_force_sensor_ai_feedback.Visible = true;
+ hbox_force_sensor_ai_feedback.Visible = true;
+ } else {
+ label_force_sensor_ai_feedback.Visible = false;
+ hbox_force_sensor_ai_feedback.Visible = false;
+ }
}
}