[chronojump] Added LINEARONPLANEWEIGHTDIFFANGLEMOVPULLEY on gui



commit 8465c41ea332a15a4351973dac2a7a400a3bd109
Author: Xavier de Blas <xaviblas gmail com>
Date:   Wed Mar 1 18:45:32 2017 +0100

    Added LINEARONPLANEWEIGHTDIFFANGLEMOVPULLEY on gui

 src/constants.cs   |    2 +-
 src/encoder.cs     |   12 ++++++++++++
 src/utilEncoder.cs |    2 ++
 3 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/src/constants.cs b/src/constants.cs
index 82acdef..254ab16 100644
--- a/src/constants.cs
+++ b/src/constants.cs
@@ -819,7 +819,7 @@ public class Constants
                WEIGHTEDMOVPULLEYLINEARONPERSON1, WEIGHTEDMOVPULLEYLINEARONPERSON1INV,
                WEIGHTEDMOVPULLEYLINEARONPERSON2, WEIGHTEDMOVPULLEYLINEARONPERSON2INV,
                WEIGHTEDMOVPULLEYONLINEARENCODER, 
-               LINEARONPLANE, LINEARONPLANEWEIGHTDIFFANGLE, 
+               LINEARONPLANE, LINEARONPLANEWEIGHTDIFFANGLE, LINEARONPLANEWEIGHTDIFFANGLEMOVPULLEY,
                // ---- ROTARY FRICTION ----
                ROTARYFRICTIONSIDE, ROTARYFRICTIONAXIS,
                WEIGHTEDMOVPULLEYROTARYFRICTION,
diff --git a/src/encoder.cs b/src/encoder.cs
index 2c9dc44..77ff2d5 100644
--- a/src/encoder.cs
+++ b/src/encoder.cs
@@ -1344,6 +1344,18 @@ public class EncoderConfiguration
                        has_angle_push = true;
                        has_angle_weight = true;
                }
+               else if(name == Constants.EncoderConfigurationNames.LINEARONPLANEWEIGHTDIFFANGLEMOVPULLEY) {
+                       type = Constants.EncoderType.LINEAR;
+                       position = 9;
+                       image = Constants.FileNameEncoderLinearOnPlaneWeightDiffAngle; //TODO
+                       code = "Linear - inclined plane different angle - moving pulley";
+                       text = Catalog.GetString("Linear encoder on a inclined plane moving a weight in 
different angle.") + "\n" +
+                               Catalog.GetString("Suitable also for horizontal movement. Just set a 0 push 
angle."); //TODO
+
+                       has_angle_push = true;
+                       has_angle_weight = true;
+                       has_gearedDown = true;
+               }
                // ---- inertial
                else if(name == Constants.EncoderConfigurationNames.LINEARINERTIAL) {
                        type = Constants.EncoderType.LINEAR;
diff --git a/src/utilEncoder.cs b/src/utilEncoder.cs
index de5cd5b..af6307e 100644
--- a/src/utilEncoder.cs
+++ b/src/utilEncoder.cs
@@ -747,6 +747,8 @@ public class UtilEncoder
                                                        Constants.EncoderConfigurationNames.LINEARONPLANE));
                                list.Add(new EncoderConfiguration(
                                                        
Constants.EncoderConfigurationNames.LINEARONPLANEWEIGHTDIFFANGLE));
+                               list.Add(new EncoderConfiguration(
+                                                       
Constants.EncoderConfigurationNames.LINEARONPLANEWEIGHTDIFFANGLEMOVPULLEY));
                        } else {
                                list.Add(new EncoderConfiguration(
                                                        Constants.EncoderConfigurationNames.LINEARINERTIAL));


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