Skip to content

Commit b89a681

Browse files
dbeuchlerdbeuchler
authored
Merge pull request PHOENIXCONTACT#890 from PHOENIXCONTACT/rework/visual-instructions-naming
Naming of VisualInstructions
2 parents 4dec9bf + d975390 commit b89a681

File tree

174 files changed

+1800
-1688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+1800
-1688
lines changed

‎MORYX-Framework.slnx‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
<Project Path="src/Moryx.ControlSystem.Processes.Endpoints/Moryx.ControlSystem.Processes.Endpoints.csproj" />
1616
<Project Path="src/Moryx.ControlSystem.SetupProvider/Moryx.ControlSystem.SetupProvider.csproj" />
1717
<Project Path="src/Moryx.ControlSystem.Simulator/Moryx.ControlSystem.Simulator.csproj" />
18-
<Project Path="src/Moryx.ControlSystem.VisualInstructions.Endpoints/Moryx.ControlSystem.VisualInstructions.Endpoints.csproj" />
19-
<Project Path="src/Moryx.ControlSystem.WorkerSupport.Web/Moryx.ControlSystem.WorkerSupport.Web.csproj" />
20-
<Project Path="src/Moryx.ControlSystem.WorkerSupport/Moryx.ControlSystem.WorkerSupport.csproj" />
21-
<Project Path="src/Moryx.Resources.AssemblyInstruction/Moryx.Resources.AssemblyInstruction.csproj" />
2218
</Folder>
2319
<Folder Name="/Drivers/">
2420
<Project Path="src/Moryx.Drivers.Mqtt/Moryx.Drivers.Mqtt.csproj" />
@@ -127,8 +123,6 @@
127123
<Project Path="src/Tests/Moryx.ControlSystem.ProcessEngine.Tests/Moryx.ControlSystem.ProcessEngine.Tests.csproj" />
128124
<Project Path="src/Tests/Moryx.ControlSystem.SetupProvider.Tests/Moryx.ControlSystem.SetupProvider.Tests.csproj" />
129125
<Project Path="src/Tests/Moryx.ControlSystem.Tests/Moryx.ControlSystem.Tests.csproj" />
130-
<Project Path="src/Tests/Moryx.ControlSystem.VisualInstructions.Endpoints.Tests/Moryx.ControlSystem.VisualInstructions.Endpoints.Tests.csproj" />
131-
<Project Path="src/Tests/Moryx.ControlSystem.WorkerSupport.Tests/Moryx.ControlSystem.WorkerSupport.Tests.csproj" />
132126
<Project Path="src/Tests/Moryx.Drivers.Mqtt.Tests/Moryx.Drivers.Mqtt.Tests.csproj" />
133127
<Project Path="src/Tests/Moryx.Drivers.OpcUa.Tests/Moryx.Drivers.OpcUa.Tests.csproj" />
134128
<Project Path="src/Tests/Moryx.FactoryMonitor.Endpoints.Tests/Moryx.FactoryMonitor.Endpoints.Tests.csproj" />
@@ -143,12 +137,16 @@
143137
<Project Path="src/Tests/Moryx.ProcessData.Tests/Moryx.ProcessData.Tests.csproj" />
144138
<Project Path="src/Tests/Moryx.Products.Management.Tests/Moryx.AbstractionLayer.Products.Endpoints.Tests.csproj" />
145139
<Project Path="src/Tests/Moryx.Resources.Management.Tests/Moryx.Resources.Management.Tests.csproj" />
140+
<Project Path="src/Tests/Moryx.Resources.VisualInstructions.Tests/Moryx.Resources.VisualInstructions.Tests.csproj" />
146141
<Project Path="src/Tests/Moryx.Runtime.Endpoints.Tests/Moryx.Runtime.Endpoints.Tests.csproj" />
147142
<Project Path="src/Tests/Moryx.Runtime.Kernel.Tests/Moryx.Runtime.Kernel.Tests.csproj" />
148143
<Project Path="src/Tests/Moryx.Runtime.Tests/Moryx.Runtime.Tests.csproj" />
149144
<Project Path="src/Tests/Moryx.Simulation.Tests/Moryx.Simulation.Tests.csproj" />
150145
<Project Path="src/Tests/Moryx.Tests/Moryx.Tests.csproj" />
146+
<Project Path="src/Tests/Moryx.VisualInstructions.Tests/Moryx.VisualInstructions.Tests.csproj" />
151147
<Project Path="src/Tests/Moryx.Workplans.Editing.Tests/Moryx.Workplans.Editing.Tests.csproj" />
148+
<Project Path="src/Tests/Moryx.VisualInstructions.Controller.Tests/Moryx.VisualInstructions.Controller.Tests.csproj" />
149+
<Project Path="src/Tests/Moryx.VisualInstructions.Endpoints.Tests/Moryx.VisualInstructions.Endpoints.Tests.csproj" />
152150
</Folder>
153151
<Folder Name="/TestTools/">
154152
<Project Path="src/Moryx.AbstractionLayer.TestTools/Moryx.AbstractionLayer.TestTools.csproj" />
@@ -163,6 +161,13 @@
163161
<Project Path="src/Tests/Moryx.Container.TestRootPlugin/Moryx.Container.TestRootPlugin.csproj" />
164162
<Project Path="src/Tests/Moryx.Container.TestTools/Moryx.Container.TestTools.csproj" />
165163
</Folder>
164+
<Folder Name="/VisualInstructions/">
165+
<Project Path="src/Moryx.VisualInstructions/Moryx.VisualInstructions.csproj" />
166+
<Project Path="src/Moryx.Resources.VisualInstructions/Moryx.Resources.VisualInstructions.csproj" />
167+
<Project Path="src/Moryx.VisualInstructions.Controller/Moryx.VisualInstructions.Controller.csproj" />
168+
<Project Path="src/Moryx.VisualInstructions.Endpoints/Moryx.VisualInstructions.Endpoints.csproj" />
169+
<Project Path="src/Moryx.VisualInstructions.Web/Moryx.VisualInstructions.Web.csproj" />
170+
</Folder>
166171
<Folder Name="/Workplans/">
167172
<Project Path="src/Moryx.Workplans.Editing/Moryx.Workplans.Editing.csproj" />
168173
<Project Path="src/Moryx.Workplans.Samples/Moryx.Workplans.Samples.csproj" />

‎docs/migrations/v8_to_v10.md‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,30 @@
11
# MORYX 8.x to 10.x
22

3-
## Replaced result of visual instructions with dedicated result object
3+
## WorkerSupport / VisualInstructions
4+
5+
The WorkerSupport Module `Moryx.ControlSystem.WorkerSupport` was renamed to `Moryx.VisualInstructions.Controller` to match all namespaces. Also the Resource project was renamed from `Moryx.Resources.AssemblyInstruction` to `Moryx.Resources.VisualInstructions`.
6+
7+
VisualInstructions has an own separate namespace now.
8+
9+
| Project | Description | MORYX 8 |
10+
|-------------------------------------|-----------------------------------------------------------|---------------------------------------------|
11+
| Moryx.VisualInstructions | API for usage of Visual Instructions | Moryx.ControlSystem.VisualInstructions |
12+
| Moryx.VisualInstructions.Controller | Module for managing Visual Instructions | Moryx.ControlSystem.WorkerSupport |
13+
| Moryx.VisualInstructions.Web | Web Module to display Visual Instructions | Moryx.ControlSystem.WorkerSupport.Web |
14+
| Moryx.VisualInstructions.Endpoints | ASP.NET Controller for hosting API of Visual Instructions | Moryx.ControlSystem.WorkerSupport.Endpoints |
15+
| Moryx.Resources.VisualInstructions | Digital Twin of a visual instructions | Moryx.Resources.AssemblyInstructions |
16+
17+
### Replaced result of visual instructions with dedicated result object
418

519
In *Moryx.Factory* **6.3** and **8.1** we introduced the new result object and optional extended APIs. The result object solved issues caused by localization of the different results. With **Moryx 10** we remove all old APIs based on strings.
620

7-
## Replaced `IVisualInstructions` with `VisualInstructionParameters`
21+
### Replaced `IVisualInstructions` with `VisualInstructionParameters`
822
The interface was only used in `VisualInstructionParameters` which can and is being used as a base class in most cases anyway.
923
Hence, `IVisualInstructions` is removed in favor of a more extendable base class.
1024

1125
## Integration of Moryx.Simulation into Moryx.ControlSystem
1226

13-
To reduce the number of API packages and simplify the overall architecture, **Moryx.Simulation** has been integrated into **Moryx.ControlSystem** starting with Moryx 10. All simulation-related APIs and functionality are now part of the Moryx.ControlSystem package. This change streamlines dependency management and makes it easier to maintain and extend simulation features within the control system context.
27+
To reduce the number of API packages and simplify the overall architecture, **Moryx.Simulation** has been integrated into **Moryx.ControlSystem** starting with MORYX 10. All simulation-related APIs and functionality are now part of the Moryx.ControlSystem package. This change streamlines dependency management and makes it easier to maintain and extend simulation features within the control system context.
1428

1529
The simulator module has also been renamed, and its namespace and package id have changed accordingly to reflect its new location within Moryx.ControlSystem.
1630

‎src/Moryx.Benchmarking/BenchmarkParameters.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using Moryx.AbstractionLayer.Activities;
55
using Moryx.AbstractionLayer.Processes;
66
using Moryx.ControlSystem.Activities;
7-
using Moryx.ControlSystem.VisualInstructions;
7+
using Moryx.VisualInstructions;
88

99
namespace Moryx.Benchmarking
1010
{

‎src/Moryx.Benchmarking/Moryx.Benchmarking.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<ItemGroup>
99
<ProjectReference Include="..\Moryx.AbstractionLayer\Moryx.AbstractionLayer.csproj" />
1010
<ProjectReference Include="..\Moryx.ControlSystem\Moryx.ControlSystem.csproj" />
11+
<ProjectReference Include="..\Moryx.VisualInstructions\Moryx.VisualInstructions.csproj" />
1112
</ItemGroup>
1213

1314
</Project>

‎src/Moryx.ControlSystem.Assemble/AssembleParameters.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Moryx.AbstractionLayer.Processes;
66
using Moryx.AbstractionLayer.Products;
77
using Moryx.AbstractionLayer.Recipes;
8-
using Moryx.ControlSystem.VisualInstructions;
8+
using Moryx.VisualInstructions;
99

1010
namespace Moryx.ControlSystem.Assemble
1111
{

‎src/Moryx.ControlSystem.Assemble/AssembleSetupParameters.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using Moryx.AbstractionLayer.Activities;
55
using Moryx.AbstractionLayer.Capabilities;
66
using Moryx.AbstractionLayer.Processes;
7-
using Moryx.ControlSystem.VisualInstructions;
7+
using Moryx.VisualInstructions;
88

99
namespace Moryx.ControlSystem.Assemble
1010
{

‎src/Moryx.ControlSystem.Assemble/AssembleSetupTrigger.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using Moryx.Container;
99
using Moryx.ControlSystem.Capabilities;
1010
using Moryx.ControlSystem.Setups;
11-
using Moryx.ControlSystem.VisualInstructions;
11+
using Moryx.VisualInstructions;
1212
using Moryx.Modules;
1313
using Moryx.Tools;
1414
using Moryx.Workplans;

‎src/Moryx.ControlSystem.ProcessEngine/Processes/Implementation/ProcessRemoval.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
using Moryx.Container;
1010
using Moryx.ControlSystem.Activities;
1111
using Moryx.ControlSystem.Processes;
12-
using Moryx.ControlSystem.VisualInstructions;
1312
using Moryx.Logging;
13+
using Moryx.VisualInstructions;
1414

1515
namespace Moryx.ControlSystem.ProcessEngine.Processes
1616
{

‎src/Moryx.ControlSystem.TestTools/Activities/Mounting/MountingParameters.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the Apache License, Version 2.0
33

44
using System.Runtime.Serialization;
5-
using Moryx.ControlSystem.VisualInstructions;
5+
using Moryx.VisualInstructions;
66

77
namespace Moryx.ControlSystem.TestTools.Activities
88
{

‎src/Moryx.ControlSystem.TestTools/Activities/Mounting/MountingResult.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) 2025, Phoenix Contact GmbH & Co. KG
22
// Licensed under the Apache License, Version 2.0
33

4-
using Moryx.ControlSystem.VisualInstructions;
4+
using Moryx.VisualInstructions;
55
using System.ComponentModel.DataAnnotations;
66

77
namespace Moryx.ControlSystem.TestTools.Activities

0 commit comments

Comments
 (0)