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-02-10 20:22:41 +08:00
parent 7b027a10ea
commit c22a8cc98f
12 changed files with 180 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CapMachine.Wpf/Views/MonitorView.xaml
View File

@@ -170,6 +170,7 @@
HandValueCommand="{Binding Source={StaticResource Proxy}, Path=Data.HandValueCmd}"
HandValueMVParameter="{Binding EngMvValue}"
HandValueSVParameter="{Binding EngSvValue}"
IsEnabled="False"
MeterName="{Binding NameNoUnit}"
PVValue="{Binding EngPvValue}"
SVValue="{Binding EngSvValue}"
@@ -837,7 +838,7 @@
</StackPanel>
</Grid>-->
<materialDesign:Card Margin="0,0" materialDesign:ElevationAssist.Elevation="Dp2">
<ItemsControl ItemsSource="{Binding ListHandSwitchData}">
<ItemsControl IsEnabled="False" ItemsSource="{Binding ListHandSwitchData}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Vertical" />
@@ -867,7 +868,7 @@
<!--<svg1:SVGImage Grid.Column="1" Source="E:\图库资源\SVGEdit\CapMachineOutput.svg" RenderTransformOrigin="0.5,0.5" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Margin="3" />-->
<!-- inkscape -->
<Canvas Grid.Column="1">
<Canvas Grid.Column="1" Visibility="Visible">
<Canvas.Background>
<ImageBrush ImageSource="\Assets\Images\CapMachineOutput1.png" />
</Canvas.Background>
@@ -1002,15 +1003,15 @@
CellTitle="吸气口温度"
CellUnit="{Binding InhTempTag.Unit}"
CellValue="{Binding InhTempTag.EngPvValueStr}" />
<Controls:ValueShow
<!--<Controls:ValueShow
Canvas.Left="551"
Canvas.Top="272"
HorizontalAlignment="Center"
VerticalAlignment="Top"
CellTitle="吸气压力MV"
CellUnit="%"
CellValue="{Binding InhPressTag.EngMvValue}" />
<Controls:ValueShow
CellValue="{Binding InhPressTag.EngMvValue}" />-->
<!--<Controls:ValueShow
Canvas.Left="1003"
Canvas.Top="152"
HorizontalAlignment="Left"
@@ -1065,7 +1066,7 @@
VerticalAlignment="Center"
CellTitle="吸气温度MV"
CellUnit="%"
CellValue="{Binding InhTempTag.EngMvValue}" />
CellValue="{Binding InhTempTag.EngMvValue}" />-->
<Label
Canvas.Left="1339"
Canvas.Top="225"

16
CapMachine.Wpf/Views/ProConfigView.xaml
View File

@@ -621,7 +621,7 @@
<DataGridTemplateColumn>
<DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="排气压力&#x0A;(MpaA)" />
<TextBlock FontWeight="Bold" Text="排气压力&#x0A;(BarA)" />
</DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
@@ -632,7 +632,7 @@
<DataGridTemplateColumn>
<DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="吸气压力&#x0A;(MpaA)" />
<TextBlock FontWeight="Bold" Text="吸气压力&#x0A;(BarA)" />
</DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
@@ -676,7 +676,7 @@
<!--<DataGridTemplateColumn>
<DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="润滑油压力&#x0A;(MpaA)" />
<TextBlock FontWeight="Bold" Text="润滑油压力&#x0A;(BarA)" />
</DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
@@ -687,7 +687,7 @@
<DataGridTemplateColumn>
<DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="COND2压力&#x0A;(MpaA)" />
<TextBlock FontWeight="Bold" Text="COND2压力&#x0A;(BarA)" />
</DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
@@ -1371,7 +1371,7 @@
VerticalAlignment="Center"
FontSize="12"
FontWeight="Bold"
Text="排气压力&#10;(MpaA)" />
Text="排气压力&#10;(BarA)" />
</StackPanel>
</TabItem.Header>
<Controls:MeterConfig
@@ -1405,7 +1405,7 @@
VerticalAlignment="Center"
FontSize="12"
FontWeight="Bold"
Text="吸气压力&#10;(MpaA)" />
Text="吸气压力&#10;(BarA)" />
</StackPanel>
</TabItem.Header>
<Controls:MeterConfig
@@ -1508,7 +1508,7 @@
VerticalAlignment="Center"
FontSize="12"
FontWeight="Bold"
Text="润滑油压力&#10;(MpaA)" />
Text="润滑油压力&#10;(BarA)" />
</StackPanel>
</TabItem.Header>
<Controls:MeterConfig
@@ -1576,7 +1576,7 @@
VerticalAlignment="Center"
FontSize="12"
FontWeight="Bold"
Text="COND2压力&#10;(MpaA)" />
Text="COND2压力&#10;(BarA)" />
</StackPanel>
</TabItem.Header>
<Controls:MeterConfig

8
CapMachine.Wpf/Views/QuickMeterStepView.xaml
View File

@@ -167,11 +167,11 @@
MappingName="Speed"
NumberDecimalDigits="0" />
<syncfusion:GridNumericColumn
HeaderText="排气压力(MpaA)"
HeaderText="排气压力(BarA)"
MappingName="ExPress"
NumberDecimalDigits="2" />
<syncfusion:GridNumericColumn
HeaderText="吸气压力(MpaA)"
HeaderText="吸气压力(BarA)"
MappingName="InhPress"
NumberDecimalDigits="2" />
<syncfusion:GridNumericColumn
@@ -184,11 +184,11 @@
MappingName="Cond1Temp"
NumberDecimalDigits="1" />
<syncfusion:GridNumericColumn
HeaderText="润滑油压力(MpaA)"
HeaderText="润滑油压力(BarA)"
MappingName="LubePress"
NumberDecimalDigits="2" />
<syncfusion:GridNumericColumn
HeaderText="COND2压力(MpaA)"
HeaderText="COND2压力(BarA)"
MappingName="Cond2Press"
NumberDecimalDigits="2" />
<syncfusion:GridNumericColumn