From 44815f86fa6a16936607799d7640e9f9e96dc048 Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Thu, 23 Jan 2025 17:29:46 +0100 Subject: [PATCH] - aggiunta gestione ddt con parametri e swing - aggiunto timer per csv output - implementata gestione calcolo porte uguali una sola volta - gestita barra caricamento calcolo porta prima di mandarlo a macchina - gestita barra di caricamento durante verifica porte --- .../Constants/ConstIni.vb | 3 + .../DoorListPage/DoorListPageV.xaml | 67 +- .../DoorListPage/DoorListPageVM.vb | 635 ++++++++++-- .../DoorListPage/DoorListPageVM.vb.bak | 977 ------------------ .../MachinePage/MachinePageV.xaml | 15 +- .../MachinePage/MachinePageVM.vb | 31 +- .../Utility/Dictionary.xaml | 7 + .../Utility/JsonUtility.vb | 11 +- 8 files changed, 684 insertions(+), 1062 deletions(-) delete mode 100644 Effector.Plugin.FiveLakes/DoorListPage/DoorListPageVM.vb.bak diff --git a/Effector.Plugin.FiveLakes/Constants/ConstIni.vb b/Effector.Plugin.FiveLakes/Constants/ConstIni.vb index 70bcd17..12153b0 100644 --- a/Effector.Plugin.FiveLakes/Constants/ConstIni.vb +++ b/Effector.Plugin.FiveLakes/Constants/ConstIni.vb @@ -16,9 +16,11 @@ Module ConstIni Public Const S_GENERAL As String = "General" Public Const K_CAMEXEPATH As String = "CAMExePath" + Public Const K_DOORCREATOREXEPATH As String = "DoorCreatorExePath" 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_GENDDFDIR As String = "GenDDFDir" Public Const K_CSVOUTPUT As String = "CSVOutput" @@ -28,6 +30,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_SWING As String = "Swing" Public Const K_STATE As String = "State" Public Const K_PROGRAMSENT As String = "ProgramSent" Public Const K_PROGRAMSTART As String = "ProgramStart" diff --git a/Effector.Plugin.FiveLakes/DoorListPage/DoorListPageV.xaml b/Effector.Plugin.FiveLakes/DoorListPage/DoorListPageV.xaml index 3034b84..74783cd 100644 --- a/Effector.Plugin.FiveLakes/DoorListPage/DoorListPageV.xaml +++ b/Effector.Plugin.FiveLakes/DoorListPage/DoorListPageV.xaml @@ -4,6 +4,7 @@ xmlns:local="clr-namespace:Effector.Plugin.FiveLakes"> + @@ -25,6 +26,7 @@ -->