Improved SystemInfo

3 files changed, 85 insertions, 55 deletions

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/MonitoringView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/MonitoringView.xaml
index fbe53327f..79077d0b9 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/MonitoringView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/MonitoringView.xaml
@@ -129,51 +129,72 @@
 
                         <controls:FSEPanel Margin="0 10 0 0" Padding="20" >
                             <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="200"/>
-                                    <ColumnDefinition Width="1*"/>
-                                </Grid.ColumnDefinitions>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="270"/>
+                                        <ColumnDefinition Width="1*"/>
+                                    </Grid.ColumnDefinitions>
 
-                                <ListBox ItemsSource="{Binding SystemInfo.System}" SelectedItem="{Binding SelectedSystemObjectCollection}">
-                                    <ListBox.ItemTemplate>
-                                        <DataTemplate>
-                                            <TextBlock Text="{Binding Name}"></TextBlock>
-                                        </DataTemplate>
-                                    </ListBox.ItemTemplate>
-                                </ListBox>
-
-                                <ScrollViewer Margin="40 0 0 0" Grid.Column="1" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled">
-                                    <ItemsControl ItemsSource="{Binding SelectedSystemObjectCollection.Objects}">
-                                        <ItemsControl.ItemsPanel>
+                                    <ListBox ItemsSource="{Binding SystemInfo.System}" SelectedItem="{Binding SelectedSystemObjectCollection}">
+                                        <ListBox.ItemsPanel>
                                             <ItemsPanelTemplate>
-                                                <StackPanel Orientation="Horizontal" IsItemsHost="True"></StackPanel>
+                                                <WrapPanel/>
                                             </ItemsPanelTemplate>
-                                        </ItemsControl.ItemsPanel>
-                                        <ItemsControl.ItemTemplate>
+                                        </ListBox.ItemsPanel>
+                                        <ListBox.ItemTemplate>
                                             <DataTemplate>
-                                                <DockPanel Width="250" Margin="10 0 0 0">
-                                                    <TextBlock TextTrimming="CharacterEllipsis" DockPanel.Dock="Top" Text="{Binding Name}" Foreground="{StaticResource FSE_GrayBrush}"></TextBlock>
-                                                    <Border TextElement.FontSize="{StaticResource FSE_SmallFontSize}" Margin="0 5 0 0" Padding="3" BorderThickness="1" BorderBrush="{StaticResource FSE_BorderBrush}" CornerRadius="5">
-                                                        <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+                                                <TextBlock Width="115" Text="{Binding Name}"></TextBlock>
+                                            </DataTemplate>
+                                        </ListBox.ItemTemplate>
+                                    </ListBox>
+
+                                    <ScrollViewer Margin="40 0 0 0" Grid.Column="1" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
+                                        <ItemsControl ItemsSource="{Binding SelectedSystemObjectCollection.Objects}">
+                                            <ItemsControl.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <WrapPanel Orientation="Horizontal" IsItemsHost="True"></WrapPanel>
+                                                </ItemsPanelTemplate>
+                                            </ItemsControl.ItemsPanel>
+                                            <ItemsControl.ItemTemplate>
+                                                <DataTemplate>
+                                                    <DockPanel Margin="10 0 10 10" Width="400">
+                                                        <TextBlock TextTrimming="CharacterEllipsis" DockPanel.Dock="Top" Text="{Binding Name}" Foreground="{StaticResource FSE_GrayBrush}"></TextBlock>
+                                                        <Border TextElement.FontSize="{StaticResource FSE_SmallFontSize}" Margin="0 5 0 0" Padding="3" BorderThickness="0" BorderBrush="{StaticResource FSE_BorderBrush}" CornerRadius="5">
                                                             <ItemsControl Opacity="0.7" ItemsSource="{Binding Properties}">
+                                                                <ItemsControl.ItemsPanel>
+                                                                    <ItemsPanelTemplate>
+                                                                        <WrapPanel Orientation="Vertical" />
+                                                                    </ItemsPanelTemplate>
+                                                                </ItemsControl.ItemsPanel>
                                                                 <ItemsControl.ItemTemplate>
                                                                     <DataTemplate>
                                                                         <DockPanel>
-                                                                            <TextBlock FontWeight="SemiBold" HorizontalAlignment="Left">
-                                                                        <Run Text="{Binding Name}"></Run><Run>:</Run>
+                                                                            <DockPanel.ToolTip>
+                                                                                <TextBlock>
+                                                                                    <Run FontWeight="SemiBold" Text="{Binding Name}"></Run><Run>:</Run>
+                                                                                    <Run Text="{Binding Value}"></Run>
+                                                                                </TextBlock>
+                                                                            </DockPanel.ToolTip>
+                                                                            <TextBlock TextTrimming="CharacterEllipsis" Width="100" FontWeight="SemiBold" HorizontalAlignment="Left">
+                                                                                <Run Text="{Binding Name}"></Run><Run>:</Run>
                                                                             </TextBlock>
-                                                                            <TextBlock HorizontalAlignment="Right" Text="{Binding Value}"></TextBlock>
+                                                                            <TextBlock TextTrimming="CharacterEllipsis" Margin="20 0 0 0" HorizontalAlignment="Left" Text="{Binding Value}"></TextBlock>
                                                                         </DockPanel>
                                                                     </DataTemplate>
                                                                 </ItemsControl.ItemTemplate>
                                                             </ItemsControl>
-                                                        </ScrollViewer>
-                                                    </Border>
-                                                </DockPanel>
-                                            </DataTemplate>
-                                        </ItemsControl.ItemTemplate>
-                                    </ItemsControl>
-                                </ScrollViewer>
+                                                        </Border>
+                                                    </DockPanel>
+                                                </DataTemplate>
+                                            </ItemsControl.ItemTemplate>
+                                        </ItemsControl>
+                                    </ScrollViewer>
+                                </Grid>
+
+                                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding FetchingSystemInfo,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                    <ProgressBar HorizontalAlignment="Center" Style="{StaticResource FSE_CircularProgressBar}" IsIndeterminate="{Binding FetchingSystemInfo}" Width="100" Height="100" />
+                                    <TextBlock HorizontalAlignment="Center" Margin="0 10 0 0" Text="Fetching System Information..."></TextBlock>
+                                </StackPanel>
                             </Grid>
                         </controls:FSEPanel>
                     </DockPanel>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Styles.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Styles.xaml
index 0543d501e..90e0f20f2 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Styles.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Styles.xaml
@@ -117,6 +117,10 @@
         </Setter>
     </Style>
 
+    <Style x:Key="FSE_CircularProgressBar" TargetType="ProgressBar" BasedOn="{StaticResource MaterialDesignCircularProgressBar}">
+        
+    </Style>
+
     <Style TargetType="editors:AutoCompleteTextBox" >
         <Setter Property="Focusable" Value="True" />
         <Setter Property="BorderThickness" Value="0 0 0 1"/>
diff --git a/Software/Visual_Studio/Tango.SystemInfo/SystemObjectsCollection.cs b/Software/Visual_Studio/Tango.SystemInfo/SystemObjectsCollection.cs
index ec191750c..92937f561 100644
--- a/Software/Visual_Studio/Tango.SystemInfo/SystemObjectsCollection.cs
+++ b/Software/Visual_Studio/Tango.SystemInfo/SystemObjectsCollection.cs
@@ -40,6 +40,11 @@ namespace Tango.SystemInfo
 
             Connection wmiConnection = new Connection();
 
+            SystemObjectsCollection os = new SystemObjectsCollection() { Name = "Operation System" };
+            Win32_OperatingSystem osConnection = new Win32_OperatingSystem(wmiConnection);
+            os.Objects = osConnection.GetHardwareInfoList().ToList();
+            list.Add(os);
+
             SystemObjectsCollection board = new SystemObjectsCollection() { Name = "Board" };
             Win32_BaseBoard boardConnection = new Win32_BaseBoard(wmiConnection);
             board.Objects = boardConnection.GetHardwareInfoList().ToList();
@@ -50,40 +55,45 @@ namespace Tango.SystemInfo
             bios.Objects = biosConnection.GetHardwareInfoList().ToList();
             list.Add(bios);
 
+            SystemObjectsCollection processor = new SystemObjectsCollection() { Name = "Processor" };
+            Win32_Processor processorConnection = new Win32_Processor(wmiConnection);
+            processor.Objects = processorConnection.GetHardwareInfoList().ToList();
+            list.Add(processor);
+
+            SystemObjectsCollection memory = new SystemObjectsCollection() { Name = "Memory" };
+            Win32_PhysicalMemory memoryConnection = new Win32_PhysicalMemory(wmiConnection);
+            memory.Objects = memoryConnection.GetHardwareInfoList().ToList();
+            list.Add(memory);
+
+            SystemObjectsCollection video = new SystemObjectsCollection() { Name = "Video Controller" };
+            Win32_VideoController videoConnection = new Win32_VideoController(wmiConnection);
+            video.Objects = videoConnection.GetHardwareInfoList().ToList();
+            list.Add(video);
+
             SystemObjectsCollection disk = new SystemObjectsCollection() { Name = "Disk Drives" };
             Win32_DiskDrive diskConnection = new Win32_DiskDrive(wmiConnection);
             disk.Objects = diskConnection.GetHardwareInfoList().ToList();
             list.Add(disk);
 
-            SystemObjectsCollection fan = new SystemObjectsCollection() { Name = "Fan" };
-            Win32_Fan fanConnection = new Win32_Fan(wmiConnection);
-            fan.Objects = fanConnection.GetHardwareInfoList().ToList();
-            list.Add(fan);
-
             SystemObjectsCollection network = new SystemObjectsCollection() { Name = "Network" };
             Win32_NetworkAdapter networkConnection = new Win32_NetworkAdapter(wmiConnection);
             network.Objects = networkConnection.GetHardwareInfoList().ToList();
             list.Add(network);
 
-            SystemObjectsCollection memory = new SystemObjectsCollection() { Name = "Memory" };
-            Win32_PhysicalMemory memoryConnection = new Win32_PhysicalMemory(wmiConnection);
-            memory.Objects = memoryConnection.GetHardwareInfoList().ToList();
-            list.Add(memory);
-
-            SystemObjectsCollection processor = new SystemObjectsCollection() { Name = "Processor" };
-            Win32_Processor processorConnection = new Win32_Processor(wmiConnection);
-            processor.Objects = processorConnection.GetHardwareInfoList().ToList();
-            list.Add(processor);
+            SystemObjectsCollection sound = new SystemObjectsCollection() { Name = "Sound" };
+            Win32_SoundDevice soundConnection = new Win32_SoundDevice(wmiConnection);
+            sound.Objects = soundConnection.GetHardwareInfoList().ToList();
+            list.Add(sound);
 
             SystemObjectsCollection serial = new SystemObjectsCollection() { Name = "Serial Ports" };
             Win32_SerialPort serialConnection = new Win32_SerialPort(wmiConnection);
             serial.Objects = serialConnection.GetHardwareInfoList().ToList();
             list.Add(serial);
 
-            SystemObjectsCollection sound = new SystemObjectsCollection() { Name = "Sound" };
-            Win32_SoundDevice soundConnection = new Win32_SoundDevice(wmiConnection);
-            sound.Objects = soundConnection.GetHardwareInfoList().ToList();
-            list.Add(sound);
+            SystemObjectsCollection fan = new SystemObjectsCollection() { Name = "Fan" };
+            Win32_Fan fanConnection = new Win32_Fan(wmiConnection);
+            fan.Objects = fanConnection.GetHardwareInfoList().ToList();
+            list.Add(fan);
 
             SystemObjectsCollection temp = new SystemObjectsCollection() { Name = "Temperature" };
             Win32_TemperatureProbe tempConnection = new Win32_TemperatureProbe(wmiConnection);
@@ -95,11 +105,6 @@ namespace Tango.SystemInfo
             power.Objects = powerConnection.GetHardwareInfoList().ToList();
             list.Add(power);
 
-            SystemObjectsCollection video = new SystemObjectsCollection() { Name = "Video Controller" };
-            Win32_VideoController videoConnection = new Win32_VideoController(wmiConnection);
-            video.Objects = videoConnection.GetHardwareInfoList().ToList();
-            list.Add(video);
-
             SystemObjectsCollection voltage = new SystemObjectsCollection() { Name = "Voltage" };
             Win32_VoltageProbe voltageConnection = new Win32_VoltageProbe(wmiConnection);
             voltage.Objects = voltageConnection.GetHardwareInfoList().ToList();