publish prerelease (#142)

* Update README.md * Update README.md * [BUG] Copy of TcOpen issue 725 (#139) * Create draft PR for #138 * Fixed issue 138 (725 on TcOpen) (#140) --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Krisztian Olah <[email protected]> * *tco package updated to 0.11.0.alpha-74 (#141) *rendering components in controled unit frozzing ui fixed * Update CUBaseInfoDetailsTasksView.xaml --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Krisztian Olah <[email protected]>
TcOpenGroup · Jun 26, 2024 · 8326a47 · 8326a47
1 parent 0c6a678
commit 8326a47
Show file tree

Hide file tree

Showing 17 changed files with 255 additions and 210 deletions.
diff --git a/README.md b/README.md
@@ -40,13 +40,13 @@ dotnet tool install TcOpen.tco --global --version --prerelease
 
 Installing specific version:
 ~~~Powershell
-dotnet tool install TcOpen.tco --global --version 0.2.3-preview.2
+dotnet tool install TcOpen.tco --global --version 0.3.0-preview.2
 ~~~
 
 ## Updating to specific version
 
 ~~~Powershell
-dotnet tool update TcOpen.tco --global --version 0.2.3-preview.2
+dotnet tool update TcOpen.tco --global --version 0.3.0-preview.2
 ~~~
 
 ## Uninstalling global tool
@@ -82,7 +82,7 @@ PS C:\> .\tco.exe --help
 
 Get mts-s-template from the repository
 ~~~Powershell
-tco --project-name MyNewProject --template-name mts-s-template --source repository --release 0.2.3-preview.2
+tco --project-name MyNewProject --template-name mts-s-template --source repository --release 0.3.0-preview.2
 ~~~
 ### Important!  
   Project name must comply with C# identifier rules.It must start with a letter (not number or other characters except for `@`). For details see [here](https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/language-specification/lexical-structure#643-identifiers).

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
@@ -151,7 +151,7 @@
 		</System>
 		<Plc>
 			<Project GUID="{1F826822-78EF-46D2-B0C2-A803A090596D}" Name="x_template_xPlc" PrjFilePath="x_template_xPlc\x_template_xPlc.plcproj" TmcFilePath="x_template_xPlc\x_template_xPlc.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
-				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="x_template_xPlc\x_template_xPlc.tmc" TmcHash="{084F41A0-87AE-0BF0-6C92-DEFF9063B281}">
+				<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="x_template_xPlc\x_template_xPlc.tmc" TmcHash="{1F9D1A1A-2F73-CE6D-ACAE-C20B46BB167B}">
 					<Name>x_template_xPlc Instance</Name>
 					<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 					<Vars VarGrpType="1">

diff --git a/.../t/src/x_template_x-xae/x_template_xPlc/Technology/CU00x/Components/CU00xComponents.TcDUT b/.../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
@@ -429,71 +429,71 @@
       <Namespace>Tc3_Module</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoAbbRobotics">
-      <DefaultResolution>TcoAbbRobotics, 0.11.0.71 (Vortex.Library)</DefaultResolution>
+      <DefaultResolution>TcoAbbRobotics, 0.11.0.74 (Vortex.Library)</DefaultResolution>
       <Namespace>TcoAbbRobotics</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoAbstractions">
-      <DefaultResolution>TcoAbstractions, 0.11.0.71 (Vortex.Library)</DefaultResolution>
+      <DefaultResolution>TcoAbstractions, 0.11.0.74 (Vortex.Library)</DefaultResolution>
       <Namespace>TcoAbstractions</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoAimTtiPowerSupply">
-      <DefaultResolution>TcoAimTtiPowerSupply, 0.11.0.71 (Vortex.Library)</DefaultResolution>
+      <DefaultResolution>TcoAimTtiPowerSupply, 0.11.0.74 (Vortex.Library)</DefaultResolution>
       <Namespace>TcoAimTtiPowerSupply</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoCognexVision">
-      <DefaultResolution>TcoCognexVision, 0.11.0.71 (Vortex.Library)</DefaultResolution>
+      <DefaultResolution>TcoCognexVision, 0.11.0.74 (Vortex.Library)</DefaultResolution>
       <Namespace>TcoCognexVision</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoCore">
-      <DefaultResolution>TcoCore, 0.11.0.71 (Vortex.Library)</DefaultResolution>
+      <DefaultResolution>TcoCore, 0.11.0.74 (Vortex.Library)</DefaultResolution>
       <Namespace>TcoCore</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoData">
-      <DefaultResolution>TcoData, 0.11.0.71 (Vortex.Library)</DefaultResolution>
+      <DefaultResolution>TcoData, 0.11.0.74 (Vortex.Library)</DefaultResolution>
       <Namespace>TcoData</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoDrivesBeckhoff">
-      <DefaultResolution>TcoDrivesBeckhoff, 0.11.0.71 (Vortex.Library)</DefaultResolution>
+      <DefaultResolution>TcoDrivesBeckhoff, 0.11.0.74 (Vortex.Library)</DefaultResolution>
       <Namespace>TcoDrivesBeckhoff</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoElements">
-      <DefaultResolution>TcoElements, 0.11.0.71 (Vortex.Library)</DefaultResolution>
+      <DefaultResolution>TcoElements, 0.11.0.74 (Vortex.Library)</DefaultResolution>
       <Namespace>TcoElements</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoInspectors">
-      <DefaultResolution>TcoInspectors, 0.11.0.71 (Vortex.Library)</DefaultResolution>
+      <DefaultResolution>TcoInspectors, 0.11.0.74 (Vortex.Library)</DefaultResolution>
       <Namespace>TcoInspectors</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoIo">
-      <DefaultResolution>TcoIo, 0.11.0.71 (Vortex.Library)</DefaultResolution>
+      <DefaultResolution>TcoIo, 0.11.0.74 (Vortex.Library)</DefaultResolution>
       <Namespace>TcoIo</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoKukaRobotics">
-      <DefaultResolution>TcoKukaRobotics, 0.11.0.71 (Vortex.Library)</DefaultResolution>
+      <DefaultResolution>TcoKukaRobotics, 0.11.0.74 (Vortex.Library)</DefaultResolution>
       <Namespace>TcoKukaRobotics</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoMitsubishiRobotics">
-      <DefaultResolution>TcoMitsubishiRobotics, 0.11.0.71 (Vortex.Library)</DefaultResolution>
+      <DefaultResolution>TcoMitsubishiRobotics, 0.11.0.74 (Vortex.Library)</DefaultResolution>
       <Namespace>TcoMitsubishiRobotics</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoPneumatics">
-      <DefaultResolution>TcoPneumatics, 0.11.0.71 (Vortex.Library)</DefaultResolution>
+      <DefaultResolution>TcoPneumatics, 0.11.0.74 (Vortex.Library)</DefaultResolution>
       <Namespace>TcoPneumatics</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoRexrothPress">
-      <DefaultResolution>TcoRexrothPress, 0.11.0.71 (Vortex.Library)</DefaultResolution>
+      <DefaultResolution>TcoRexrothPress, 0.11.0.74 (Vortex.Library)</DefaultResolution>
       <Namespace>TcoRexrothPress</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoTixonFeeding">
-      <DefaultResolution>TcoTixonFeeding, 0.11.0.71 (Vortex.Library)</DefaultResolution>
+      <DefaultResolution>TcoTixonFeeding, 0.11.0.74 (Vortex.Library)</DefaultResolution>
       <Namespace>TcoTixonFeeding</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoUrRobotics">
-      <DefaultResolution>TcoUrRobotics, 0.11.0.71 (Vortex.Library)</DefaultResolution>
+      <DefaultResolution>TcoUrRobotics, 0.11.0.74 (Vortex.Library)</DefaultResolution>
       <Namespace>TcoUrRobotics</Namespace>
     </PlaceholderReference>
     <PlaceholderReference Include="TcoUtilities">
-      <DefaultResolution>TcoUtilities, 0.11.0.71 (Vortex.Library)</DefaultResolution>
+      <DefaultResolution>TcoUtilities, 0.11.0.74 (Vortex.Library)</DefaultResolution>
       <Namespace>TcoUtilities</Namespace>
     </PlaceholderReference>
   </ItemGroup>
@@ -504,55 +504,55 @@
   </ItemGroup>
   <ItemGroup>
     <PlaceholderResolution Include="TcoAbbRobotics">
-      <Resolution>TcoAbbRobotics, 0.11.0.71 (Vortex.Library)</Resolution>
+      <Resolution>TcoAbbRobotics, 0.11.0.74 (Vortex.Library)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="TcoAbstractions">
-      <Resolution>TcoAbstractions, 0.11.0.71 (Vortex.Library)</Resolution>
+      <Resolution>TcoAbstractions, 0.11.0.74 (Vortex.Library)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="TcoAimTtiPowerSupply">
-      <Resolution>TcoAimTtiPowerSupply, 0.11.0.71 (Vortex.Library)</Resolution>
+      <Resolution>TcoAimTtiPowerSupply, 0.11.0.74 (Vortex.Library)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="TcoCognexVision">
-      <Resolution>TcoCognexVision, 0.11.0.71 (Vortex.Library)</Resolution>
+      <Resolution>TcoCognexVision, 0.11.0.74 (Vortex.Library)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="TcoCore">
-      <Resolution>TcoCore, 0.11.0.71 (Vortex.Library)</Resolution>
+      <Resolution>TcoCore, 0.11.0.74 (Vortex.Library)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="TcoData">
-      <Resolution>TcoData, 0.11.0.71 (Vortex.Library)</Resolution>
+      <Resolution>TcoData, 0.11.0.74 (Vortex.Library)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="TcoDrivesBeckhoff">
-      <Resolution>TcoDrivesBeckhoff, 0.11.0.71 (Vortex.Library)</Resolution>
+      <Resolution>TcoDrivesBeckhoff, 0.11.0.74 (Vortex.Library)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="TcoElements">
-      <Resolution>TcoElements, 0.11.0.71 (Vortex.Library)</Resolution>
+      <Resolution>TcoElements, 0.11.0.74 (Vortex.Library)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="TcoInspectors">
-      <Resolution>TcoInspectors, 0.11.0.71 (Vortex.Library)</Resolution>
+      <Resolution>TcoInspectors, 0.11.0.74 (Vortex.Library)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="TcoIo">
-      <Resolution>TcoIo, 0.11.0.71 (Vortex.Library)</Resolution>
+      <Resolution>TcoIo, 0.11.0.74 (Vortex.Library)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="TcoKukaRobotics">
-      <Resolution>TcoKukaRobotics, 0.11.0.71 (Vortex.Library)</Resolution>
+      <Resolution>TcoKukaRobotics, 0.11.0.74 (Vortex.Library)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="TcoMitsubishiRobotics">
-      <Resolution>TcoMitsubishiRobotics, 0.11.0.71 (Vortex.Library)</Resolution>
+      <Resolution>TcoMitsubishiRobotics, 0.11.0.74 (Vortex.Library)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="TcoPneumatics">
-      <Resolution>TcoPneumatics, 0.11.0.71 (Vortex.Library)</Resolution>
+      <Resolution>TcoPneumatics, 0.11.0.74 (Vortex.Library)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="TcoRexrothPress">
-      <Resolution>TcoRexrothPress, 0.11.0.71 (Vortex.Library)</Resolution>
+      <Resolution>TcoRexrothPress, 0.11.0.74 (Vortex.Library)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="TcoTixonFeeding">
-      <Resolution>TcoTixonFeeding, 0.11.0.71 (Vortex.Library)</Resolution>
+      <Resolution>TcoTixonFeeding, 0.11.0.74 (Vortex.Library)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="TcoUrRobotics">
-      <Resolution>TcoUrRobotics, 0.11.0.71 (Vortex.Library)</Resolution>
+      <Resolution>TcoUrRobotics, 0.11.0.74 (Vortex.Library)</Resolution>
     </PlaceholderResolution>
     <PlaceholderResolution Include="TcoUtilities">
-      <Resolution>TcoUtilities, 0.11.0.71 (Vortex.Library)</Resolution>
+      <Resolution>TcoUtilities, 0.11.0.74 (Vortex.Library)</Resolution>
     </PlaceholderResolution>
   </ItemGroup>
   <ProjectExtensions>

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
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="TcOpen.Inxton.DataMerge" Version="0.11.0-alpha.71" />
+    <PackageReference Include="TcOpen.Inxton.DataMerge" Version="0.11.0-alpha.74" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...es/mts-s-template/t/src/x_template_xHmi.Wpf/Views/ControlledUnits/Base/CUBaseViewModel.cs b/...es/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<object> _taskControls = new List<object>();
         public IEnumerable<object> TaskControls
         {
@@ -71,14 +82,19 @@ public IEnumerable<object> SafetyTaskControls
             }
         }
 
-        public CUBase Component { get; private set; } = new CUBase();
+        public CUBase Component { get; private set; } 
 
         public ProcessData OnlineData { get { return Component.GetChildren<TcoData.TcoDataExchange>().FirstOrDefault()?.GetChildren<TcoData.TcoEntity>().FirstOrDefault() as ProcessData; } }
 
 
         public EntityHeader EntityHeader { get { return OnlineData.EntityHeader; } }
 
-        public object Components { get { return Component.GetChildren<CUComponentsBase>().FirstOrDefault(); } }
+        public object Components { get {
+                CUComponentsBase components = new CUComponentsBase(); 
+                if (Component != null)
+                    components = Component.GetChildren<CUComponentsBase>().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/...rolledUnits/Base/ControlledUnitBase/Diagnostics/Simplified/CUBaseMiniDiagnosticsView.xaml b/...rolledUnits/Base/ControlledUnitBase/Diagnostics/Simplified/CUBaseMiniDiagnosticsView.xaml
@@ -15,9 +15,7 @@
     MaxHeight="200"
     IsVisibleChanged="UserControl_IsVisibleChanged"
     Visibility="{Binding ActiveMessagesCount, Converter={vortex:ActiveMessagesToVisibilityConverter}}">
-    <UserControl.Resources>
-        <materialDesign:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
-    </UserControl.Resources>
+
     <d:UserControl.DataContext>
         <mainplc:CUBaseMiniDiagnosticsViewModel />
     </d:UserControl.DataContext>