[chronojump] Propulsive check on analyze(distinct than capture)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Propulsive check on analyze(distinct than capture)
- Date: Thu, 7 Mar 2013 19:00:37 +0000 (UTC)
commit a507adac499cce88d2bcadae9bf714964cc750af
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Mar 7 20:00:03 2013 +0100
Propulsive check on analyze(distinct than capture)
glade/chronojump.glade | 28 +++++++++++++++++++++++-----
src/gui/encoder.cs | 9 +++++----
2 files changed, 28 insertions(+), 9 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index fd50a29..8cfe110 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -12386,7 +12386,7 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton"
id="checkbutton_encoder_propulsive">
+ <widget class="GtkCheckButton"
id="checkbutton_encoder_capture_propulsive">
<property name="label"
translatable="yes">Propulsive</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -13584,6 +13584,24 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
+ <widget class="GtkCheckButton"
id="checkbutton_encoder_analyze_propulsive">
+ <property name="label"
translatable="yes">P.</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip" translatable="yes">On
concentric evaluate only propulsive phase</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkHBox"
id="hbox_encoder_analyze_curve_num">
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -13617,7 +13635,7 @@ on current Chronojump version.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -13630,7 +13648,7 @@ on current Chronojump version.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
@@ -13677,7 +13695,7 @@ on current Chronojump version.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -13690,7 +13708,7 @@ on current Chronojump version.</property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
</widget>
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 957655c..1681694 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -34,7 +34,8 @@ public partial class ChronoJumpWindow
[Widget] Gtk.SpinButton spin_encoder_extra_weight;
[Widget] Gtk.SpinButton spin_encoder_smooth;
- [Widget] Gtk.CheckButton checkbutton_encoder_propulsive;
+ [Widget] Gtk.CheckButton checkbutton_encoder_capture_propulsive;
+ [Widget] Gtk.CheckButton checkbutton_encoder_analyze_propulsive;
[Widget] Gtk.Button button_encoder_capture;
[Widget] Gtk.Button button_encoder_capture_csharp;
@@ -362,7 +363,7 @@ public partial class ChronoJumpWindow
private void encoderCreateCurvesGraphR()
{
string analysisOptions = "-";
- if(checkbutton_encoder_propulsive.Active)
+ if(checkbutton_encoder_capture_propulsive.Active)
analysisOptions = "p";
EncoderParams ep = new EncoderParams(
@@ -772,7 +773,7 @@ public partial class ChronoJumpWindow
void on_button_encoder_export_all_curves_file_selected (string selectedFileName)
{
string analysisOptions = "-";
- if(checkbutton_encoder_propulsive.Active)
+ if(checkbutton_encoder_capture_propulsive.Active)
analysisOptions = "p";
EncoderParams ep = new EncoderParams(
@@ -1277,7 +1278,7 @@ public partial class ChronoJumpWindow
string dataFileName = "";
string analysisOptions = "-";
- if(checkbutton_encoder_propulsive.Active)
+ if(checkbutton_encoder_analyze_propulsive.Active)
analysisOptions = "p";
//use this send because we change it to send it to R
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]