Skip to content

Port #114 to MORYX 8 #115

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

Merged
enis-pixel merged 3 commits into from
Aug 15, 2025
Merged

Port #114 to MORYX 8 #115

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57410dd
Merge pull request #96 from PHOENIXCONTACT/feature/process-holder-ext…
1nf0rmagician Dec 18, 2024
0a017ae
Set default machine location to visible coordinates
enis-pixel Aug 7, 2025
24d3a26
Merge remote-tracking branch 'origin/dev' into fix/default-machine-lo…
enis-pixel Aug 15, 2025
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
88 changes: 44 additions & 44 deletions src/Moryx.Factory/MachineLocation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,55 +13,55 @@

namespace Moryx.Factory
{
/// <summary>
/// Class for MachineLocation in the factory
/// </summary>
[ResourceRegistration]
// TODO: ADD value
[Display(Name = nameof(Strings.MACHINE_LOCATION), ResourceType = typeof(Localizations.Strings))]
public class MachineLocation : Resource, IMachineLocation
{
public IResource Machine => Children.OfType<ICell>().FirstOrDefault();
/// <summary>
/// Class for MachineLocation in the factory
/// </summary>
[ResourceRegistration]
// TODO: ADD value
[Display(Name = nameof(Strings.MACHINE_LOCATION), ResourceType = typeof(Localizations.Strings))]
public class MachineLocation : Resource, IMachineLocation
{
public IResource Machine => Children.OfType<ICell>().FirstOrDefault();

[DataMember, EntrySerialize]
[Display(Name = nameof(Strings.SPECIFIC_ICON), ResourceType = typeof(Localizations.Strings))]
public string SpecificIcon { get; set; }
[DataMember, EntrySerialize]
[Display(Name = nameof(Strings.SPECIFIC_ICON), ResourceType = typeof(Localizations.Strings))]
public string SpecificIcon { get; set; }

[DataMember, EntrySerialize]
[Display(Name = nameof(Strings.IMAGE), ResourceType = typeof(Localizations.Strings))]
public string Image { get; set; }
[DataMember, EntrySerialize]
[Display(Name = nameof(Strings.IMAGE), ResourceType = typeof(Localizations.Strings))]
public string Image { get; set; }

/// <summary>
/// X position of the location
/// </summary>
[DataMember, EntrySerialize, DefaultValue(10)]
[Display(Name = nameof(Strings.POSITION_X), ResourceType = typeof(Localizations.Strings))]
public double PositionX { get; set; }
/// <summary>
/// X position of the location
/// </summary>
[DataMember, EntrySerialize, DefaultValue(0.5)]
[Display(Name = nameof(Strings.POSITION_X), ResourceType = typeof(Localizations.Strings))]
public double PositionX { get; set; }

/// <summary>
/// Y position of the location
/// </summary>
[DataMember, EntrySerialize, DefaultValue(10)]
[Display(Name = nameof(Strings.POSITION_Y), ResourceType = typeof(Localizations.Strings))]
public double PositionY { get; set; }
/// <summary>
/// Y position of the location
/// </summary>
[DataMember, EntrySerialize, DefaultValue(0.5)]
[Display(Name = nameof(Strings.POSITION_Y), ResourceType = typeof(Localizations.Strings))]
public double PositionY { get; set; }

public Position Position
{
get => new() { PositionX = PositionX, PositionY = PositionY };
set
{
PositionX = value.PositionX;
PositionY = value.PositionY;
}
}
public Position Position
{
get => new() { PositionX = PositionX, PositionY = PositionY };
set
{
PositionX = value.PositionX;
PositionY = value.PositionY;
}
}

[ResourceReference(ResourceRelationType.TransportRoute, ResourceReferenceRole.Source)]
public IReferences<ITransportPath> Origins { get; set; }
[ResourceReference(ResourceRelationType.TransportRoute, ResourceReferenceRole.Source)]
public IReferences<ITransportPath> Origins { get; set; }

[ResourceReference(ResourceRelationType.TransportRoute, ResourceReferenceRole.Target)]
public IReferences<ITransportPath> Destinations { get; set; }
[ResourceReference(ResourceRelationType.TransportRoute, ResourceReferenceRole.Target)]
public IReferences<ITransportPath> Destinations { get; set; }

IEnumerable<ITransportPath> ILocation.Origins => Origins;
IEnumerable<ITransportPath> ILocation.Destinations => Destinations;
}
}
IEnumerable<ITransportPath> ILocation.Origins => Origins;
IEnumerable<ITransportPath> ILocation.Destinations => Destinations;
}
}
Loading