diff --git a/src/TcoAbbRobotics/src/TcoAbbRobotics.Wpf/Irc5/Service/TcoIrc5_v_1_x_xServiceViewModel.cs b/src/TcoAbbRobotics/src/TcoAbbRobotics.Wpf/Irc5/Service/TcoIrc5_v_1_x_xServiceViewModel.cs index 36d385e41..618246875 100644 --- a/src/TcoAbbRobotics/src/TcoAbbRobotics.Wpf/Irc5/Service/TcoIrc5_v_1_x_xServiceViewModel.cs +++ b/src/TcoAbbRobotics/src/TcoAbbRobotics.Wpf/Irc5/Service/TcoIrc5_v_1_x_xServiceViewModel.cs @@ -21,5 +21,7 @@ public TcoIrc5_v_1_x_xServiceViewModel():base() } } + public class TcoIrc5_v_1_x_xViewModel : TcoIrc5_v_1_x_xServiceViewModel + { } } diff --git a/src/TcoAbbRobotics/src/TcoAbbRobotics.Wpf/Omnicore/Service/TcoOmnicore_v_1_x_xServiceViewModel.cs b/src/TcoAbbRobotics/src/TcoAbbRobotics.Wpf/Omnicore/Service/TcoOmnicore_v_1_x_xServiceViewModel.cs index a7e33a394..7a39d402a 100644 --- a/src/TcoAbbRobotics/src/TcoAbbRobotics.Wpf/Omnicore/Service/TcoOmnicore_v_1_x_xServiceViewModel.cs +++ b/src/TcoAbbRobotics/src/TcoAbbRobotics.Wpf/Omnicore/Service/TcoOmnicore_v_1_x_xServiceViewModel.cs @@ -23,4 +23,6 @@ public TcoOmnicore_v_1_x_xServiceViewModel():base() } + public class TcoOmnicore_v_1_x_xViewModel : TcoOmnicore_v_1_x_xServiceViewModel + { } } diff --git a/src/TcoCore/src/TcoCoreConnector/pex/TcoComponent/TcoComponent.cs b/src/TcoCore/src/TcoCoreConnector/pex/TcoComponent/TcoComponent.cs index be5947a8d..046692f93 100644 --- a/src/TcoCore/src/TcoCoreConnector/pex/TcoComponent/TcoComponent.cs +++ b/src/TcoCore/src/TcoCoreConnector/pex/TcoComponent/TcoComponent.cs @@ -33,7 +33,7 @@ public IEnumerable Children public IEnumerable Components { - get { if (_components == null) _components = this.GetDescendants(); return _components; } + get { if (_components == null) _components = this.GetChildren(); return _components; } } public bool HasComponents diff --git a/src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/TcoDriveSimple/TcoDriveSimpleServiceViewModel.cs b/src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/TcoDriveSimple/TcoDriveSimpleServiceViewModel.cs index 0ea8ee1fe..85f866d2d 100644 --- a/src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/TcoDriveSimple/TcoDriveSimpleServiceViewModel.cs +++ b/src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/TcoDriveSimple/TcoDriveSimpleServiceViewModel.cs @@ -19,4 +19,7 @@ public TcoDriveSimpleServiceViewModel() public override object Model { get => this.Component; set { this.Component = value as TcoDriveSimple; } } } + + public class TcoDriveSimpleViewModel : TcoDriveSimpleServiceViewModel + { } } diff --git a/src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/TcoMultiAxis/TcoMultiAxisServiceViewModel.cs b/src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/TcoMultiAxis/TcoMultiAxisServiceViewModel.cs index 03d5f7667..974f6e611 100644 --- a/src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/TcoMultiAxis/TcoMultiAxisServiceViewModel.cs +++ b/src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/TcoMultiAxis/TcoMultiAxisServiceViewModel.cs @@ -235,4 +235,6 @@ public TcoMultiAxisMoveParam SelectedItem public bool Axis4MoveAllowed { get => axis4MoveAllowed; set => SetProperty(ref axis4MoveAllowed, value); } } + public class TcoMultiAxisViewModel : TcoMultiAxisServiceViewModel + { } } diff --git a/src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/TcoSingleAxis/TcoSingleAxisServiceViewModel.cs b/src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/TcoSingleAxis/TcoSingleAxisServiceViewModel.cs index 1a13e488c..7c3d33dd4 100644 --- a/src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/TcoSingleAxis/TcoSingleAxisServiceViewModel.cs +++ b/src/TcoDrivesBeckhoff/src/TcoDrivesBeckhoff.Wpf/TcoSingleAxis/TcoSingleAxisServiceViewModel.cs @@ -14,6 +14,7 @@ namespace TcoDrivesBeckhoff { + public class TcoSingleAxisServiceViewModel : RenderableViewModel { private TcoMultiAxisMoveParam selectedItem; @@ -175,4 +176,6 @@ public TcoMultiAxisMoveParam SelectedItem public RelayCommand RefreshPositionsCommand { get; private set; } } + public class TcoSingleAxisViewModel : TcoSingleAxisServiceViewModel + { } } diff --git a/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/TcoDrivesBeckhoffTests.plcproj b/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/TcoDrivesBeckhoffTests.plcproj index cb2c153e5..eab5ee62b 100644 --- a/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/TcoDrivesBeckhoffTests.plcproj +++ b/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/TcoDrivesBeckhoffTests.plcproj @@ -48,6 +48,21 @@ Code + + Code + + + Code + + + Code + + + Code + + + Code + Code @@ -80,6 +95,7 @@ + diff --git a/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WpfContext.TcPOU b/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WpfContext.TcPOU index 67e36048b..0ab12cc19 100644 --- a/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WpfContext.TcPOU +++ b/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WpfContext.TcPOU @@ -36,6 +36,8 @@ VAR {attribute addProperty Name "<#Test multi axis#>"} _multiAxis : TcoDrivesBeckhoff.TcoMultiAxis(THIS^); + {attribute addProperty Name "<#Wrapped Component Example#>"} + _wrappedExample : WrappedComponentExample(THIS^); _sequence1 : TcoCore.TcoSequence(THIS^, eRestoreMode.None); _observer : TcoCore.TcoSequencerObserver(THIS^); diff --git a/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WrappedComponent/WrappedComponentExample.TcPOU b/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WrappedComponent/WrappedComponentExample.TcPOU new file mode 100644 index 000000000..3dea53a6e --- /dev/null +++ b/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WrappedComponent/WrappedComponentExample.TcPOU @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + Restores this instance to the Ready state. Can be called explicitly or from within one of the restore mechanisms. + + +~*) +METHOD Restore : ITcoRestorable + + +]]> + + + + + + + + Custom service (manual, maintenance) logic. + This method must be implemented in derived class. + + +~*) +METHOD PROTECTED ServiceMode +]]> + + + + + + \ No newline at end of file diff --git a/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WrappedComponent/WrappedComponentExample_Config.TcDUT b/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WrappedComponent/WrappedComponentExample_Config.TcDUT new file mode 100644 index 000000000..f298d6585 --- /dev/null +++ b/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WrappedComponent/WrappedComponentExample_Config.TcDUT @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WrappedComponent/WrappedComponentExample_Control.TcDUT b/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WrappedComponent/WrappedComponentExample_Control.TcDUT new file mode 100644 index 000000000..9932b4cb2 --- /dev/null +++ b/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WrappedComponent/WrappedComponentExample_Control.TcDUT @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WrappedComponent/WrappedComponentExample_Status.TcDUT b/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WrappedComponent/WrappedComponentExample_Status.TcDUT new file mode 100644 index 000000000..962e38802 --- /dev/null +++ b/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WrappedComponent/WrappedComponentExample_Status.TcDUT @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WrappedComponent/WrappedComponentsExample.TcDUT b/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WrappedComponent/WrappedComponentsExample.TcDUT new file mode 100644 index 000000000..9b342f46f --- /dev/null +++ b/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/TcoDrivesBeckhoffTests/Tests/TcoContext/WrappedComponent/WrappedComponentsExample.TcDUT @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/XaeTcoDrivesBeckhoff.tsproj b/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/XaeTcoDrivesBeckhoff.tsproj index ddbeeb2bc..42c3ca168 100644 --- a/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/XaeTcoDrivesBeckhoff.tsproj +++ b/src/TcoDrivesBeckhoff/src/XaeTcoDrivesBeckhoff/XaeTcoDrivesBeckhoff.tsproj @@ -2797,7 +2797,7 @@ External Setpoint Generation: - + TcoDrivesBeckhoffTests Instance {08500001-0000-0000-F000-000000000064} diff --git a/src/TcoDrivesBeckhoff/tests/TcoDrivesBeckhoff.Wpf.Sandbox/MainWindow.xaml b/src/TcoDrivesBeckhoff/tests/TcoDrivesBeckhoff.Wpf.Sandbox/MainWindow.xaml index 95833ba78..fceab8e25 100644 --- a/src/TcoDrivesBeckhoff/tests/TcoDrivesBeckhoff.Wpf.Sandbox/MainWindow.xaml +++ b/src/TcoDrivesBeckhoff/tests/TcoDrivesBeckhoff.Wpf.Sandbox/MainWindow.xaml @@ -14,6 +14,16 @@ + + + + + + + + + + diff --git a/src/TcoDrivesBeckhoff/tests/TcoDrivesBeckhoffTestsConnector/Properties/Localizations.resx b/src/TcoDrivesBeckhoff/tests/TcoDrivesBeckhoffTestsConnector/Properties/Localizations.resx index 01edd70be..aa7259ad1 100644 --- a/src/TcoDrivesBeckhoff/tests/TcoDrivesBeckhoffTestsConnector/Properties/Localizations.resx +++ b/src/TcoDrivesBeckhoff/tests/TcoDrivesBeckhoffTestsConnector/Properties/Localizations.resx @@ -141,4 +141,7 @@ Test multi axis + + Wrapped Component Example + \ No newline at end of file