TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加干度计算的数据

Browse Source
This commit is contained in:
Tyrone CT
2025-03-26 19:52:04 +08:00
parent df07efe5b6
commit 9273f6db42
6 changed files with 264 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
CapMachine.Shared/Controls/Meter.xaml
View File

@@ -7,61 +7,62 @@
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
x:Name="MeterInstance"
Width="140"
Width="82"
Height="155"
BorderBrush="Gray"
mc:Ignorable="d">
<materialDesign:Card
Margin="3"
Margin="0,1"
Background="{DynamicResource MaterialDesignLightBackground}"
Foreground="{DynamicResource PrimaryHueLightForegroundBrush}"
UniformCornerRadius="2">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="4*" />
<RowDefinition Height="3*" />
<RowDefinition Height="2*" />
<RowDefinition Height="3*" />
<RowDefinition Height="1.5*" />
</Grid.RowDefinitions>
<Border
Margin="3,3,3,0"
Margin="1,3,1,0"
Background="#404040"
CornerRadius="3" />
<StackPanel Margin="3,3,3,0">
<DockPanel Margin="3">
<StackPanel Margin="1,3,1,0">
<DockPanel Margin="1,3">
<TextBlock
Margin="1,0,1,0"
VerticalAlignment="Center"
DockPanel.Dock="Left"
FontSize="20"
FontSize="14"
Foreground="White"
Text="PV" />
<TextBlock
Margin="5,0,5,0"
Margin="0,0,0,0"
VerticalAlignment="Center"
FontSize="18"
FontSize="13"
Foreground="White"
Text="{Binding ElementName=MeterInstance, Path=PVValue}" />
<TextBlock
Margin="1,0"
Margin="0,0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
DockPanel.Dock="Right"
FontSize="12"
FontSize="10"
Foreground="White"
Text="{Binding ElementName=MeterInstance, Path=Unit}" />
</DockPanel>
<DockPanel Margin="3,-3,3,0">
<DockPanel Margin="1,-3,2,0">
<TextBlock
VerticalAlignment="Center"
DockPanel.Dock="Left"
FontSize="20"
FontSize="16"
FontStyle="Italic"
Foreground="Gold"
Text="SV" />
<TextBlock
Margin="10,0,5,0"
Margin="5,0,5,0"
VerticalAlignment="Center"
FontSize="18"
FontSize="16"
Foreground="Gold"
Text="{Binding ElementName=MeterInstance, Path=SVValue}" />
<!--<TextBlock
@@ -76,17 +77,24 @@
</StackPanel>
<Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition Height="0.5*" />
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<StackPanel Margin="0,3,0,0">
<StackPanel
Grid.ColumnSpan="2"
Margin="5,3,3,0"
Orientation="Horizontal">
<!--
Command="{Binding ElementName=MeterInstance, Path=AutoHandCommand}"
CommandParameter="{Binding ElementName=MeterInstance}"
把整个控件作为参数传递进去
-->
<!-- Width="40" -->
<ToggleButton
x:Name="ToggleBtnAutoHand"
Width="40"
@@ -97,7 +105,7 @@
Style="{StaticResource MaterialDesignSwitchToggleButton}"
ToolTip="手自动" />
<TextBlock
Margin="0,5,0,0"
Margin="3,3,0,0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontWeight="Bold"
@@ -105,7 +113,10 @@
Text="{Binding ElementName=MeterInstance, Path=AutoStateMsg}" />
</StackPanel>
<StackPanel Grid.Column="1" Margin="3,3,3,0">
<StackPanel
Grid.Row="1"
Grid.Column="0"
Margin="3,3,3,0">
<StackPanel.Resources />
<!--
Text="{Binding ElementName=MeterInstance, Path=AutoStateMsg}"
@@ -143,7 +154,10 @@
Text="MV"
Visibility="{Binding ElementName=MeterInstance, Path=IsHandValueShow}" />
</StackPanel>
<StackPanel Grid.Column="2" Margin="3,3,3,0">
<StackPanel
Grid.Row="1"
Grid.Column="1"
Margin="3,3,3,0">
<StackPanel.Resources />
<!--
Text="{Binding ElementName=MeterInstance, Path=AutoStateMsg}"
@@ -185,13 +199,13 @@
<Border
Grid.Row="2"
Margin="3,3,3,3"
Margin="1,2,1,2"
Background="Gray"
CornerRadius="3">
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="16"
FontSize="12"
Foreground="White"
Text="{Binding ElementName=MeterInstance, Path=MeterName}" />
</Border>