Sic-Software
/
SicMultiplate
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整碳化硅多片机Device界面

This commit is contained in:
Han Qiang Qiang 2024-05-13 09:14:58 +08:00
parent acefb69517
commit 107dfc5a99
8 changed files with 149 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Modules/Mainframe/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.505",
"PreReleaseTagWithDash": "-----multiplate-develop.505",
"PreReleaseTag": "----multiplate-develop.506",
"PreReleaseTagWithDash": "-----multiplate-develop.506",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 505,
"WeightedPreReleaseNumber": 505,
"PreReleaseNumber": 506,
"WeightedPreReleaseNumber": 506,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.3d13baafcfd576ff96818617d9883143b60a73f3",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.acefb695178f51d5ebd9aaf5a717bdc1567426a4",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.505",
"LegacySemVer": "23.9.2-----multiplate-de505",
"LegacySemVerPadded": "23.9.2-----multiplate-d0505",
"AssemblySemVer": "23.9.2.505",
"AssemblySemFileVer": "23.9.2.505",
"FullSemVer": "23.9.2-----multiplate-develop.505",
"InformationalVersion": "23.9.2-----multiplate-develop.505+Branch.----multiplate-develop.Sha.3d13baafcfd576ff96818617d9883143b60a73f3",
"SemVer": "23.9.2-----multiplate-develop.506",
"LegacySemVer": "23.9.2-----multiplate-de506",
"LegacySemVerPadded": "23.9.2-----multiplate-d0506",
"AssemblySemVer": "23.9.2.506",
"AssemblySemFileVer": "23.9.2.506",
"FullSemVer": "23.9.2-----multiplate-develop.506",
"InformationalVersion": "23.9.2-----multiplate-develop.506+Branch.----multiplate-develop.Sha.acefb695178f51d5ebd9aaf5a717bdc1567426a4",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "3d13baafcfd576ff96818617d9883143b60a73f3",
"ShortSha": "3d13baa",
"NuGetVersionV2": "23.9.2-----multiplate-d0505",
"NuGetVersion": "23.9.2-----multiplate-d0505",
"NuGetPreReleaseTagV2": "----multiplate-d0505",
"NuGetPreReleaseTag": "----multiplate-d0505",
"Sha": "acefb695178f51d5ebd9aaf5a717bdc1567426a4",
"ShortSha": "acefb69",
"NuGetVersionV2": "23.9.2-----multiplate-d0506",
"NuGetVersion": "23.9.2-----multiplate-d0506",
"NuGetPreReleaseTagV2": "----multiplate-d0506",
"NuGetPreReleaseTag": "----multiplate-d0506",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 505,
"CommitsSinceVersionSourcePadded": "0505",
"UncommittedChanges": 2,
"CommitDate": "2024-05-07"
"CommitsSinceVersionSource": 506,
"CommitsSinceVersionSourcePadded": "0506",
"UncommittedChanges": 0,
"CommitDate": "2024-05-08"
}

44
SicRT/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.505",
"PreReleaseTagWithDash": "-----multiplate-develop.505",
"PreReleaseTag": "----multiplate-develop.506",
"PreReleaseTagWithDash": "-----multiplate-develop.506",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 505,
"WeightedPreReleaseNumber": 505,
"PreReleaseNumber": 506,
"WeightedPreReleaseNumber": 506,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.3d13baafcfd576ff96818617d9883143b60a73f3",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.acefb695178f51d5ebd9aaf5a717bdc1567426a4",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.505",
"LegacySemVer": "23.9.2-----multiplate-de505",
"LegacySemVerPadded": "23.9.2-----multiplate-d0505",
"AssemblySemVer": "23.9.2.505",
"AssemblySemFileVer": "23.9.2.505",
"FullSemVer": "23.9.2-----multiplate-develop.505",
"InformationalVersion": "23.9.2-----multiplate-develop.505+Branch.----multiplate-develop.Sha.3d13baafcfd576ff96818617d9883143b60a73f3",
"SemVer": "23.9.2-----multiplate-develop.506",
"LegacySemVer": "23.9.2-----multiplate-de506",
"LegacySemVerPadded": "23.9.2-----multiplate-d0506",
"AssemblySemVer": "23.9.2.506",
"AssemblySemFileVer": "23.9.2.506",
"FullSemVer": "23.9.2-----multiplate-develop.506",
"InformationalVersion": "23.9.2-----multiplate-develop.506+Branch.----multiplate-develop.Sha.acefb695178f51d5ebd9aaf5a717bdc1567426a4",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "3d13baafcfd576ff96818617d9883143b60a73f3",
"ShortSha": "3d13baa",
"NuGetVersionV2": "23.9.2-----multiplate-d0505",
"NuGetVersion": "23.9.2-----multiplate-d0505",
"NuGetPreReleaseTagV2": "----multiplate-d0505",
"NuGetPreReleaseTag": "----multiplate-d0505",
"Sha": "acefb695178f51d5ebd9aaf5a717bdc1567426a4",
"ShortSha": "acefb69",
"NuGetVersionV2": "23.9.2-----multiplate-d0506",
"NuGetVersion": "23.9.2-----multiplate-d0506",
"NuGetPreReleaseTagV2": "----multiplate-d0506",
"NuGetPreReleaseTag": "----multiplate-d0506",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 505,
"CommitsSinceVersionSourcePadded": "0505",
"UncommittedChanges": 2,
"CommitDate": "2024-05-07"
"CommitsSinceVersionSource": 506,
"CommitsSinceVersionSourcePadded": "0506",
"UncommittedChanges": 0,
"CommitDate": "2024-05-08"
}

44
SicSimulator/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.505",
"PreReleaseTagWithDash": "-----multiplate-develop.505",
"PreReleaseTag": "----multiplate-develop.506",
"PreReleaseTagWithDash": "-----multiplate-develop.506",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 505,
"WeightedPreReleaseNumber": 505,
"PreReleaseNumber": 506,
"WeightedPreReleaseNumber": 506,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.3d13baafcfd576ff96818617d9883143b60a73f3",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.acefb695178f51d5ebd9aaf5a717bdc1567426a4",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.505",
"LegacySemVer": "23.9.2-----multiplate-de505",
"LegacySemVerPadded": "23.9.2-----multiplate-d0505",
"AssemblySemVer": "23.9.2.505",
"AssemblySemFileVer": "23.9.2.505",
"FullSemVer": "23.9.2-----multiplate-develop.505",
"InformationalVersion": "23.9.2-----multiplate-develop.505+Branch.----multiplate-develop.Sha.3d13baafcfd576ff96818617d9883143b60a73f3",
"SemVer": "23.9.2-----multiplate-develop.506",
"LegacySemVer": "23.9.2-----multiplate-de506",
"LegacySemVerPadded": "23.9.2-----multiplate-d0506",
"AssemblySemVer": "23.9.2.506",
"AssemblySemFileVer": "23.9.2.506",
"FullSemVer": "23.9.2-----multiplate-develop.506",
"InformationalVersion": "23.9.2-----multiplate-develop.506+Branch.----multiplate-develop.Sha.acefb695178f51d5ebd9aaf5a717bdc1567426a4",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "3d13baafcfd576ff96818617d9883143b60a73f3",
"ShortSha": "3d13baa",
"NuGetVersionV2": "23.9.2-----multiplate-d0505",
"NuGetVersion": "23.9.2-----multiplate-d0505",
"NuGetPreReleaseTagV2": "----multiplate-d0505",
"NuGetPreReleaseTag": "----multiplate-d0505",
"Sha": "acefb695178f51d5ebd9aaf5a717bdc1567426a4",
"ShortSha": "acefb69",
"NuGetVersionV2": "23.9.2-----multiplate-d0506",
"NuGetVersion": "23.9.2-----multiplate-d0506",
"NuGetPreReleaseTagV2": "----multiplate-d0506",
"NuGetPreReleaseTag": "----multiplate-d0506",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 505,
"CommitsSinceVersionSourcePadded": "0505",
"UncommittedChanges": 2,
"CommitDate": "2024-05-07"
"CommitsSinceVersionSource": 506,
"CommitsSinceVersionSourcePadded": "0506",
"UncommittedChanges": 0,
"CommitDate": "2024-05-08"
}

5
SicUI/MainView.xaml
View File

@ -444,7 +444,8 @@
Text="{Binding RTVersion}" />
</StackPanel>
<Grid Name="自动模块状态" Grid.Column="1" Visibility="{Binding EFEMInstalled, FallbackValue='false', Converter={StaticResource BoolVisibilityConverter}}">
<Grid Name="自动模块状态" Grid.Column="1" Visibility="{Binding EFEMInstalled, Converter={StaticResource BoolVisibilityConverter}}">
<!--下面这个Grid被手动隐藏了(Visibility="Collapsed")，方便调试，后期可以不隐藏-->
<Grid
Grid.Column="1"
Margin="-25,8,0,8"
@ -687,7 +688,7 @@
Margin="-20,8,5,8"
ColumnSpan="2"
IsHitTestVisible="{Binding IsReadOnlyMode, Converter={StaticResource BoolReverseConverter}}"
Visibility="{Binding vss, Converter={StaticResource BoolVisibilityConverter}}">
Visibility="{Binding EFEMNotInstalled, Converter={StaticResource BoolVisibilityConverter}}">
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />

2
SicUI/MainViewModel.cs
View File

@ -183,8 +183,6 @@ namespace SicUI.Client
get => !EFEMInstalled;
}
public Visibility vss { get; set; }=Visibility.Collapsed;
public bool IsBufferInstalled { get; set; }
public bool IsLoadLockInstalled { get; set; }

91
SicUI/Models/Maintenances/TM/DeviceView.xaml
View File

@ -8,32 +8,35 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:deviceControl="clr-namespace:Aitex.Core.UI.DeviceControl;assembly=MECF.Framework.UI.Core"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:lex="http://wpflocalizeextension.codeplex.com"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:unitControls="clr-namespace:MECF.Framework.UI.Client.Ctrlib.UnitControls;assembly=MECF.Framework.UI.Client"
xmlns:lex="http://wpflocalizeextension.codeplex.com"
d:DesignHeight="800"
d:DesignWidth="1980"
mc:Ignorable="d"
lex:LocalizeDictionary.DesignCulture="en"
lex:ResxLocalizationProvider.DefaultAssembly="Sicentury.Localization"
lex:ResxLocalizationProvider.DefaultDictionary="lang_common">
lex:ResxLocalizationProvider.DefaultDictionary="lang_common"
mc:Ignorable="d">
<ScrollViewer
HorizontalScrollBarVisibility="Auto"
IsEnabled="{Binding IsPermission}"
VerticalScrollBarVisibility="Auto">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="530" />
<ColumnDefinition Width="500" />
<ColumnDefinition Width="480" />
<ColumnDefinition Width="600" />
<ColumnDefinition Width="480" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="520" />
<RowDefinition Height="220" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<StackPanel Grid.Row="0" Grid.Column="0">
<StackPanel
Grid.Row="1"
Grid.Column="0"
Visibility="{Binding IsEFEMInstalled, Converter={StaticResource BoolVisibilityConverter}}">
<Grid Margin="10,10">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80" />
@ -153,8 +156,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -185,8 +188,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -247,10 +250,10 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
Width="130"
Height="30"
HorizontalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
Content="{lex:Loc ID_BTN_RelativeHome_Content}"
IsEnabled="{Binding LdRotationBtnEnable}">
<i:Interaction.Triggers>
@ -309,10 +312,10 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
Width="130"
Height="30"
HorizontalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
Content="{lex:Loc ID_BTN_JogCW_Content}"
IsEnabled="{Binding LdRotationBtnEnable}">
<i:Interaction.Triggers>
@ -377,10 +380,10 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
Width="130"
Height="30"
HorizontalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
Content="{lex:Loc ID_BTN_JogCCW_Content}"
IsEnabled="{Binding LdRotationBtnEnable}">
<i:Interaction.Triggers>
@ -427,8 +430,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -459,8 +462,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -517,10 +520,10 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
Width="130"
Height="30"
HorizontalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
Content="{lex:Loc ID_BTN_MoveOneCircle_Content}"
IsEnabled="{Binding LdRotationBtnEnable}">
<i:Interaction.Triggers>
@ -553,10 +556,10 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
Width="130"
Height="30"
HorizontalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
Content="{lex:Loc ID_BTN_CCDPos1_Content}"
IsEnabled="{Binding LdRotationBtnEnable}">
<i:Interaction.Triggers>
@ -598,10 +601,10 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
Width="130"
Height="30"
HorizontalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
Content="{lex:Loc ID_BTN_CCDPos2_Content}"
IsEnabled="{Binding LdRotationBtnEnable}">
<i:Interaction.Triggers>
@ -637,7 +640,7 @@
</Grid>
<Grid Margin="10,20">
<Grid Margin="10,20" Visibility="{Binding IsEFEMInstalled, Converter={StaticResource BoolVisibilityConverter}}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="80" />
<ColumnDefinition Width="60" />
@ -665,10 +668,10 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
Width="130"
Height="30"
HorizontalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
Content="{lex:Loc ID_BTN_CCDTrigger_Content}">
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
@ -716,10 +719,10 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<Button
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
Width="130"
Height="30"
HorizontalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
Content="{lex:Loc ID_BTN_GoToRun_Content}">
<i:Interaction.Triggers>
<i:EventTrigger EventName="Click">
@ -1191,12 +1194,12 @@
</StackPanel>
-->
<StackPanel Grid.Row="1" Grid.Column="0">
<Grid
Grid.Row="1"
Grid.Column="0"
Width="530"
Margin="0,10">
<StackPanel
Grid.Row="1"
Grid.Column="1"
HorizontalAlignment="Left"
Visibility="{Binding IsEFEMInstalled, Converter={StaticResource BoolVisibilityConverter}}">
<Grid Width="530" Margin="0,10">
<Grid.RowDefinitions>
<RowDefinition Height="24" />
<RowDefinition Height="30" />
@ -1231,8 +1234,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -1248,9 +1251,9 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
HorizontalAlignment="Left"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -1357,8 +1360,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -1374,9 +1377,9 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
HorizontalAlignment="Left"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -1433,8 +1436,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -1450,9 +1453,9 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
HorizontalAlignment="Left"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -1509,8 +1512,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -1526,9 +1529,9 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
HorizontalAlignment="Left"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -1589,8 +1592,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -1606,9 +1609,9 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
HorizontalAlignment="Left"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -1624,9 +1627,9 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
HorizontalAlignment="Center"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -1661,8 +1664,8 @@
</StackPanel>
<StackPanel
Grid.Row="1"
Grid.Column="1"
Grid.Row="0"
Grid.Column="0"
Grid.ColumnSpan="3">
<Grid
Grid.Row="1"
@ -1824,8 +1827,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -1951,8 +1954,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -2079,8 +2082,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"
@ -2207,8 +2210,8 @@
BorderBrush="{DynamicResource Table_BD}"
BorderThickness="1,0,1,1">
<TextBlock
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
VerticalAlignment="Center"
lex:ResxLocalizationProvider.DefaultDictionary="lang_deviceview"
FontFamily="Arial"
FontSize="12"
Foreground="{DynamicResource FG_Black}"

11
SicUI/Models/Maintenances/TM/DeviceViewModel.cs
View File

@ -9,6 +9,9 @@ using System.Text;
using System.Threading.Tasks;
using System.Threading;
using Aitex.Core.Common.DeviceData;
using MECF.Framework.Common.Account.Permissions;
using MECF.Framework.UI.Client.ClientBase;
using System.Windows;
namespace SicUI.Client.Models.Platform.TM
{
@ -55,6 +58,8 @@ namespace SicUI.Client.Models.Platform.TM
public bool LdRotationBtnEnable => !LdRotationIsBusy && !LdRotationIsServoError && !LoadLockIsOnline;
public bool IsEFEMInstalled { get; set; }
#region AutoTransferCondition
[Subscription("Aligner.HiWinAligner.HwWaferSize")]
public string WaferSize { get; set; }
@ -77,6 +82,12 @@ namespace SicUI.Client.Models.Platform.TM
}
protected override void OnActivate()
{
IsEFEMInstalled = (bool)QueryDataClient.Instance.Service.GetConfig("System.SetUp.IsEFEMInstalled");
base.OnActivate();
}
public void LdRotationStop()
{
InvokeClient.Instance.Service.DoOperation($"Load.Rotation.Stop");

44
SicUI/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.505",
"PreReleaseTagWithDash": "-----multiplate-develop.505",
"PreReleaseTag": "----multiplate-develop.506",
"PreReleaseTagWithDash": "-----multiplate-develop.506",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 505,
"WeightedPreReleaseNumber": 505,
"PreReleaseNumber": 506,
"WeightedPreReleaseNumber": 506,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.3d13baafcfd576ff96818617d9883143b60a73f3",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.acefb695178f51d5ebd9aaf5a717bdc1567426a4",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.505",
"LegacySemVer": "23.9.2-----multiplate-de505",
"LegacySemVerPadded": "23.9.2-----multiplate-d0505",
"AssemblySemVer": "23.9.2.505",
"AssemblySemFileVer": "23.9.2.505",
"FullSemVer": "23.9.2-----multiplate-develop.505",
"InformationalVersion": "23.9.2-----multiplate-develop.505+Branch.----multiplate-develop.Sha.3d13baafcfd576ff96818617d9883143b60a73f3",
"SemVer": "23.9.2-----multiplate-develop.506",
"LegacySemVer": "23.9.2-----multiplate-de506",
"LegacySemVerPadded": "23.9.2-----multiplate-d0506",
"AssemblySemVer": "23.9.2.506",
"AssemblySemFileVer": "23.9.2.506",
"FullSemVer": "23.9.2-----multiplate-develop.506",
"InformationalVersion": "23.9.2-----multiplate-develop.506+Branch.----multiplate-develop.Sha.acefb695178f51d5ebd9aaf5a717bdc1567426a4",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "3d13baafcfd576ff96818617d9883143b60a73f3",
"ShortSha": "3d13baa",
"NuGetVersionV2": "23.9.2-----multiplate-d0505",
"NuGetVersion": "23.9.2-----multiplate-d0505",
"NuGetPreReleaseTagV2": "----multiplate-d0505",
"NuGetPreReleaseTag": "----multiplate-d0505",
"Sha": "acefb695178f51d5ebd9aaf5a717bdc1567426a4",
"ShortSha": "acefb69",
"NuGetVersionV2": "23.9.2-----multiplate-d0506",
"NuGetVersion": "23.9.2-----multiplate-d0506",
"NuGetPreReleaseTagV2": "----multiplate-d0506",
"NuGetPreReleaseTag": "----multiplate-d0506",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 505,
"CommitsSinceVersionSourcePadded": "0505",
"UncommittedChanges": 2,
"CommitDate": "2024-05-07"
"CommitsSinceVersionSource": 506,
"CommitsSinceVersionSourcePadded": "0506",
"UncommittedChanges": 0,
"CommitDate": "2024-05-08"
}