Enable Flight Computer to queue and execute a sequence of maneuver nodes at one go and increase the message duration by 2 seconds

KSP-TaxiService · KSP-TaxiService · commit 7bb3484014d1 · 2017-06-21T21:48:00.000+08:00
diff --git a/src/RemoteTech/FlightComputer/Commands/ManeuverCommand.cs b/src/RemoteTech/FlightComputer/Commands/ManeuverCommand.cs
@@ -37,13 +37,22 @@ public override string Description
                     return flightInfo + Environment.NewLine + base.Description;
                 }
                 else
-                    return "Execute planned maneuver" + Environment.NewLine + base.Description;
+                {
+                    return "Execute planned maneuver"+ Environment.NewLine + base.Description;
+                }
             }
         }
         public override string ShortName { get { return "Execute maneuver node"; } }
 
         public override bool Pop(FlightComputer f)
         {
+            // check if the stored node is still valid
+            if (f.Vessel.patchedConicSolver.maneuverNodes.IndexOf(this.Node) < 0)
+            {
+                RTUtil.ScreenMessage("[Flight Computer]: No maneuver node found.");
+                return false;
+            }
+
             var burn = f.ActiveCommands.FirstOrDefault(c => c is BurnCommand);
             if (burn != null) {
                 f.Remove (burn);
@@ -75,12 +84,12 @@ private double getRemainingDeltaV(FlightComputer computer)
         }
 
         /// <summary>
-        /// 
+        /// Remove the current maneuver node from MapView
         /// </summary>
         /// <param name="computer">FlightComputer instance of the computer of the vessel.</param>
         private void AbortManeuver(FlightComputer computer)
         {
-            RTUtil.ScreenMessage("[Flight Computer]: Maneuver removed");
+            RTUtil.ScreenMessage("[Flight Computer]: Maneuver node removed");
             if (computer.Vessel.patchedConicSolver != null)
             {
                 Node.RemoveSelf();
diff --git a/src/RemoteTech/RTUtil.cs b/src/RemoteTech/RTUtil.cs
@@ -82,7 +82,7 @@ public static double TryParseDuration(String duration)
 
         public static void ScreenMessage(String msg)
         {
-            ScreenMessages.PostScreenMessage(new ScreenMessage(msg, 4.0f, ScreenMessageStyle.UPPER_LEFT));
+            ScreenMessages.PostScreenMessage(new ScreenMessage(msg, 6.0f, ScreenMessageStyle.UPPER_LEFT));
         }
 
         public static String Truncate(this String targ, int len)
diff --git a/src/RemoteTech/UI/AttitudeFragment.cs b/src/RemoteTech/UI/AttitudeFragment.cs
@@ -209,7 +209,7 @@ public void Draw()
                 {
                     RTUtil.Button(new GUIContent("BURN", "Example: 125, 125s, 5m20s, 1d6h20m10s, 123m/s."),
                         OnBurnClick, GUILayout.Width(width3));
-                    RTUtil.Button(new GUIContent("EXEC", "Executes next maneuver node."),
+                    RTUtil.Button(new GUIContent("EXEC", "Executes next and subsequent maneuver nodes."),
                         OnExecClick, GUILayout.Width(width3));
                     RTUtil.Button(new GUIContent(">>", "Toggles the queue and delay functionality."),
                         mOnClickQueue, GUILayout.Width(width3));
@@ -314,6 +314,16 @@ private void OnExecClick()
             else
             {
                 mFlightComputer.Enqueue(cmd, false, false, true);
+
+                //check for subsequent nodes
+                int numSubsequentNodes = mFlightComputer.Vessel.patchedConicSolver.maneuverNodes.Count - 1;
+                if (numSubsequentNodes >= 1)
+                {
+                    for (int nodeIndex = 1; nodeIndex <= numSubsequentNodes; nodeIndex++)
+                    {
+                        mFlightComputer.Enqueue(ManeuverCommand.WithNode(nodeIndex, mFlightComputer), false, false, true);
+                    }
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,22 @@ public override string Description`
`37`	`37`	`return flightInfo + Environment.NewLine + base.Description;`
`38`	`38`	`}`
`39`	`39`	`else`
`40`		`- return "Execute planned maneuver" + Environment.NewLine + base.Description;`
	`40`	`+ {`
	`41`	`+ return "Execute planned maneuver"+ Environment.NewLine + base.Description;`
	`42`	`+ }`
`41`	`43`	`}`
`42`	`44`	`}`
`43`	`45`	`public override string ShortName { get { return "Execute maneuver node"; } }`
`44`	`46`
`45`	`47`	`public override bool Pop(FlightComputer f)`
`46`	`48`	`{`
	`49`	`+ // check if the stored node is still valid`
	`50`	`+ if (f.Vessel.patchedConicSolver.maneuverNodes.IndexOf(this.Node) < 0)`
	`51`	`+ {`
	`52`	`+ RTUtil.ScreenMessage("[Flight Computer]: No maneuver node found.");`
	`53`	`+ return false;`
	`54`	`+ }`
	`55`	`+`
`47`	`56`	`var burn = f.ActiveCommands.FirstOrDefault(c => c is BurnCommand);`
`48`	`57`	`if (burn != null) {`
`49`	`58`	`f.Remove (burn);`
`@@ -75,12 +84,12 @@ private double getRemainingDeltaV(FlightComputer computer)`
`75`	`84`	`}`
`76`	`85`
`77`	`86`	`/// <summary>`
`78`		`- ///`
	`87`	`+ /// Remove the current maneuver node from MapView`
`79`	`88`	`/// </summary>`
`80`	`89`	`/// <param name="computer">FlightComputer instance of the computer of the vessel.</param>`
`81`	`90`	`private void AbortManeuver(FlightComputer computer)`
`82`	`91`	`{`
`83`		`- RTUtil.ScreenMessage("[Flight Computer]: Maneuver removed");`
	`92`	`+ RTUtil.ScreenMessage("[Flight Computer]: Maneuver node removed");`
`84`	`93`	`if (computer.Vessel.patchedConicSolver != null)`
`85`	`94`	`{`
`86`	`95`	`Node.RemoveSelf();`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public static double TryParseDuration(String duration)`
`82`	`82`
`83`	`83`	`public static void ScreenMessage(String msg)`
`84`	`84`	`{`
`85`		`- ScreenMessages.PostScreenMessage(new ScreenMessage(msg, 4.0f, ScreenMessageStyle.UPPER_LEFT));`
	`85`	`+ ScreenMessages.PostScreenMessage(new ScreenMessage(msg, 6.0f, ScreenMessageStyle.UPPER_LEFT));`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`public static String Truncate(this String targ, int len)`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ public void Draw()`
`209`	`209`	`{`
`210`	`210`	`RTUtil.Button(new GUIContent("BURN", "Example: 125, 125s, 5m20s, 1d6h20m10s, 123m/s."),`
`211`	`211`	`OnBurnClick, GUILayout.Width(width3));`
`212`		`- RTUtil.Button(new GUIContent("EXEC", "Executes next maneuver node."),`
	`212`	`+ RTUtil.Button(new GUIContent("EXEC", "Executes next and subsequent maneuver nodes."),`
`213`	`213`	`OnExecClick, GUILayout.Width(width3));`
`214`	`214`	`RTUtil.Button(new GUIContent(">>", "Toggles the queue and delay functionality."),`
`215`	`215`	`mOnClickQueue, GUILayout.Width(width3));`
`@@ -314,6 +314,16 @@ private void OnExecClick()`
`314`	`314`	`else`
`315`	`315`	`{`
`316`	`316`	`mFlightComputer.Enqueue(cmd, false, false, true);`
	`317`	`+`
	`318`	`+ //check for subsequent nodes`
	`319`	`+ int numSubsequentNodes = mFlightComputer.Vessel.patchedConicSolver.maneuverNodes.Count - 1;`
	`320`	`+ if (numSubsequentNodes >= 1)`
	`321`	`+ {`
	`322`	`+ for (int nodeIndex = 1; nodeIndex <= numSubsequentNodes; nodeIndex++)`
	`323`	`+ {`
	`324`	`+ mFlightComputer.Enqueue(ManeuverCommand.WithNode(nodeIndex, mFlightComputer), false, false, true);`
	`325`	`+ }`
	`326`	`+ }`
`317`	`327`	`}`
`318`	`328`	`}`
`319`	`329`