From 9636ff0457576753ac554488b2ee6cce13e0339c Mon Sep 17 00:00:00 2001 From: bliestlech-tc Date: Thu, 5 Mar 2026 14:37:43 +0100 Subject: [PATCH] Push Changes from Techcrafters Repo --- uniper_hmi/Infineon.sln.DotSettings | 2 + .../UniperHMI/Common/L4ItXmlSerializer.cs | 251 ++-- .../UniperHMI/Common/MediaContainer.xaml | 80 +- .../UniperHMI/Common/MediaContainer.xaml.cs | 47 +- .../UniperHMI/Common/PackMLControl.xaml | 68 + .../UniperHMI/Common/PackMLControl.xaml.cs | 23 +- .../UniperHMI/Common/PackMLControlVm.cs | 201 +++ .../UniperHMI/Common/ParamControlFloat.xaml | 21 +- .../Common/ParamControlFloat.xaml.cs | 47 +- .../UniperHMI/Common/ParamControlInt.xaml | 25 +- .../UniperHMI/Common/ParamControlInt.xaml.cs | 47 +- uniper_hmi/UniperHMI/Common/User.cs | 57 + .../Common/UserManagementWindow.xaml | 52 + .../Common/UserManagementWindow.xaml.cs | 17 + .../Common/UserManagementWindowVm.cs | 213 +++ .../Common/WorkingmodeToColorConverter.cs | 34 + .../UniperHMI/DateTimeToEventTimeConverter.cs | 55 +- .../HMIToolkit/BinaryValveWindow.xaml.cs | 23 +- .../AnalogMotorControl.xaml.cs | 37 +- .../AnalogMotorcontrolVM.cs | 123 +- .../AnalogValue/AnalogRangeValidator.cs | 45 +- .../AnalogValue/AnalogValue.xaml.cs | 47 +- .../AnalogValveControl.xaml.cs | 37 +- .../AnalogValveControlVM.cs | 123 +- .../BinaryValveControl.xaml | 7 +- .../BinaryValveControl.xaml.cs | 37 +- .../BinaryValveControlVM.cs | 99 +- .../HMIObjects/BoolToBrushConverter.cs | 31 +- .../HMIObjects/HMIControlButtonVM.cs | 109 +- .../InterlockControl/IntlkControl.xaml.cs | 37 +- .../IntlkDetails.xaml.cs | 37 +- .../InterlockDetailsControl/IntlkDetailsVM.cs | 227 ++- .../IntlkDetailsWindow.xaml.cs | 23 +- .../HMIObjects/structures/HMIDataTypes.cs | 304 ++-- uniper_hmi/UniperHMI/InfineonHMI.csproj | 4 + uniper_hmi/UniperHMI/MainWindow.xaml | 109 +- uniper_hmi/UniperHMI/MainWindow.xaml.cs | 42 +- uniper_hmi/UniperHMI/MainWindowVM.cs | 180 ++- uniper_hmi/UniperHMI/Model/Models.cs | 248 ++- .../ViewModels/UnitControlButtonVM.cs | 23 +- .../ViewModels/UnitDetailsControlVM.cs | 781 +++++----- .../Views/SMUControlButton.xaml.cs | 37 +- .../Views/UnitDetailsControl.xaml.cs | 35 +- .../ViewModels/AlignmentStationPageVM.cs | 51 +- .../Pages/ViewModels/EtchingStationPage1VM.cs | 156 +- .../Pages/ViewModels/EtchingStationPage2VM.cs | 122 +- .../Pages/ViewModels/EventsPageVM.cs | 157 +- .../ViewModels/HighVoltageStationPageVM.cs | 113 +- .../Pages/ViewModels/HotCoolPlatePageVM.cs | 664 +++++---- .../Pages/ViewModels/KukaRobotPageVM.cs | 1323 +++++++++-------- .../Pages/ViewModels/MachineOverviewPageVM.cs | 117 +- .../Pages/ViewModels/MediaCabinetPageVM.cs | 166 ++- .../Pages/ViewModels/NIOStationPageVM.cs | 81 +- .../ViewModels/ProductionOverviewPageVM.cs | 25 +- .../Pages/ViewModels/ReceipePageVM.cs | 144 +- .../Pages/ViewModels/TrayFeederPageVM.cs | 52 +- .../Pages/Views/AlignmentStationPage.xaml | 48 +- .../Pages/Views/AlignmentStationPage.xaml.cs | 37 +- .../Pages/Views/EtchingStation1Page.xaml | 14 +- .../Pages/Views/EtchingStation1Page.xaml.cs | 37 +- .../Pages/Views/EtchingStation2Page.xaml | 16 +- .../Pages/Views/EtchingStation2Page.xaml.cs | 37 +- .../Pages/Views/HighVoltageStationPage.xaml | 45 +- .../Views/HighVoltageStationPage.xaml.cs | 37 +- .../Pages/Views/HotCoolPlatePage.xaml | 68 +- .../Pages/Views/HotCoolPlatePage.xaml.cs | 37 +- .../UniperHMI/Pages/Views/KukaRobotPage.xaml | 302 ++-- .../Pages/Views/KukaRobotPage.xaml.cs | 37 +- .../Pages/Views/MachineOverviewPage.xaml | 213 +-- .../Pages/Views/MachineOverviewPage.xaml.cs | 38 +- .../Pages/Views/MediaCabinetPage.xaml | 15 +- .../Pages/Views/MediaCabinetPage.xaml.cs | 37 +- .../UniperHMI/Pages/Views/NIOStationPage.xaml | 16 +- .../Pages/Views/NIOStationPage.xaml.cs | 37 +- .../Pages/Views/ProductionOverviewPage.xaml | 72 +- .../Views/ProductionOverviewPage.xaml.cs | 37 +- .../UniperHMI/Pages/Views/ReceipePage.xaml | 134 +- .../UniperHMI/Pages/Views/ReceipePage.xaml.cs | 19 +- .../UniperHMI/Pages/Views/TrayFeederPage.xaml | 14 +- .../Pages/Views/TrayFeederPage.xaml.cs | 25 +- .../UniperHMI/Resources/application.png | Bin 0 -> 48391 bytes uniper_hmi/UniperHMI/Resources/user.png | Bin 0 -> 44544 bytes .../UniperHMI/SettingsPage/SettingsPage.xaml | 1 - .../SettingsPage/SettingsPage.xaml.cs | 37 +- .../UniperHMI/SettingsPage/SettingsPageVM.cs | 207 ++- uniper_hmi_old/.gitattributes | 63 - uniper_hmi_old/.gitignore | 367 ----- uniper_hmi_old/AdsSettings.json | 1 - uniper_hmi_old/Infineon.sln | 25 - uniper_hmi_old/README.md | 98 -- .../UniperHMI/3rdParty/AdsManager.dll | Bin 11264 -> 0 bytes .../UniperHMI/Anlagenuebersicht.png | Bin 125802 -> 0 bytes uniper_hmi_old/UniperHMI/App.xaml | 17 - uniper_hmi_old/UniperHMI/App.xaml.cs | 42 - uniper_hmi_old/UniperHMI/AssemblyInfo.cs | 10 - .../UniperHMI/Common/L4ItXmlSerializer.cs | 127 -- .../UniperHMI/Common/MediaContainer.xaml | 83 -- .../UniperHMI/Common/MediaContainer.xaml.cs | 32 - .../UniperHMI/Common/MediaContainerVm.cs | 76 - .../UniperHMI/Common/ParamControlFloat.xaml | 33 - .../Common/ParamControlFloat.xaml.cs | 32 - .../UniperHMI/Common/ParamControlFloatVM.cs | 27 - .../UniperHMI/Common/ParamControlInt.xaml | 33 - .../UniperHMI/Common/ParamControlInt.xaml.cs | 32 - .../UniperHMI/Common/ParamControlIntVM.cs | 28 - .../UniperHMI/DateTimeToEventTimeConverter.cs | 33 - .../HMIToolkit/AnalogMotorWindow.xaml | 12 - .../HMIToolkit/AnalogMotorWindow.xaml.cs | 14 - .../HMIToolkit/BinaryValveWindow.xaml | 12 - .../HMIToolkit/BinaryValveWindow.xaml.cs | 15 - .../HMIToolkit/FeedbackToColorConverter.cs | 46 - .../AnalogMotorControl.xaml | 91 -- .../AnalogMotorControl.xaml.cs | 23 - .../AnalogMotorcontrolVM.cs | 83 -- .../AnalogValue/AnalogRangeValidator.cs | 33 - .../HMIObjects/AnalogValue/AnalogValue.xaml | 33 - .../AnalogValue/AnalogValue.xaml.cs | 32 - .../HMIObjects/AnalogValue/AnalogValueVM.cs | 144 -- .../AnalogValveControl.xaml | 87 -- .../AnalogValveControl.xaml.cs | 35 - .../AnalogValveControlVM.cs | 83 -- .../BinaryValveControl.xaml | 76 - .../BinaryValveControl.xaml.cs | 35 - .../BinaryValveControlVM.cs | 70 - .../HMIObjects/BoolToBrushConverter.cs | 25 - .../HMIObjects/HMIControlButtonVM.cs | 74 - .../InterlockControl/IntlkControl.xaml | 33 - .../InterlockControl/IntlkControl.xaml.cs | 35 - .../InterlockControl/IntlkControlVM.cs | 109 -- .../InterlockDetailsControl/IntlkDetails.xaml | 132 -- .../IntlkDetails.xaml.cs | 35 - .../InterlockDetailsControl/IntlkDetailsVM.cs | 151 -- .../IntlkDetailsWindow.xaml | 13 - .../IntlkDetailsWindow.xaml.cs | 27 - .../HMIObjects/structures/HMIDataTypes.cs | 218 --- uniper_hmi_old/UniperHMI/InfineonHMI.csproj | 79 - uniper_hmi_old/UniperHMI/MainWindow.xaml | 190 --- uniper_hmi_old/UniperHMI/MainWindow.xaml.cs | 26 - uniper_hmi_old/UniperHMI/MainWindowVM.cs | 298 ---- uniper_hmi_old/UniperHMI/Model/Models.cs | 138 -- uniper_hmi_old/UniperHMI/Model/ReceipeDto.cs | 225 --- uniper_hmi_old/UniperHMI/NavigateMessage.cs | 3 - .../ViewModels/ModuleControlButtonVM.cs | 18 - .../OwnControls/ViewModels/SMUBaseVM.cs | 60 - .../ViewModels/StringControlButtonVM.cs | 16 - .../ViewModels/UnitControlButtonVM.cs | 19 - .../ViewModels/UnitDetailsControlVM.cs | 494 ------ .../OwnControls/Views/SMUControlButton.xaml | 42 - .../Views/SMUControlButton.xaml.cs | 23 - .../OwnControls/Views/UnitDetailsControl.xaml | 138 -- .../Views/UnitDetailsControl.xaml.cs | 22 - .../ViewModels/AlignmentStationPageVM.cs | 43 - .../Pages/ViewModels/AutomaticModePageVM.cs | 134 -- .../Pages/ViewModels/BatteryOverviewPageVM.cs | 55 - .../Pages/ViewModels/ChuckMagazinPageVM.cs | 140 -- .../Pages/ViewModels/EtchingStationPage1VM.cs | 94 -- .../Pages/ViewModels/EtchingStationPage2VM.cs | 92 -- .../Pages/ViewModels/EtchingStationPageVM.cs | 123 -- .../Pages/ViewModels/EventsPageVM.cs | 114 -- .../ViewModels/HighVoltageStationPageVM.cs | 72 - .../Pages/ViewModels/HotCoolPlatePageVM.cs | 408 ----- .../Pages/ViewModels/KukaRobotPageVM.cs | 677 --------- .../Pages/ViewModels/MachineOverviewPageVM.cs | 300 ---- .../Pages/ViewModels/MediaCabinetPageVM.cs | 108 -- .../Pages/ViewModels/ModuleOverviewPageVM.cs | 69 - .../Pages/ViewModels/NIOStationPageVM.cs | 59 - .../ViewModels/ProductionOverviewPageVM.cs | 307 ---- .../Pages/ViewModels/ReceipePageVM.cs | 746 ---------- .../Pages/ViewModels/StringOverviewPageVM.cs | 56 - .../Pages/ViewModels/TrayFeederPageVM.cs | 42 - .../Pages/ViewModels/UnitOverviewPageVM.cs | 31 - .../Pages/Views/AlignmentStationPage.xaml | 36 - .../Pages/Views/AlignmentStationPage.xaml.cs | 22 - .../Pages/Views/AutomaticModePage.xaml | 49 - .../Pages/Views/AutomaticModePage.xaml.cs | 22 - .../Pages/Views/BatteryOverviewPage.xaml | 39 - .../Pages/Views/BatteryOverviewPage.xaml.cs | 22 - .../Pages/Views/ChuckMagazinPage.xaml | 64 - .../Pages/Views/ChuckMagazinPage.xaml.cs | 22 - .../Pages/Views/EtchingStation1Page.xaml | 49 - .../Pages/Views/EtchingStation1Page.xaml.cs | 22 - .../Pages/Views/EtchingStation2Page.xaml | 48 - .../Pages/Views/EtchingStation2Page.xaml.cs | 22 - .../Pages/Views/EtchingStationPage.xaml | 49 - .../Pages/Views/EtchingStationPage.xaml.cs | 22 - .../UniperHMI/Pages/Views/EventsPage.xaml | 25 - .../UniperHMI/Pages/Views/EventsPage.xaml.cs | 14 - .../Pages/Views/HighVoltageStationPage.xaml | 52 - .../Views/HighVoltageStationPage.xaml.cs | 22 - .../Pages/Views/HotCoolPlatePage.xaml | 100 -- .../Pages/Views/HotCoolPlatePage.xaml.cs | 22 - .../UniperHMI/Pages/Views/KukaRobotPage.xaml | 169 --- .../Pages/Views/KukaRobotPage.xaml.cs | 22 - .../Pages/Views/MachineOverviewPage.xaml | 163 -- .../Pages/Views/MachineOverviewPage.xaml.cs | 22 - .../Pages/Views/MediaCabinetPage.xaml | 45 - .../Pages/Views/MediaCabinetPage.xaml.cs | 22 - .../Pages/Views/ModuleOverviewPage.xaml | 25 - .../UniperHMI/Pages/Views/NIOStationPage.xaml | 46 - .../Pages/Views/NIOStationPage.xaml.cs | 22 - .../Pages/Views/ProductionOverviewPage.xaml | 100 -- .../Views/ProductionOverviewPage.xaml.cs | 22 - .../UniperHMI/Pages/Views/ReceipePage.xaml | 192 --- .../UniperHMI/Pages/Views/ReceipePage.xaml.cs | 15 - .../Pages/Views/StringOverviewPage.xaml | 23 - .../Pages/Views/StringOverviewPage.xaml.cs | 15 - .../UniperHMI/Pages/Views/TrayFeederPage.xaml | 33 - .../Pages/Views/TrayFeederPage.xaml.cs | 16 - .../Pages/Views/UnitOverviewPage.xaml | 16 - .../Pages/Views/UnitOverviewPage.xaml.cs | 14 - .../UniperHMI/SettingsPage/SettingsPage.xaml | 52 - .../SettingsPage/SettingsPage.xaml.cs | 22 - .../UniperHMI/SettingsPage/SettingsPageVM.cs | 125 -- uniper_hmi_old/UniperHMI/UniperHMI.csproj | 60 - uniper_hmi_old/UniperHMI/appsettings.json | 9 - 215 files changed, 5052 insertions(+), 14150 deletions(-) create mode 100644 uniper_hmi/Infineon.sln.DotSettings create mode 100644 uniper_hmi/UniperHMI/Common/PackMLControl.xaml rename uniper_hmi_old/UniperHMI/Pages/Views/ModuleOverviewPage.xaml.cs => uniper_hmi/UniperHMI/Common/PackMLControl.xaml.cs (59%) create mode 100644 uniper_hmi/UniperHMI/Common/PackMLControlVm.cs create mode 100644 uniper_hmi/UniperHMI/Common/User.cs create mode 100644 uniper_hmi/UniperHMI/Common/UserManagementWindow.xaml create mode 100644 uniper_hmi/UniperHMI/Common/UserManagementWindow.xaml.cs create mode 100644 uniper_hmi/UniperHMI/Common/UserManagementWindowVm.cs create mode 100644 uniper_hmi/UniperHMI/Common/WorkingmodeToColorConverter.cs create mode 100644 uniper_hmi/UniperHMI/Resources/application.png create mode 100644 uniper_hmi/UniperHMI/Resources/user.png delete mode 100644 uniper_hmi_old/.gitattributes delete mode 100644 uniper_hmi_old/.gitignore delete mode 100644 uniper_hmi_old/AdsSettings.json delete mode 100644 uniper_hmi_old/Infineon.sln delete mode 100644 uniper_hmi_old/README.md delete mode 100644 uniper_hmi_old/UniperHMI/3rdParty/AdsManager.dll delete mode 100644 uniper_hmi_old/UniperHMI/Anlagenuebersicht.png delete mode 100644 uniper_hmi_old/UniperHMI/App.xaml delete mode 100644 uniper_hmi_old/UniperHMI/App.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/AssemblyInfo.cs delete mode 100644 uniper_hmi_old/UniperHMI/Common/L4ItXmlSerializer.cs delete mode 100644 uniper_hmi_old/UniperHMI/Common/MediaContainer.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Common/MediaContainer.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Common/MediaContainerVm.cs delete mode 100644 uniper_hmi_old/UniperHMI/Common/ParamControlFloat.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Common/ParamControlFloat.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Common/ParamControlFloatVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Common/ParamControlInt.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Common/ParamControlInt.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Common/ParamControlIntVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/DateTimeToEventTimeConverter.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/AnalogMotorWindow.xaml delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/AnalogMotorWindow.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/BinaryValveWindow.xaml delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/BinaryValveWindow.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/FeedbackToColorConverter.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/AnalogMotorControl/AnalogMotorControl.xaml delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/AnalogMotorControl/AnalogMotorControl.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/AnalogMotorControl/AnalogMotorcontrolVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/AnalogValue/AnalogRangeValidator.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/AnalogValue/AnalogValue.xaml delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/AnalogValue/AnalogValue.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/AnalogValue/AnalogValueVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/AnalogValveControl/AnalogValveControl.xaml delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/AnalogValveControl/AnalogValveControl.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/AnalogValveControl/AnalogValveControlVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/BinaryValveControl/BinaryValveControl.xaml delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/BinaryValveControl/BinaryValveControl.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/BinaryValveControl/BinaryValveControlVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/BoolToBrushConverter.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/HMIControlButtonVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/InterlockControl/IntlkControl.xaml delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/InterlockControl/IntlkControl.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/InterlockControl/IntlkControlVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/InterlockDetailsControl/IntlkDetails.xaml delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/InterlockDetailsControl/IntlkDetails.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/InterlockDetailsControl/IntlkDetailsVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/InterlockDetailsControl/IntlkDetailsWindow.xaml delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/InterlockDetailsControl/IntlkDetailsWindow.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/HMIToolkit/HMIObjects/structures/HMIDataTypes.cs delete mode 100644 uniper_hmi_old/UniperHMI/InfineonHMI.csproj delete mode 100644 uniper_hmi_old/UniperHMI/MainWindow.xaml delete mode 100644 uniper_hmi_old/UniperHMI/MainWindow.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/MainWindowVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Model/Models.cs delete mode 100644 uniper_hmi_old/UniperHMI/Model/ReceipeDto.cs delete mode 100644 uniper_hmi_old/UniperHMI/NavigateMessage.cs delete mode 100644 uniper_hmi_old/UniperHMI/OwnControls/ViewModels/ModuleControlButtonVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/OwnControls/ViewModels/SMUBaseVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/OwnControls/ViewModels/StringControlButtonVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/OwnControls/ViewModels/UnitControlButtonVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/OwnControls/ViewModels/UnitDetailsControlVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/OwnControls/Views/SMUControlButton.xaml delete mode 100644 uniper_hmi_old/UniperHMI/OwnControls/Views/SMUControlButton.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/OwnControls/Views/UnitDetailsControl.xaml delete mode 100644 uniper_hmi_old/UniperHMI/OwnControls/Views/UnitDetailsControl.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/AlignmentStationPageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/AutomaticModePageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/BatteryOverviewPageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/ChuckMagazinPageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/EtchingStationPage1VM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/EtchingStationPage2VM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/EtchingStationPageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/EventsPageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/HighVoltageStationPageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/HotCoolPlatePageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/KukaRobotPageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/MachineOverviewPageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/MediaCabinetPageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/ModuleOverviewPageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/NIOStationPageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/ProductionOverviewPageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/ReceipePageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/StringOverviewPageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/TrayFeederPageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/ViewModels/UnitOverviewPageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/AlignmentStationPage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/AlignmentStationPage.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/AutomaticModePage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/AutomaticModePage.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/BatteryOverviewPage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/BatteryOverviewPage.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/ChuckMagazinPage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/ChuckMagazinPage.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/EtchingStation1Page.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/EtchingStation1Page.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/EtchingStation2Page.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/EtchingStation2Page.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/EtchingStationPage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/EtchingStationPage.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/EventsPage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/EventsPage.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/HighVoltageStationPage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/HighVoltageStationPage.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/HotCoolPlatePage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/HotCoolPlatePage.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/KukaRobotPage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/KukaRobotPage.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/MachineOverviewPage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/MachineOverviewPage.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/MediaCabinetPage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/MediaCabinetPage.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/ModuleOverviewPage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/NIOStationPage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/NIOStationPage.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/ProductionOverviewPage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/ProductionOverviewPage.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/ReceipePage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/ReceipePage.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/StringOverviewPage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/StringOverviewPage.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/TrayFeederPage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/TrayFeederPage.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/UnitOverviewPage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/Pages/Views/UnitOverviewPage.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/SettingsPage/SettingsPage.xaml delete mode 100644 uniper_hmi_old/UniperHMI/SettingsPage/SettingsPage.xaml.cs delete mode 100644 uniper_hmi_old/UniperHMI/SettingsPage/SettingsPageVM.cs delete mode 100644 uniper_hmi_old/UniperHMI/UniperHMI.csproj delete mode 100644 uniper_hmi_old/UniperHMI/appsettings.json diff --git a/uniper_hmi/Infineon.sln.DotSettings b/uniper_hmi/Infineon.sln.DotSettings new file mode 100644 index 0000000..dd67cff --- /dev/null +++ b/uniper_hmi/Infineon.sln.DotSettings @@ -0,0 +1,2 @@ + + True \ No newline at end of file diff --git a/uniper_hmi/UniperHMI/Common/L4ItXmlSerializer.cs b/uniper_hmi/UniperHMI/Common/L4ItXmlSerializer.cs index 3ee37b3..4c6dc75 100644 --- a/uniper_hmi/UniperHMI/Common/L4ItXmlSerializer.cs +++ b/uniper_hmi/UniperHMI/Common/L4ItXmlSerializer.cs @@ -1,127 +1,176 @@ using System.IO; using System.Reflection; using System.Runtime.InteropServices; +using System.Security.Cryptography; using System.Text; using System.Xml; using System.Xml.Serialization; -namespace InfineonHMI.Common +namespace InfineonHMI.Common; + +public static class L4ItXmlSerializer { - public static class L4ItXmlSerializer + /// + /// Serializes an object. + /// + /// + /// + /// + /// + /// + + public static void SerializeObject(T serializableObject, string fileName, bool encrypt = false, string rootElementName = null) { - /// - /// Serializes an object. - /// - /// - /// - /// - /// - /// + if (string.IsNullOrEmpty(fileName)) + return; - public static void SerializeObject(T serializableObject, string fileName, bool encrypt = false, string rootElementName = null) + if (serializableObject == null) + return; + + XmlSerializer serializer; + if (rootElementName != null) { - if (string.IsNullOrEmpty(fileName)) - return; + var xmlRoot = new XmlRootAttribute(rootElementName); + serializer = new XmlSerializer(serializableObject.GetType(), xmlRoot); + } + else + { + serializer = new XmlSerializer(serializableObject.GetType()); + } - if (serializableObject == null) + try + { + var dir = new FileInfo(fileName).DirectoryName; + if (dir != null && !Directory.Exists(dir)) // Überprüfen Sie, ob dir nicht null ist, bevor Sie es verwenden + Directory.CreateDirectory(dir); + + var xmlDocument = new XmlDocument(); + using var stream = new MemoryStream(); + serializer.Serialize(stream, serializableObject); + stream.Position = 0; + xmlDocument.Load(stream); + if (encrypt && false) + { + //FileEncryption.SaveEncryptedToFile(fileName, xmlDocument.OuterXml); return; + } + xmlDocument.Save(fileName); + } + catch (Exception ex) + { + Console.Write(ex); + } + } + + + /// + /// Deserializes an xml file into an object list + /// + /// + /// + /// + /// + /// + /// + /// + public static T DeSerializeObject(string fileName, bool decrypt = false, string rootElementName = null) + { + if (string.IsNullOrEmpty(fileName) || !File.Exists(fileName)) return default!; + + T objectOut; + + try + { + string xmlString; + if (decrypt && false) + { + //xmlString = FileEncryption.ReadDecryptedFromFile(fileName)!; + } + else + { + var xmlDocument = new XmlDocument(); + xmlDocument.Load(fileName); + xmlString = xmlDocument.OuterXml; + } + + if (string.IsNullOrEmpty(xmlString)) + { + // Handle empty xmlString if necessary + return default!; + } + + using var read = new StringReader(xmlString); + var outType = typeof(T); XmlSerializer serializer; if (rootElementName != null) { - var xmlRoot = new XmlRootAttribute(rootElementName); - serializer = new XmlSerializer(serializableObject.GetType(), xmlRoot); + var root = new XmlRootAttribute(rootElementName); + serializer = new XmlSerializer(outType, root); } else { - serializer = new XmlSerializer(serializableObject.GetType()); + serializer = new XmlSerializer(outType); } - try - { - var dir = new FileInfo(fileName).DirectoryName; - if (dir != null && !Directory.Exists(dir)) // Überprüfen Sie, ob dir nicht null ist, bevor Sie es verwenden - Directory.CreateDirectory(dir); - - var xmlDocument = new XmlDocument(); - using var stream = new MemoryStream(); - serializer.Serialize(stream, serializableObject); - stream.Position = 0; - xmlDocument.Load(stream); - if (encrypt && false) - { - //FileEncryption.SaveEncryptedToFile(fileName, xmlDocument.OuterXml); - return; - } - xmlDocument.Save(fileName); - } - catch (Exception ex) - { - Console.Write(ex); - } + using XmlReader reader = new XmlTextReader(read); + objectOut = (T)serializer.Deserialize(reader)!; } - - - /// - /// Deserializes an xml file into an object list - /// - /// - /// - /// - /// - /// - /// - /// - public static T DeSerializeObject(string fileName, bool decrypt = false, string rootElementName = null) + catch (Exception ex) { - if (string.IsNullOrEmpty(fileName) || !File.Exists(fileName)) return default!; - - T objectOut; - - try - { - string xmlString; - if (decrypt && false) - { - //xmlString = FileEncryption.ReadDecryptedFromFile(fileName)!; - } - else - { - var xmlDocument = new XmlDocument(); - xmlDocument.Load(fileName); - xmlString = xmlDocument.OuterXml; - } - - if (string.IsNullOrEmpty(xmlString)) - { - // Handle empty xmlString if necessary - return default!; - } - - using var read = new StringReader(xmlString); - var outType = typeof(T); - - XmlSerializer serializer; - if (rootElementName != null) - { - var root = new XmlRootAttribute(rootElementName); - serializer = new XmlSerializer(outType, root); - } - else - { - serializer = new XmlSerializer(outType); - } - - using XmlReader reader = new XmlTextReader(read); - objectOut = (T)serializer.Deserialize(reader)!; - } - catch (Exception ex) - { - Console.Write(ex); - return default!; - } - - return objectOut; + Console.Write(ex); + return default!; } + + return objectOut; } -} + + public static string Encrypt(string encryptString) + { + string EncryptionKey = "0ram@1234xxxxxxxxxxtttttuuuuuiiiiio"; //we can change the code converstion key as per our requirement + byte[] clearBytes = Encoding.Unicode.GetBytes(encryptString); + using (Aes encryptor = Aes.Create()) + { + Rfc2898DeriveBytes pdb = new Rfc2898DeriveBytes(EncryptionKey, new byte[] { + 0x49, 0x76, 0x61, 0x6e, 0x20, 0x4d, 0x65, 0x64, 0x76, 0x65, 0x64, 0x65, 0x76 + }); + encryptor.Key = pdb.GetBytes(32); + encryptor.IV = pdb.GetBytes(16); + using (MemoryStream ms = new MemoryStream()) + { + using (CryptoStream cs = new CryptoStream(ms, encryptor.CreateEncryptor(), CryptoStreamMode.Write)) + { + cs.Write(clearBytes, 0, clearBytes.Length); + cs.Close(); + } + encryptString = Convert.ToBase64String(ms.ToArray()); + } + } + return encryptString; + } + + public static string Decrypt(string cipherText) + { + string EncryptionKey = "0ram@1234xxxxxxxxxxtttttuuuuuiiiiio"; //we can change the code converstion key as per our requirement, but the decryption key should be same as encryption key + cipherText = cipherText.Replace(" ", "+"); + byte[] cipherBytes = Convert.FromBase64String(cipherText); + using (Aes encryptor = Aes.Create()) + { + Rfc2898DeriveBytes pdb = new Rfc2898DeriveBytes(EncryptionKey, new byte[] { + 0x49, 0x76, 0x61, 0x6e, 0x20, 0x4d, 0x65, 0x64, 0x76, 0x65, 0x64, 0x65, 0x76 + }); + encryptor.Key = pdb.GetBytes(32); + encryptor.IV = pdb.GetBytes(16); + using (MemoryStream ms = new MemoryStream()) + { + using (CryptoStream cs = new CryptoStream(ms, encryptor.CreateDecryptor(), CryptoStreamMode.Write)) + { + cs.Write(cipherBytes, 0, cipherBytes.Length); + cs.Close(); + } + cipherText = Encoding.Unicode.GetString(ms.ToArray()); + } + } + return cipherText; + } +} \ No newline at end of file diff --git a/uniper_hmi/UniperHMI/Common/MediaContainer.xaml b/uniper_hmi/UniperHMI/Common/MediaContainer.xaml index 6594243..cda2874 100644 --- a/uniper_hmi/UniperHMI/Common/MediaContainer.xaml +++ b/uniper_hmi/UniperHMI/Common/MediaContainer.xaml @@ -6,11 +6,9 @@ xmlns:common="clr-namespace:Common" xmlns:HMIToolkit="clr-namespace:HMIToolkit" d:DataContext="{d:DesignInstance Type=common:MediaContainerVm, IsDesignTimeCreatable=True}" - mc:Ignorable="d" - Width="Auto" - Height="Auto" - MinWidth="200"> - + mc:Ignorable="d"> + + @@ -19,65 +17,85 @@ - + - - + + + - - - - + + + + - + -