From 7f031691bbccd5ca820542adfae16347cb7f6482 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Tue, 3 Sep 2024 11:19:57 +0200 Subject: [PATCH] - aggiunti backup dir e resources dir - aggiunti flag di debug per nascondere grafica di debug - aggiunti bottoni per verificare porte e resettare coda di produzione - aggiunto stato di produzione e tempi a lista porte - aggiunto stato lua a plugin - aggiunta gestione tabella di tabella in alcune funzioni lua - aggiunte funzioni che gestiscono esecuzione sincrona ed asincrona dell' eseguibile - migliorato mainmenu ora funzionante - aggiunta pagina statistiche - aggiunto in pagina macchina disegno macchina con variabili di debug e lista circolare porte --- .../Constants/ConstIni.vb | 8 + .../DoorListPage/DoorListPageV.xaml | 37 +- .../DoorListPage/DoorListPageVM.vb | 247 ++++- Supervisor.Plugin.FiveLakes/FiveLakesUI.xaml | 12 +- Supervisor.Plugin.FiveLakes/FiveLakesUIVM.vb | 21 +- Supervisor.Plugin.FiveLakes/LUA/LuaManager.vb | 1 + Supervisor.Plugin.FiveLakes/LUA/Lua_Aux.vb | 345 ++++++- .../LUA/Lua_General.vb | 35 +- .../MachinePage/MachinePageV.xaml | 857 ++++++++++++++++-- .../MachinePage/MachinePageVM.vb | 620 ++++++++++++- .../MainMenu/MainMenuV.xaml | 33 +- .../MainMenu/MainMenuVM.vb | 21 +- .../StatisticsPage/StatisticsPageV.xaml | 12 + .../StatisticsPage/StatisticsPageV.xaml.vb | 3 + .../StatisticsPage/StatisticsPageVM.vb | 3 + .../Supervisor.Plugin.FiveLakes.vbproj | 9 +- .../Utility/Dictionary.xaml | 8 + .../Utility/JsonUtility.vb | 72 +- 18 files changed, 2152 insertions(+), 192 deletions(-) create mode 100644 Supervisor.Plugin.FiveLakes/StatisticsPage/StatisticsPageV.xaml create mode 100644 Supervisor.Plugin.FiveLakes/StatisticsPage/StatisticsPageV.xaml.vb create mode 100644 Supervisor.Plugin.FiveLakes/StatisticsPage/StatisticsPageVM.vb diff --git a/Supervisor.Plugin.FiveLakes/Constants/ConstIni.vb b/Supervisor.Plugin.FiveLakes/Constants/ConstIni.vb index 79ab7d5..78ae2b3 100644 --- a/Supervisor.Plugin.FiveLakes/Constants/ConstIni.vb +++ b/Supervisor.Plugin.FiveLakes/Constants/ConstIni.vb @@ -15,6 +15,8 @@ Module ConstIni Public Const INI_FILE_NAME As String = "Supervisor.Plugin.FiveLakes.ini" Public Const S_GENERAL As String = "General" + Public Const K_BACKUPDIR As String = "BackupDir" + Public Const K_RESOURCESDIR As String = "ResourcesDir" Public Const S_CSV As String = "CSV" Public Const K_DDFNAME As String = "DDFName" @@ -23,4 +25,10 @@ Module ConstIni Public Const K_WIDTH As String = "Width" Public Const K_THICKNESS As String = "Thickness" + Public Const S_DEBUG As String = "Debug" + Public Const K_VARIABLELIST As String = "VariableList" + Public Const K_VARIABLEONDRAW As String = "VariableOnDraw" + Public Const K_MACHINECOMMANDS As String = "MachineCommands" + Public Const K_DOORCIRCLIST As String = "DoorCircList" + End Module diff --git a/Supervisor.Plugin.FiveLakes/DoorListPage/DoorListPageV.xaml b/Supervisor.Plugin.FiveLakes/DoorListPage/DoorListPageV.xaml index f1fa2f8..b8762d4 100644 --- a/Supervisor.Plugin.FiveLakes/DoorListPage/DoorListPageV.xaml +++ b/Supervisor.Plugin.FiveLakes/DoorListPage/DoorListPageV.xaml @@ -1,7 +1,6 @@  + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> @@ -9,7 +8,8 @@