From e490597a7bbefd6d2a2773de9499a6332d3e5a54 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Mon, 21 Oct 2024 12:12:11 +0200 Subject: [PATCH] - Eliminato nome FiveLakes - agginta gestione ddt - aggiunta gestione csvout - possibilita' di aggiungere porte manualmente - cambiati testi in italiano - gestito blocco edit su lista porte quando in produzione - aggiunta eliminazione porte prodotte - aggiunta funzione che resetta stati su reset macchina --- .../Constants/ConstIni.vb | 4 + .../DoorListPage/DoorListPageV.xaml | 78 +++++-- .../DoorListPage/DoorListPageV.xaml.vb | 10 + .../DoorListPage/DoorListPageVM.vb | 193 +++++++++++++++--- .../Effector.Plugin.DoorArreda.vbproj | 4 +- Effector.Plugin.DoorArreda/FiveLakesUI.xaml | 2 +- Effector.Plugin.DoorArreda/FiveLakesUIVM.vb | 1 + Effector.Plugin.DoorArreda/LUA/Lua_General.vb | 16 +- .../MainMenu/MainMenuV.xaml | 6 +- .../My Project/AssemblyInfo.vb | 4 +- .../My Project/Settings.Designer.vb | 4 +- .../RestartWnd/RestartWndV.xaml | 2 +- .../StatisticsPage/StatisticsPageV.xaml | 2 +- .../Utility/Dictionary.xaml | 2 +- .../Utility/ExecProcessManager.vb | 2 +- .../Utility/JsonUtility.vb | 2 +- 16 files changed, 267 insertions(+), 65 deletions(-) diff --git a/Effector.Plugin.DoorArreda/Constants/ConstIni.vb b/Effector.Plugin.DoorArreda/Constants/ConstIni.vb index 8c95c49..1a61f13 100644 --- a/Effector.Plugin.DoorArreda/Constants/ConstIni.vb +++ b/Effector.Plugin.DoorArreda/Constants/ConstIni.vb @@ -17,6 +17,9 @@ Module ConstIni Public Const S_GENERAL As String = "General" Public Const K_BACKUPDIR As String = "BackupDir" Public Const K_RESOURCESDIR As String = "ResourcesDir" + Public Const K_DDFDIR As String = "DDFDir" + Public Const K_DDTDIR As String = "DDTDir" + Public Const K_CSVOUTPUT As String = "CSVOutput" Public Const S_CSV As String = "CSV" Public Const K_DDFNAME As String = "DDFName" @@ -24,6 +27,7 @@ Module ConstIni Public Const K_HEIGHT As String = "Height" Public Const K_WIDTH As String = "Width" Public Const K_THICKNESS As String = "Thickness" + Public Const K_MANUALADDEDDOORNAME As String = "ManualAddedDoorName" Public Const S_DEBUG As String = "Debug" Public Const K_VARIABLELIST As String = "VariableList" diff --git a/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageV.xaml b/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageV.xaml index fa2beeb..2cba8f1 100644 --- a/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageV.xaml +++ b/Effector.Plugin.DoorArreda/DoorListPage/DoorListPageV.xaml @@ -1,49 +1,64 @@  + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="clr-namespace:Effector.Plugin.DoorArreda"> - +