[chronojump] Removed gearedDown 1, and other minor problems
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Removed gearedDown 1, and other minor problems
- Date: Sat, 27 Feb 2016 11:58:36 +0000 (UTC)
commit 7f3d99b2b72651de4e85ad8751bbba2f361b3f40
Author: Xavier de Blas <xaviblas gmail com>
Date: Sat Feb 27 12:53:02 2016 +0100
Removed gearedDown 1, and other minor problems
glade/chronojump.glade | 5 +++--
src/encoder.cs | 16 +++++-----------
2 files changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 2454549..2e5bcc1 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -29687,8 +29687,10 @@ to the center of the loads.</property>
<widget class="GtkLabel" id="label23">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="tooltip" translatable="yes">Machine
speed / Person speed ratio.
+Eg. value = 2, means person does twice force at half speed.</property>
<property name="xalign">0</property>
- <property name="label"
translatable="yes">Multiplied</property>
+ <property name="label" translatable="yes">Force
multiplier</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -29703,7 +29705,6 @@ to the center of the loads.</property>
<property name="items">4
3
2
-1
1/2
1/3
1/4</property>
diff --git a/src/encoder.cs b/src/encoder.cs
index 8936a13..dcef4d8 100644
--- a/src/encoder.cs
+++ b/src/encoder.cs
@@ -1438,9 +1438,9 @@ public class EncoderConfiguration {
* on C#, R, SQL we use "gearedDown" for historical reasons. So a conversion is done on displaying
data to user
* gearedDown is stored as integer on database and is converted to this gearedUp for GUI
* R will do another conversion and will use the double
- * 4 , 3 , 2 , 1, 1/2, 1/3, 1/4 #gearedUp string (GUI)
- * -4 , -3 , -2 , 1, 2, 3, 4 #gearedDown
- * 0.25, 0.333, 0.5, 1, 2, 3, 4 #gearedDown on R (see
readFromFile.gearedDown() on util.cs)
+ * 4 , 3 , 2 , 1/2, 1/3, 1/4 #gearedUp string (GUI)
+ * -4 , -3 , -2 , 2, 3, 4 #gearedDown
+ * 0.25, 0.333, 0.5, 2, 3, 4 #gearedDown on R (see
readFromFile.gearedDown() on util.cs)
*/
public string GearedUpDisplay()
{
@@ -1454,9 +1454,6 @@ public class EncoderConfiguration {
case -2:
return "2";
break;
- case 1:
- return "1";
- break;
case 2:
return "1/2";
break;
@@ -1467,7 +1464,7 @@ public class EncoderConfiguration {
return "1/4";
break;
default:
- return "1";
+ return "2";
break;
}
}
@@ -1483,9 +1480,6 @@ public class EncoderConfiguration {
case "2":
gearedDown = -2;
break;
- case "1":
- gearedDown = 1;
- break;
case "1/2":
gearedDown = 2;
break;
@@ -1496,7 +1490,7 @@ public class EncoderConfiguration {
gearedDown = 4;
break;
default:
- gearedDown = 1;
+ gearedDown = -2;
break;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]