Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightCentralizedControlManagement
This commit is contained in:
commit
eb7a314d97
1 file changed
+3
-3
+3
-3
@@ -13,12 +13,12 @@
|
|||||||
d:DesignHeight="900" d:DesignWidth="1800">
|
d:DesignHeight="900" d:DesignWidth="1800">
|
||||||
<Grid>
|
<Grid>
|
||||||
<DataGrid x:Name="Griddata" AlternationCount="2" IsReadOnly="True" SelectionChanged="Griddata_SelectionChanged"
|
<DataGrid x:Name="Griddata" AlternationCount="2" IsReadOnly="True" SelectionChanged="Griddata_SelectionChanged"
|
||||||
Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=999}" AutoGenerateColumns="False" MinColumnWidth="30"
|
Margin="0,0,0,57" d:ItemsSource="{d:SampleData ItemCount=999}" AutoGenerateColumns="False" MinColumnWidth="30"
|
||||||
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All"
|
HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All"
|
||||||
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" AllowDrop="False"
|
BorderThickness="1,1,1,1" ColumnHeaderHeight="40" HorizontalContentAlignment="Right" Grid.ColumnSpan="2" AllowDrop="False"
|
||||||
CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"
|
CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserResizeColumns="False"
|
||||||
CanUserAddRows="True" CanUserDeleteRows="False" HeadersVisibility ="Column"
|
CanUserAddRows="True" CanUserDeleteRows="False" HeadersVisibility ="Column"
|
||||||
Background="White" SelectionMode="Single" FontSize="15" TabIndex="1" Focusable="True" BorderBrush="Black" HorizontalAlignment="Left" Width="150">
|
Background="White" SelectionMode="Single" FontSize="15" TabIndex="1" Focusable="True" BorderBrush="Black" HorizontalAlignment="Right" Width="150">
|
||||||
<DataGrid.RowStyle >
|
<DataGrid.RowStyle >
|
||||||
<Style TargetType="{x:Type DataGridRow}">
|
<Style TargetType="{x:Type DataGridRow}">
|
||||||
<Setter Property="Height" Value="30" />
|
<Setter Property="Height" Value="30" />
|
||||||
@@ -54,7 +54,7 @@
|
|||||||
</DataGrid>
|
</DataGrid>
|
||||||
|
|
||||||
<lvc:CartesianChart x:Name="OscChart" MinWidth="1280" MinHeight="600" EasingFunction="{x:Null}"
|
<lvc:CartesianChart x:Name="OscChart" MinWidth="1280" MinHeight="600" EasingFunction="{x:Null}"
|
||||||
Series="{Binding Series}" YAxes="{Binding YAxes}" XAxes="{Binding XAxes}" Margin="300,0,0,60">
|
Series="{Binding Series}" YAxes="{Binding YAxes}" XAxes="{Binding XAxes}" Margin="0,0,300,60">
|
||||||
<lvc:CartesianChart.Style>
|
<lvc:CartesianChart.Style>
|
||||||
<Style TargetType="{x:Type lvc:CartesianChart}">
|
<Style TargetType="{x:Type lvc:CartesianChart}">
|
||||||
<Setter Property="ZoomMode" Value="PanX"/>
|
<Setter Property="ZoomMode" Value="PanX"/>
|
||||||
|
|||||||
Reference in new issue
Block a user