Skip to content

Stabilize node traffic role editing #5

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
wnj00524 merged 1 commit into from
Apr 7, 2026
Merged

Stabilize node traffic role editing #5

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
18 changes: 9 additions & 9 deletions src/MedWNetworkSim.App/NodeEditorWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@
<ComboBox Grid.Row="2"
Grid.Column="1"
ItemsSource="{Binding TrafficTypeNameOptions}"
SelectedItem="{Binding SelectedNodeTrafficProfile.TrafficType, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
SelectedItem="{Binding SelectedNodeTrafficType, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

<TextBlock Grid.Row="4"
VerticalAlignment="Center"
Expand All @@ -232,8 +232,8 @@
Text="Role" />
<ComboBox Grid.Row="4"
Grid.Column="1"
ItemsSource="{Binding SelectedNodeTrafficProfile.RoleOptions}"
SelectedItem="{Binding SelectedNodeTrafficProfile.SelectedRoleName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
ItemsSource="{Binding SelectedNodeRoleOptions}"
SelectedItem="{Binding SelectedNodeRoleName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

<TextBlock Grid.Row="6"
VerticalAlignment="Center"
Expand All @@ -242,8 +242,8 @@
Text="Production" />
<TextBox Grid.Row="6"
Grid.Column="1"
IsEnabled="{Binding SelectedNodeTrafficProfile.IsProducer}"
Text="{Binding SelectedNodeTrafficProfile.Production, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
IsEnabled="{Binding IsSelectedNodeProducer}"
Text="{Binding SelectedNodeProduction, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />

<TextBlock Grid.Row="8"
VerticalAlignment="Center"
Expand All @@ -252,8 +252,8 @@
Text="Consumption" />
<TextBox Grid.Row="8"
Grid.Column="1"
IsEnabled="{Binding SelectedNodeTrafficProfile.IsConsumer}"
Text="{Binding SelectedNodeTrafficProfile.Consumption, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
IsEnabled="{Binding IsSelectedNodeConsumer}"
Text="{Binding SelectedNodeConsumption, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
</Grid>

<Border Grid.Row="6"
Expand All @@ -266,11 +266,11 @@
<TextBlock FontSize="12"
FontWeight="SemiBold"
Foreground="{StaticResource AccentStrongBrush}"
Text="{Binding SelectedNodeTrafficProfile.SelectionLabel}" />
Text="{Binding SelectedNodeTrafficSelectionLabel}" />
<TextBlock Margin="0,6,0,0"
FontSize="12"
Foreground="{StaticResource MutedForegroundBrush}"
Text="{Binding SelectedNodeTrafficProfile.RoleSummary}" />
Text="{Binding SelectedNodeTrafficRoleSummary}" />
</StackPanel>
</Border>
</Grid>
Expand Down
201 changes: 198 additions & 3 deletions src/MedWNetworkSim.App/ViewModels/MainWindowViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public sealed class MainWindowViewModel : ObservableObject
private NodeTrafficProfileViewModel? selectedNodeTrafficProfile;
private EdgeViewModel? selectedEdge;
private TrafficTypeDefinitionEditorViewModel? selectedTrafficDefinition;
private bool isNormalizingNodeTrafficProfiles;
private double workspaceWidth = 1600d;
private double workspaceHeight = 1000d;
private bool hasNetwork;
Expand Down Expand Up @@ -149,13 +150,122 @@ public NodeViewModel? SelectedNode
public NodeTrafficProfileViewModel? SelectedNodeTrafficProfile
{
get => selectedNodeTrafficProfile;
set => SetProperty(ref selectedNodeTrafficProfile, value);
set
{
if (ReferenceEquals(selectedNodeTrafficProfile, value))
{
return;
}

if (selectedNodeTrafficProfile is not null)
{
selectedNodeTrafficProfile.PropertyChanged -= HandleSelectedNodeTrafficProfilePropertyChanged;
}

if (!SetProperty(ref selectedNodeTrafficProfile, value))
{
return;
}

if (selectedNodeTrafficProfile is not null)
{
selectedNodeTrafficProfile.PropertyChanged += HandleSelectedNodeTrafficProfilePropertyChanged;
}

RaiseSelectedNodeTrafficEditorPropertiesChanged();
}
}

public string SelectedNodeTrafficRoleHeadline => SelectedNode is null
? "Traffic Roles"
: $"Traffic Roles For {SelectedNode.Name}";

public IReadOnlyList<string> SelectedNodeRoleOptions => SelectedNodeTrafficProfile?.RoleOptions ?? [];

public string? SelectedNodeTrafficType
{
get => SelectedNodeTrafficProfile?.TrafficType;
set
{
if (SelectedNodeTrafficProfile is null || string.IsNullOrWhiteSpace(value))
{
return;
}

if (Comparer.Equals(SelectedNodeTrafficProfile.TrafficType, value))
{
return;
}

SelectedNodeTrafficProfile.TrafficType = value;
}
}

public string? SelectedNodeRoleName
{
get => SelectedNodeTrafficProfile?.SelectedRoleName;
set
{
if (SelectedNodeTrafficProfile is null || string.IsNullOrWhiteSpace(value))
{
return;
}

if (string.Equals(SelectedNodeTrafficProfile.SelectedRoleName, value, StringComparison.Ordinal))
{
return;
}

SelectedNodeTrafficProfile.SelectedRoleName = value;
}
}

public bool IsSelectedNodeProducer => SelectedNodeTrafficProfile?.IsProducer ?? false;

public bool IsSelectedNodeConsumer => SelectedNodeTrafficProfile?.IsConsumer ?? false;

public double SelectedNodeProduction
{
get => SelectedNodeTrafficProfile?.Production ?? 0d;
set
{
if (SelectedNodeTrafficProfile is null)
{
return;
}

if (Math.Abs(SelectedNodeTrafficProfile.Production - value) < 0.000001d)
{
return;
}

SelectedNodeTrafficProfile.Production = value;
}
}

public double SelectedNodeConsumption
{
get => SelectedNodeTrafficProfile?.Consumption ?? 0d;
set
{
if (SelectedNodeTrafficProfile is null)
{
return;
}

if (Math.Abs(SelectedNodeTrafficProfile.Consumption - value) < 0.000001d)
{
return;
}

SelectedNodeTrafficProfile.Consumption = value;
}
}

public string SelectedNodeTrafficSelectionLabel => SelectedNodeTrafficProfile?.SelectionLabel ?? "No traffic role selected";

public string SelectedNodeTrafficRoleSummary => SelectedNodeTrafficProfile?.RoleSummary ?? "Choose or add a traffic role entry.";

public EdgeViewModel? SelectedEdge
{
get => selectedEdge;
Expand Down Expand Up @@ -268,8 +378,30 @@ public void AutoArrangeNodes()
return;
}

var arranged = fileService.AutoArrange(BuildValidatedNetwork());
LoadNetwork(arranged, ActiveFileLabel, "Auto-arranged all node positions.");
var current = BuildValidatedNetwork();
var arranged = fileService.AutoArrange(current);
var arrangedNodesById = arranged.Nodes.ToDictionary(node => node.Id, Comparer);

foreach (var node in Nodes)
{
if (!arrangedNodesById.TryGetValue(node.Id, out var arrangedNode))
{
continue;
}

if (arrangedNode.X.HasValue)
{
node.X = arrangedNode.X.Value;
}

if (arrangedNode.Y.HasValue)
{
node.Y = arrangedNode.Y.Value;
}
}

RecalculateWorkspace();
StatusMessage = "Auto-arranged all node positions.";
}

public void AddTrafficDefinition()
Expand Down Expand Up @@ -630,6 +762,16 @@ private void HandleNodePositionChanged(object? sender, EventArgs e)

private void HandleNodeDefinitionChanged(object? sender, EventArgs e)
{
if (isNormalizingNodeTrafficProfiles)
{
return;
}

if (!isNormalizingNodeTrafficProfiles && sender is NodeViewModel node)
Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist Bot Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The check !isNormalizingNodeTrafficProfiles is redundant here because the method already returns early on line 767 if this condition is true.

        if (sender is NodeViewModel node)

{
NormalizeNodeTrafficProfiles(node);
}

OnPropertyChanged(nameof(SelectedNodeTrafficRoleHeadline));
RefreshDerivedStateAfterStructureChange("Updated node data.");
}
Expand Down Expand Up @@ -657,6 +799,11 @@ private void HandleEdgeDefinitionChanged(object? sender, EventArgs e)
RefreshDerivedStateAfterStructureChange("Updated edge data.");
}

private void HandleSelectedNodeTrafficProfilePropertyChanged(object? sender, PropertyChangedEventArgs e)
{
RaiseSelectedNodeTrafficEditorPropertiesChanged();
}

private void HandleTrafficDefinitionPropertyChanged(object? sender, PropertyChangedEventArgs e)
{
if (e.PropertyName == nameof(TrafficTypeDefinitionEditorViewModel.Name))
Expand Down Expand Up @@ -796,6 +943,41 @@ private IEnumerable<string> GetOrderedTrafficNames()
return orderedNames;
}

private void NormalizeNodeTrafficProfiles(NodeViewModel node)
{
isNormalizingNodeTrafficProfiles = true;

try
{
foreach (var duplicateGroup in node.TrafficProfiles
.Where(profile => !string.IsNullOrWhiteSpace(profile.TrafficType))
.GroupBy(profile => profile.TrafficType.Trim(), Comparer)
.Where(group => group.Count() > 1)
.ToList())
{
var primaryProfile = duplicateGroup.First();

foreach (var duplicateProfile in duplicateGroup.Skip(1).ToList())
{
primaryProfile.Production += duplicateProfile.Production;
primaryProfile.Consumption += duplicateProfile.Consumption;
primaryProfile.CanTransship |= duplicateProfile.CanTransship;

if (ReferenceEquals(SelectedNodeTrafficProfile, duplicateProfile))
{
SelectedNodeTrafficProfile = primaryProfile;
}

node.RemoveTrafficProfile(duplicateProfile);
}
}
}
finally
{
isNormalizingNodeTrafficProfiles = false;
}
}

private void RecalculateWorkspace()
{
if (Nodes.Count == 0)
Expand Down Expand Up @@ -886,4 +1068,17 @@ private static string GetNextUniqueName(string prefix, IEnumerable<string> exist
index++;
}
}

private void RaiseSelectedNodeTrafficEditorPropertiesChanged()
{
OnPropertyChanged(nameof(SelectedNodeRoleOptions));
OnPropertyChanged(nameof(SelectedNodeTrafficType));
OnPropertyChanged(nameof(SelectedNodeRoleName));
OnPropertyChanged(nameof(IsSelectedNodeProducer));
OnPropertyChanged(nameof(IsSelectedNodeConsumer));
OnPropertyChanged(nameof(SelectedNodeProduction));
OnPropertyChanged(nameof(SelectedNodeConsumption));
OnPropertyChanged(nameof(SelectedNodeTrafficSelectionLabel));
OnPropertyChanged(nameof(SelectedNodeTrafficRoleSummary));
}
}
Loading