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

PM开关腔状态和动画不一致问题修改

This commit is contained in:
Han Qiang Qiang 2024-07-02 13:27:08 +08:00
parent e0bf983e50
commit 74e06c94cb
6 changed files with 111 additions and 103 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.588",
"PreReleaseTagWithDash": "-----multiplate-develop.588",
"PreReleaseTag": "----multiplate-develop.597",
"PreReleaseTagWithDash": "-----multiplate-develop.597",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 588,
"WeightedPreReleaseNumber": 588,
"PreReleaseNumber": 597,
"WeightedPreReleaseNumber": 597,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.a5a61abb6afe3222e126eaf3cd2f3b3bf109b405",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.588",
"LegacySemVer": "23.9.2-----multiplate-de588",
"LegacySemVerPadded": "23.9.2-----multiplate-d0588",
"AssemblySemVer": "23.9.2.588",
"AssemblySemFileVer": "23.9.2.588",
"FullSemVer": "23.9.2-----multiplate-develop.588",
"InformationalVersion": "23.9.2-----multiplate-develop.588+Branch.----multiplate-develop.Sha.a5a61abb6afe3222e126eaf3cd2f3b3bf109b405",
"SemVer": "23.9.2-----multiplate-develop.597",
"LegacySemVer": "23.9.2-----multiplate-de597",
"LegacySemVerPadded": "23.9.2-----multiplate-d0597",
"AssemblySemVer": "23.9.2.597",
"AssemblySemFileVer": "23.9.2.597",
"FullSemVer": "23.9.2-----multiplate-develop.597",
"InformationalVersion": "23.9.2-----multiplate-develop.597+Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "a5a61abb6afe3222e126eaf3cd2f3b3bf109b405",
"ShortSha": "a5a61ab",
"NuGetVersionV2": "23.9.2-----multiplate-d0588",
"NuGetVersion": "23.9.2-----multiplate-d0588",
"NuGetPreReleaseTagV2": "----multiplate-d0588",
"NuGetPreReleaseTag": "----multiplate-d0588",
"Sha": "e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"ShortSha": "e0bf983",
"NuGetVersionV2": "23.9.2-----multiplate-d0597",
"NuGetVersion": "23.9.2-----multiplate-d0597",
"NuGetPreReleaseTagV2": "----multiplate-d0597",
"NuGetPreReleaseTag": "----multiplate-d0597",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 588,
"CommitsSinceVersionSourcePadded": "0588",
"UncommittedChanges": 25,
"CommitDate": "2024-06-25"
"CommitsSinceVersionSource": 597,
"CommitsSinceVersionSourcePadded": "0597",
"UncommittedChanges": 1,
"CommitDate": "2024-07-02"
}

44
SicRT/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.588",
"PreReleaseTagWithDash": "-----multiplate-develop.588",
"PreReleaseTag": "----multiplate-develop.597",
"PreReleaseTagWithDash": "-----multiplate-develop.597",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 588,
"WeightedPreReleaseNumber": 588,
"PreReleaseNumber": 597,
"WeightedPreReleaseNumber": 597,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.a5a61abb6afe3222e126eaf3cd2f3b3bf109b405",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.588",
"LegacySemVer": "23.9.2-----multiplate-de588",
"LegacySemVerPadded": "23.9.2-----multiplate-d0588",
"AssemblySemVer": "23.9.2.588",
"AssemblySemFileVer": "23.9.2.588",
"FullSemVer": "23.9.2-----multiplate-develop.588",
"InformationalVersion": "23.9.2-----multiplate-develop.588+Branch.----multiplate-develop.Sha.a5a61abb6afe3222e126eaf3cd2f3b3bf109b405",
"SemVer": "23.9.2-----multiplate-develop.597",
"LegacySemVer": "23.9.2-----multiplate-de597",
"LegacySemVerPadded": "23.9.2-----multiplate-d0597",
"AssemblySemVer": "23.9.2.597",
"AssemblySemFileVer": "23.9.2.597",
"FullSemVer": "23.9.2-----multiplate-develop.597",
"InformationalVersion": "23.9.2-----multiplate-develop.597+Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "a5a61abb6afe3222e126eaf3cd2f3b3bf109b405",
"ShortSha": "a5a61ab",
"NuGetVersionV2": "23.9.2-----multiplate-d0588",
"NuGetVersion": "23.9.2-----multiplate-d0588",
"NuGetPreReleaseTagV2": "----multiplate-d0588",
"NuGetPreReleaseTag": "----multiplate-d0588",
"Sha": "e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"ShortSha": "e0bf983",
"NuGetVersionV2": "23.9.2-----multiplate-d0597",
"NuGetVersion": "23.9.2-----multiplate-d0597",
"NuGetPreReleaseTagV2": "----multiplate-d0597",
"NuGetPreReleaseTag": "----multiplate-d0597",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 588,
"CommitsSinceVersionSourcePadded": "0588",
"UncommittedChanges": 25,
"CommitDate": "2024-06-25"
"CommitsSinceVersionSource": 597,
"CommitsSinceVersionSourcePadded": "0597",
"UncommittedChanges": 1,
"CommitDate": "2024-07-02"
}

44
SicSimulator/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.588",
"PreReleaseTagWithDash": "-----multiplate-develop.588",
"PreReleaseTag": "----multiplate-develop.597",
"PreReleaseTagWithDash": "-----multiplate-develop.597",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 588,
"WeightedPreReleaseNumber": 588,
"PreReleaseNumber": 597,
"WeightedPreReleaseNumber": 597,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.a5a61abb6afe3222e126eaf3cd2f3b3bf109b405",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.588",
"LegacySemVer": "23.9.2-----multiplate-de588",
"LegacySemVerPadded": "23.9.2-----multiplate-d0588",
"AssemblySemVer": "23.9.2.588",
"AssemblySemFileVer": "23.9.2.588",
"FullSemVer": "23.9.2-----multiplate-develop.588",
"InformationalVersion": "23.9.2-----multiplate-develop.588+Branch.----multiplate-develop.Sha.a5a61abb6afe3222e126eaf3cd2f3b3bf109b405",
"SemVer": "23.9.2-----multiplate-develop.597",
"LegacySemVer": "23.9.2-----multiplate-de597",
"LegacySemVerPadded": "23.9.2-----multiplate-d0597",
"AssemblySemVer": "23.9.2.597",
"AssemblySemFileVer": "23.9.2.597",
"FullSemVer": "23.9.2-----multiplate-develop.597",
"InformationalVersion": "23.9.2-----multiplate-develop.597+Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "a5a61abb6afe3222e126eaf3cd2f3b3bf109b405",
"ShortSha": "a5a61ab",
"NuGetVersionV2": "23.9.2-----multiplate-d0588",
"NuGetVersion": "23.9.2-----multiplate-d0588",
"NuGetPreReleaseTagV2": "----multiplate-d0588",
"NuGetPreReleaseTag": "----multiplate-d0588",
"Sha": "e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"ShortSha": "e0bf983",
"NuGetVersionV2": "23.9.2-----multiplate-d0597",
"NuGetVersion": "23.9.2-----multiplate-d0597",
"NuGetPreReleaseTagV2": "----multiplate-d0597",
"NuGetPreReleaseTag": "----multiplate-d0597",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 588,
"CommitsSinceVersionSourcePadded": "0588",
"UncommittedChanges": 25,
"CommitDate": "2024-06-25"
"CommitsSinceVersionSource": 597,
"CommitsSinceVersionSourcePadded": "0597",
"UncommittedChanges": 1,
"CommitDate": "2024-07-02"
}

14
SicUI/Controls/BodyBottom.xaml
View File

@ -62,7 +62,10 @@
Source="/SicUI;component/Themes/Images/parts/bodymove/bottom3.png" />
</Canvas>
<Canvas Canvas.Left="395" Canvas.Top="337" Visibility="Collapsed">
<Canvas
Canvas.Left="395"
Canvas.Top="337"
Visibility="Collapsed">
<common:AxisCanvas x:Name="canvasRing2">
<Image
Width="206"
@ -76,10 +79,13 @@
Canvas.Top="316"
Width="327"
Height="123"
Visibility="Collapsed"
Source="/SicUI;component/Themes/Images/parts/bodymove/Fixed.png" />
Source="/SicUI;component/Themes/Images/parts/bodymove/Fixed.png"
Visibility="Collapsed" />
<Canvas Canvas.Left="395" Canvas.Top="357" Visibility="Collapsed">
<Canvas
Canvas.Left="395"
Canvas.Top="357"
Visibility="Collapsed">
<common:AxisCanvas x:Name="canvasRing">
<Image
Width="206"

24
SicUI/Controls/BodyLid.xaml.cs
View File

@ -329,21 +329,23 @@ namespace SicUI.Controls
this.PicTR.Source = new BitmapImage(new Uri("pack://application:,,,/SicUI;component/Themes/Images/parts/bodymove/khr.png"));
this.PicTL.Source = new BitmapImage(new Uri("pack://application:,,,/SicUI;component/Themes/Images/parts/bodymove/khl.png"));
if (!TightenSH && !SwingLockSH)
{
this.PicTop.Source = new BitmapImage(new Uri("pack://application:,,,/SicUI;component/Themes/Images/parts/bodymove/Showerhead.png"));
bd = this.bdht;
}
else if (TightenSH && SwingLockSH && !TightenMiddle && !SwingLockMiddle)
if (!SwingLockSH)
{
this.PicTop.Source = new BitmapImage(new Uri("pack://application:,,,/SicUI;component/Themes/Images/parts/bodymove/Showerhead.png"));
this.picMiddle.Source = new BitmapImage(new Uri("pack://application:,,,/SicUI;component/Themes/Images/parts/bodymove/Middle2.png"));
this.PicTR.Source = new BitmapImage(new Uri("pack://application:,,,/SicUI;component/Themes/Images/parts/bodymove/khr2.png"));
this.PicTL.Source = new BitmapImage(new Uri("pack://application:,,,/SicUI;component/Themes/Images/parts/bodymove/khl2.png"));
bd = this.bdhtm;
bd = this.bdht;
}
//else if (TightenSH && SwingLockSH )
//{
// this.PicTop.Source = new BitmapImage(new Uri("pack://application:,,,/SicUI;component/Themes/Images/parts/bodymove/Showerhead.png"));
// this.picMiddle.Source = new BitmapImage(new Uri("pack://application:,,,/SicUI;component/Themes/Images/parts/bodymove/Middle2.png"));
// this.PicTR.Source = new BitmapImage(new Uri("pack://application:,,,/SicUI;component/Themes/Images/parts/bodymove/khr2.png"));
// this.PicTL.Source = new BitmapImage(new Uri("pack://application:,,,/SicUI;component/Themes/Images/parts/bodymove/khl2.png"));
// bd = this.bdhtm;
//}
}

44
SicUI/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.588",
"PreReleaseTagWithDash": "-----multiplate-develop.588",
"PreReleaseTag": "----multiplate-develop.597",
"PreReleaseTagWithDash": "-----multiplate-develop.597",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 588,
"WeightedPreReleaseNumber": 588,
"PreReleaseNumber": 597,
"WeightedPreReleaseNumber": 597,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.a5a61abb6afe3222e126eaf3cd2f3b3bf109b405",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.588",
"LegacySemVer": "23.9.2-----multiplate-de588",
"LegacySemVerPadded": "23.9.2-----multiplate-d0588",
"AssemblySemVer": "23.9.2.588",
"AssemblySemFileVer": "23.9.2.588",
"FullSemVer": "23.9.2-----multiplate-develop.588",
"InformationalVersion": "23.9.2-----multiplate-develop.588+Branch.----multiplate-develop.Sha.a5a61abb6afe3222e126eaf3cd2f3b3bf109b405",
"SemVer": "23.9.2-----multiplate-develop.597",
"LegacySemVer": "23.9.2-----multiplate-de597",
"LegacySemVerPadded": "23.9.2-----multiplate-d0597",
"AssemblySemVer": "23.9.2.597",
"AssemblySemFileVer": "23.9.2.597",
"FullSemVer": "23.9.2-----multiplate-develop.597",
"InformationalVersion": "23.9.2-----multiplate-develop.597+Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "a5a61abb6afe3222e126eaf3cd2f3b3bf109b405",
"ShortSha": "a5a61ab",
"NuGetVersionV2": "23.9.2-----multiplate-d0588",
"NuGetVersion": "23.9.2-----multiplate-d0588",
"NuGetPreReleaseTagV2": "----multiplate-d0588",
"NuGetPreReleaseTag": "----multiplate-d0588",
"Sha": "e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"ShortSha": "e0bf983",
"NuGetVersionV2": "23.9.2-----multiplate-d0597",
"NuGetVersion": "23.9.2-----multiplate-d0597",
"NuGetPreReleaseTagV2": "----multiplate-d0597",
"NuGetPreReleaseTag": "----multiplate-d0597",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 588,
"CommitsSinceVersionSourcePadded": "0588",
"UncommittedChanges": 25,
"CommitDate": "2024-06-25"
"CommitsSinceVersionSource": 597,
"CommitsSinceVersionSourcePadded": "0597",
"UncommittedChanges": 1,
"CommitDate": "2024-07-02"
}