[chronojump] Session load with a show tests selector for each of the 6 modes



commit 2a054f67044cabbd34ebdde49702b441ae91a5f3
Author: Xavier de Blas <xaviblas gmail com>
Date:   Fri Mar 19 18:20:05 2021 +0100

    Session load with a show tests selector for each of the 6 modes

 glade/app1.glade                      | 159 ++++++++++++++++++++++++------
 src/gui/app1/session/loadAndImport.cs | 175 +++++++++++++++++++++-------------
 src/gui/app1/session/main.cs          |   8 +-
 3 files changed, 246 insertions(+), 96 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index b0158651..8b910eff 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -24512,6 +24512,9 @@ Concentric</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -30595,18 +30598,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>
@@ -30643,6 +30634,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>
@@ -39038,6 +39041,9 @@ then click this button.</property>
                                                             <child>
                                                             <placeholder/>
                                                             </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            </child>
                                                             </widget>
                                                             <packing>
                                                             <property name="expand">False</property>
@@ -40896,67 +40902,160 @@ then click this button.</property>
                                                             <property name="label_yalign">1</property>
                                                             <property name="shadow_type">none</property>
                                                             <child>
+                                                            <widget class="GtkVBox" id="vbox254">
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
+                                                            <child>
                                                             <widget class="GtkHBox" id="hbox405">
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">False</property>
                                                             <property name="border_width">6</property>
                                                             <property name="spacing">6</property>
                                                             <child>
+                                                            <widget class="GtkLabel" id="label575">
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
+                                                            <property name="label" translatable="yes">Show 
more columns</property>
+                                                            <property name="use_markup">True</property>
+                                                            </widget>
+                                                            <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                            <property name="position">0</property>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
                                                             <widget class="GtkCheckButton" 
id="app1s_checkbutton_show_data_persons">
                                                             <property name="label" 
translatable="yes">Persons</property>
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property 
name="receives_default">False</property>
                                                             <property name="draw_indicator">True</property>
-                                                            <signal name="toggled" 
handler="app1s_on_checkbutton_show_data_persons_toggled" swapped="no"/>
+                                                            <signal name="toggled" 
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
                                                             </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>
                                                             <child>
-                                                            <widget class="GtkCheckButton" 
id="app1s_checkbutton_show_data_jump_run">
-                                                            <property name="label" translatable="yes">Jumps 
and races</property>
+                                                            <widget class="GtkTable" id="table20">
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">False</property>
+                                                            <property name="n_rows">2</property>
+                                                            <property name="n_columns">3</property>
+                                                            <child>
+                                                            <widget class="GtkCheckButton" 
id="app1s_checkbutton_show_data_jumps">
+                                                            <property name="label" 
translatable="yes">Jumps</property>
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property 
name="receives_default">False</property>
                                                             <property name="draw_indicator">True</property>
-                                                            <signal name="toggled" 
handler="app1s_on_checkbutton_show_data_jump_run_toggled" swapped="no"/>
+                                                            <signal name="toggled" 
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
                                                             </widget>
                                                             <packing>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">False</property>
-                                                            <property name="position">1</property>
+                                                            <property name="x_options">GTK_FILL</property>
                                                             </packing>
                                                             </child>
                                                             <child>
-                                                            <widget class="GtkCheckButton" 
id="app1s_checkbutton_show_data_other_tests">
-                                                            <property name="label" translatable="yes">Other 
tests</property>
+                                                            <widget class="GtkCheckButton" 
id="app1s_checkbutton_show_data_runs">
+                                                            <property name="label" 
translatable="yes">Races</property>
                                                             <property name="visible">True</property>
                                                             <property name="can_focus">True</property>
                                                             <property 
name="receives_default">False</property>
                                                             <property name="draw_indicator">True</property>
-                                                            <signal name="toggled" 
handler="app1s_on_checkbutton_show_data_other_tests_toggled" swapped="no"/>
+                                                            <signal name="toggled" 
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
                                                             </widget>
                                                             <packing>
-                                                            <property name="expand">False</property>
-                                                            <property name="fill">False</property>
-                                                            <property name="pack_type">end</property>
-                                                            <property name="position">2</property>
+                                                            <property name="left_attach">1</property>
+                                                            <property name="right_attach">2</property>
+                                                            <property name="x_options">GTK_FILL</property>
                                                             </packing>
                                                             </child>
+                                                            <child>
+                                                            <widget class="GtkCheckButton" 
id="app1s_checkbutton_show_data_force_sensor">
+                                                            <property name="label" translatable="yes">Force 
sensor</property>
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">True</property>
+                                                            <property 
name="receives_default">False</property>
+                                                            <property name="draw_indicator">True</property>
+                                                            <signal name="toggled" 
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
                                                             </widget>
+                                                            <packing>
+                                                            <property name="top_attach">1</property>
+                                                            <property name="bottom_attach">2</property>
+                                                            <property name="x_options">GTK_FILL</property>
+                                                            </packing>
                                                             </child>
                                                             <child>
-                                                            <widget class="GtkLabel" id="label575">
+                                                            <widget class="GtkCheckButton" 
id="app1s_checkbutton_show_data_encoder">
+                                                            <property name="label" 
translatable="yes">Encoder</property>
                                                             <property name="visible">True</property>
-                                                            <property name="can_focus">False</property>
-                                                            <property name="label" translatable="yes">Show 
more columns</property>
-                                                            <property name="use_markup">True</property>
+                                                            <property name="can_focus">True</property>
+                                                            <property 
name="receives_default">False</property>
+                                                            <property name="draw_indicator">True</property>
+                                                            <signal name="toggled" 
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
+                                                            </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="x_options">GTK_FILL</property>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
+                                                            <widget class="GtkCheckButton" 
id="app1s_checkbutton_show_data_rt">
+                                                            <property name="label" 
translatable="yes">Reaction time</property>
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">True</property>
+                                                            <property 
name="receives_default">False</property>
+                                                            <property name="draw_indicator">True</property>
+                                                            <signal name="toggled" 
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
+                                                            </widget>
+                                                            <packing>
+                                                            <property name="left_attach">2</property>
+                                                            <property name="right_attach">3</property>
+                                                            <property name="x_options">GTK_FILL</property>
+                                                            </packing>
+                                                            </child>
+                                                            <child>
+                                                            <widget class="GtkCheckButton" 
id="app1s_checkbutton_show_data_other">
+                                                            <property name="label" 
translatable="yes">Other</property>
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">True</property>
+                                                            <property 
name="receives_default">False</property>
+                                                            <property name="draw_indicator">True</property>
+                                                            <signal name="toggled" 
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
+                                                            </widget>
+                                                            <packing>
+                                                            <property name="left_attach">2</property>
+                                                            <property name="right_attach">3</property>
+                                                            <property name="top_attach">1</property>
+                                                            <property name="bottom_attach">2</property>
+                                                            <property name="x_options">GTK_FILL</property>
+                                                            </packing>
+                                                            </child>
                                                             </widget>
                                                             <packing>
+                                                            <property name="expand">True</property>
+                                                            <property name="fill">True</property>
+                                                            <property name="position">1</property>
+                                                            </packing>
+                                                            </child>
+                                                            </widget>
+                                                            </child>
+                                                            <child>
+                                                            <placeholder/>
+                                                            <packing>
                                                             <property name="type">label_item</property>
                                                             </packing>
                                                             </child>
diff --git a/src/gui/app1/session/loadAndImport.cs b/src/gui/app1/session/loadAndImport.cs
index 29ba4741..fd4a4766 100644
--- a/src/gui/app1/session/loadAndImport.cs
+++ b/src/gui/app1/session/loadAndImport.cs
@@ -119,27 +119,41 @@ public partial class ChronoJumpWindow
 
                //radio buttons
                sessionLoadWinSignals = false;
+               /*
                app1s_checkbutton_show_data_persons.Active = preferences.sessionLoadDisplay.ShowAthletesInfo;
                app1s_checkbutton_show_data_jump_run.Active = preferences.sessionLoadDisplay.ShowJumpsRaces;
                app1s_checkbutton_show_data_other_tests.Active = 
preferences.sessionLoadDisplay.ShowOtherTests;
+               */
                sessionLoadWinSignals = true;
 
                app1s_createTreeView(app1s_treeview_session_load, app1s_type == app1s_windowType.LOAD_SESSION,
                                app1s_checkbutton_show_data_persons.Active,
-                               app1s_checkbutton_show_data_jump_run.Active,
-                               app1s_checkbutton_show_data_other_tests.Active);
+                               app1s_checkbutton_show_data_jumps.Active,
+                               app1s_checkbutton_show_data_runs.Active,
+                               app1s_checkbutton_show_data_force_sensor.Active,
+                               app1s_checkbutton_show_data_encoder.Active,
+                               app1s_checkbutton_show_data_rt.Active,
+                               app1s_checkbutton_show_data_other.Active);
 
                app1s_store = app1s_getStore(true,
                                app1s_checkbutton_show_data_persons.Active,
-                               app1s_checkbutton_show_data_jump_run.Active,
-                               app1s_checkbutton_show_data_other_tests.Active);
+                               app1s_checkbutton_show_data_jumps.Active,
+                               app1s_checkbutton_show_data_runs.Active,
+                               app1s_checkbutton_show_data_force_sensor.Active,
+                               app1s_checkbutton_show_data_encoder.Active,
+                               app1s_checkbutton_show_data_rt.Active,
+                               app1s_checkbutton_show_data_other.Active);
 
                app1s_treeview_session_load.Model = app1s_store;
 
                app1s_fillTreeView(app1s_treeview_session_load, app1s_store,
                                app1s_checkbutton_show_data_persons.Active,
-                               app1s_checkbutton_show_data_jump_run.Active,
-                               app1s_checkbutton_show_data_other_tests.Active);
+                               app1s_checkbutton_show_data_jumps.Active,
+                               app1s_checkbutton_show_data_runs.Active,
+                               app1s_checkbutton_show_data_force_sensor.Active,
+                               app1s_checkbutton_show_data_encoder.Active,
+                               app1s_checkbutton_show_data_rt.Active,
+                               app1s_checkbutton_show_data_other.Active);
 
                app1s_store.SetSortColumnId(1, Gtk.SortType.Descending); //date
                app1s_store.ChangeSortColumn();
@@ -161,7 +175,9 @@ public partial class ChronoJumpWindow
                */
        }
 
-       private TreeStore app1s_getStore(bool loadOrImport, bool showPersons, bool showContacts, bool 
showOtherTests)
+       private TreeStore app1s_getStore(bool loadOrImport, bool showPersons,
+                       //bool showContacts, bool showOtherTests)
+                       bool showJumps, bool showRuns, bool showForceSensor, bool showEncoder, bool showRT, 
bool showOther)
        {
                int columns = 6;
                if(loadOrImport)
@@ -169,10 +185,18 @@ public partial class ChronoJumpWindow
 
                if(showPersons)
                        columns += 3;
-               if(showContacts)
-                       columns += 7;
-               if(showOtherTests)
-                       columns += 4;
+               if(showJumps)
+                       columns += 2;
+               if(showRuns)
+                       columns += 3; //includes race analyzer
+               if(showForceSensor)
+                       columns ++;
+               if(showEncoder)
+                       columns += 2;
+               if(showRT)
+                       columns ++;
+               if(showOther)
+                       columns += 2; //pulses, RT
 
                Type [] types = new Type [columns];
                for (int i=0; i < columns; i++) {
@@ -212,7 +236,9 @@ public partial class ChronoJumpWindow
                app1s_recreateTreeView("loaded the dialog");
        }
 
-       private void app1s_createTreeView (Gtk.TreeView tv, bool loadOrImport, bool showPersons, bool 
showContacts, bool showOtherTests)
+       //private void app1s_createTreeView (Gtk.TreeView tv, bool loadOrImport, bool showPersons, bool 
showContacts, bool showOtherTests)
+       private void app1s_createTreeView (Gtk.TreeView tv, bool loadOrImport, bool showPersons,
+                       bool showJumps, bool showRuns, bool showForceSensor, bool showEncoder, bool showRT, 
bool showOther)
        {
                tv.HeadersVisible=true;
                int count = 0;
@@ -249,24 +275,32 @@ public partial class ChronoJumpWindow
                        tv.AppendColumn ( Catalog.GetString ("Specialty"), new CellRendererText(), "text", 
count++);
                        tv.AppendColumn ( Catalog.GetString ("Level"), new CellRendererText(), "text", 
count++);
                }
-               if(showContacts) {
+               if(showJumps) {
                        tv.AppendColumn ( Catalog.GetString ("Jumps simple"), new CellRendererText(), "text", 
count++);
                        tv.AppendColumn ( Catalog.GetString ("Jumps reactive"), new CellRendererText(), 
"text", count++);
+               }
+               if(showRuns) {
                        tv.AppendColumn ( Catalog.GetString ("Races simple"), new CellRendererText(), "text", 
count++);
                        tv.AppendColumn ( Catalog.GetString ("Races interval"), new CellRendererText(), 
"text", count++);
-                       tv.AppendColumn ( Catalog.GetString ("Reaction time"), new CellRendererText(), 
"text", count++);
-                       tv.AppendColumn ( Catalog.GetString ("Pulses"), new CellRendererText(), "text", 
count++);
-                       tv.AppendColumn ( Catalog.GetString ("MultiChronopic"), new CellRendererText(), 
"text", count++);
+                       tv.AppendColumn ( Catalog.GetString ("Race analyzer"), new CellRendererText(), 
"text", count++);
+               }
+               if(showForceSensor) {
+                       tv.AppendColumn ( Catalog.GetString ("Force sensor"), new CellRendererText(), "text", 
count++);
                }
-               if(showOtherTests) {
+               if(showEncoder) {
                        tv.AppendColumn ( Catalog.GetString ("Gravitatory encoder") + "\n" +
                                        Catalog.GetString("Sets") + " ; " + Catalog.GetString("Repetitions"),
                                        new CellRendererText(), "text", count++);
                        tv.AppendColumn ( Catalog.GetString ("Inertial encoder") + "\n" +
                                        Catalog.GetString("Sets") + " ; " + Catalog.GetString("Repetitions"),
                                        new CellRendererText(), "text", count++);
-                       tv.AppendColumn ( Catalog.GetString ("Force sensor"), new CellRendererText(), "text", 
count++);
-                       tv.AppendColumn ( Catalog.GetString ("Race analyzer"), new CellRendererText(), 
"text", count++);
+               }
+               if(showRT) {
+                       tv.AppendColumn ( Catalog.GetString ("Reaction time"), new CellRendererText(), 
"text", count++);
+               }
+               if(showOther) {
+                       tv.AppendColumn ( Catalog.GetString ("Pulses"), new CellRendererText(), "text", 
count++);
+                       tv.AppendColumn ( Catalog.GetString ("MultiChronopic"), new CellRendererText(), 
"text", count++);
                }
                tv.AppendColumn ( Catalog.GetString ("Comments"), new CellRendererText(), "text", count++);
        }
@@ -318,7 +352,7 @@ public partial class ChronoJumpWindow
                app1s_recreateTreeView ("file path changed");
        }
 
-       void app1s_on_checkbutton_show_data_persons_toggled (object o, EventArgs args)
+       void app1s_on_checkbutton_show_data_toggled (object o, EventArgs args)
        {
                if(! sessionLoadWinSignals)
                        return;
@@ -327,40 +361,24 @@ public partial class ChronoJumpWindow
                if (app1s_type == app1s_windowType.LOAD_SESSION)
                        sqlChangeSessionLoadDisplay();
 
-               app1s_recreateTreeView("persons " + app1s_checkbutton_show_data_persons.Active.ToString());
-       }
-       void app1s_on_checkbutton_show_data_jump_run_toggled (object o, EventArgs args)
-       {
-               if(! sessionLoadWinSignals)
-                       return;
-
-               //on import this call will be done t end to affect to our desired database
-               if (app1s_type == app1s_windowType.LOAD_SESSION)
-                       sqlChangeSessionLoadDisplay();
-
-               app1s_recreateTreeView("jump run " + app1s_checkbutton_show_data_jump_run.Active.ToString());
-       }
-       void app1s_on_checkbutton_show_data_other_tests_toggled (object o, EventArgs args)
-       {
-               if(! sessionLoadWinSignals)
-                       return;
-
-               //on import this call will be done t end to affect to our desired database
-               if (app1s_type == app1s_windowType.LOAD_SESSION)
-                       sqlChangeSessionLoadDisplay();
-
-               app1s_recreateTreeView("other tests " + 
app1s_checkbutton_show_data_other_tests.Active.ToString());
+               app1s_recreateTreeView("show_data_toggled " + 
app1s_checkbutton_show_data_persons.Active.ToString());
        }
 
        private void sqlChangeSessionLoadDisplay ()
        {
+               /*
                preferences.sessionLoadDisplay = new SessionLoadDisplay(
                                app1s_checkbutton_show_data_persons.Active,
-                               app1s_checkbutton_show_data_jump_run.Active,
-                               app1s_checkbutton_show_data_other_tests.Active);
+                               app1s_checkbutton_show_data_jumps.Active,
+                               app1s_checkbutton_show_data_runs.Active,
+                               app1s_checkbutton_show_data_force_sensor.Active,
+                               app1s_checkbutton_show_data_encoder.Active,
+                               app1s_checkbutton_show_data_rt.Active,
+                               app1s_checkbutton_show_data_other.Active);
 
                SqlitePreferences.Update (SqlitePreferences.SessionLoadDisplay,
                                preferences.sessionLoadDisplay.GetInt.ToString(), false);
+                               */
        }
 
        void app1s_recreateTreeView(string message)
@@ -372,18 +390,30 @@ public partial class ChronoJumpWindow
                app1s_createTreeView(app1s_treeview_session_load,
                                app1s_type == app1s_windowType.LOAD_SESSION,
                                app1s_checkbutton_show_data_persons.Active,
-                               app1s_checkbutton_show_data_jump_run.Active,
-                               app1s_checkbutton_show_data_other_tests.Active);
+                               app1s_checkbutton_show_data_jumps.Active,
+                               app1s_checkbutton_show_data_runs.Active,
+                               app1s_checkbutton_show_data_force_sensor.Active,
+                               app1s_checkbutton_show_data_encoder.Active,
+                               app1s_checkbutton_show_data_rt.Active,
+                               app1s_checkbutton_show_data_other.Active);
                app1s_store = app1s_getStore(
                                true,
                                app1s_checkbutton_show_data_persons.Active,
-                               app1s_checkbutton_show_data_jump_run.Active,
-                               app1s_checkbutton_show_data_other_tests.Active);
+                               app1s_checkbutton_show_data_jumps.Active,
+                               app1s_checkbutton_show_data_runs.Active,
+                               app1s_checkbutton_show_data_force_sensor.Active,
+                               app1s_checkbutton_show_data_encoder.Active,
+                               app1s_checkbutton_show_data_rt.Active,
+                               app1s_checkbutton_show_data_other.Active);
                app1s_treeview_session_load.Model = app1s_store;
                app1s_fillTreeView(app1s_treeview_session_load, app1s_store,
                                app1s_checkbutton_show_data_persons.Active,
-                               app1s_checkbutton_show_data_jump_run.Active,
-                               app1s_checkbutton_show_data_other_tests.Active);
+                               app1s_checkbutton_show_data_jumps.Active,
+                               app1s_checkbutton_show_data_runs.Active,
+                               app1s_checkbutton_show_data_force_sensor.Active,
+                               app1s_checkbutton_show_data_encoder.Active,
+                               app1s_checkbutton_show_data_rt.Active,
+                               app1s_checkbutton_show_data_other.Active);
                
                app1s_store.SetSortColumnId(1, Gtk.SortType.Descending); //date
                app1s_store.ChangeSortColumn();
@@ -397,8 +427,9 @@ public partial class ChronoJumpWindow
                app1s_onSelectionEntry (app1s_treeview_session_load.Selection, new EventArgs ());
        }
 
-       private void app1s_fillTreeView (Gtk.TreeView tv, TreeStore store,
-                       bool showPersons, bool showContacts, bool showOtherTests)
+       private void app1s_fillTreeView (Gtk.TreeView tv, TreeStore store, bool showPersons,
+                       //bool showContacts, bool showOtherTests)
+                       bool showJumps, bool showRuns, bool showForceSensor, bool showEncoder, bool showRT, 
bool showOther)
        {
                string filterName = "";
                if(app1s_entry_search_filter.Text.ToString().Length > 0)
@@ -418,10 +449,18 @@ public partial class ChronoJumpWindow
                int columns = 6;
                if(showPersons)
                        columns += 3;
-               if(showContacts)
-                       columns += 7;
-               if(showOtherTests)
-                       columns += 4;
+               if(showJumps)
+                       columns += 2;
+               if(showRuns)
+                       columns += 3; //includes race analyzer
+               if(showForceSensor)
+                       columns ++;
+               if(showEncoder)
+                       columns += 2;
+               if(showRT)
+                       columns ++;
+               if(showOther)
+                       columns += 2; //pulses, RT
 
                //tags are not going to be imported right now, so use only on load session
                List<SessionTagSession> tagsOfAllSessions = new List<SessionTagSession>();
@@ -486,20 +525,28 @@ public partial class ChronoJumpWindow
                                strings[i ++] = mySpeciallity;          //personsSpeciallity
                                strings[i ++] = myLevel;                //personsLevel
                        }
-                       if(showContacts) {
+                       if(showJumps) {
                                strings[i ++] = myStringFull[9];        //number of jumps x session
                                strings[i ++] = myStringFull[10];       //number of jumpsRj x session
+                       }
+                       if(showRuns) {
                                strings[i ++] = myStringFull[11];       //number of runs x session
                                strings[i ++] = myStringFull[12];       //number of runsInterval x session
-                               strings[i ++] = myStringFull[13];       //number of reaction times x session
-                               strings[i ++] = myStringFull[14];       //number of pulses x session
-                               strings[i ++] = myStringFull[15];       //number of multiChronopics x session
+                               strings[i ++] = myStringFull[19];       //number of runEncoder
                        }
-                       if(showOtherTests) {
+                       if(showForceSensor) {
+                               strings[i ++] = myStringFull[18];       //number of forceSensor
+                       }
+                       if(showEncoder) {
                                strings[i ++] = myStringFull[16];       //number of encoder signal x session
                                strings[i ++] = myStringFull[17];       //number of encoder curve x session
-                               strings[i ++] = myStringFull[18];       //number of forceSensor
-                               strings[i ++] = myStringFull[19];       //number of runEncoder
+                       }
+                       if(showRT) {
+                               strings[i ++] = myStringFull[13];       //number of reaction times x session
+                       }
+                       if(showOther) {
+                               strings[i ++] = myStringFull[14];       //number of pulses x session
+                               strings[i ++] = myStringFull[15];       //number of multiChronopics x session
                        }
                        strings[i ++] = myStringFull[7];                //description of session (comments)
 
diff --git a/src/gui/app1/session/main.cs b/src/gui/app1/session/main.cs
index 60e54cc0..538e0e44 100644
--- a/src/gui/app1/session/main.cs
+++ b/src/gui/app1/session/main.cs
@@ -62,8 +62,12 @@ public partial class ChronoJumpWindow
        [Widget] Gtk.HBox app1s_hbox_manage;
        [Widget] Gtk.Button app1s_button_manage_tags;
        [Widget] Gtk.CheckButton app1s_checkbutton_show_data_persons;
-       [Widget] Gtk.CheckButton app1s_checkbutton_show_data_jump_run;
-       [Widget] Gtk.CheckButton app1s_checkbutton_show_data_other_tests;
+       [Widget] Gtk.CheckButton app1s_checkbutton_show_data_jumps;
+       [Widget] Gtk.CheckButton app1s_checkbutton_show_data_runs;
+       [Widget] Gtk.CheckButton app1s_checkbutton_show_data_force_sensor;
+       [Widget] Gtk.CheckButton app1s_checkbutton_show_data_encoder;
+       [Widget] Gtk.CheckButton app1s_checkbutton_show_data_rt;
+       [Widget] Gtk.CheckButton app1s_checkbutton_show_data_other;
        [Widget] Gtk.Label app1s_file_path_import;
        [Widget] Gtk.Notebook app1s_notebook_load_button_animation;
        [Widget] Gtk.HButtonBox app1s_hbuttonbox_page2_import;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]