sc/DyeingComputer
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

功能图标添加

Browse Source
This commit is contained in:
sc committed 2025-07-27 17:18:36 +08:00
2 parents c1e324438d a7ff642b0c
commit f161ee0e77
10 files changed
+114 -44
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

DyeingComputer.csproj
+6
View File
@@ -413,6 +413,12 @@
<Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.css" />
<Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.min.css" />
<Content Include="Fonts\font-awesome-4.7.0\fonts\fontawesome-webfont.svg" />
<Resource Include="Lmage\IconParkPauseOne.png" />
<Resource Include="Lmage\IconParkPlay.png" />
<Resource Include="Lmage\IconParkStopwatch.png" />
<Resource Include="Lmage\IconParkLock.png" />
<Resource Include="Lmage\Manual.png" />
<Resource Include="Lmage\Hand.png" />
<Resource Include="Lmage\link.png" />
<Resource Include="Lmage\LOCK.png" />
<Resource Include="Lmage\inf.png" />
Lmage/FlatColorIconsCancel.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

Lmage/Hand.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

Lmage/IconParkLock.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

Lmage/IconParkPauseOne.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

Lmage/IconParkPlay.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

Lmage/IconParkStopwatch.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

Lmage/Manual.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

MainWindow.xaml
+101 -43
View File
@@ -58,52 +58,90 @@
<Grid>
<Rectangle Margin="0,0,0,0" Fill="#FFCCCCCC" VerticalAlignment="Bottom" Height="40"/>
<RadioButton Content="{x:Static lang:Resources.WorkOrder}" x:Name="Work_Order" Tag="&#xF2d2;"
Style="{DynamicResource RadioButtonStyle}" HorizontalAlignment="Left" Height="40" Margin="0,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC" Checked="RadioButton_Page"/>
<RadioButton Content="{x:Static lang:Resources.TechnologicalProcess}" x:Name="Technological_Process" Tag="&#xF036;"
Style="{DynamicResource RadioButtonStyle}" HorizontalAlignment="Left" Height="40" Margin="200,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC" Checked="RadioButton_Page"/>
<RadioButton Content="{x:Static lang:Resources.CurveDiagram}" x:Name="Curve_Diagram" Tag="&#xF1fe;"
Style="{DynamicResource RadioButtonStyle}" HorizontalAlignment="Left" Height="40" Margin="400,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC" Checked="RadioButton_Page"/>
<RadioButton Content="{x:Static lang:Resources.EquipmentSimulation}" x:Name="Equipment_Simulation" Tag="&#xF1b3;"
Style="{DynamicResource RadioButtonStyle}" HorizontalAlignment="Left" Height="40" Margin="600,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC" Checked="RadioButton_Page"/>
<RadioButton Content="{x:Static lang:Resources.HistoryRecords}" x:Name="History_Records" Tag="&#xF15C;"
Style="{DynamicResource RadioButtonStyle}" HorizontalAlignment="Left" Height="40" Margin="800,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC" Checked="RadioButton_Page"/>
<RadioButton Content="{x:Static lang:Resources.Next}" x:Name="Next" Tag="&#xF061;"
Style="{DynamicResource RadioButtonStyle}" HorizontalAlignment="Right" Height="40" Margin="0,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC" Checked="RadioButton_toolbar" GroupName="toolbar"/>
<RadioButton Content="{x:Static lang:Resources.WorkOrder}"
x:Name="Work_Order" Tag="&#xF2d2;"
Style="{DynamicResource RadioButtonStyle}"
HorizontalAlignment="Left" Height="40" Margin="0,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC"
Checked="RadioButton_Page"/>
<RadioButton Content="{x:Static lang:Resources.TechnologicalProcess}"
x:Name="Technological_Process" Tag="&#xF036;"
Style="{DynamicResource RadioButtonStyle}"
HorizontalAlignment="Left" Height="40" Margin="200,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC"
Checked="RadioButton_Page"/>
<RadioButton Content="{x:Static lang:Resources.CurveDiagram}"
x:Name="Curve_Diagram" Tag="&#xF1fe;"
Style="{DynamicResource RadioButtonStyle}"
HorizontalAlignment="Left" Height="40" Margin="400,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC"
Checked="RadioButton_Page"/>
<RadioButton Content="{x:Static lang:Resources.EquipmentSimulation}"
x:Name="Equipment_Simulation" Tag="&#xF1b3;"
Style="{DynamicResource RadioButtonStyle}"
HorizontalAlignment="Left" Height="40" Margin="600,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC"
Checked="RadioButton_Page"/>
<RadioButton Content="{x:Static lang:Resources.HistoryRecords}"
x:Name="History_Records" Tag="&#xF15C;"
Style="{DynamicResource RadioButtonStyle}"
HorizontalAlignment="Left" Height="40" Margin="800,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC"
Checked="RadioButton_Page"/>
<RadioButton Content="{x:Static lang:Resources.Next}"
x:Name="Next" Tag="&#xF061;"
Style="{DynamicResource RadioButtonStyle}"
HorizontalAlignment="Right" Height="40" Margin="0,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC"
Checked="RadioButton_toolbar" GroupName="toolbar"/>
<RadioButton Content="{x:Static lang:Resources.InOut}" x:Name="In_Out" Tag="&#xF065;"
Style="{DynamicResource RadioButtonStyle}" HorizontalAlignment="Left" Height="40" Margin="0,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC" Checked="RadioButton_Page" Visibility="Hidden"/>
<RadioButton Content="{x:Static lang:Resources.SysSet}" x:Name="Sys_Set" Tag="&#xF2a2;"
Style="{DynamicResource RadioButtonStyle}" HorizontalAlignment="Left" Height="40" Margin="200,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC" Checked="RadioButton_Page" Visibility="Hidden"/>
<RadioButton Content="{x:Static lang:Resources.ParameterSet}" x:Name="Parameter_Set" Tag="&#xF013;"
Style="{DynamicResource RadioButtonStyle}" HorizontalAlignment="Left" Height="40" Margin="400,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC" Checked="RadioButton_Page" Visibility="Hidden"/>
<RadioButton Content="{x:Static lang:Resources.Programgroup}" x:Name="Program_group" Tag="&#xF00a;"
Style="{DynamicResource RadioButtonStyle}" HorizontalAlignment="Left" Height="40" Margin="600,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC" Checked="RadioButton_Page" Visibility="Hidden"/>
<RadioButton Content="{x:Static lang:Resources.EngineerSet}" x:Name="Engineer_Set" Tag="&#xF0f0;"
Style="{DynamicResource RadioButtonStyle}" HorizontalAlignment="Left" Height="40" Margin="800,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC" Checked="RadioButton_Page" Visibility="Hidden"/>
<RadioButton Content="{x:Static lang:Resources.Previous}" x:Name="Previous" Tag="&#xF060;"
Style="{DynamicResource RadioButtonStyle}" HorizontalAlignment="Right" Height="40" Margin="0,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC" Checked="RadioButton_toolbar" GroupName="toolbar" Visibility="Hidden"/>
<RadioButton Content="{x:Static lang:Resources.InOut}"
x:Name="In_Out" Tag="&#xF065;"
Style="{DynamicResource RadioButtonStyle}"
HorizontalAlignment="Left" Height="40" Margin="0,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC"
Checked="RadioButton_Page" Visibility="Hidden"/>
<RadioButton Content="{x:Static lang:Resources.SysSet}"
x:Name="Sys_Set" Tag="&#xF2a2;"
Style="{DynamicResource RadioButtonStyle}"
HorizontalAlignment="Left" Height="40" Margin="200,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC"
Checked="RadioButton_Page" Visibility="Hidden"/>
<RadioButton Content="{x:Static lang:Resources.ParameterSet}"
x:Name="Parameter_Set" Tag="&#xF013;"
Style="{DynamicResource RadioButtonStyle}"
HorizontalAlignment="Left" Height="40" Margin="400,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC"
Checked="RadioButton_Page" Visibility="Hidden"/>
<RadioButton Content="{x:Static lang:Resources.Programgroup}"
x:Name="Program_group" Tag="&#xF00a;"
Style="{DynamicResource RadioButtonStyle}"
HorizontalAlignment="Left" Height="40" Margin="600,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC"
Checked="RadioButton_Page" Visibility="Hidden"/>
<RadioButton Content="{x:Static lang:Resources.EngineerSet}"
x:Name="Engineer_Set" Tag="&#xF0f0;"
Style="{DynamicResource RadioButtonStyle}"
HorizontalAlignment="Left" Height="40" Margin="800,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC"
Checked="RadioButton_Page" Visibility="Hidden"/>
<RadioButton Content="{x:Static lang:Resources.Previous}"
x:Name="Previous" Tag="&#xF060;"
Style="{DynamicResource RadioButtonStyle}"
HorizontalAlignment="Right" Height="40" Margin="0,0,0,0"
VerticalAlignment="Bottom" Width="200" Background="#FFCCCCCC"
Checked="RadioButton_toolbar" GroupName="toolbar" Visibility="Hidden"/>
<ContentControl x:Name="container" Margin="0,50,0,40"/>
<Grid Margin="0,0,0,0" VerticalAlignment="Top" Height="50" Background="#FFD2D2D2">
<TextBox Text="{x:Static lang:Resources.Temperature}" HorizontalAlignment="Left" Height="20" Margin="0,0,0,0"
<TextBox Text="{x:Static lang:Resources.Temperature}"
HorizontalAlignment="Left" Height="20" Margin="0,0,0,0"
TextWrapping="Wrap" VerticalAlignment="Top" Width="100" FontSize="12"
Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}"
IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False"/>
<TextBox Text="{x:Static lang:Resources.WorkOrderNumder}" HorizontalAlignment="Left" Height="20" Margin="100,0,5,0"
<TextBox Text="{x:Static lang:Resources.WorkOrderNumder}"
HorizontalAlignment="Left" Height="20" Margin="100,0,5,0"
TextWrapping="Wrap" VerticalAlignment="Top" Width="100" FontSize="12"
Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}"
IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False"/>
@@ -117,17 +155,37 @@
IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False"/>
<TextBox Text="{Binding Status_Str}" HorizontalAlignment="Center" Height="50" Margin="0,0,0,0"
TextWrapping="Wrap" VerticalAlignment="Top" Width="700" FontSize="35"
Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}" Foreground="{Binding Status_Str_coloer}"
Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}"
Foreground="{Binding Status_Str_coloer}"
IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False"/>
<TextBox Text="{Binding Sys_Time}" HorizontalAlignment="Right" Height="50" Margin="0,0,5,0"
TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20"
Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}"
IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False"/>
<Image HorizontalAlignment="Right" Height="40" VerticalAlignment="Top" Width="40" Margin="0,5,220,5"
Source="/Lmage/link.png" Visibility="{Binding Link_bool}"/>
<Image HorizontalAlignment="Right" Height="40" VerticalAlignment="Top" Width="40" Margin="0,5,270,5"
Source="/Lmage/LOCK.png" Visibility="{Binding Lock_bool}" MouseLeftButtonDown="Image_MouseLeftButtonDown"
<StackPanel Margin="0,0,170,0" HorizontalAlignment="Right"
Orientation="Horizontal" FlowDirection="RightToLeft">
<Image Height="40" VerticalAlignment="Top" Width="40">
<Image.Style>
<Style TargetType="Image">
<Setter Property="Source" Value="/Lmage/IconParkStopwatch.png"/>
<Style.Triggers>
<DataTrigger Binding="{Binding WORK_run}" Value="1">
<Setter Property="Source" Value="/Lmage/IconParkPauseOne.png"/>
</DataTrigger>
<DataTrigger Binding="{Binding WORK_run}" Value="2">
<Setter Property="Source" Value="/Lmage/IconParkPlay.png"/>
</DataTrigger>
</Style.Triggers>
</Style>
</Image.Style>
</Image>
<Image Height="40" VerticalAlignment="Top" Width="40" Source="/Lmage/IconParkLock.png"
Visibility="{Binding Lock_bool}" MouseLeftButtonDown="Image_MouseLeftButtonDown"
MouseLeftButtonUp="Image_MouseLeftButtonUp"/>
<Image Height="40" VerticalAlignment="Top" Width="40" Source="/Lmage/link.png"
Visibility="{Binding Link_bool}"/>
<Image Height="40" VerticalAlignment="Top" Width="40" Source="/Lmage/Manual.png"/>
</StackPanel>
</Grid>
</Grid>
</Window>
ViewModel/MainWindowViewModel.cs
+7 -1
View File
@@ -135,6 +135,12 @@ namespace DyeingComputer.ViewModel
OnPropertyChanged("Status_Str_coloer");
}
}
public int wORK_run; //显示状态
public int WORK_run //通知UI控件参数改变
{
get { return wORK_run; }
set { wORK_run = value; OnPropertyChanged("WORK_run"); }
}
public string work_Temp; //显示温度
public string Work_Temp //通知UI控件参数改变
{
@@ -790,7 +796,6 @@ namespace DyeingComputer.ViewModel
break;//PH温度控制
case "093":
STEP_TIME = Convert.ToInt16(P1);
WORK_RUN = 2;
SETP_runtime = true;
STEP_finish = false;
break;//PH检测
@@ -826,6 +831,7 @@ namespace DyeingComputer.ViewModel
private int TANK1_REDYE,TANK1_STEP, TANK2_REDYE, TANK2_STEP, TANK3_REDYE, TANK3_STEP;
void STEP_RUN()
{
WORK_run = WORK_RUN;
if (WORK_RUN == 2)
{
if (SETP_runtime && (!STEP_finish))//