Merge pull request #983 from sweiland-openrails/SwitchPanelDpu

WEB based Switch Panel bug: DPU window
openrails · Sep 26, 2024 · ca63633 · ca63633
2 parents 336a700 + 202316e
commit ca63633
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 1 deletion.
diff --git a/Source/RunActivity/Viewer3D/Popups/TrainDPUWindow.cs b/Source/RunActivity/Viewer3D/Popups/TrainDPUWindow.cs
@@ -340,7 +340,7 @@ void VerticalWindow_Click(Control arg1, Point arg2)
             UpdateWindowSize();
         }
 
-        private void UpdateWindowSize()
+        public void UpdateWindowSize()
         {
             labels = TrainDPUWindowList(Owner.Viewer, normalTextMode).ToList();
             ModifyWindowSize();

diff --git a/Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchesOnPanel.cs b/Source/RunActivity/Viewer3D/WebServices/SwitchPanel/SwitchesOnPanel.cs
@@ -195,6 +195,9 @@ public bool IsPressed(UserCommand userCommand)
                     case UserCommand.DisplayHUD:
                         IsPressedDisplayHUD();
                         return false;
+                    case UserCommand.DisplayTrainDpuWindow:
+                        IsPressedDisplayDpuWindow();
+                        return false;
                     default:
                         return true;
                 }
@@ -328,6 +331,52 @@ private void IsPressedDisplayHUD()
             }
         }
 
+        private void IsPressedDisplayDpuWindow()
+        {
+            if (!Viewer.TrainDpuWindow.Visible)
+            {
+                // DpuWindow not visible
+                Viewer.TrainDpuWindow.normalTextMode = true;
+                Viewer.TrainDpuWindow.normalVerticalMode = true;
+                Viewer.TrainDpuWindow.Visible = true;
+                Viewer.TrainDpuWindow.UpdateWindowSize();
+            }
+            else
+            {
+                // visible
+                if ((Viewer.TrainDpuWindow.normalTextMode == true) && (Viewer.TrainDpuWindow.normalVerticalMode == true))
+                {
+                    Viewer.TrainDpuWindow.normalVerticalMode = false;
+                    Viewer.TrainDpuWindow.UpdateWindowSize();
+                    return;
+                }
+
+                if ((Viewer.TrainDpuWindow.normalTextMode == true) && (Viewer.TrainDpuWindow.normalVerticalMode == false))
+                {
+                    Viewer.TrainDpuWindow.normalTextMode = false;
+                    Viewer.TrainDpuWindow.normalVerticalMode = true;
+                    Viewer.TrainDpuWindow.UpdateWindowSize();
+                    return;
+                }
+
+                if ((Viewer.TrainDpuWindow.normalTextMode == false) && (Viewer.TrainDpuWindow.normalVerticalMode == true))
+                {
+                    Viewer.TrainDpuWindow.normalVerticalMode = false;
+                    Viewer.TrainDpuWindow.UpdateWindowSize();
+                    return;
+                }
+
+                if ((Viewer.TrainDpuWindow.normalTextMode == false) && (Viewer.TrainDpuWindow.normalVerticalMode == false))
+                {
+                    Viewer.TrainDpuWindow.normalTextMode = true;
+                    Viewer.TrainDpuWindow.normalVerticalMode = true;
+                    Viewer.TrainDpuWindow.Visible = false;
+                    Viewer.TrainDpuWindow.UpdateWindowSize();
+                    return;
+                }
+            }
+        }
+
         public bool IsChanged()
         {
             bool changed = false;