commit e3c9a78ac350f01d09bf0b7d566367a115d6758d
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Mar 3 13:32:50 2021 +0100
RunEncoder analyze individual/set/session/groupal modes like on forceSensor
glade/app1.glade | 559 +++++++++++++++++++++++++++++++++----
src/gui/app1/forceSensorAnalyze.cs | 3 +-
src/gui/app1/icons.cs | 7 +
src/gui/app1/runEncoderAnalyze.cs | 79 +++++-
4 files changed, 589 insertions(+), 59 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index f46b95c4..2f2f1db0 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -23824,6 +23824,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -24388,7 +24391,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox249">
+ <widget class="GtkVBox"
id="vbox_force_sensor_export">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
@@ -26560,22 +26563,49 @@ Concentric</property>
<property name="border_width">2</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkHBox" id="hbox199">
+ <widget class="GtkHBox" id="hbox253">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">20</property>
<child>
- <widget class="GtkButton"
id="button_run_encoder_analyze_load">
+ <widget class="GtkHBox"
id="hbox_run_encoder_analyze_top_modes">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkFrame" id="frame30">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0.5</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment39">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">3</property>
+ <property name="bottom_padding">1</property>
+ <property name="left_padding">1</property>
+ <property name="right_padding">1</property>
+ <child>
+ <widget class="GtkHBox" id="hbox277">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkRadioButton"
id="radio_run_encoder_analyze_individual_current_set">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_contacts_capture_load_clicked" swapped="no"/>
+ <property
name="receives_default">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">False</property>
+ <signal name="toggled"
handler="on_radio_run_encoder_analyze_individual_current_set_toggled" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox335">
+ <widget class="GtkHBox" id="hbox448">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkImage"
id="image_run_encoder_analyze_load">
+ <widget class="GtkImage"
id="image_run_encoder_analyze_individual_current_set">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -26587,10 +26617,10 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label418">
+ <widget class="GtkLabel" id="label301">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Load
file</property>
+ <property name="label"
translatable="yes">Current set</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -26608,23 +26638,20 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkHBox"
id="hbox_run_encoder_analyze_options">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">20</property>
- <child>
- <widget class="GtkButton"
id="button_run_encoder_analyze_options">
+ <widget class="GtkRadioButton"
id="radio_run_encoder_analyze_individual_current_session">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_run_encoder_analyze_options_clicked" swapped="no"/>
+ <property
name="receives_default">False</property>
+ <property name="draw_indicator">False</property>
+ <property
name="group">radio_run_encoder_analyze_individual_current_set</property>
+ <signal name="toggled"
handler="on_radio_run_encoder_analyze_individual_current_session_toggled" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox409">
+ <widget class="GtkHBox" id="hbox469">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkImage"
id="image_force_sensor_analyze_options1">
+ <widget class="GtkImage"
id="image_run_encoder_analyze_individual_current_session">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -26636,10 +26663,10 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label522">
+ <widget class="GtkLabel" id="label307">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Options</property>
+ <property name="label"
translatable="yes">Current session</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -26653,23 +26680,60 @@ Concentric</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label308">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Individual</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</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="GtkButton"
id="button_run_encoder_analyze_analyze">
+ <widget class="GtkFrame" id="frame31">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0.5</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment69">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">3</property>
+ <property name="bottom_padding">1</property>
+ <property name="left_padding">1</property>
+ <property name="right_padding">1</property>
+ <child>
+ <widget class="GtkRadioButton"
id="radio_run_encoder_analyze_groupal_current_session">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_run_encoder_analyze_analyze_clicked" swapped="no"/>
+ <property
name="receives_default">False</property>
+ <property name="draw_indicator">False</property>
+ <property
name="group">radio_run_encoder_analyze_individual_current_set</property>
+ <signal name="toggled"
handler="on_radio_run_encoder_analyze_groupal_current_session_toggled" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox410">
+ <widget class="GtkHBox" id="hbox471">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkImage"
id="image_force_sensor_analyze_analyze1">
+ <widget class="GtkImage"
id="image_run_encoder_analyze_groupal_current_session">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -26681,10 +26745,10 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label523">
+ <widget class="GtkLabel" id="label368">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">Analyze</property>
+ <property name="label"
translatable="yes">Current session</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -26695,6 +26759,21 @@ Concentric</property>
</widget>
</child>
</widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label597">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Groupwise</property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -26705,26 +26784,55 @@ Concentric</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkButton"
id="button_run_encoder_export_current_session">
+ <widget class="GtkVBox" id="vbox122">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox474">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkButton"
id="button_run_encoder_analyze_load">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked"
handler="on_button_run_encoder_export_current_session_clicked" swapped="no"/>
+ <signal name="clicked"
handler="on_button_contacts_capture_load_clicked" swapped="no"/>
<child>
- <widget class="GtkHBox" id="hbox182">
+ <widget class="GtkHBox" id="hbox335">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label111">
+ <widget class="GtkImage"
id="image_run_encoder_analyze_load">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Export</property>
+ <property
name="stock">gtk-missing-image</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="label418">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Load
file</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -26733,7 +26841,19 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkImage"
id="image_force_sensor_analyze_table_save1">
+ <widget class="GtkButton"
id="button_run_encoder_analyze_analyze">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_run_encoder_analyze_analyze_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox410">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage"
id="image_force_sensor_analyze_analyze1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -26741,11 +26861,48 @@ Concentric</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label523">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Analyze</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</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_force_sensor_analyze_table_save_2">
+ <widget class="GtkAlignment" id="alignment70">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkButton"
id="button_run_encoder_analyze_options">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_run_encoder_analyze_options_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox409">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkImage"
id="image_force_sensor_analyze_options1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
@@ -26753,18 +26910,48 @@ Concentric</property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label522">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Options</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
</child>
</widget>
+ </child>
+ </widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -26773,7 +26960,7 @@ Concentric</property>
</packing>
</child>
<child>
- <widget class="GtkNotebook"
id="notebook_run_encoder_analyze_or_options">
+ <widget class="GtkNotebook"
id="notebook_run_encoder_analyze">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="show_tabs">False</property>
@@ -27073,6 +27260,267 @@ Concentric</property>
</packing>
</child>
<child>
+ <widget class="GtkVBox"
id="vbox_run_encoder_export">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkLabel" id="label600">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Export
to CSV</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox475">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkLabel" id="label601">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Data:</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_run_encoder_export_data">
+ <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">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton"
id="check_run_encoder_export_images">
+ <property name="label"
translatable="yes">Include images</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox476">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkNotebook"
id="notebook_run_encoder_export">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_tabs">False</property>
+ <property name="show_border">False</property>
+ <child>
+ <widget class="GtkHBox" id="hbox477">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <widget class="GtkButton"
id="button_run_encoder_export_current_session">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <signal name="clicked"
handler="on_button_run_encoder_export_current_session_clicked" swapped="no"/>
+ <child>
+ <widget class="GtkHBox" id="hbox182">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label111">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">Export</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage"
id="image_run_encoder_analyze_table_save">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkImage"
id="image_run_encoder_analyze_table_save_1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label603">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">buttons</property>
+ </widget>
+ <packing>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox248">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">8</property>
+ <child>
+ <widget class="GtkHBox" id="hbox479">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkProgressBar"
id="progressbar_run_encoder_export">
+ <property name="width_request">200</property>
+ <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="GtkButton"
id="button_run_encoder_export_cancel">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <widget class="GtkImage"
id="image_run_encoder_cancel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label604">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">progressbar</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel"
id="label_run_encoder_export_result">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label599">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">export</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkAlignment" id="alignment13">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -27329,7 +27777,7 @@ Concentric</property>
</child>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -27339,7 +27787,7 @@ Concentric</property>
<property name="label">options</property>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
<property name="tab_fill">False</property>
<property name="type">tab</property>
</packing>
@@ -29235,18 +29683,6 @@ Concentric</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Tests
will be filmed</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox"
id="hbox_video_encoder_capturing">
<property name="can_focus">False</property>
<property name="spacing">4</property>
@@ -29283,6 +29719,18 @@ Concentric</property>
</packing>
</child>
<child>
+ <widget class="GtkLabel"
id="label_video_encoder_tests_will_be_filmed">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Tests
will be filmed</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox"
id="hbox_video_encoder_no_capturing">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -37642,6 +38090,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/app1/forceSensorAnalyze.cs b/src/gui/app1/forceSensorAnalyze.cs
index f78c5d8c..7df38b48 100644
--- a/src/gui/app1/forceSensorAnalyze.cs
+++ b/src/gui/app1/forceSensorAnalyze.cs
@@ -33,7 +33,6 @@ public partial class ChronoJumpWindow
//analyze tab
[Widget] Gtk.RadioButton radio_force_sensor_analyze_individual_current_set;
[Widget] Gtk.RadioButton radio_force_sensor_analyze_individual_current_session;
- [Widget] Gtk.RadioButton radio_force_sensor_analyze_individual_all_sessions;
[Widget] Gtk.RadioButton radio_force_sensor_analyze_groupal_current_session;
[Widget] Gtk.Image image_force_sensor_analyze_individual_current_set;
@@ -689,6 +688,8 @@ public partial class ChronoJumpWindow
bool force_sensor_ai_drawingareaShown = false;
+ //move to export gui file
+
private void on_radio_force_sensor_analyze_individual_current_set_toggled (object o, EventArgs args)
{
button_force_sensor_analyze_load.Visible = true;
diff --git a/src/gui/app1/icons.cs b/src/gui/app1/icons.cs
index aff4afd0..ac071ae8 100644
--- a/src/gui/app1/icons.cs
+++ b/src/gui/app1/icons.cs
@@ -238,6 +238,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Image image_forcesensor_analyze_image_save7;
[Widget] Gtk.Image image_force_sensor_analyze_table_save;
[Widget] Gtk.Image image_force_sensor_analyze_table_save_1;
+ [Widget] Gtk.Image image_run_encoder_analyze_table_save;
+ [Widget] Gtk.Image image_run_encoder_analyze_table_save_1;
[Widget] Gtk.Image image_sprint_analyze_image_save;
[Widget] Gtk.Image image_raceAnalyzer_table_save_grid;
[Widget] Gtk.Image image_raceAnalyzer_table_save_disk;
@@ -737,6 +739,7 @@ public partial class ChronoJumpWindow
image_encoder_session_overview.Pixbuf = pixbuf;
image_encoder_analyze_table_save.Pixbuf = pixbuf;
image_force_sensor_analyze_table_save.Pixbuf = pixbuf;
+ image_run_encoder_analyze_table_save.Pixbuf = pixbuf;
image_raceAnalyzer_table_save_grid.Pixbuf = pixbuf;
image_session_export_csv1.Pixbuf = pixbuf;
@@ -792,6 +795,7 @@ public partial class ChronoJumpWindow
image_forcesensor_analyze_image_save6.Pixbuf = pixbuf;
image_forcesensor_analyze_image_save7.Pixbuf = pixbuf;
image_force_sensor_analyze_table_save_1.Pixbuf = pixbuf;
+ image_run_encoder_analyze_table_save_1.Pixbuf = pixbuf;
image_sprint_analyze_image_save.Pixbuf = pixbuf;
image_run_encoder_analyze_image_save_disk.Pixbuf = pixbuf;
image_raceAnalyzer_table_save_disk.Pixbuf = pixbuf;
@@ -826,10 +830,12 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeIndividualCurrentSetIcon);
image_encoder_analyze_individual_current_set.Pixbuf = pixbuf;
image_force_sensor_analyze_individual_current_set.Pixbuf = pixbuf;
+ image_run_encoder_analyze_individual_current_set.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeIndividualCurrentSessionIcon);
image_encoder_analyze_individual_current_session.Pixbuf = pixbuf;
image_force_sensor_analyze_individual_current_session.Pixbuf = pixbuf;
+ image_run_encoder_analyze_individual_current_session.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeIndividualAllSessionsIcon);
image_encoder_analyze_individual_all_sessions.Pixbuf = pixbuf;
@@ -838,6 +844,7 @@ public partial class ChronoJumpWindow
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzeGroupalCurrentSessionIcon);
image_encoder_analyze_groupal_current_session.Pixbuf = pixbuf;
image_force_sensor_analyze_groupal_current_session.Pixbuf = pixbuf;
+ image_run_encoder_analyze_groupal_current_session.Pixbuf = pixbuf;
pixbuf = new Pixbuf (null, Util.GetImagePath(false) +
Constants.FileNameEncoderAnalyzePowerbarsIcon);
image_encoder_analyze_powerbars.Pixbuf = pixbuf;
diff --git a/src/gui/app1/runEncoderAnalyze.cs b/src/gui/app1/runEncoderAnalyze.cs
index 470bef1e..d03080a0 100644
--- a/src/gui/app1/runEncoderAnalyze.cs
+++ b/src/gui/app1/runEncoderAnalyze.cs
@@ -28,7 +28,7 @@ using Mono.Unix;
public partial class ChronoJumpWindow
{
- [Widget] Gtk.Notebook notebook_run_encoder_analyze_or_options;
+ [Widget] Gtk.Notebook notebook_run_encoder_analyze;
[Widget] Gtk.CheckButton check_run_encoder_analyze_accel;
[Widget] Gtk.CheckButton check_run_encoder_analyze_force;
[Widget] Gtk.CheckButton check_run_encoder_analyze_power;
@@ -39,6 +39,21 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Button button_run_encoder_analyze_analyze;
[Widget] Gtk.Button button_run_encoder_image_save;
+ [Widget] Gtk.RadioButton radio_run_encoder_analyze_individual_current_set;
+ [Widget] Gtk.RadioButton radio_run_encoder_analyze_individual_current_session;
+ [Widget] Gtk.RadioButton radio_run_encoder_analyze_groupal_current_session;
+ [Widget] Gtk.Image image_run_encoder_analyze_individual_current_set;
+ [Widget] Gtk.Image image_run_encoder_analyze_individual_current_session;
+ [Widget] Gtk.Image image_run_encoder_analyze_groupal_current_session;
+ [Widget] Gtk.HBox hbox_run_encoder_analyze_top_modes;
+
+ //export
+ [Widget] Gtk.Label label_run_encoder_export_data;
+ [Widget] Gtk.CheckButton check_run_encoder_export_images;
+ [Widget] Gtk.ProgressBar progressbar_run_encoder_export;
+ [Widget] Gtk.Label label_run_encoder_export_result;
+
+ private enum notebook_run_encoder_analyze_pages { CURRENTSET, CURRENTSESSION, OPTIONS }
private void createRunEncoderAnalyzeCombos ()
{
@@ -101,11 +116,14 @@ public partial class ChronoJumpWindow
private void on_button_run_encoder_analyze_options_clicked (object o, EventArgs args)
{
- notebook_run_encoder_analyze_or_options.CurrentPage = 1;
+ notebook_run_encoder_analyze.CurrentPage =
Convert.ToInt32(notebook_run_encoder_analyze_pages.OPTIONS);
+ hbox_run_encoder_analyze_top_modes.Sensitive = false;
runEncoderButtonsSensitive(false);
}
private void on_button_run_encoder_analyze_options_close_clicked (object o, EventArgs args)
{
+ hbox_run_encoder_analyze_top_modes.Sensitive = true;
+
// 1 change stuff on Sqlite if needed
Sqlite.Open();
@@ -141,7 +159,7 @@ public partial class ChronoJumpWindow
// 2 change sensitivity of widgets
- notebook_run_encoder_analyze_or_options.CurrentPage = 0;
+ notebook_run_encoder_analyze.CurrentPage =
Convert.ToInt32(notebook_run_encoder_analyze_pages.CURRENTSET);
runEncoderButtonsSensitive(true);
}
@@ -236,8 +254,61 @@ public partial class ChronoJumpWindow
new DialogMessage(Constants.MessageTypes.INFO, myString);
}
- RunEncoderExport runEncoderExport;
+
+ //move to export gui file
+
+ private void on_radio_run_encoder_analyze_individual_current_set_toggled (object o, EventArgs args)
+ {
+ button_run_encoder_analyze_load.Visible = true;
+ button_run_encoder_analyze_analyze.Visible = true;
+
+ notebook_run_encoder_analyze.CurrentPage =
Convert.ToInt32(notebook_run_encoder_analyze_pages.CURRENTSET);
+ label_run_encoder_export_result.Text = "";
+ }
+ private void on_radio_run_encoder_analyze_individual_current_session_toggled (object o, EventArgs
args)
+ {
+ button_run_encoder_analyze_load.Visible = false;
+ button_run_encoder_analyze_analyze.Visible = false;
+
+ if(currentPerson != null)
+ label_run_encoder_export_data.Text = currentPerson.Name;
+ else
+ label_run_encoder_export_data.Text = "";
+
+ notebook_run_encoder_analyze.CurrentPage =
Convert.ToInt32(notebook_run_encoder_analyze_pages.CURRENTSESSION);
+ label_run_encoder_export_result.Text = "";
+ }
+ private void on_radio_run_encoder_analyze_groupal_current_session_toggled (object o, EventArgs args)
+ {
+ button_run_encoder_analyze_load.Visible = false;
+ button_run_encoder_analyze_analyze.Visible = false;
+
+ label_run_encoder_export_data.Text = currentSession.Name;
+
+ notebook_run_encoder_analyze.CurrentPage =
Convert.ToInt32(notebook_run_encoder_analyze_pages.CURRENTSESSION);
+ label_run_encoder_export_result.Text = "";
+ }
+
private void on_button_run_encoder_export_current_session_clicked (object o, EventArgs args)
+ {
+ if(currentSession == null)
+ return;
+
+ if (radio_run_encoder_analyze_individual_current_session.Active)
+ {
+ if(currentPerson == null)
+ return;
+
+ button_run_encoder_export_session (currentPerson.UniqueID);
+ }
+ else if (radio_run_encoder_analyze_groupal_current_session.Active)
+ {
+ button_run_encoder_export_session (-1);
+ }
+ }
+
+ RunEncoderExport runEncoderExport;
+ private void button_run_encoder_export_session (int personID)
{
runEncoderExport = new RunEncoderExport (
true, //includeImages //TODO