[chronojump] forcesensor removed radios of analyze general/automatic (unused since last commits)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] forcesensor removed radios of analyze general/automatic (unused since last commits)
- Date: Fri, 20 Nov 2020 14:23:19 +0000 (UTC)
commit 242f5d0e5a2d7d17b56c159268b09f6d3920b12d
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Nov 20 15:22:46 2020 +0100
forcesensor removed radios of analyze general/automatic (unused since last commits)
glade/app1.glade | 81 +-------------------------------------
src/gui/app1/chronojump.cs | 2 +-
src/gui/app1/forceSensorAnalyze.cs | 18 ++-------
3 files changed, 5 insertions(+), 96 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 7301b372..cf6a0ee9 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -20726,79 +20726,7 @@ Concentric</property>
<property name="border_width">2</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkVBox" id="vbox189">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">10</property>
- <child>
- <widget class="GtkHBox" id="hbox447">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">40</property>
- <child>
- <widget class="GtkHBox"
id="hbox_force_sensor_analyze_modes">
- <property name="can_focus">False</property>
- <property name="spacing">20</property>
- <child>
- <widget class="GtkLabel" id="label357">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Analysis:</property>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton"
id="radiobutton_force_sensor_analyze_manual">
- <property name="label"
translatable="yes">General analysis</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled"
handler="on_radiobutton_force_sensor_analyze_manual_toggled" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkRadioButton"
id="radiobutton_force_sensor_analyze_automatic">
- <property name="label" translatable="yes">RFD
Automatic</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="draw_indicator">True</property>
- <property
name="group">radiobutton_force_sensor_analyze_manual</property>
- <signal name="toggled"
handler="on_radiobutton_force_sensor_analyze_automatic_toggled" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="expand">False</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="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkTable" id="table19">
+ <widget class="GtkTable" id="table19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">2</property>
@@ -21507,13 +21435,6 @@ Concentric</property>
<property name="y_options"/>
</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">False</property>
diff --git a/src/gui/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index b62850ac..84f74b7a 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -2868,7 +2868,7 @@ public partial class ChronoJumpWindow
initialize_menu_or_menu_tiny();
// update force_capture_drawingarea
- if(current_menuitem_mode == Constants.Menuitem_modes.FORCESENSOR &&
radiobutton_force_sensor_analyze_manual.Active)
+ if(current_menuitem_mode == Constants.Menuitem_modes.FORCESENSOR)// &&
radiobutton_force_sensor_analyze_manual.Active)
forceSensorDoGraphAI(false);
}
diff --git a/src/gui/app1/forceSensorAnalyze.cs b/src/gui/app1/forceSensorAnalyze.cs
index 23097cc9..07a5803e 100644
--- a/src/gui/app1/forceSensorAnalyze.cs
+++ b/src/gui/app1/forceSensorAnalyze.cs
@@ -31,7 +31,6 @@ using Mono.Unix;
public partial class ChronoJumpWindow
{
//analyze tab
- [Widget] Gtk.HBox hbox_force_sensor_analyze_modes;
[Widget] Gtk.Button button_force_sensor_analyze_load;
[Widget] Gtk.Button button_force_sensor_analyze_analyze;
[Widget] Gtk.Label label_force_sensor_analyze;
@@ -54,8 +53,6 @@ public partial class ChronoJumpWindow
//analyze options
[Widget] Gtk.Notebook notebook_force_sensor_analyze; //decide between automatic and manual
- [Widget] Gtk.RadioButton radiobutton_force_sensor_analyze_automatic;
- [Widget] Gtk.RadioButton radiobutton_force_sensor_analyze_manual;
// [Widget] Gtk.HBox hbox_force_sensor_analyze_automatic_options;
// [Widget] Gtk.Notebook notebook_force_analyze_automatic;
[Widget] Gtk.Button button_force_sensor_analyze_options;
@@ -146,7 +143,6 @@ public partial class ChronoJumpWindow
{
button_force_sensor_analyze_options.Sensitive = s;
button_force_sensor_analyze_load.Sensitive = s;
- hbox_force_sensor_analyze_modes.Sensitive = s;
if(s)
button_force_sensor_analyze_analyze.Sensitive =
button_force_sensor_analyze_analyze_was_sensitive;
@@ -611,6 +607,7 @@ public partial class ChronoJumpWindow
ForceSensorAnalyzeInstant fsAI;
+ /*
private void on_radiobutton_force_sensor_analyze_automatic_toggled (object o, EventArgs args)
{
if(! radiobutton_force_sensor_analyze_automatic.Active)
@@ -619,17 +616,9 @@ public partial class ChronoJumpWindow
// hbox_force_sensor_analyze_automatic_options.Visible = true;
notebook_force_sensor_analyze.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_pages.AUTOMATIC);
}
- bool force_sensor_ai_drawingareaShown = false;
- private void on_radiobutton_force_sensor_analyze_manual_toggled (object o, EventArgs args)
- {
- if(! radiobutton_force_sensor_analyze_manual.Active)
- return;
+ */
-// hbox_force_sensor_analyze_automatic_options.Visible = false;
- notebook_force_sensor_analyze.CurrentPage =
Convert.ToInt32(notebook_force_sensor_analyze_pages.MANUAL);
- force_sensor_ai_drawingareaShown = true;
- forceSensorDoGraphAI(false);
- }
+ bool force_sensor_ai_drawingareaShown = false;
private void forceSensorDoGraphAI(bool windowResizedAndZoom)
{
@@ -1341,7 +1330,6 @@ public partial class ChronoJumpWindow
forceSensorWriteRepetitionCode (j, reps_l[j].TypeShort(), xposRepStart,
xposRepEnd, true, false);
}
-
/*
* 7) Invert AB if needed to paint correctly blue and red lines
* making it work also when B is higher than A
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
