Merge pull request sirkut#14 from ZiwKerman/develop

Changes: Preset KSPActions are more event-like now, API refined, GUI memory usage optimisations and fixes

Author: ZiwKerman

InfernalRobotics/InfernalRobotics/API/IRWrapper.cs

@@ -339,11 +339,15 @@ internal IRServo(Object s)
                     MinConfigPositionProperty = IRServoMechanismType.GetProperty("MinPosition");
                     MaxConfigPositionProperty = IRServoMechanismType.GetProperty("MaxPosition");
 
-                    PositionProperty = IRServoMechanismType.GetProperty("Position");
                     SpeedProperty = IRServoMechanismType.GetProperty("SpeedLimit");
                     ConfigSpeedProperty = IRServoMechanismType.GetProperty("DefaultSpeed");
+                    CurrentSpeedProperty = IRServoMechanismType.GetProperty("CurrentSpeed");
                     AccelerationProperty = IRServoMechanismType.GetProperty("AccelerationLimit");
-
+                    IsMovingProperty = IRServoMechanismType.GetProperty("IsMoving");
+                    IsFreeMovingProperty = IRServoMechanismType.GetProperty("IsFreeMoving");
+                    IsLockedProperty = IRServoMechanismType.GetProperty("IsLocked");
+                    IsAxisInvertedProperty = IRServoMechanismType.GetProperty("IsAxisInverted");
+                    
                     MoveRightMethod = IRServoMechanismType.GetMethod("MoveRight", BindingFlags.Public | BindingFlags.Instance);
                     MoveLeftMethod = IRServoMechanismType.GetMethod("MoveLeft", BindingFlags.Public | BindingFlags.Instance);
                     MoveCenterMethod = IRServoMechanismType.GetMethod("MoveCenter", BindingFlags.Public | BindingFlags.Instance);
@@ -368,7 +372,7 @@ public String Name
                 private PropertyInfo HighlightProperty;
                 public bool Highlight
                 {
-                    get { return (bool)HighlightProperty.GetValue(actualServo, null); }
+                    //get { return (bool)HighlightProperty.GetValue(actualServo, null); }
                     set { HighlightProperty.SetValue(actualServo, value, null); }
                 }
 
@@ -417,13 +421,46 @@ public float Speed
                     set { SpeedProperty.SetValue(actualServoMechanism, value, null); }
                 }
 
+                private PropertyInfo CurrentSpeedProperty;
+                public float CurrentSpeed
+                {
+                    get { return (float)CurrentSpeedProperty.GetValue(actualServoMechanism, null); }
+                    set { CurrentSpeedProperty.SetValue(actualServoMechanism, value, null); }
+                }
+
                 private PropertyInfo AccelerationProperty;
                 public float Acceleration
                 {
                     get { return (float)AccelerationProperty.GetValue(actualServoMechanism, null); }
                     set { AccelerationProperty.SetValue(actualServoMechanism, value, null); }
                 }
 
+                private PropertyInfo IsMovingProperty;
+                public bool IsMoving
+                {
+                    get { return (bool)IsMovingProperty.GetValue(actualServoMechanism, null); }
+                }
+
+                private PropertyInfo IsFreeMovingProperty;
+                public bool IsFreeMoving
+                {
+                    get { return (bool)IsFreeMovingProperty.GetValue(actualServoMechanism, null); }
+                }
+
+                private PropertyInfo IsLockedProperty;
+                public bool IsLocked
+                {
+                    get { return (bool)IsLockedProperty.GetValue(actualServoMechanism, null); }
+                    set { IsLockedProperty.SetValue(actualServoMechanism, value, null); }
+                }
+
+                private PropertyInfo IsAxisInvertedProperty;
+                public bool IsAxisInverted
+                {
+                    get { return (bool)IsAxisInvertedProperty.GetValue(actualServoMechanism, null); }
+                    set { IsAxisInvertedProperty.SetValue(actualServoMechanism, value, null); }
+                }
+
                 private MethodInfo MoveRightMethod;
                 internal void MoveRight()
                 {
@@ -465,6 +502,32 @@ internal void Stop()
                 {
                     StopMethod.Invoke(actualServoMechanism, new System.Object[] { });
                 }
+
+                public override bool Equals(object o)
+                {
+                    var servo = o as IRServo;
+                    return servo != null && actualServo.Equals(servo.actualServo);
+                }
+
+                public override int GetHashCode()
+                {
+                    return (actualServo != null ? actualServo.GetHashCode() : 0);
+                }
+
+                public static bool operator ==(IRServo left, IRServo right)
+                {
+                    return Equals(left, right);
+                }
+
+                public static bool operator !=(IRServo left, IRServo right)
+                {
+                    return !Equals(left, right);
+                }
+
+                protected bool Equals(IRServo other)
+                {
+                    return Equals(actualServo, other.actualServo);
+                }
             }
 
             public class IRServoGroupsList : List<IRControlGroup>

InfernalRobotics/InfernalRobotics/Control/Servo/MechanismBase.cs

@@ -28,8 +28,8 @@ public float Position
         /// </summary>
         public float DefaultPosition
         {
-            get { return RawServo.defaultPosition; }
-            set { RawServo.defaultPosition = Math.Min(Math.Max(value, RawServo.minTweak), RawServo.maxTweak); }
+            get { return RawServo.Translator.ToExternalPos(RawServo.defaultPosition); }
+            set { RawServo.defaultPosition = Math.Min(Math.Max(RawServo.Translator.ToInternalPos(value), RawServo.minTweak), RawServo.maxTweak); }
         }
 
         protected MuMechToggle RawServo
@@ -55,7 +55,7 @@ public bool IsLocked
 
         public float CurrentSpeed
         {
-            get { return RawServo.Translator.GetSpeedUnit(); }
+            get { return RawServo.Interpolator.Velocity; }
         }
 
         public float MaxSpeed

InfernalRobotics/InfernalRobotics/Control/Servo/ServoPreset.cs

@@ -30,29 +30,6 @@ public void MoveNext()
             rawServo.MoveNextPreset();
         }
 
-        public void MoveToIndex(int presetIndex)
-        {
-            if (rawServo.PresetPositions == null || rawServo.PresetPositions.Count == 0
-                || presetIndex < 0 || presetIndex >= rawServo.PresetPositions.Count)
-                return;
-
-            float nextPosition = rawServo.PresetPositions[presetIndex];
-
-            if (HighLogic.LoadedSceneIsEditor)
-            {
-                var deltaPosition = nextPosition - (rawServo.Position);
-                rawServo.ApplyDeltaPos(deltaPosition);
-            }
-            else
-            {
-                //because Translator expects position in external coordinates
-                nextPosition = rawServo.Translator.ToExternalPos(nextPosition);
-                rawServo.Translator.Move(nextPosition, rawServo.customSpeed * rawServo.speedTweak);
-            }
-
-            Logger.Log("[Action] MoveToPreset, index=" + presetIndex + " currentPos = " + rawServo.Position + ", nextPosition=" + nextPosition, Logger.Level.Debug);
-        }
-
         public void Save(bool symmetry = false)
         {
             Sort();