diff --git a/SmartAquaViewer/Resources/Generic.xaml b/SmartAquaViewer/Resources/Generic.xaml index 89638de..4af457e 100644 --- a/SmartAquaViewer/Resources/Generic.xaml +++ b/SmartAquaViewer/Resources/Generic.xaml @@ -662,4 +662,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SmartAquaViewer/View/MonitoringView.xaml b/SmartAquaViewer/View/MonitoringView.xaml index f709cb2..25e66bf 100644 --- a/SmartAquaViewer/View/MonitoringView.xaml +++ b/SmartAquaViewer/View/MonitoringView.xaml @@ -193,7 +193,7 @@ helper:DataGridAutoPageSizeBehavior.Enable="True" helper:DataGridAutoPageSizeBehavior.Suspend="{Binding IsOpenMode}" helper:DataGridAutoPageSizeBehavior.ThrottleMs="120" - Grid.Row="1" Margin="15 0 15 0" + Grid.Row="1" Margin="0" Background="Transparent" RowStyle="{StaticResource DataGridRowStyle}" ColumnHeaderStyle="{StaticResource DataGridColumnHeaderStyle}"> @@ -322,7 +322,7 @@ helper:DataGridAutoPageSizeBehavior.Enable="True" helper:DataGridAutoPageSizeBehavior.Pager="{Binding TanksPager}" helper:DataGridAutoPageSizeBehavior.Suspend="{Binding IsOpenMode}" - Grid.Row="1" Margin="15 0 15 0" + Grid.Row="1" Margin="0" Background="Transparent" VerticalScrollBarVisibility="Auto" RowStyle="{StaticResource DataGridRowStyle}" @@ -567,7 +567,7 @@ - + @@ -583,7 +583,7 @@ helper:ComboBoxHelper.SelectFirstOnItemsChange="True" IsEditable="False" IsTextSearchEnabled="False"/> - + @@ -598,7 +598,7 @@ DisplayMemberPath="Display"/> - + @@ -682,7 +682,7 @@ - + @@ -700,7 +700,7 @@ - + @@ -727,7 +727,7 @@ - + @@ -765,7 +765,7 @@ - + @@ -780,7 +780,7 @@ Style="{StaticResource ComboBoxStyle}"/> - + @@ -789,7 +789,8 @@ + Minimum="1" Maximum="15" Value="{Binding ScatterMarkerSize}" Width="280" IsSnapToTickEnabled="True" TickFrequency="1" + Style="{StaticResource CustomSliderStyle}"/> @@ -798,31 +799,32 @@ - + - + + FontSize="18" FontFamily="{StaticResource SCDream5}" Foreground="White"/> + Value="{Binding BoxTimeSpan}" Width="280" + Style="{StaticResource CustomSliderStyle}"/> - + - + + FontSize="18" FontFamily="{StaticResource SCDream5}" Foreground="White"/> - + - + + FontSize="18" FontFamily="{StaticResource SCDream5}" Foreground="White"/> + Value="{Binding BoxWidth}" Width="280" + Style="{StaticResource CustomSliderStyle}"/>