[chronojump] Addded ROTARYAXISINERTIALLATERALMOVPULLEY on gui



commit 60a0340c73b033839e730676845fb815c01e5502
Author: Xavier de Blas <xaviblas gmail com>
Date:   Thu Mar 2 14:14:05 2017 +0100

    Addded ROTARYAXISINERTIALLATERALMOVPULLEY on gui

 src/constants.cs   |    2 +-
 src/encoder.cs     |   13 +++++++++++++
 src/utilEncoder.cs |    2 ++
 3 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/src/constants.cs b/src/constants.cs
index 254ab16..09b632c 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -828,7 +828,7 @@ public class Constants
                ROTARYFRICTIONSIDEINERTIALMOVPULLEY, ROTARYFRICTIONAXISINERTIALMOVPULLEY,
                // ---- ROTARY AXIS ----
                ROTARYAXIS, WEIGHTEDMOVPULLEYROTARYAXIS,
-               ROTARYAXISINERTIAL, ROTARYAXISINERTIALLATERAL, ROTARYAXISINERTIALMOVPULLEY
+               ROTARYAXISINERTIAL, ROTARYAXISINERTIALLATERAL, ROTARYAXISINERTIALMOVPULLEY, 
ROTARYAXISINERTIALLATERALMOVPULLEY
        }
 
        public static string DefaultEncoderConfigurationCode = "Linear - barbell";
diff --git a/src/encoder.cs b/src/encoder.cs
index 77ff2d5..67cfffb 100644
--- a/src/encoder.cs
+++ b/src/encoder.cs
@@ -1533,6 +1533,19 @@ public class EncoderConfiguration
                        has_inertia = true;
                        has_gearedDown = true;
                }
+               else if(name == Constants.EncoderConfigurationNames.ROTARYAXISINERTIALLATERALMOVPULLEY) {
+                       type = Constants.EncoderType.ROTARYAXIS;
+                       position = 3;
+                       image = Constants.FileNameEncoderAxisInertialMovPulley; //TODO
+                       code = "Rotary axis - inertial machine - horizontal movement - geared up";
+                       text = Catalog.GetString("Rotary axis encoder on inertial machine geared up when 
person is moving horizontally.") + "\n" +
+                               Catalog.GetString("On inertial machines, 'd' means the average diameter where 
the pull-push string is rolled") + "\n" +
+                               Catalog.GetString("Inertial machine rolls twice faster than body.");
+
+                       has_d = true;
+                       has_inertia = true;
+                       has_gearedDown = true;
+               }
        }
 
        public void SetInertialDefaultOptions() {
diff --git a/src/utilEncoder.cs b/src/utilEncoder.cs
index af6307e..f476409 100644
--- a/src/utilEncoder.cs
+++ b/src/utilEncoder.cs
@@ -792,6 +792,8 @@ public class UtilEncoder
                                                        
Constants.EncoderConfigurationNames.ROTARYAXISINERTIALLATERAL));
                                list.Add(new EncoderConfiguration(
                                                        
Constants.EncoderConfigurationNames.ROTARYAXISINERTIALMOVPULLEY));
+                               list.Add(new EncoderConfiguration(
+                                                       
Constants.EncoderConfigurationNames.ROTARYAXISINERTIALLATERALMOVPULLEY));
                        }
                }
                return list;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]