Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*tco package updated to 0.11.0.alpha-74 #141

Merged
merged 1 commit into from
Jun 25, 2024
Merged

*tco package updated to 0.11.0.alpha-74 #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/mts-s-template/t/src/x_template_x-xae/x_template_x-xae.tsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
1 change: 0 additions & 1 deletion .../t/src/x_template_x-xae/x_template_xPlc/Technology/CU00x/Components/CU00xComponents.TcDUT
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
68 changes: 34 additions & 34 deletions templates/mts-s-template/t/src/x_template_x-xae/x_template_xPlc/x_template_xPlc.plcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion templates/mts-s-template/t/src/x_template_xDataMerge/x_template_xDataMerge.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
22 changes: 20 additions & 2 deletions ...es/mts-s-template/t/src/x_template_xHmi.Wpf/Views/ControlledUnits/Base/CUBaseViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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()
{
Expand Down Expand Up @@ -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(); } }

Expand Down
4 changes: 1 addition & 3 deletions ...rolledUnits/Base/ControlledUnitBase/Diagnostics/Simplified/CUBaseMiniDiagnosticsView.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading