From c5e99a202817704a337c4cf6248546d2e8ade53c Mon Sep 17 00:00:00 2001 From: peterbarancek <62284244+peterbarancek@users.noreply.github.com> Date: Tue, 25 Jun 2024 17:34:03 +0200 Subject: [PATCH] *tco package updated to 0.11.0.alpha-74 *rendering components in controled unit frozzing ui fixed --- .../x_template_x-xae/x_template_x-xae.tsproj | 2 +- .../CU00x/Components/CU00xComponents.TcDUT | 1 - .../x_template_xPlc/x_template_xPlc.plcproj | 68 +-- .../x_template_xDataMerge.csproj | 2 +- .../ControlledUnits/Base/CUBaseViewModel.cs | 22 +- .../Simplified/CUBaseMiniDiagnosticsView.xaml | 4 +- .../Tasks/CUBaseInfoDetailsTasksView.xaml | 456 ++++++++++++++---- .../Tasks/CUBaseTasksView.xaml | 43 +- .../x_template_xHmi.Wpf.csproj | 36 +- .../x_template_xInstructor.csproj | 2 +- .../Properties/Localizations.resx | 8 +- .../x_template_xPlcConnector.csproj | 44 +- .../x_template_xProductionPlaner.csproj | 2 +- .../x_template_xStatistic.csproj | 2 +- .../x_template_xTagsDictionary.csproj | 2 +- 15 files changed, 490 insertions(+), 204 deletions(-) diff --git a/templates/mts-s-template/t/src/x_template_x-xae/x_template_x-xae.tsproj b/templates/mts-s-template/t/src/x_template_x-xae/x_template_x-xae.tsproj index cbfb611..c9642b7 100644 --- a/templates/mts-s-template/t/src/x_template_x-xae/x_template_x-xae.tsproj +++ b/templates/mts-s-template/t/src/x_template_x-xae/x_template_x-xae.tsproj @@ -151,7 +151,7 @@ - + x_template_xPlc Instance {08500001-0000-0000-F000-000000000064} diff --git a/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Technology/CU00x/Components/CU00xComponents.TcDUT b/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Technology/CU00x/Components/CU00xComponents.TcDUT index 060c3d5..856f40c 100644 --- a/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Technology/CU00x/Components/CU00xComponents.TcDUT +++ b/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/Technology/CU00x/Components/CU00xComponents.TcDUT @@ -5,7 +5,6 @@ TYPE CU00xComponents EXTENDS CUComponentsBase : STRUCT - {attribute wpf [Container(Layout.Stack)]} {attribute wpf [Group(Layout.Scroll)]} {attribute addProperty Name "Supplu TTI QL"} diff --git a/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/x_template_xPlc.plcproj b/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/x_template_xPlc.plcproj index be46088..f04e1cb 100644 --- a/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/x_template_xPlc.plcproj +++ b/templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/x_template_xPlc.plcproj @@ -429,71 +429,71 @@ Tc3_Module - TcoAbbRobotics, 0.11.0.71 (Vortex.Library) + TcoAbbRobotics, 0.11.0.74 (Vortex.Library) TcoAbbRobotics - TcoAbstractions, 0.11.0.71 (Vortex.Library) + TcoAbstractions, 0.11.0.74 (Vortex.Library) TcoAbstractions - TcoAimTtiPowerSupply, 0.11.0.71 (Vortex.Library) + TcoAimTtiPowerSupply, 0.11.0.74 (Vortex.Library) TcoAimTtiPowerSupply - TcoCognexVision, 0.11.0.71 (Vortex.Library) + TcoCognexVision, 0.11.0.74 (Vortex.Library) TcoCognexVision - TcoCore, 0.11.0.71 (Vortex.Library) + TcoCore, 0.11.0.74 (Vortex.Library) TcoCore - TcoData, 0.11.0.71 (Vortex.Library) + TcoData, 0.11.0.74 (Vortex.Library) TcoData - TcoDrivesBeckhoff, 0.11.0.71 (Vortex.Library) + TcoDrivesBeckhoff, 0.11.0.74 (Vortex.Library) TcoDrivesBeckhoff - TcoElements, 0.11.0.71 (Vortex.Library) + TcoElements, 0.11.0.74 (Vortex.Library) TcoElements - TcoInspectors, 0.11.0.71 (Vortex.Library) + TcoInspectors, 0.11.0.74 (Vortex.Library) TcoInspectors - TcoIo, 0.11.0.71 (Vortex.Library) + TcoIo, 0.11.0.74 (Vortex.Library) TcoIo - TcoKukaRobotics, 0.11.0.71 (Vortex.Library) + TcoKukaRobotics, 0.11.0.74 (Vortex.Library) TcoKukaRobotics - TcoMitsubishiRobotics, 0.11.0.71 (Vortex.Library) + TcoMitsubishiRobotics, 0.11.0.74 (Vortex.Library) TcoMitsubishiRobotics - TcoPneumatics, 0.11.0.71 (Vortex.Library) + TcoPneumatics, 0.11.0.74 (Vortex.Library) TcoPneumatics - TcoRexrothPress, 0.11.0.71 (Vortex.Library) + TcoRexrothPress, 0.11.0.74 (Vortex.Library) TcoRexrothPress - TcoTixonFeeding, 0.11.0.71 (Vortex.Library) + TcoTixonFeeding, 0.11.0.74 (Vortex.Library) TcoTixonFeeding - TcoUrRobotics, 0.11.0.71 (Vortex.Library) + TcoUrRobotics, 0.11.0.74 (Vortex.Library) TcoUrRobotics - TcoUtilities, 0.11.0.71 (Vortex.Library) + TcoUtilities, 0.11.0.74 (Vortex.Library) TcoUtilities @@ -504,55 +504,55 @@ - TcoAbbRobotics, 0.11.0.71 (Vortex.Library) + TcoAbbRobotics, 0.11.0.74 (Vortex.Library) - TcoAbstractions, 0.11.0.71 (Vortex.Library) + TcoAbstractions, 0.11.0.74 (Vortex.Library) - TcoAimTtiPowerSupply, 0.11.0.71 (Vortex.Library) + TcoAimTtiPowerSupply, 0.11.0.74 (Vortex.Library) - TcoCognexVision, 0.11.0.71 (Vortex.Library) + TcoCognexVision, 0.11.0.74 (Vortex.Library) - TcoCore, 0.11.0.71 (Vortex.Library) + TcoCore, 0.11.0.74 (Vortex.Library) - TcoData, 0.11.0.71 (Vortex.Library) + TcoData, 0.11.0.74 (Vortex.Library) - TcoDrivesBeckhoff, 0.11.0.71 (Vortex.Library) + TcoDrivesBeckhoff, 0.11.0.74 (Vortex.Library) - TcoElements, 0.11.0.71 (Vortex.Library) + TcoElements, 0.11.0.74 (Vortex.Library) - TcoInspectors, 0.11.0.71 (Vortex.Library) + TcoInspectors, 0.11.0.74 (Vortex.Library) - TcoIo, 0.11.0.71 (Vortex.Library) + TcoIo, 0.11.0.74 (Vortex.Library) - TcoKukaRobotics, 0.11.0.71 (Vortex.Library) + TcoKukaRobotics, 0.11.0.74 (Vortex.Library) - TcoMitsubishiRobotics, 0.11.0.71 (Vortex.Library) + TcoMitsubishiRobotics, 0.11.0.74 (Vortex.Library) - TcoPneumatics, 0.11.0.71 (Vortex.Library) + TcoPneumatics, 0.11.0.74 (Vortex.Library) - TcoRexrothPress, 0.11.0.71 (Vortex.Library) + TcoRexrothPress, 0.11.0.74 (Vortex.Library) - TcoTixonFeeding, 0.11.0.71 (Vortex.Library) + TcoTixonFeeding, 0.11.0.74 (Vortex.Library) - TcoUrRobotics, 0.11.0.71 (Vortex.Library) + TcoUrRobotics, 0.11.0.74 (Vortex.Library) - TcoUtilities, 0.11.0.71 (Vortex.Library) + TcoUtilities, 0.11.0.74 (Vortex.Library) diff --git a/templates/mts-s-template/t/src/x_template_xDataMerge/x_template_xDataMerge.csproj b/templates/mts-s-template/t/src/x_template_xDataMerge/x_template_xDataMerge.csproj index 86a4aea..9cdb8c6 100644 --- a/templates/mts-s-template/t/src/x_template_xDataMerge/x_template_xDataMerge.csproj +++ b/templates/mts-s-template/t/src/x_template_xDataMerge/x_template_xDataMerge.csproj @@ -6,7 +6,7 @@ - + diff --git a/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/ControlledUnits/Base/CUBaseViewModel.cs b/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/ControlledUnits/Base/CUBaseViewModel.cs index 0c78c5b..ee7eebc 100644 --- a/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/ControlledUnits/Base/CUBaseViewModel.cs +++ b/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/ControlledUnits/Base/CUBaseViewModel.cs @@ -39,6 +39,17 @@ private void OpenDetails() } } + public TcoTaskedService ManualTask + { + get + { + TcoTaskedService task = new TcoTaskedService(); + if (Component != null) + task = Component.GetType().GetProperty("_manualTask")?.GetValue(Component) as TcoTaskedService; + return task; + } + } + public IEnumerable _taskControls = new List(); public IEnumerable TaskControls { @@ -71,14 +82,19 @@ public IEnumerable SafetyTaskControls } } - public CUBase Component { get; private set; } = new CUBase(); + public CUBase Component { get; private set; } public ProcessData OnlineData { get { return Component.GetChildren().FirstOrDefault()?.GetChildren().FirstOrDefault() as ProcessData; } } public EntityHeader EntityHeader { get { return OnlineData.EntityHeader; } } - public object Components { get { return Component.GetChildren().FirstOrDefault(); } } + public object Components { get { + CUComponentsBase components = new CUComponentsBase(); + if (Component != null) + components = Component.GetChildren().FirstOrDefault(); + + return components; } } void Update() { @@ -112,8 +128,10 @@ void Update() return MessageBox.Show(x_template_xHmi.Wpf.Properties.strings.ManualWarning, "Manual", MessageBoxButton.YesNo, MessageBoxImage.Warning) == MessageBoxResult.Yes; }; } + } + public override object Model { get => Component; set { Component = (CUBase)value; this.Update(); } } diff --git a/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/ControlledUnits/Base/ControlledUnitBase/Diagnostics/Simplified/CUBaseMiniDiagnosticsView.xaml b/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/ControlledUnits/Base/ControlledUnitBase/Diagnostics/Simplified/CUBaseMiniDiagnosticsView.xaml index 1cda768..839b48a 100644 --- a/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/ControlledUnits/Base/ControlledUnitBase/Diagnostics/Simplified/CUBaseMiniDiagnosticsView.xaml +++ b/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/ControlledUnits/Base/ControlledUnitBase/Diagnostics/Simplified/CUBaseMiniDiagnosticsView.xaml @@ -15,9 +15,7 @@ MaxHeight="200" IsVisibleChanged="UserControl_IsVisibleChanged" Visibility="{Binding ActiveMessagesCount, Converter={vortex:ActiveMessagesToVisibilityConverter}}"> - - - + diff --git a/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/ControlledUnits/Base/ControlledUnitBase/Tasks/CUBaseInfoDetailsTasksView.xaml b/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/ControlledUnits/Base/ControlledUnitBase/Tasks/CUBaseInfoDetailsTasksView.xaml index aea0c2f..459bab2 100644 --- a/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/ControlledUnits/Base/ControlledUnitBase/Tasks/CUBaseInfoDetailsTasksView.xaml +++ b/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/ControlledUnits/Base/ControlledUnitBase/Tasks/CUBaseInfoDetailsTasksView.xaml @@ -37,23 +37,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + - - - - - + + + + + + - - - - - - + - - - - - - - + + + + + + - - - - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/ControlledUnits/Base/ControlledUnitBase/Tasks/CUBaseTasksView.xaml b/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/ControlledUnits/Base/ControlledUnitBase/Tasks/CUBaseTasksView.xaml index c6ba77a..f43209f 100644 --- a/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/ControlledUnits/Base/ControlledUnitBase/Tasks/CUBaseTasksView.xaml +++ b/templates/mts-s-template/t/src/x_template_xHmi.Wpf/Views/ControlledUnits/Base/ControlledUnitBase/Tasks/CUBaseTasksView.xaml @@ -184,28 +184,41 @@ - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/templates/mts-s-template/t/src/x_template_xInstructor/x_template_xInstructor.csproj b/templates/mts-s-template/t/src/x_template_xInstructor/x_template_xInstructor.csproj index 1bb35bb..f349bbd 100644 --- a/templates/mts-s-template/t/src/x_template_xInstructor/x_template_xInstructor.csproj +++ b/templates/mts-s-template/t/src/x_template_xInstructor/x_template_xInstructor.csproj @@ -8,7 +8,7 @@ - + diff --git a/templates/mts-s-template/t/src/x_template_xPlcConnector/Properties/Localizations.resx b/templates/mts-s-template/t/src/x_template_xPlcConnector/Properties/Localizations.resx index 080e79d..e5c0fa4 100644 --- a/templates/mts-s-template/t/src/x_template_xPlcConnector/Properties/Localizations.resx +++ b/templates/mts-s-template/t/src/x_template_xPlcConnector/Properties/Localizations.resx @@ -861,12 +861,8 @@ Modified - - Presure OK - - - Emergency Stop - + + Presure OK Global control voltage diff --git a/templates/mts-s-template/t/src/x_template_xPlcConnector/x_template_xPlcConnector.csproj b/templates/mts-s-template/t/src/x_template_xPlcConnector/x_template_xPlcConnector.csproj index 676a245..70cfe2d 100644 --- a/templates/mts-s-template/t/src/x_template_xPlcConnector/x_template_xPlcConnector.csproj +++ b/templates/mts-s-template/t/src/x_template_xPlcConnector/x_template_xPlcConnector.csproj @@ -30,28 +30,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/mts-s-template/t/src/x_template_xProductionPlaner/x_template_xProductionPlaner.csproj b/templates/mts-s-template/t/src/x_template_xProductionPlaner/x_template_xProductionPlaner.csproj index f129129..d8cf26e 100644 --- a/templates/mts-s-template/t/src/x_template_xProductionPlaner/x_template_xProductionPlaner.csproj +++ b/templates/mts-s-template/t/src/x_template_xProductionPlaner/x_template_xProductionPlaner.csproj @@ -13,7 +13,7 @@ - + diff --git a/templates/mts-s-template/t/src/x_template_xStatistic/x_template_xStatistic.csproj b/templates/mts-s-template/t/src/x_template_xStatistic/x_template_xStatistic.csproj index 91367b5..222b5f6 100644 --- a/templates/mts-s-template/t/src/x_template_xStatistic/x_template_xStatistic.csproj +++ b/templates/mts-s-template/t/src/x_template_xStatistic/x_template_xStatistic.csproj @@ -6,7 +6,7 @@ - + diff --git a/templates/mts-s-template/t/src/x_template_xTagsDictionary/x_template_xTagsDictionary.csproj b/templates/mts-s-template/t/src/x_template_xTagsDictionary/x_template_xTagsDictionary.csproj index a016563..3220cf4 100644 --- a/templates/mts-s-template/t/src/x_template_xTagsDictionary/x_template_xTagsDictionary.csproj +++ b/templates/mts-s-template/t/src/x_template_xTagsDictionary/x_template_xTagsDictionary.csproj @@ -13,7 +13,7 @@ - +