[chronojump] Changed race analyzer names: manual / resisted
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Changed race analyzer names: manual / resisted
- Date: Mon, 9 Sep 2019 13:44:59 +0000 (UTC)
commit 94a3717b06d673f7d7f26ecde6662600eab92f62
Author: Xavier de Blas <xaviblas gmail com>
Date: Mon Sep 9 15:44:41 2019 +0200
Changed race analyzer names: manual / resisted
glade/app1.glade | 40 +++++++++++++++++++++++-----------------
r-scripts/sprintEncoder.R | 6 +++---
src/gui/runEncoder.cs | 8 ++++----
src/runEncoder.cs | 2 +-
4 files changed, 31 insertions(+), 25 deletions(-)
---
diff --git a/glade/app1.glade b/glade/app1.glade
index 080ac2a6..f5ddcc63 100644
--- a/glade/app1.glade
+++ b/glade/app1.glade
@@ -7135,7 +7135,7 @@ EncoderInertialCapture</property>
<widget class="GtkLabel" id="label368">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">Races with encoder - SOON
AVAILABLE</property>
+ <property name="label">Race analyzer - SOON
AVAILABLE</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -7587,8 +7587,8 @@ EncoderInertialCapture</property>
<property name="can_focus">False</property>
<property name="spacing">4</property>
<child>
- <widget class="GtkRadioButton"
id="race_analyzer_radio_device_fishing">
- <property name="label">Fishing device</property>
+ <widget class="GtkRadioButton"
id="race_analyzer_radio_device_manual">
+ <property name="label">Manual race
analyzer</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
@@ -7603,13 +7603,13 @@ EncoderInertialCapture</property>
</child>
<child>
<widget class="GtkRadioButton"
id="race_analyzer_radio_device_other">
- <property name="label">Other device</property>
+ <property name="label">Resisted race
analyzer</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <property
name="group">race_analyzer_radio_device_fishing</property>
+ <property
name="group">race_analyzer_radio_device_manual</property>
</widget>
<packing>
<property name="expand">True</property>
@@ -21811,6 +21811,9 @@ Concentric</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -23771,18 +23774,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>
@@ -23819,6 +23810,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>
@@ -30687,6 +30690,9 @@ then click this button.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
diff --git a/r-scripts/sprintEncoder.R b/r-scripts/sprintEncoder.R
index 303b056e..cdf2d129 100644
--- a/r-scripts/sprintEncoder.R
+++ b/r-scripts/sprintEncoder.R
@@ -50,7 +50,7 @@ assignOptions <- function(options) {
#-------------- assign options -------------
op <- assignOptions(options)
-getSprintFromEncoder <- function(filename, testLength, Mass, Temperature = 25, Height , Vw = 0, device =
"FISHING")
+getSprintFromEncoder <- function(filename, testLength, Mass, Temperature = 25, Height , Vw = 0, device =
"MANUAL")
{
print("#####Entering in getSprintFromEncoder###############")
# Constants for the air friction modeling
@@ -74,9 +74,9 @@ getSprintFromEncoder <- function(filename, testLength, Mass, Temperature = 25, H
#TODO: measure metersPerPulse several times to have an accurate value
metersPerPulse = NULL
- if(device == "FISHING") #Hand device
+ if(device == "MANUAL") #manual race analyzer - Hand device
metersPerPulse = 0.003003
- else #sled device
+ else #resisted race analyzer - sled device
metersPerPulse = 30 / 12267 #In 30m there are 12267 pulses.
raceAnalyzer$displacement = raceAnalyzer$displacement * metersPerPulse
diff --git a/src/gui/runEncoder.cs b/src/gui/runEncoder.cs
index b419f309..17d6ef93 100644
--- a/src/gui/runEncoder.cs
+++ b/src/gui/runEncoder.cs
@@ -38,7 +38,7 @@ public partial class ChronoJumpWindow
[Widget] Gtk.SpinButton race_analyzer_spinbutton_graph_width;
[Widget] Gtk.SpinButton race_analyzer_spinbutton_graph_height;
[Widget] Gtk.HBox hbox_race_analyzer_device;
- [Widget] Gtk.RadioButton race_analyzer_radio_device_fishing;
+ [Widget] Gtk.RadioButton race_analyzer_radio_device_manual;
[Widget] Gtk.Image image_race_encoder_graph;
[Widget] Gtk.Button button_run_encoder_recalculate;
@@ -214,10 +214,10 @@ public partial class ChronoJumpWindow
race_analyzer_graph_width = Convert.ToInt32(race_analyzer_spinbutton_graph_width.Value);
race_analyzer_graph_height = Convert.ToInt32(race_analyzer_spinbutton_graph_height.Value);
- if(race_analyzer_radio_device_fishing.Active)
- race_analyzer_device = RunEncoderGraph.Devices.FISHING;
+ if(race_analyzer_radio_device_manual.Active)
+ race_analyzer_device = RunEncoderGraph.Devices.MANUAL;
else
- race_analyzer_device = RunEncoderGraph.Devices.OTHER;
+ race_analyzer_device = RunEncoderGraph.Devices.RESISTED;
}
//TODO: do all this with an "other" thread like in force sensor to allow connecting messages to be
displayed
diff --git a/src/runEncoder.cs b/src/runEncoder.cs
index bcc7a99e..3e586b7b 100644
--- a/src/runEncoder.cs
+++ b/src/runEncoder.cs
@@ -24,7 +24,7 @@ using System.Collections.Generic; //List<T>
public class RunEncoderGraph
{
- public enum Devices { FISHING, OTHER }
+ public enum Devices { MANUAL, RESISTED }
private int testLength;
private double mass;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
