From 18c858a42639d5586d70cf293bf125bb7d7544f3 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Wed, 11 Sep 2024 10:05:31 +0200 Subject: [PATCH] - letta modalita' simulazione macchina anche in plugin - disabilitato sort su colonne lista porte - corretta riattivazione bottoni dopo calcolo - corretta acquisizione risultato da calcolo porta - corrette funzioni lua con parametro inutile - cambiato valori di avanzamento variabili porta in WP per scarico uguale a 2 - cambiata sorgente indice porta su disegnino - aggiunta lista porte a finestra di restart - aggiunta a finestra di restart lettura json del lua - aggiunta classe IdNameStruct --- .../Constants/ConstIni.vb | 3 + .../DoorListPage/DoorListPageV.xaml | 3 +- .../DoorListPage/DoorListPageVM.vb | 8 +- .../LUA/Lua_General.vb | 12 +- .../MachinePage/MachinePageV.xaml | 20 +- .../MachinePage/MachinePageVM.vb | 123 ++++++---- .../RestartWnd/RestartWndV.xaml | 69 +++++- .../RestartWnd/RestartWndVM.vb | 213 +++++++++++++++++- .../Supervisor.Plugin.FiveLakes.vbproj | 1 + .../Utility/ExecProcessManager.vb | 4 + .../Utility/IdNameStruct.vb | 97 ++++++++ .../Utility/JsonUtility.vb | 188 +++++++++++++++- 12 files changed, 661 insertions(+), 80 deletions(-) create mode 100644 Supervisor.Plugin.FiveLakes/Utility/IdNameStruct.vb diff --git a/Supervisor.Plugin.FiveLakes/Constants/ConstIni.vb b/Supervisor.Plugin.FiveLakes/Constants/ConstIni.vb index 78ae2b3..9a85b00 100644 --- a/Supervisor.Plugin.FiveLakes/Constants/ConstIni.vb +++ b/Supervisor.Plugin.FiveLakes/Constants/ConstIni.vb @@ -31,4 +31,7 @@ Module ConstIni Public Const K_MACHINECOMMANDS As String = "MachineCommands" Public Const K_DOORCIRCLIST As String = "DoorCircList" + Public Const S_NC As String = "NC" + Public Const K_NC_SIMULATE As String = "NcSimulate" + End Module diff --git a/Supervisor.Plugin.FiveLakes/DoorListPage/DoorListPageV.xaml b/Supervisor.Plugin.FiveLakes/DoorListPage/DoorListPageV.xaml index b8762d4..f762524 100644 --- a/Supervisor.Plugin.FiveLakes/DoorListPage/DoorListPageV.xaml +++ b/Supervisor.Plugin.FiveLakes/DoorListPage/DoorListPageV.xaml @@ -42,7 +42,8 @@ + AutoGenerateColumns="False" + CanUserSortColumns="False">