[chronojump] Button export current set (raw data) on analyze
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Button export current set (raw data) on analyze
- Date: Fri, 3 Apr 2020 15:35:54 +0000 (UTC)
commit 3e4c0661186ca06bb7c54f604b3c0092d322d0dc
Author: Xavier de Blas <xaviblas gmail com>
Date: Fri Apr 3 17:35:18 2020 +0200
Button export current set (raw data) on analyze
glade/app1.glade | 116 ++++++++++++++++++++++++++++-----------------
src/gui/app1/chronojump.cs | 5 --
src/gui/app1/encoder.cs | 7 ++-
3 files changed, 75 insertions(+), 53 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 8a5c6e8c..24697a73 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -450,37 +450,6 @@
</child>
</widget>
</child>
- <child>
- <widget class="GtkMenuItem" id="encoder_menuitem">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Encoder</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="menu1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <widget class="GtkImageMenuItem" id="menuitem_export_encoder_signal">
- <property name="label" translatable="yes">Export current set (to raw data)</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip" translatable="yes">Export set to CSV
(Spreadsheet)</property>
- <property name="use_stock">False</property>
- <property name="always_show_image">True</property>
- <signal name="activate" handler="on_button_encoder_export_all_curves_clicked"
swapped="no"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image_export_encoder_signal">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
<child>
<widget class="GtkMenuItem" id="force_sensor_menuitem">
<property name="can_focus">False</property>
@@ -24850,6 +24819,12 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -30147,7 +30122,7 @@ then click this button.</property>
<widget class="GtkHBox"
id="hbox_encoder_analyze_current_signal">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">4</property>
+ <property name="spacing">8</property>
<child>
<widget class="GtkLabel"
id="label_encoder_analyze_current_signal">
<property name="visible">True</property>
@@ -30176,6 +30151,19 @@ then click this button.</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
+ <widget class="GtkImage"
id="image_encoder_capture_open1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</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="label37">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -30184,19 +30172,53 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkImage"
id="image_encoder_capture_open1">
+ <widget class="GtkButton"
id="button_export_encoder_signal">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked"
handler="on_button_encoder_export_all_curves_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox396">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage"
id="image_export_encoder_signal">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
- <property name="icon-size">2</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="label485">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Export
(to raw data)</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -30206,7 +30228,7 @@ then click this button.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -30333,27 +30355,27 @@ then click this button.</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label404">
+ <widget class="GtkImage"
id="image_encoder_analyze_check">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Select</property>
+ <property
name="stock">gtk-missing-image</property>
+ <property name="icon-size">2</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkImage"
id="image_encoder_analyze_check">
+ <widget class="GtkLabel" id="label404">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- <property name="icon-size">2</property>
+ <property name="label"
translatable="yes">Select</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -34785,6 +34807,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/app1/chronojump.cs b/src/gui/app1/chronojump.cs
index fd96578b..a05b8d3f 100644
--- a/src/gui/app1/chronojump.cs
+++ b/src/gui/app1/chronojump.cs
@@ -45,7 +45,6 @@ public partial class ChronoJumpWindow
[Widget] Gtk.MenuItem menuitem_open_session;
[Widget] Gtk.MenuItem menuitem_mode;
- //[Widget] Gtk.MenuItem encoder_menuitem;
//[Widget] Gtk.VBox vbox_menu_encoder;
[Widget] Gtk.MenuItem force_sensor_menuitem;
[Widget] Gtk.MenuItem race_encoder_menuitem;
@@ -2809,7 +2808,6 @@ public partial class ChronoJumpWindow
frame_run_simple_double_contacts.Visible = false;
//default for everything except encoder
- //encoder_menuitem.Visible = false;
//vbox_menu_encoder.Visible = false;
menuitem_export_csv.Visible = true;
@@ -2930,7 +2928,6 @@ public partial class ChronoJumpWindow
}
else if(m == Constants.Menuitem_modes.POWERGRAVITATORY || m ==
Constants.Menuitem_modes.POWERINERTIAL)
{
- //encoder_menuitem.Visible = true;
//vbox_menu_encoder.Visible = true;
menuitem_export_csv.Visible = false;
@@ -7104,7 +7101,6 @@ LogB.Debug("mc finished 5");
vbox_menu_tiny.Sensitive = false;
session_menuitem.Sensitive = false;
menuitem_mode.Sensitive = false;
- //encoder_menuitem.Sensitive = false;
//vbox_menu_encoder.Sensitive = false;
force_sensor_menuitem.Sensitive = false;
race_encoder_menuitem.Sensitive = false;
@@ -7176,7 +7172,6 @@ LogB.Debug("mc finished 5");
vbox_menu_tiny.Sensitive = true;
session_menuitem.Sensitive = true;
menuitem_mode.Sensitive = true;
- //encoder_menuitem.Sensitive = true;
//vbox_menu_encoder.Sensitive = true;
force_sensor_menuitem.Sensitive = true;
race_encoder_menuitem.Sensitive = true;
diff --git a/src/gui/app1/encoder.cs b/src/gui/app1/encoder.cs
index 78a5dfde..fc17afd4 100644
--- a/src/gui/app1/encoder.cs
+++ b/src/gui/app1/encoder.cs
@@ -109,7 +109,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Notebook notebook_encoder_signal_comment_rhythm_and_triggers;
[Widget] Gtk.TextView textview_encoder_signal_comment;
[Widget] Gtk.Button button_encoder_signal_save_comment;
- //[Widget] Gtk.MenuItem menuitem_export_encoder_signal;
+ [Widget] Gtk.Button button_export_encoder_signal;
// [Widget] Gtk.Button button_menu_encoder_export_set;
[Widget] Gtk.Button button_encoder_delete_signal;
@@ -5043,7 +5043,7 @@ public partial class ChronoJumpWindow
// hbox_encoder_configuration, frame_encoder_capture_options
//c1 button_encoder_exercise_close_and_recalculate
//c2 button_encoder_capture_session_overview, button_encoder_load_signal
- //c3 hbox_encoder_capture_curves_save_all_none, menuitem_export_encoder_signal,
//button_menu_encoder_export_set
+ //c3 hbox_encoder_capture_curves_save_all_none, button_export_encoder_signal,
// button_encoder_delete_signal, vbox_encoder_signal_comment,
// and images: image_encoder_capture , image_encoder_analyze.Sensitive. Update: both NOT
managed here
//UNUSED c4 button_encoder_save_curve, entry_encoder_curve_comment
@@ -5105,8 +5105,7 @@ public partial class ChronoJumpWindow
button_encoder_load_signal_on_analyze.Sensitive = Util.IntToBool(table[2]);
hbox_encoder_capture_curves_save_all_none.Sensitive = Util.IntToBool(table[3]);
- //menuitem_export_encoder_signal.Sensitive = Util.IntToBool(table[3]);
-// button_menu_encoder_export_set.Sensitive = Util.IntToBool(table[3]);
+ button_export_encoder_signal.Sensitive = Util.IntToBool(table[3]);
button_encoder_delete_signal.Sensitive = Util.IntToBool(table[3]);
vbox_encoder_signal_comment.Sensitive = Util.IntToBool(table[3]);
//image_encoder_capture.Sensitive = Util.IntToBool(table[3]);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
