Merge pull request #41 from dkavolis/update-23

Update 23
dkavolis · Apr 10, 2019 · 8be2ebe · 8be2ebe
2 parents 6b1a58f + f487d00
commit 8be2ebe
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/FerramAerospaceResearch/FARGUI/FAREditorGUI/StabilityDerivGUI.cs b/FerramAerospaceResearch/FARGUI/FAREditorGUI/StabilityDerivGUI.cs
@@ -249,17 +249,17 @@ private void StabDerivCalcButtonAction(CalcAndExportEnum exportflag)
             if (body.GetPressure(altitudeDouble) > 0)
             {
                 StabilityDerivExportOutput stabDerivResult = simManager.StabDerivCalculator.CalculateStabilityDerivs(body, altitudeDouble, machDouble, flapsettingInt, spoilersDeployedBool, 0, 0, 0);
-                if (stabDerivResult.outputvals.stableAoAState == "")
-                {
-                    stabDerivOutput = stabDerivResult.outputvals;
-                    simManager.vehicleData = stabDerivResult.outputvals;
-                    SetAngleVectors(stabDerivResult.outputvals.stableAoA);
+                // if (stabDerivResult.outputvals.stableAoAState == "")
+                // {
+                stabDerivOutput = stabDerivResult.outputvals;
+                simManager.vehicleData = stabDerivResult.outputvals;
+                SetAngleVectors(stabDerivResult.outputvals.stableAoA);
 
                     // Rodhern: Export of stability derivatives disabled in dkavolis branch.
                     // if (exportflag == CalcAndExportEnum.CalculateAndExport ...
-                }
-                else
-                    PopupDialog.SpawnPopupDialog(new Vector2(0, 0), new Vector2(0, 0), "FARStabDerivError", Localizer.Format("FAREditorStabDerivError"), Localizer.Format("FAREditorStabDerivErrorExp"), Localizer.Format("FARGUIOKButton"), true, HighLogic.UISkin);
+                // }
+                // else
+                //     PopupDialog.SpawnPopupDialog(new Vector2(0, 0), new Vector2(0, 0), "FARStabDerivError", Localizer.Format("FAREditorStabDerivError"), Localizer.Format("FAREditorStabDerivErrorExp"), Localizer.Format("FARGUIOKButton"), true, HighLogic.UISkin);
             }
             else
                 PopupDialog.SpawnPopupDialog(new Vector2(0, 0), new Vector2(0, 0), "FARStabDerivError", Localizer.Format("FAREditorStabDerivError"), Localizer.Format("FAREditorStabDerivErrorExp"), Localizer.Format("FARGUIOKButton"), true, HighLogic.UISkin);

diff --git a/GameData/FerramAerospaceResearch/Plugins/FerramAerospaceResearch.dll b/GameData/FerramAerospaceResearch/Plugins/FerramAerospaceResearch.dll
diff --git a/GameData/FerramAerospaceResearch/Plugins/ferramGraph.dll b/GameData/FerramAerospaceResearch/Plugins/ferramGraph.dll
diff --git a/bin/Debug/FerramAerospaceResearch.dll b/bin/Debug/FerramAerospaceResearch.dll
diff --git a/bin/Debug/ferramGraph.dll b/bin/Debug/ferramGraph.dll