From 3e83a73b848c7279e676438aeafb4736bb13ca7d Mon Sep 17 00:00:00 2001
From: wnj00524 <68168066+wnj00524@users.noreply.github.com>
Date: Tue, 7 Apr 2026 16:26:32 +0100
Subject: [PATCH] Add dropdown-based node and edge editors

Move node role editing into a dedicated window with dropdown selection for nodes, traffic entries, traffic types, and roles, and constrain edge endpoints to existing nodes.
---
 src/MedWNetworkSim.App/MainWindow.xaml        | 184 +++++++++--
 src/MedWNetworkSim.App/MainWindow.xaml.cs     |  19 ++
 src/MedWNetworkSim.App/NodeEditorWindow.xaml  | 291 ++++++++++++++++++
 .../NodeEditorWindow.xaml.cs                  |  58 ++++
 .../ViewModels/MainWindowViewModel.cs         |  50 ++-
 .../ViewModels/NodeTrafficProfileViewModel.cs | 121 ++++++++
 6 files changed, 693 insertions(+), 30 deletions(-)
 create mode 100644 src/MedWNetworkSim.App/NodeEditorWindow.xaml
 create mode 100644 src/MedWNetworkSim.App/NodeEditorWindow.xaml.cs

diff --git a/src/MedWNetworkSim.App/MainWindow.xaml b/src/MedWNetworkSim.App/MainWindow.xaml
index 9d0dc25..35e4c33 100644
--- a/src/MedWNetworkSim.App/MainWindow.xaml
+++ b/src/MedWNetworkSim.App/MainWindow.xaml
@@ -363,6 +363,7 @@
                                         <Thumb Width="{Binding Width}"
                                                Height="{Binding Height}"
                                                Cursor="SizeAll"
+                                               PreviewMouseLeftButtonDown="NodeThumb_OnPreviewMouseLeftButtonDown"
                                                DragDelta="NodeThumb_OnDragDelta"
                                                ToolTip="{Binding FullTrafficSummary}">
                                             <Thumb.Template>
@@ -536,6 +537,95 @@
                         </Grid>
                     </TabItem>
 
+                    <TabItem Header="Node Roles">
+                        <Grid Margin="10">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="8" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="12" />
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+
+                            <TextBlock FontSize="12"
+                                       Foreground="{StaticResource MutedForegroundBrush}"
+                                       Text="Choose the node and traffic-role entry from dropdown lists here, then open the dedicated node editor window to make changes."
+                                       TextWrapping="Wrap" />
+
+                            <Grid Grid.Row="2">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="280" />
+                                    <ColumnDefinition Width="16" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="280" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+
+                                <TextBlock VerticalAlignment="Center"
+                                           FontSize="12"
+                                           FontWeight="SemiBold"
+                                           Text="Node" />
+                                <ComboBox Grid.Column="1"
+                                          ItemsSource="{Binding Nodes}"
+                                          SelectedItem="{Binding SelectedNode, Mode=TwoWay}">
+                                    <ComboBox.ItemTemplate>
+                                        <DataTemplate DataType="{x:Type vm:NodeViewModel}">
+                                            <TextBlock>
+                                                <Run Text="{Binding Name}" />
+                                                <Run Text=" (" />
+                                                <Run Text="{Binding Id}" />
+                                                <Run Text=")" />
+                                            </TextBlock>
+                                        </DataTemplate>
+                                    </ComboBox.ItemTemplate>
+                                </ComboBox>
+
+                                <TextBlock Grid.Column="3"
+                                           VerticalAlignment="Center"
+                                           FontSize="12"
+                                           FontWeight="SemiBold"
+                                           Text="Traffic Role" />
+                                <ComboBox Grid.Column="4"
+                                          ItemsSource="{Binding SelectedNode.TrafficProfiles}"
+                                          SelectedItem="{Binding SelectedNodeTrafficProfile, Mode=TwoWay}"
+                                          DisplayMemberPath="SelectionLabel" />
+                            </Grid>
+
+                            <Border Grid.Row="4"
+                                    Padding="14"
+                                    Background="#FFFFFBF4"
+                                    BorderBrush="{StaticResource BorderBrush}"
+                                    BorderThickness="1"
+                                    CornerRadius="14">
+                                <StackPanel>
+                                    <TextBlock FontSize="15"
+                                               FontWeight="SemiBold"
+                                               Text="Use The Node Editor Window" />
+                                    <TextBlock Margin="0,8,0,0"
+                                               FontSize="12"
+                                               Foreground="{StaticResource MutedForegroundBrush}"
+                                               Text="The dedicated node editor provides dropdowns for node, traffic role, traffic type, and role, and keeps the amount fields together in a single place."
+                                               TextWrapping="Wrap" />
+                                    <WrapPanel Margin="0,14,0,0">
+                                        <Button Content="Open Node Editor..." Click="EditSelectedNode_Click" />
+                                        <Button Content="Add Traffic Role" Click="AddTrafficProfile_Click" />
+                                        <Button Content="Remove Selected" Click="RemoveTrafficProfile_Click" />
+                                    </WrapPanel>
+                                    <TextBlock Margin="0,14,0,0"
+                                               FontSize="12"
+                                               FontWeight="SemiBold"
+                                               Foreground="{StaticResource AccentStrongBrush}"
+                                               Text="{Binding SelectedNodeTrafficProfile.SelectionLabel}" />
+                                    <TextBlock Margin="0,4,0,0"
+                                               FontSize="12"
+                                               Foreground="{StaticResource MutedForegroundBrush}"
+                                               Text="{Binding SelectedNodeTrafficProfile.RoleSummary}" />
+                                </StackPanel>
+                            </Border>
+                        </Grid>
+                    </TabItem>
+
                     <TabItem Header="Network Editor">
                         <Grid Margin="10">
                             <Grid.RowDefinitions>
@@ -591,14 +681,27 @@
                                                   ItemsSource="{Binding TrafficDefinitions}"
                                                   SelectedItem="{Binding SelectedTrafficDefinition, Mode=TwoWay}"
                                                   AutoGenerateColumns="False"
+                                                  CanUserAddRows="False"
+                                                  IsReadOnly="False"
                                                   SelectionMode="Single"
                                                   SelectionUnit="FullRow">
                                             <DataGrid.Columns>
                                                 <DataGridTextColumn Binding="{Binding Name, Mode=TwoWay}" Header="Name" Width="95" />
-                                                <DataGridComboBoxColumn Header="Preference"
-                                                                        Width="110"
-                                                                        SelectedItemBinding="{Binding RoutingPreference, Mode=TwoWay}"
-                                                                        ItemsSource="{Binding DataContext.RoutingPreferences, RelativeSource={RelativeSource AncestorType=Window}}" />
+                                                <DataGridTemplateColumn Header="Preference" Width="118">
+                                                    <DataGridTemplateColumn.CellTemplate>
+                                                        <DataTemplate DataType="{x:Type vm:TrafficTypeDefinitionEditorViewModel}">
+                                                            <TextBlock Text="{Binding RoutingPreference}" VerticalAlignment="Center" />
+                                                        </DataTemplate>
+                                                    </DataGridTemplateColumn.CellTemplate>
+                                                    <DataGridTemplateColumn.CellEditingTemplate>
+                                                        <DataTemplate DataType="{x:Type vm:TrafficTypeDefinitionEditorViewModel}">
+                                                            <ComboBox Padding="2"
+                                                                      MinWidth="96"
+                                                                      ItemsSource="{Binding DataContext.RoutingPreferences, RelativeSource={RelativeSource AncestorType=Window}}"
+                                                                      SelectedItem="{Binding RoutingPreference, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                                                        </DataTemplate>
+                                                    </DataGridTemplateColumn.CellEditingTemplate>
+                                                </DataGridTemplateColumn>
                                                 <DataGridTextColumn Binding="{Binding CapacityBidPerUnit, Mode=TwoWay, StringFormat={}{0:0.##}}" Header="Bid / Unit" Width="90" />
                                                 <DataGridTextColumn Binding="{Binding Description, Mode=TwoWay}" Header="Description" Width="*" />
                                             </DataGrid.Columns>
@@ -633,6 +736,7 @@
 
                                         <WrapPanel Grid.Row="2">
                                             <Button Content="Add Node" Click="AddNode_Click" />
+                                            <Button Content="Edit Selected Node..." Click="EditSelectedNode_Click" />
                                             <Button Content="Remove Selected" Click="RemoveNode_Click" />
                                         </WrapPanel>
 
@@ -640,6 +744,7 @@
                                                   ItemsSource="{Binding Nodes}"
                                                   SelectedItem="{Binding SelectedNode, Mode=TwoWay}"
                                                   AutoGenerateColumns="False"
+                                                  CanUserAddRows="False"
                                                   SelectionMode="Single"
                                                   SelectionUnit="FullRow">
                                             <DataGrid.Columns>
@@ -653,26 +758,34 @@
                                         <TextBlock Grid.Row="6"
                                                    FontSize="16"
                                                    FontWeight="SemiBold"
-                                                   Text="Selected Node Traffic Profiles" />
+                                                   Text="Node Role Editing" />
 
                                         <WrapPanel Grid.Row="8">
-                                            <Button Content="Add Profile" Click="AddTrafficProfile_Click" />
-                                            <Button Content="Remove Selected" Click="RemoveTrafficProfile_Click" />
+                                            <Button Content="Open Node Editor..." Click="EditSelectedNode_Click" />
                                         </WrapPanel>
 
-                                        <DataGrid Grid.Row="10"
-                                                  ItemsSource="{Binding SelectedNode.TrafficProfiles}"
-                                                  SelectedItem="{Binding SelectedNodeTrafficProfile, Mode=TwoWay}"
-                                                  AutoGenerateColumns="False"
-                                                  SelectionMode="Single"
-                                                  SelectionUnit="FullRow">
-                                            <DataGrid.Columns>
-                                                <DataGridTextColumn Binding="{Binding TrafficType, Mode=TwoWay}" Header="Traffic Type" Width="*" />
-                                                <DataGridTextColumn Binding="{Binding Production, Mode=TwoWay, StringFormat={}{0:0.##}}" Header="Production" Width="82" />
-                                                <DataGridTextColumn Binding="{Binding Consumption, Mode=TwoWay, StringFormat={}{0:0.##}}" Header="Consumption" Width="90" />
-                                                <DataGridCheckBoxColumn Binding="{Binding CanTransship, Mode=TwoWay}" Header="Transship" Width="75" />
-                                            </DataGrid.Columns>
-                                        </DataGrid>
+                                        <Border Grid.Row="10"
+                                                Padding="12"
+                                                Background="#FFF8F1E7"
+                                                BorderBrush="{StaticResource BorderBrush}"
+                                                BorderThickness="1"
+                                                CornerRadius="12">
+                                            <StackPanel>
+                                                <TextBlock FontSize="12"
+                                                           Foreground="{StaticResource MutedForegroundBrush}"
+                                                           Text="Use the dedicated node editor window to choose nodes, traffic-role entries, traffic types, and roles from dropdown lists."
+                                                           TextWrapping="Wrap" />
+                                                <TextBlock Margin="0,10,0,0"
+                                                           FontSize="12"
+                                                           FontWeight="SemiBold"
+                                                           Foreground="{StaticResource AccentStrongBrush}"
+                                                           Text="{Binding SelectedNodeTrafficProfile.SelectionLabel}" />
+                                                <TextBlock Margin="0,4,0,0"
+                                                           FontSize="12"
+                                                           Foreground="{StaticResource MutedForegroundBrush}"
+                                                           Text="{Binding SelectedNodeTrafficProfile.RoleSummary}" />
+                                            </StackPanel>
+                                        </Border>
                                     </Grid>
                                 </Border>
 
@@ -704,12 +817,39 @@
                                                   ItemsSource="{Binding Edges}"
                                                   SelectedItem="{Binding SelectedEdge, Mode=TwoWay}"
                                                   AutoGenerateColumns="False"
+                                                  CanUserAddRows="False"
                                                   SelectionMode="Single"
                                                   SelectionUnit="FullRow">
                                             <DataGrid.Columns>
                                                 <DataGridTextColumn Binding="{Binding Id, Mode=TwoWay}" Header="Id" Width="70" />
-                                                <DataGridTextColumn Binding="{Binding FromNodeId, Mode=TwoWay}" Header="From" Width="82" />
-                                                <DataGridTextColumn Binding="{Binding ToNodeId, Mode=TwoWay}" Header="To" Width="82" />
+                                                <DataGridTemplateColumn Header="From" Width="110">
+                                                    <DataGridTemplateColumn.CellTemplate>
+                                                        <DataTemplate DataType="{x:Type vm:EdgeViewModel}">
+                                                            <TextBlock VerticalAlignment="Center"
+                                                                       Text="{Binding FromNodeId}" />
+                                                        </DataTemplate>
+                                                    </DataGridTemplateColumn.CellTemplate>
+                                                    <DataGridTemplateColumn.CellEditingTemplate>
+                                                        <DataTemplate DataType="{x:Type vm:EdgeViewModel}">
+                                                            <ComboBox ItemsSource="{Binding DataContext.NodeIdOptions, RelativeSource={RelativeSource AncestorType=Window}}"
+                                                                      SelectedItem="{Binding FromNodeId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                                                        </DataTemplate>
+                                                    </DataGridTemplateColumn.CellEditingTemplate>
+                                                </DataGridTemplateColumn>
+                                                <DataGridTemplateColumn Header="To" Width="110">
+                                                    <DataGridTemplateColumn.CellTemplate>
+                                                        <DataTemplate DataType="{x:Type vm:EdgeViewModel}">
+                                                            <TextBlock VerticalAlignment="Center"
+                                                                       Text="{Binding ToNodeId}" />
+                                                        </DataTemplate>
+                                                    </DataGridTemplateColumn.CellTemplate>
+                                                    <DataGridTemplateColumn.CellEditingTemplate>
+                                                        <DataTemplate DataType="{x:Type vm:EdgeViewModel}">
+                                                            <ComboBox ItemsSource="{Binding DataContext.NodeIdOptions, RelativeSource={RelativeSource AncestorType=Window}}"
+                                                                      SelectedItem="{Binding ToNodeId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                                                        </DataTemplate>
+                                                    </DataGridTemplateColumn.CellEditingTemplate>
+                                                </DataGridTemplateColumn>
                                                 <DataGridTextColumn Binding="{Binding Time, Mode=TwoWay, StringFormat={}{0:0.##}}" Header="Time" Width="68" />
                                                 <DataGridTextColumn Binding="{Binding Cost, Mode=TwoWay, StringFormat={}{0:0.##}}" Header="Cost" Width="68" />
                                                 <DataGridTextColumn Binding="{Binding Capacity, Mode=TwoWay, StringFormat={}{0:0.##}}" Header="Capacity" Width="80" />
diff --git a/src/MedWNetworkSim.App/MainWindow.xaml.cs b/src/MedWNetworkSim.App/MainWindow.xaml.cs
index 36b97cd..15607ed 100644
--- a/src/MedWNetworkSim.App/MainWindow.xaml.cs
+++ b/src/MedWNetworkSim.App/MainWindow.xaml.cs
@@ -1,6 +1,7 @@
 using Microsoft.Win32;
 using System.Windows;
 using System.Windows.Controls.Primitives;
+using System.Windows.Input;
 using MedWNetworkSim.App.ViewModels;
 
 namespace MedWNetworkSim.App;
@@ -87,6 +88,16 @@ private void AddNode_Click(object sender, RoutedEventArgs e)
         ExecuteWithErrorHandling(ViewModel.AddNode);
     }
 
+    private void EditSelectedNode_Click(object sender, RoutedEventArgs e)
+    {
+        var window = new NodeEditorWindow(ViewModel)
+        {
+            Owner = this
+        };
+
+        window.ShowDialog();
+    }
+
     private void RemoveNode_Click(object sender, RoutedEventArgs e)
     {
         ExecuteWithErrorHandling(ViewModel.RemoveSelectedNode);
@@ -120,6 +131,14 @@ private void NodeThumb_OnDragDelta(object sender, DragDeltaEventArgs e)
         }
     }
 
+    private void NodeThumb_OnPreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+    {
+        if (sender is Thumb { DataContext: NodeViewModel node })
+        {
+            ViewModel.SelectedNode = node;
+        }
+    }
+
     private void ExecuteWithErrorHandling(Action action)
     {
         try
diff --git a/src/MedWNetworkSim.App/NodeEditorWindow.xaml b/src/MedWNetworkSim.App/NodeEditorWindow.xaml
new file mode 100644
index 0000000..7bf3cd4
--- /dev/null
+++ b/src/MedWNetworkSim.App/NodeEditorWindow.xaml
@@ -0,0 +1,291 @@
+<Window x:Class="MedWNetworkSim.App.NodeEditorWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:vm="clr-namespace:MedWNetworkSim.App.ViewModels"
+        mc:Ignorable="d"
+        Title="Node Editor"
+        Width="820"
+        Height="680"
+        MinWidth="760"
+        MinHeight="620"
+        WindowStartupLocation="CenterOwner">
+    <Grid Margin="18">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="12" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="12" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <Border Padding="16"
+                Background="{StaticResource PanelBrush}"
+                BorderBrush="{StaticResource BorderBrush}"
+                BorderThickness="1"
+                CornerRadius="18">
+            <StackPanel>
+                <TextBlock FontSize="18"
+                           FontWeight="SemiBold"
+                           Text="Node Editor" />
+                <TextBlock Margin="0,8,0,0"
+                           FontSize="12"
+                           Foreground="{StaticResource MutedForegroundBrush}"
+                           Text="Choose a node, choose one of its traffic-role entries, then set the traffic type and role from dropdown lists."
+                           TextWrapping="Wrap" />
+            </StackPanel>
+        </Border>
+
+        <Grid Grid.Row="2">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1.05*" />
+                <ColumnDefinition Width="14" />
+                <ColumnDefinition Width="1.25*" />
+            </Grid.ColumnDefinitions>
+
+            <Border Padding="14"
+                    Background="{StaticResource PanelBrush}"
+                    BorderBrush="{StaticResource BorderBrush}"
+                    BorderThickness="1"
+                    CornerRadius="18">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="12" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="12" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="12" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+
+                    <TextBlock FontSize="16"
+                               FontWeight="SemiBold"
+                               Text="Node Details" />
+
+                    <WrapPanel Grid.Row="2">
+                        <Button Content="Add Node" Click="AddNode_Click" />
+                        <Button Content="Remove Selected" Click="RemoveNode_Click" />
+                    </WrapPanel>
+
+                    <Grid Grid.Row="4">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="10" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="10" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="10" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <TextBlock VerticalAlignment="Center"
+                                   FontSize="11"
+                                   Foreground="{StaticResource MutedForegroundBrush}"
+                                   Text="Node" />
+                        <ComboBox Grid.Column="1"
+                                  MinWidth="220"
+                                  ItemsSource="{Binding Nodes}"
+                                  SelectedItem="{Binding SelectedNode, Mode=TwoWay}">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate DataType="{x:Type vm:NodeViewModel}">
+                                    <TextBlock>
+                                        <Run Text="{Binding Name}" />
+                                        <Run Text=" (" />
+                                        <Run Text="{Binding Id}" />
+                                        <Run Text=")" />
+                                    </TextBlock>
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+
+                        <TextBlock Grid.Row="2"
+                                   VerticalAlignment="Center"
+                                   FontSize="11"
+                                   Foreground="{StaticResource MutedForegroundBrush}"
+                                   Text="Id" />
+                        <TextBox Grid.Row="2"
+                                 Grid.Column="1"
+                                 Margin="0,0,0,0"
+                                 Text="{Binding SelectedNode.Id, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+                        <TextBlock Grid.Row="4"
+                                   VerticalAlignment="Center"
+                                   FontSize="11"
+                                   Foreground="{StaticResource MutedForegroundBrush}"
+                                   Text="Name" />
+                        <TextBox Grid.Row="4"
+                                 Grid.Column="1"
+                                 Text="{Binding SelectedNode.Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+                        <Grid Grid.Row="6" Grid.ColumnSpan="2">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="120" />
+                                <ColumnDefinition Width="16" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="120" />
+                            </Grid.ColumnDefinitions>
+
+                            <TextBlock VerticalAlignment="Center"
+                                       FontSize="11"
+                                       Foreground="{StaticResource MutedForegroundBrush}"
+                                       Text="X" />
+                            <TextBox Grid.Column="1"
+                                     Text="{Binding SelectedNode.X, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                            <TextBlock Grid.Column="3"
+                                       VerticalAlignment="Center"
+                                       FontSize="11"
+                                       Foreground="{StaticResource MutedForegroundBrush}"
+                                       Text="Y" />
+                            <TextBox Grid.Column="4"
+                                     Text="{Binding SelectedNode.Y, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                        </Grid>
+                    </Grid>
+
+                    <Border Grid.Row="6"
+                            Padding="12"
+                            Background="#FFF8F1E7"
+                            BorderBrush="{StaticResource BorderBrush}"
+                            BorderThickness="1"
+                            CornerRadius="12">
+                        <TextBlock FontSize="12"
+                                   Foreground="{StaticResource MutedForegroundBrush}"
+                                   Text="Tip: select a node on the canvas or in the main node table, then use this window to manage its traffic-role entries with dropdowns."
+                                   TextWrapping="Wrap" />
+                    </Border>
+                </Grid>
+            </Border>
+
+            <Border Grid.Column="2"
+                    Padding="14"
+                    Background="{StaticResource PanelBrush}"
+                    BorderBrush="{StaticResource BorderBrush}"
+                    BorderThickness="1"
+                    CornerRadius="18">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="12" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="12" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="12" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+
+                    <TextBlock FontSize="16"
+                               FontWeight="SemiBold"
+                               Text="Traffic Role Entry" />
+
+                    <WrapPanel Grid.Row="2">
+                        <Button Content="Add Traffic Role" Click="AddTrafficRole_Click" />
+                        <Button Content="Remove Selected" Click="RemoveTrafficRole_Click" />
+                    </WrapPanel>
+
+                    <Grid Grid.Row="4">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="10" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="10" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="10" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="10" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <TextBlock VerticalAlignment="Center"
+                                   FontSize="11"
+                                   Foreground="{StaticResource MutedForegroundBrush}"
+                                   Text="Entry" />
+                        <ComboBox Grid.Column="1"
+                                  MinWidth="260"
+                                  ItemsSource="{Binding SelectedNode.TrafficProfiles}"
+                                  SelectedItem="{Binding SelectedNodeTrafficProfile, Mode=TwoWay}"
+                                  DisplayMemberPath="SelectionLabel" />
+
+                        <TextBlock Grid.Row="2"
+                                   VerticalAlignment="Center"
+                                   FontSize="11"
+                                   Foreground="{StaticResource MutedForegroundBrush}"
+                                   Text="Traffic Type" />
+                        <ComboBox Grid.Row="2"
+                                  Grid.Column="1"
+                                  ItemsSource="{Binding TrafficTypeNameOptions}"
+                                  SelectedItem="{Binding SelectedNodeTrafficProfile.TrafficType, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+                        <TextBlock Grid.Row="4"
+                                   VerticalAlignment="Center"
+                                   FontSize="11"
+                                   Foreground="{StaticResource MutedForegroundBrush}"
+                                   Text="Role" />
+                        <ComboBox Grid.Row="4"
+                                  Grid.Column="1"
+                                  ItemsSource="{Binding SelectedNodeTrafficProfile.RoleOptions}"
+                                  SelectedItem="{Binding SelectedNodeTrafficProfile.SelectedRoleName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+                        <TextBlock Grid.Row="6"
+                                   VerticalAlignment="Center"
+                                   FontSize="11"
+                                   Foreground="{StaticResource MutedForegroundBrush}"
+                                   Text="Production" />
+                        <TextBox Grid.Row="6"
+                                 Grid.Column="1"
+                                 IsEnabled="{Binding SelectedNodeTrafficProfile.IsProducer}"
+                                 Text="{Binding SelectedNodeTrafficProfile.Production, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
+                        <TextBlock Grid.Row="8"
+                                   VerticalAlignment="Center"
+                                   FontSize="11"
+                                   Foreground="{StaticResource MutedForegroundBrush}"
+                                   Text="Consumption" />
+                        <TextBox Grid.Row="8"
+                                 Grid.Column="1"
+                                 IsEnabled="{Binding SelectedNodeTrafficProfile.IsConsumer}"
+                                 Text="{Binding SelectedNodeTrafficProfile.Consumption, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    </Grid>
+
+                    <Border Grid.Row="6"
+                            Padding="12"
+                            Background="#FFF8F1E7"
+                            BorderBrush="{StaticResource BorderBrush}"
+                            BorderThickness="1"
+                            CornerRadius="12">
+                        <StackPanel>
+                            <TextBlock FontSize="12"
+                                       FontWeight="SemiBold"
+                                       Foreground="{StaticResource AccentStrongBrush}"
+                                       Text="{Binding SelectedNodeTrafficProfile.SelectionLabel}" />
+                            <TextBlock Margin="0,6,0,0"
+                                       FontSize="12"
+                                       Foreground="{StaticResource MutedForegroundBrush}"
+                                       Text="{Binding SelectedNodeTrafficProfile.RoleSummary}" />
+                        </StackPanel>
+                    </Border>
+                </Grid>
+            </Border>
+        </Grid>
+
+        <DockPanel Grid.Row="4">
+            <TextBlock VerticalAlignment="Center"
+                       FontSize="12"
+                       Foreground="{StaticResource MutedForegroundBrush}"
+                       Text="{Binding StatusMessage}" />
+            <Button DockPanel.Dock="Right"
+                    Margin="12,0,0,0"
+                    Content="Close"
+                    Click="Close_Click" />
+        </DockPanel>
+    </Grid>
+</Window>
diff --git a/src/MedWNetworkSim.App/NodeEditorWindow.xaml.cs b/src/MedWNetworkSim.App/NodeEditorWindow.xaml.cs
new file mode 100644
index 0000000..d6b51bd
--- /dev/null
+++ b/src/MedWNetworkSim.App/NodeEditorWindow.xaml.cs
@@ -0,0 +1,58 @@
+using System.Windows;
+using MedWNetworkSim.App.ViewModels;
+
+namespace MedWNetworkSim.App;
+
+public partial class NodeEditorWindow : Window
+{
+    public NodeEditorWindow(MainWindowViewModel viewModel)
+    {
+        InitializeComponent();
+        ViewModel = viewModel;
+        DataContext = ViewModel;
+    }
+
+    public MainWindowViewModel ViewModel { get; }
+
+    private void AddNode_Click(object sender, RoutedEventArgs e)
+    {
+        ExecuteWithErrorHandling(ViewModel.AddNode);
+    }
+
+    private void RemoveNode_Click(object sender, RoutedEventArgs e)
+    {
+        ExecuteWithErrorHandling(ViewModel.RemoveSelectedNode);
+    }
+
+    private void AddTrafficRole_Click(object sender, RoutedEventArgs e)
+    {
+        ExecuteWithErrorHandling(ViewModel.AddTrafficProfileToSelectedNode);
+    }
+
+    private void RemoveTrafficRole_Click(object sender, RoutedEventArgs e)
+    {
+        ExecuteWithErrorHandling(ViewModel.RemoveSelectedTrafficProfileFromNode);
+    }
+
+    private void Close_Click(object sender, RoutedEventArgs e)
+    {
+        Close();
+    }
+
+    private void ExecuteWithErrorHandling(Action action)
+    {
+        try
+        {
+            action();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(
+                this,
+                ex.Message,
+                "MedW Network Simulator",
+                MessageBoxButton.OK,
+                MessageBoxImage.Error);
+        }
+    }
+}
diff --git a/src/MedWNetworkSim.App/ViewModels/MainWindowViewModel.cs b/src/MedWNetworkSim.App/ViewModels/MainWindowViewModel.cs
index 018db49..8df0473 100644
--- a/src/MedWNetworkSim.App/ViewModels/MainWindowViewModel.cs
+++ b/src/MedWNetworkSim.App/ViewModels/MainWindowViewModel.cs
@@ -141,7 +141,8 @@ public NodeViewModel? SelectedNode
                 return;
             }
 
-            SelectedNodeTrafficProfile = null;
+            SelectedNodeTrafficProfile = value?.TrafficProfiles.FirstOrDefault();
+            OnPropertyChanged(nameof(SelectedNodeTrafficRoleHeadline));
         }
     }
 
@@ -151,6 +152,10 @@ public NodeTrafficProfileViewModel? SelectedNodeTrafficProfile
         set => SetProperty(ref selectedNodeTrafficProfile, value);
     }
 
+    public string SelectedNodeTrafficRoleHeadline => SelectedNode is null
+        ? "Traffic Roles"
+        : $"Traffic Roles For {SelectedNode.Name}";
+
     public EdgeViewModel? SelectedEdge
     {
         get => selectedEdge;
@@ -299,6 +304,8 @@ public void AddNode()
     {
         EnsureNetworkExists();
 
+        var primaryTrafficDefinition = EnsurePrimaryTrafficDefinition();
+
         var nodeIndex = Nodes.Count + 1;
         var node = new NodeViewModel(new NodeModel
         {
@@ -307,9 +314,16 @@ public void AddNode()
             X = 220d + ((nodeIndex - 1) % 4 * 220d),
             Y = 180d + ((nodeIndex - 1) / 4 * 170d)
         });
+        var initialProfile = new NodeTrafficProfileViewModel(new NodeTrafficProfile
+        {
+            TrafficType = primaryTrafficDefinition.Name
+        });
+
+        node.AddTrafficProfile(initialProfile);
 
         RegisterNode(node);
         SelectedNode = node;
+        SelectedNodeTrafficProfile = initialProfile;
         RefreshDerivedStateAfterStructureChange("Added a new node.");
     }
 
@@ -345,12 +359,12 @@ public void AddTrafficProfileToSelectedNode()
             throw new InvalidOperationException("Select a node before adding a traffic profile.");
         }
 
-        if (TrafficDefinitions.Count == 0)
-        {
-            AddTrafficDefinition();
-        }
-
-        var trafficName = TrafficTypeNameOptions.FirstOrDefault() ?? "Traffic 1";
+        var primaryTrafficDefinition = EnsurePrimaryTrafficDefinition();
+        var trafficName = TrafficDefinitions
+            .Select(definition => definition.Name)
+            .Where(name => !string.IsNullOrWhiteSpace(name))
+            .FirstOrDefault(name => SelectedNode.TrafficProfiles.All(profile => !Comparer.Equals(profile.TrafficType, name)))
+            ?? primaryTrafficDefinition.Name;
         var profile = new NodeTrafficProfileViewModel(new NodeTrafficProfile
         {
             TrafficType = trafficName
@@ -369,7 +383,7 @@ public void RemoveSelectedTrafficProfileFromNode()
         }
 
         SelectedNode.RemoveTrafficProfile(SelectedNodeTrafficProfile);
-        SelectedNodeTrafficProfile = null;
+        SelectedNodeTrafficProfile = SelectedNode.TrafficProfiles.FirstOrDefault();
         RefreshDerivedStateAfterStructureChange("Removed the selected traffic profile.");
     }
 
@@ -429,6 +443,25 @@ private void EnsureNetworkExists()
         }
     }
 
+    private TrafficTypeDefinitionEditorViewModel EnsurePrimaryTrafficDefinition()
+    {
+        var existingDefinition = TrafficDefinitions.FirstOrDefault(definition => !string.IsNullOrWhiteSpace(definition.Name));
+        if (existingDefinition is not null)
+        {
+            return existingDefinition;
+        }
+
+        var definition = new TrafficTypeDefinitionEditorViewModel(new TrafficTypeDefinition
+        {
+            Name = GetNextUniqueName("Traffic", TrafficDefinitions.Select(item => item.Name)),
+            RoutingPreference = RoutingPreference.TotalCost
+        });
+
+        RegisterTrafficDefinition(definition);
+        SelectedTrafficDefinition = definition;
+        return definition;
+    }
+
     private void LoadBundledSampleIfAvailable()
     {
         try
@@ -597,6 +630,7 @@ private void HandleNodePositionChanged(object? sender, EventArgs e)
 
     private void HandleNodeDefinitionChanged(object? sender, EventArgs e)
     {
+        OnPropertyChanged(nameof(SelectedNodeTrafficRoleHeadline));
         RefreshDerivedStateAfterStructureChange("Updated node data.");
     }
 
diff --git a/src/MedWNetworkSim.App/ViewModels/NodeTrafficProfileViewModel.cs b/src/MedWNetworkSim.App/ViewModels/NodeTrafficProfileViewModel.cs
index c9d2e4f..dc56169 100644
--- a/src/MedWNetworkSim.App/ViewModels/NodeTrafficProfileViewModel.cs
+++ b/src/MedWNetworkSim.App/ViewModels/NodeTrafficProfileViewModel.cs
@@ -4,6 +4,27 @@ namespace MedWNetworkSim.App.ViewModels;
 
 public sealed class NodeTrafficProfileViewModel : ObservableObject
 {
+    private const string NoTrafficRole = "No Traffic Role";
+    private const string ProducerRole = "Producer";
+    private const string ConsumerRole = "Consumer";
+    private const string TransshipRole = "Transship";
+    private const string ProducerConsumerRole = "Producer + Consumer";
+    private const string ProducerTransshipRole = "Producer + Transship";
+    private const string ConsumerTransshipRole = "Consumer + Transship";
+    private const string ProducerConsumerTransshipRole = "Producer + Consumer + Transship";
+
+    private static readonly IReadOnlyList<string> roleOptions =
+    [
+        NoTrafficRole,
+        ProducerRole,
+        ConsumerRole,
+        TransshipRole,
+        ProducerConsumerRole,
+        ProducerTransshipRole,
+        ConsumerTransshipRole,
+        ProducerConsumerTransshipRole
+    ];
+
     private string trafficType;
     private double production;
     private double consumption;
@@ -27,6 +48,7 @@ public string TrafficType
                 return;
             }
 
+            OnPropertyChanged(nameof(SelectionLabel));
             OnPropertyChanged(nameof(RoleSummary));
         }
     }
@@ -41,6 +63,9 @@ public double Production
                 return;
             }
 
+            OnPropertyChanged(nameof(IsProducer));
+            OnPropertyChanged(nameof(SelectedRoleName));
+            OnPropertyChanged(nameof(SelectionLabel));
             OnPropertyChanged(nameof(RoleSummary));
         }
     }
@@ -55,10 +80,41 @@ public double Consumption
                 return;
             }
 
+            OnPropertyChanged(nameof(IsConsumer));
+            OnPropertyChanged(nameof(SelectedRoleName));
+            OnPropertyChanged(nameof(SelectionLabel));
             OnPropertyChanged(nameof(RoleSummary));
         }
     }
 
+    public bool IsProducer
+    {
+        get => Production > 0;
+        set
+        {
+            if (value == IsProducer)
+            {
+                return;
+            }
+
+            Production = value ? Math.Max(Production, 1d) : 0d;
+        }
+    }
+
+    public bool IsConsumer
+    {
+        get => Consumption > 0;
+        set
+        {
+            if (value == IsConsumer)
+            {
+                return;
+            }
+
+            Consumption = value ? Math.Max(Consumption, 1d) : 0d;
+        }
+    }
+
     public bool CanTransship
     {
         get => canTransship;
@@ -69,10 +125,66 @@ public bool CanTransship
                 return;
             }
 
+            OnPropertyChanged(nameof(SelectedRoleName));
+            OnPropertyChanged(nameof(SelectionLabel));
             OnPropertyChanged(nameof(RoleSummary));
         }
     }
 
+    public IReadOnlyList<string> RoleOptions => roleOptions;
+
+    public string SelectedRoleName
+    {
+        get
+        {
+            return (IsProducer, IsConsumer, CanTransship) switch
+            {
+                (false, false, false) => NoTrafficRole,
+                (true, false, false) => ProducerRole,
+                (false, true, false) => ConsumerRole,
+                (false, false, true) => TransshipRole,
+                (true, true, false) => ProducerConsumerRole,
+                (true, false, true) => ProducerTransshipRole,
+                (false, true, true) => ConsumerTransshipRole,
+                (true, true, true) => ProducerConsumerTransshipRole
+            };
+        }
+        set
+        {
+            ArgumentNullException.ThrowIfNull(value);
+
+            switch (value)
+            {
+                case ProducerRole:
+                    ApplyRoleSelection(isProducer: true, isConsumer: false, canTransship: false);
+                    break;
+                case ConsumerRole:
+                    ApplyRoleSelection(isProducer: false, isConsumer: true, canTransship: false);
+                    break;
+                case TransshipRole:
+                    ApplyRoleSelection(isProducer: false, isConsumer: false, canTransship: true);
+                    break;
+                case ProducerConsumerRole:
+                    ApplyRoleSelection(isProducer: true, isConsumer: true, canTransship: false);
+                    break;
+                case ProducerTransshipRole:
+                    ApplyRoleSelection(isProducer: true, isConsumer: false, canTransship: true);
+                    break;
+                case ConsumerTransshipRole:
+                    ApplyRoleSelection(isProducer: false, isConsumer: true, canTransship: true);
+                    break;
+                case ProducerConsumerTransshipRole:
+                    ApplyRoleSelection(isProducer: true, isConsumer: true, canTransship: true);
+                    break;
+                default:
+                    ApplyRoleSelection(isProducer: false, isConsumer: false, canTransship: false);
+                    break;
+            }
+
+            OnPropertyChanged(nameof(SelectedRoleName));
+        }
+    }
+
     public string RoleSummary
     {
         get
@@ -97,4 +209,13 @@ public string RoleSummary
             return parts.Count == 0 ? "No traffic role" : string.Join("  ", parts);
         }
     }
+
+    public string SelectionLabel => $"{TrafficType} | {SelectedRoleName}";
+
+    private void ApplyRoleSelection(bool isProducer, bool isConsumer, bool canTransship)
+    {
+        Production = isProducer ? Math.Max(Production, 1d) : 0d;
+        Consumption = isConsumer ? Math.Max(Consumption, 1d) : 0d;
+        CanTransship = canTransship;
+    }
 }