[chronojump] Minor fixes
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Minor fixes
- Date: Wed, 8 Nov 2017 02:19:59 +0000 (UTC)
commit a809cd0f728a84f97be650ea960ebb65dfa853ad
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Nov 8 03:19:43 2017 +0100
Minor fixes
glade/app1.glade | 13 ++++++++++---
src/gui/chronojump.cs | 3 +++
src/gui/forceSensor.cs | 15 ++++++++++++---
3 files changed, 25 insertions(+), 6 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 495ac93..1a1514e 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -390,7 +390,7 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Power</property>
+ <property name="label" translatable="yes">Encoder</property>
<property name="use_underline">True</property>
</widget>
</child>
@@ -487,14 +487,14 @@
<widget class="GtkMenuItem" id="menuitem_mode_selected_power_gravitatory">
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Power (gravitatory)</property>
+ <property name="label" translatable="yes">Encoder (gravitatory)</property>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="menuitem_mode_selected_power_inertial">
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Power (inertial)</property>
+ <property name="label" translatable="yes">Encoder (inertial)</property>
</widget>
</child>
<child>
@@ -1448,6 +1448,9 @@
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkLabel"
id="label_start_selector_jumps">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -14932,6 +14935,7 @@ Concentric</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">2</property>
+ <property name="spacing">2</property>
<child>
<widget class="GtkHBox" id="hbox182">
<property name="visible">True</property>
@@ -21872,6 +21876,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/src/gui/chronojump.cs b/src/gui/chronojump.cs
index 0a85728..2d40693 100644
--- a/src/gui/chronojump.cs
+++ b/src/gui/chronojump.cs
@@ -6884,6 +6884,7 @@ LogB.Debug("X");
//notebooks
notebook_execute.Sensitive = false;
+ notebook_analyze.Sensitive = false;
notebook_results.Sensitive = false;
notebook_options_top.Sensitive = false;
notebook_encoder_sup.Sensitive = false;
@@ -6930,6 +6931,7 @@ LogB.Debug("X");
personChanged();
notebook_execute.Sensitive = false;
+ notebook_analyze.Sensitive = false;
notebook_results.Sensitive = false;
notebook_options_top.Sensitive = false;
notebook_encoder_sup.Sensitive = false;
@@ -6951,6 +6953,7 @@ LogB.Debug("X");
personChanged();
notebook_execute.Sensitive = true;
+ notebook_analyze.Sensitive = true;
notebook_results.Sensitive = true;
notebook_options_top.Sensitive = true;
notebook_encoder_sup.Sensitive = true;
diff --git a/src/gui/forceSensor.cs b/src/gui/forceSensor.cs
index feb9a6c..6e73b74 100644
--- a/src/gui/forceSensor.cs
+++ b/src/gui/forceSensor.cs
@@ -62,6 +62,8 @@ public class ForceSensorValues
public partial class ChronoJumpWindow
{
[Widget] Gtk.MenuItem menuitem_force_sensor_open_folder;
+
+ //capture tab tab
[Widget] Gtk.HBox hbox_force_buttons;
[Widget] Gtk.Button button_force_sensor_tare;
[Widget] Gtk.Button button_force_sensor_calibrate;
@@ -69,14 +71,17 @@ public partial class ChronoJumpWindow
[Widget] Gtk.Label label_force_sensor_value;
[Widget] Gtk.Label label_force_sensor_value_min;
//[Widget] Gtk.VScale vscale_force_sensor;
- [Widget] Gtk.Viewport viewport_force_sensor_graph;
- [Widget] Gtk.Image image_force_sensor_graph;
[Widget] Gtk.SpinButton spin_force_sensor_calibration_kg_value;
[Widget] Gtk.Button button_force_sensor_check_version;
[Widget] Gtk.Button button_force_sensor_image_save_signal;
- [Widget] Gtk.Button button_force_sensor_image_save_rfd;
[Widget] Gtk.DrawingArea force_capture_drawingarea;
Gdk.Pixmap force_capture_pixmap = null;
+
+ //analyze tab
+ [Widget] Gtk.Button button_force_sensor_analyze_load;
+ [Widget] Gtk.Image image_force_sensor_graph;
+ [Widget] Gtk.Viewport viewport_force_sensor_graph;
+ [Widget] Gtk.Button button_force_sensor_image_save_rfd;
Thread forceCaptureThread;
static bool forceProcessFinish;
@@ -266,6 +271,7 @@ public partial class ChronoJumpWindow
{
hbox_force_buttons.Sensitive = sensitive;
button_execute_test.Sensitive = sensitive;
+ button_force_sensor_analyze_load.Sensitive = sensitive;
}
private bool pulseGTKForceSensorOther ()
@@ -807,6 +813,9 @@ LogB.Information(" fc R ");
private void on_button_force_sensor_load_clicked (object o, EventArgs args)
{
+ if (currentSession == null)
+ return;
+
Gtk.FileChooserDialog filechooser = new Gtk.FileChooserDialog ("Choose file",
app1, FileChooserAction.Open,
"Cancel",ResponseType.Cancel,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]