[chronojump] session load: removed rt, other icons
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] session load: removed rt, other icons
- Date: Tue, 23 Mar 2021 11:07:08 +0000 (UTC)
commit 971676cf0bb53c898397c15b172ff389d450e10f
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Mar 23 12:04:14 2021 +0100
session load: removed rt, other icons
glade/app1.glade | 46 +---------------------------------
src/gui/app1/session/loadAndImport.cs | 47 +++++++++++++++++++++--------------
src/gui/app1/session/main.cs | 4 +--
3 files changed, 32 insertions(+), 65 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 98784453..831ed579 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -40905,7 +40905,7 @@ then click this button.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">2</property>
- <property name="n_columns">4</property>
+ <property name="n_columns">3</property>
<property name="column_spacing">6</property>
<property name="row_spacing">2</property>
<child>
@@ -41003,50 +41003,6 @@ then click this button.</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_rt">
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="draw_indicator">False</property>
- <signal name="toggled"
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
- <child>
- <widget class="GtkImage"
id="app1s_image_show_data_rt">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton"
id="app1s_checkbutton_show_data_other">
- <property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property name="draw_indicator">False</property>
- <signal name="toggled"
handler="app1s_on_checkbutton_show_data_toggled" swapped="no"/>
- <child>
- <widget class="GtkImage"
id="app1s_image_show_data_other">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
<widget class="GtkLabel" id="label575">
<property name="visible">True</property>
<property name="can_focus">False</property>
diff --git a/src/gui/app1/session/loadAndImport.cs b/src/gui/app1/session/loadAndImport.cs
index fd4a4766..fcbff5a8 100644
--- a/src/gui/app1/session/loadAndImport.cs
+++ b/src/gui/app1/session/loadAndImport.cs
@@ -131,18 +131,20 @@ public partial class ChronoJumpWindow
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_encoder.Active);/*,
app1s_checkbutton_show_data_rt.Active,
- app1s_checkbutton_show_data_other.Active);
+ app1s_checkbutton_show_data_other.Active
+ );*/
app1s_store = app1s_getStore(true,
app1s_checkbutton_show_data_persons.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_encoder.Active);/*,
app1s_checkbutton_show_data_rt.Active,
- app1s_checkbutton_show_data_other.Active);
+ app1s_checkbutton_show_data_other.Active
+ );*/
app1s_treeview_session_load.Model = app1s_store;
@@ -151,9 +153,10 @@ public partial class ChronoJumpWindow
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_encoder.Active);/*,
app1s_checkbutton_show_data_rt.Active,
- app1s_checkbutton_show_data_other.Active);
+ app1s_checkbutton_show_data_other.Active
+ );*/
app1s_store.SetSortColumnId(1, Gtk.SortType.Descending); //date
app1s_store.ChangeSortColumn();
@@ -176,8 +179,7 @@ public partial class ChronoJumpWindow
}
private TreeStore app1s_getStore(bool loadOrImport, bool showPersons,
- //bool showContacts, bool showOtherTests)
- bool showJumps, bool showRuns, bool showForceSensor, bool showEncoder, bool showRT,
bool showOther)
+ bool showJumps, bool showRuns, bool showForceSensor, bool showEncoder)//, bool
showRT, bool showOther)
{
int columns = 6;
if(loadOrImport)
@@ -193,10 +195,12 @@ public partial class ChronoJumpWindow
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++) {
@@ -236,9 +240,8 @@ 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 showJumps, bool showRuns, bool showForceSensor, bool showEncoder, bool showRT,
bool showOther)
+ bool showJumps, bool showRuns, bool showForceSensor, bool showEncoder)//, bool
showRT, bool showOther)
{
tv.HeadersVisible=true;
int count = 0;
@@ -295,6 +298,7 @@ public partial class ChronoJumpWindow
Catalog.GetString("Sets") + " ; " + Catalog.GetString("Repetitions"),
new CellRendererText(), "text", count++);
}
+ /*
if(showRT) {
tv.AppendColumn ( Catalog.GetString ("Reaction time"), new CellRendererText(),
"text", count++);
}
@@ -302,6 +306,7 @@ public partial class ChronoJumpWindow
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++);
}
@@ -393,27 +398,30 @@ public partial class ChronoJumpWindow
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_encoder.Active);/*,
app1s_checkbutton_show_data_rt.Active,
- app1s_checkbutton_show_data_other.Active);
+ app1s_checkbutton_show_data_other.Active
+ );*/
app1s_store = app1s_getStore(
true,
app1s_checkbutton_show_data_persons.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_encoder.Active);/*,
app1s_checkbutton_show_data_rt.Active,
- app1s_checkbutton_show_data_other.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_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_encoder.Active);/*,
app1s_checkbutton_show_data_rt.Active,
- app1s_checkbutton_show_data_other.Active);
+ app1s_checkbutton_show_data_other.Active
+ );*/
app1s_store.SetSortColumnId(1, Gtk.SortType.Descending); //date
app1s_store.ChangeSortColumn();
@@ -428,8 +436,7 @@ public partial class ChronoJumpWindow
}
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)
+ bool showJumps, bool showRuns, bool showForceSensor, bool showEncoder)//, bool
showRT, bool showOther)
{
string filterName = "";
if(app1s_entry_search_filter.Text.ToString().Length > 0)
@@ -457,10 +464,12 @@ public partial class ChronoJumpWindow
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>();
@@ -541,6 +550,7 @@ public partial class ChronoJumpWindow
strings[i ++] = myStringFull[16]; //number of encoder signal x session
strings[i ++] = myStringFull[17]; //number of encoder curve x session
}
+ /*
if(showRT) {
strings[i ++] = myStringFull[13]; //number of reaction times x session
}
@@ -548,6 +558,7 @@ public partial class ChronoJumpWindow
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)
app1s_store.AppendValues (strings);
diff --git a/src/gui/app1/session/main.cs b/src/gui/app1/session/main.cs
index 6851b0ee..2176fe4b 100644
--- a/src/gui/app1/session/main.cs
+++ b/src/gui/app1/session/main.cs
@@ -66,8 +66,8 @@ public partial class ChronoJumpWindow
[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.CheckButton app1s_checkbutton_show_data_rt;
+ //[Widget] Gtk.CheckButton app1s_checkbutton_show_data_other;
[Widget] Gtk.Image app1s_image_show_data_persons;
[Widget] Gtk.Image app1s_image_show_data_jumps;
[Widget] Gtk.Image app1s_image_show_data_runs;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
