Add selection tracking and clear results to worklist

Introduces selection count tracking in the worklist results and updates status text to reflect selected items. Adds a Clear button and command to clear results and selection. Handles DataGrid selection changes in MainWindow and updates status accordingly. Assembly version updated to 1.1.2.

Author: droidgren

DMWL4/MWL4.sln

@@ -1,10 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.14.36623.8 d17.14
+VisualStudioVersion = 17.14.36623.8
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MWL4", "MWL4.csproj", "{A3DE8EB7-C80F-4F34-BCDC-253F646C7FE1}"
 EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "DMWL4", "..\..\..\MSI\DMWL4\DMWL4.vdproj", "{FBE87749-4DFE-E910-3ACA-BD3C8AA86AAD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,8 @@ Global
 		{A3DE8EB7-C80F-4F34-BCDC-253F646C7FE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A3DE8EB7-C80F-4F34-BCDC-253F646C7FE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A3DE8EB7-C80F-4F34-BCDC-253F646C7FE1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FBE87749-4DFE-E910-3ACA-BD3C8AA86AAD}.Debug|Any CPU.ActiveCfg = Debug
+		{FBE87749-4DFE-E910-3ACA-BD3C8AA86AAD}.Release|Any CPU.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

DMWL4/MainWindow.xaml

@@ -52,9 +52,9 @@
                 <Grid Margin="8,8,8,0">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="221*"/>
-                        <ColumnDefinition Width="34*"/>
-                        <ColumnDefinition Width="69*"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="39*"/>
+                        <ColumnDefinition Width="80*"/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
@@ -74,7 +74,7 @@
                     <Label Content="Port:" Grid.Row="1" Grid.RowSpan="4" RenderTransformOrigin="0.512,0.301" Margin="0,20,0,28"/>
                     <TextBox Grid.Row="2" Text="{Binding ServerPort, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="81,5,0,0" Grid.ColumnSpan="5" Height="17.96"/>
 
-                    <CheckBox Grid.Row="3" Content="Use TLS" IsChecked="{Binding UseTLS, Mode=TwoWay}" Margin="25,62,0,0" HorizontalAlignment="Left" Grid.ColumnSpan="2" Grid.RowSpan="2"/>
+                    <CheckBox Grid.Row="3" Content="Use TLS" IsChecked="{Binding UseTLS, Mode=TwoWay}" Margin="10,62,0,0" HorizontalAlignment="Left" Grid.ColumnSpan="2" Grid.RowSpan="2"/>
 
                     <Button Grid.Row="3" Grid.Column="4" Content="Dicom Echo" Width="100" Command="{Binding DicomEchoCommand}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,62,0,0"/>
                     <Button Grid.Row="3" Grid.Column="2" Content="Ping" Width="100" Command="{Binding PingCommand}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,10,0" Grid.ColumnSpan="2" Grid.RowSpan="2"/>
@@ -121,8 +121,17 @@
                     <DatePicker Grid.Row="6" Grid.Column="1" SelectedDate="{Binding EndDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="0,0,0,4"/>
 
                     <StackPanel Grid.Row="7" Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,8,0,0">
-                        <Button Content="Query" Width="100" Command="{Binding QueryCommand}"/>
+                        <Button Content="Clear" Command="{Binding ClearResultsCommand}" Width="100" VerticalAlignment="Bottom" HorizontalAlignment="Right" />
                     </StackPanel>
+                    <Button Content="Query"
+                            Command="{Binding QueryCommand}"
+                            Grid.Column="1"
+                            Grid.Row="7"
+                            Width="100"
+                            VerticalAlignment="Top"
+                            HorizontalAlignment="Right"
+                            Margin="0,8,116,0"
+                            IsDefault="True"/>
                 </Grid>
             </GroupBox>
             <GroupBox Header="Results" Grid.Row="2" Grid.ColumnSpan="2">
@@ -133,7 +142,8 @@
                           Margin="8"
                           ColumnWidth="Auto"
                           ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                          ScrollViewer.VerticalScrollBarVisibility="Auto">
+                          ScrollViewer.VerticalScrollBarVisibility="Auto"
+                          SelectionChanged="DataGrid_SelectionChanged">
                     <DataGrid.Columns>
                         <DataGridTextColumn Binding="{Binding PatientName}">
                             <DataGridTextColumn.Header>

DMWL4/MainWindow.xaml.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using System.Reflection;
 using System.Windows;
+using System.Windows.Controls;
 
 namespace MWL4
 {
@@ -57,5 +58,15 @@ private void AppendVersionToTitle()
                    ?? "1.0";
             Title = $"{Title} v{ver}";
         }
+
+        // Handles DataGrid SelectionChanged from MainWindow.xaml
+        private void DataGrid_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            var dg = (DataGrid)sender;
+            if (DataContext is MainViewModel vm)
+            {
+                vm.SelectionChangedCommand.Execute(dg.SelectedItems?.Count ?? 0);
+            }
+        }
     }
 }

DMWL4/Properties/AssemblyInfo.cs

@@ -47,5 +47,5 @@
 //      Revision
 //
 [assembly: AssemblyVersion("1.1")]
-[assembly: AssemblyFileVersion("1.1")]
-[assembly: AssemblyInformationalVersion("1.1")]
+[assembly: AssemblyFileVersion("1.1.2")]
+[assembly: AssemblyInformationalVersion("1.1.2")]

DMWL4/ViewModels/MainViewModel.cs

@@ -88,13 +88,31 @@ public bool UseTLS
         private string _statusText = "Ready";
         public string StatusText { get => _statusText; set { _statusText = value; OnPropertyChanged(); } }
 
+        // Selected rows count
+        private int _selectedCount;
+        public int SelectedCount
+        {
+            get => _selectedCount;
+            set
+            {
+                if (_selectedCount == value) return;
+                _selectedCount = value;
+                OnPropertyChanged();
+                UpdateStatusWithCounts();
+            }
+        }
+
         public ObservableCollection<WorklistItem> WorklistResults { get; } = new ObservableCollection<WorklistItem>();
 
         public ICommand DicomEchoCommand { get; }
         public ICommand QueryCommand { get; }
         public ICommand ExitCommand { get; }
         public ICommand AboutCommand { get; }
         public ICommand PingCommand { get; }
+        public ICommand ClearResultsCommand { get; } // NEW
+
+        // Command to update selection count (bound from view)
+        public ICommand SelectionChangedCommand { get; }
 
         public MainViewModel()
         {
@@ -112,6 +130,29 @@ public MainViewModel()
                 SaveSettings();
                 Application.Current?.Shutdown();
             });
+
+            ClearResultsCommand = new RelayCommand(_ => ClearResults()); // NEW
+
+            SelectionChangedCommand = new RelayCommand(p =>
+            {
+                // Expect parameter to be the selected count (int)
+                var count = 0;
+                if (p is int i)
+                {
+                    count = i;
+                }
+                else if (p != null)
+                {
+                    // Fallback: try to read Count property via reflection to support SelectedItems
+                    var prop = p.GetType().GetProperty("Count");
+                    if (prop != null)
+                    {
+                        var val = prop.GetValue(p, null);
+                        if (val is int ci) count = ci;
+                    }
+                }
+                SelectedCount = count;
+            });
         }
 
         private void LoadSettings()
@@ -166,6 +207,7 @@ private async Task DoEchoAsync()
                 _logger.Information("C-ECHO success");
                 ShowMessage($"Connection to {ServerHost} successful.", MessageBoxImage.Information);
                 StatusText = "Echo successful";
+                UpdateStatusWithCounts();
             }
             catch (Exception ex)
             {
@@ -191,11 +233,13 @@ private async Task DoPingAsync()
                     {
                         ShowMessage($"Ping Success.\nTime: {reply.RoundtripTime}ms", MessageBoxImage.Information, "Ping Result");
                         StatusText = "Ping successful";
+                        UpdateStatusWithCounts();
                     }
                     else
                     {
                         ShowMessage($"Ping Failed: {reply.Status}", MessageBoxImage.Warning, "Ping Result");
                         StatusText = "Ping failed";
+                        UpdateStatusWithCounts();
                     }
                 }
             }
@@ -208,6 +252,7 @@ private async Task DoPingAsync()
         private async Task DoQueryAsync()
         {
             WorklistResults.Clear();
+            SelectedCount = 0; // reset selection when querying
             StatusText = "Querying Worklist...";
 
             try
@@ -227,7 +272,7 @@ private async Task DoQueryAsync()
                 await client.AddRequestAsync(request);
                 await client.SendAsync();
 
-                StatusText = $"Found {WorklistResults.Count} items.";
+                UpdateStatusWithCounts();
                 _logger.Information("Query completed. Results: {count}", WorklistResults.Count);
             }
             catch (Exception ex)
@@ -236,6 +281,28 @@ private async Task DoQueryAsync()
             }
         }
 
+        private void ClearResults() // NEW
+        {
+            WorklistResults.Clear();
+            SelectedCount = 0;
+            StatusText = "Cleared results.";
+            UpdateStatusWithCounts();
+        }
+
+        private void UpdateStatusWithCounts()
+        {
+            // Compose status text to include result count and selection
+            var baseText = $"Found {WorklistResults.Count} items.";
+            if (SelectedCount > 0)
+            {
+                StatusText = $"{baseText} {SelectedCount} selected.";
+            }
+            else
+            {
+                StatusText = baseText;
+            }
+        }
+
         private WorklistItem MapDatasetToWorklistItem(DicomDataset ds)
         {
             var spsSeq = DicomTag.ScheduledProcedureStepSequence;
@@ -264,7 +331,8 @@ private WorklistItem MapDatasetToWorklistItem(DicomDataset ds)
                 ScheduledPerformingPhysicianName = ds.GetStringSafe(DicomTag.ScheduledPerformingPhysicianName, spsSeq),
                 ScheduledProtocolCodeValue = ds.GetNestedStringSafe(spsSeq, protoSeq, DicomTag.CodeValue),
                 ScheduledProtocolCodeMeaning = ds.GetNestedStringSafe(spsSeq, protoSeq, DicomTag.CodeMeaning),
-                ScheduledProtocolCodeScheme = ds.GetNestedStringSafe(spsSeq, protoSeq, DicomTag.CodingSchemeDesignator)
+                ScheduledProtocolCodeScheme = ds.GetNestedStringSafe(spsSeq, protoSeq, DicomTag.CodingSchemeDesignator
+                )
             };
         }