v0.5.2.1

* (Add) cws: Allow change layer PWM value * (Update) Dependency ImageSharp from 1.0.0-rc0002 to 1.0.0-rc0003 (It fix a error on resize function) * (Fix) cws: GCode 0 before G29 * (Fix) Phrozen Sonic Mini: Display Height from 66.04 to 68.04 * (Fix) Zortrax Inkspire: Display and Volume to 74.67x132.88 * (Fix) Layer repair tool allow operation when every repair checkbox is deselected
sn4k3 · Jun 20, 2020 · c10bf6c · c10bf6c
1 parent fc73f2f
commit c10bf6c
Show file tree

Hide file tree

Showing 26 changed files with 1,570 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## 20/06/2020 - v0.5.2.1
+
+* (Add) cws: Allow change layer PWM value
+* (Update) Dependency ImageSharp from 1.0.0-rc0002 to 1.0.0-rc0003 (It fix a error on resize function)
+* (Fix) cws: GCode 0 before G29
+* (Fix) Phrozen Sonic Mini: Display Height from 66.04 to 68.04
+* (Fix) Zortrax Inkspire: Display and Volume to 74.67x132.88
+* (Fix) Layer repair tool allow operation when every repair checkbox is deselected
+
 ## 19/06/2020 - v0.5.2
 
 * (Add) Resin Trap issue validator and repairer - Experimental Feature (#3)

diff --git a/CreateRelease.ps1 b/CreateRelease.ps1
@@ -0,0 +1,7 @@
+cd $PSScriptRoot
+$version = (Get-Command UVtools.GUI\bin\Release\UVtools.Parser.dll).FileVersionInfo.ProductVersion
+
+Add-Type -A System.IO.Compression.FileSystem
+[IO.Compression.ZipFile]::CreateFromDirectory("$PSScriptRoot\UVtools.GUI\bin\Release", "$PSScriptRoot\UVtools.GUI\bin\UVtools_v$version.zip")
+
+Copy-Item "$PSScriptRoot\UVtools.Installer\bin\Release\UVtools.msi" -Destination "$PSScriptRoot\UVtools.GUI\bin\UVtools_v$version.msi"
diff --git a/PrusaSlicer/printer/Phrozen Sonic Mini.ini b/PrusaSlicer/printer/Phrozen Sonic Mini.ini
@@ -1,12 +1,12 @@
-# generated by PrusaSlicer 2.2.0+win64 on 2020-06-12 at 00:36:09 UTC
+# generated by PrusaSlicer 2.2.0+win64 on 2020-06-20 at 15:15:00 UTC
 absolute_correction = 0
 area_fill = 50
 bed_custom_model = 
 bed_custom_texture = 
-bed_shape = 0x0,120x0,120x66,0x66
+bed_shape = 0x0,120.96x0,120.96x68.04,0x68.04
 default_sla_material_profile = Prusa Orange Tough 0.05
 default_sla_print_profile = 0.05 Normal
-display_height = 66.04
+display_height = 68.04
 display_mirror_x = 0
 display_mirror_y = 0
 display_orientation = portrait

diff --git a/PrusaSlicer/printer/Zortrax Inkspire.ini b/PrusaSlicer/printer/Zortrax Inkspire.ini
@@ -1,18 +1,18 @@
-# generated by PrusaSlicer 2.2.0+win64 on 2020-06-12 at 00:42:42 UTC
+# generated by PrusaSlicer 2.2.0+win64 on 2020-06-20 at 15:23:41 UTC
 absolute_correction = 0
 area_fill = 50
 bed_custom_model = 
 bed_custom_texture = 
-bed_shape = 0x0,115x0,115x65,0x65
+bed_shape = 0x0,132.88x0,132.88x74.67,0x74.67
 default_sla_material_profile = Prusa Orange Tough 0.05
 default_sla_print_profile = 0.05 Normal
-display_height = 74
+display_height = 74.67
 display_mirror_x = 1
 display_mirror_y = 0
 display_orientation = portrait
 display_pixels_x = 2560
 display_pixels_y = 1440
-display_width = 132
+display_width = 132.88
 elefant_foot_compensation = 0.2
 elefant_foot_min_width = 0.2
 fast_tilt_time = 5

diff --git a/UVtools.GUI/Forms/FrmRepairLayers.cs b/UVtools.GUI/Forms/FrmRepairLayers.cs
@@ -161,7 +161,7 @@ private void ItemClicked(object sender, EventArgs e)
                     return;
                 }
 
-                if (!cbRepairIslands.Enabled && !cbRepairResinTraps.Enabled)
+                if (!RepairIslands && !RepairResinTraps)
                 {
                     MessageBox.Show("You must select at least one repair operation.", Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
                     return;

diff --git a/UVtools.GUI/FrmMain.cs b/UVtools.GUI/FrmMain.cs
@@ -1720,19 +1720,25 @@ void ShowLayer(uint layerNum)
 #if DEBUG
                     greyscale = greyscale.ThresholdBinary(new Gray(254), new Gray(255));
                     VectorOfVectorOfPoint contours = new VectorOfVectorOfPoint();
-                    Mat external = new Mat();
+                    Mat hierarchy = new Mat();
 
-                    CvInvoke.FindContours(greyscale, contours, external, RetrType.Ccomp, ChainApproxMethod.ChainApproxSimple);
+                    CvInvoke.FindContours(greyscale, contours, hierarchy, RetrType.Ccomp, ChainApproxMethod.ChainApproxSimple);
 
-                    var arr = external.GetData();
+                    /*
+                     * hierarchy[i][0]: the index of the next contour of the same level
+                     * hierarchy[i][1]: the index of the previous contour of the same level
+                     * hierarchy[i][2]: the index of the first child
+                     * hierarchy[i][3]: the index of the parent
+                     */
+                    var arr = hierarchy.GetData();
                     for (int i = 0; i < contours.Size; i++)
                     {
-                        if ((int)arr.GetValue(0, i, 2) != -1 || (int)arr.GetValue(0, i, 3) == -1) continue;
+                        if ((int)arr.GetValue(0, i, 3) >= 0) continue;
                         var r = CvInvoke.BoundingRectangle(contours[i]);
-                        CvInvoke.Rectangle(greyscale, r, new MCvScalar(80), 3);
+                        CvInvoke.Rectangle(greyscale, r, new MCvScalar(80), 2);
 
                         greyscale.Draw(contours, i, new Gray(125), -1);
-
+                        
                     }
 
 #else

diff --git a/UVtools.GUI/Properties/AssemblyInfo.cs b/UVtools.GUI/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.2.0")]
-[assembly: AssemblyFileVersion("0.5.2.0")]
+[assembly: AssemblyVersion("0.5.2.1")]
+[assembly: AssemblyFileVersion("0.5.2.1")]
diff --git a/UVtools.GUI/UVtools.GUI.csproj b/UVtools.GUI/UVtools.GUI.csproj
@@ -82,7 +82,7 @@
       <HintPath>..\packages\SixLabors.Core.1.0.0-beta0008\lib\netstandard2.0\SixLabors.Core.dll</HintPath>
     </Reference>
     <Reference Include="SixLabors.ImageSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d998eea7b14cab13, processorArchitecture=MSIL">
-      <HintPath>..\packages\SixLabors.ImageSharp.1.0.0-rc0002\lib\net472\SixLabors.ImageSharp.dll</HintPath>
+      <HintPath>..\packages\SixLabors.ImageSharp.1.0.0-rc0003\lib\net472\SixLabors.ImageSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -239,12 +239,15 @@
     </Compile>
     <None Include="..\CHANGELOG.md">
       <Link>CHANGELOG.md</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\CREDITS.md">
       <Link>CREDITS.md</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\LICENSE">
       <Link>LICENSE</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="..\README.md">
       <Link>README.md</Link>
@@ -341,8 +344,7 @@
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>xcopy /y /d $(ProjectDir)..\LICENSE $(ProjectDir)$(OutDir)
-xcopy /i /y /d /s $(ProjectDir)..\PrusaSlicer $(ProjectDir)$(OutDir)\PrusaSlicer</PostBuildEvent>
+    <PostBuildEvent>xcopy /i /y /d /s $(ProjectDir)..\PrusaSlicer $(ProjectDir)$(OutDir)\PrusaSlicer</PostBuildEvent>
   </PropertyGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

diff --git a/UVtools.GUI/packages.config b/UVtools.GUI/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.Net.Compilers.Toolset" version="3.7.0-2.final" targetFramework="net48" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net48" />
   <package id="SixLabors.Core" version="1.0.0-beta0008" targetFramework="net48" />
-  <package id="SixLabors.ImageSharp" version="1.0.0-rc0002" targetFramework="net48" />
+  <package id="SixLabors.ImageSharp" version="1.0.0-rc0003" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.Collections" version="4.3.0" targetFramework="net48" />
   <package id="System.IO" version="4.3.0" targetFramework="net48" />

diff --git a/UVtools.Installer/Code/Features.wxs b/UVtools.Installer/Code/Features.wxs
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="INSTALLLOCATION" Name="UVtools">
+          <Merge Id="UVtools" SourceFile="$(var.UVtools.InstallerMM.TargetPath)" DiskId="1" Language="1033" />
+      </Directory>
+      </Directory>
+    </Directory>
+    <Feature Id="UVtools" Title="UVtools" Description="Installs all the files needed for UVtools" Level="1" AllowAdvertise="no" ConfigurableDirectory="INSTALLLOCATION">
+      <MergeRef Id="UVtools" />
+      <!-- Uncomment the below line to pull in IIS Metadata.  Otherwise delete if not needed -->
+      <!--<ComponentGroupRef Id="webSite" />-->
+    </Feature>
+  </Fragment>
+</Wix>
diff --git a/UVtools.Installer/Code/IISMeta.wxs b/UVtools.Installer/Code/IISMeta.wxs
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:iis="http://schemas.microsoft.com/wix/IIsExtension">
+  <Fragment>
+
+    <ComponentGroup Id="webSite">
+      <ComponentRef Id="webSite" />
+    </ComponentGroup>
+
+    <PropertyRef Id="NETFRAMEWORK45" />
+    <PropertyRef Id="IISMAJORVERSION" />
+    <Property Id="ASPNETINSTALLED">
+      <RegistrySearch Id="findASPNETINSTALLED" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Name="ASPNET" Type="raw" />
+    </Property>
+    <Condition Message="[ProductName] requires Microsoft .NET Framework 4.5.">Installed OR NETFRAMEWORK45</Condition>
+    <Condition Message="[ProductName] requires Microsoft IIS">Installed OR IISMAJORVERSION</Condition>
+    <Condition Message="[ProductName] requires the ASP.NET role service for IIS">Installed OR ASPNETINSTALLED="#1"</Condition>
+
+    <DirectoryRef Id="INSTALLLOCATION">
+      <Directory Id="webSite" Name="WebSite">
+        <Component Id="webSite" Guid="b118a1b9-8c4e-44b3-bf42-1501163c8bee" KeyPath="yes">
+          <iis:WebAppPool Id="webSite" Name="UVtools.Installer" Identity="applicationPoolIdentity" ManagedRuntimeVersion="v4.0" ManagedPipelineMode="Integrated"/>
+          <iis:WebSite Id="webSite" SiteId="*" Description="UVtools.Installer Web Site" Directory="webSite" ConfigureIfExists="no">
+            <iis:WebAddress Id="webSite" Port="8080" />
+            <iis:WebDirProperties Id="webSite" AnonymousAccess="yes" WindowsAuthentication="no" />
+            <iis:WebApplication Id="webSite" WebAppPool="webSite" Name="webSite" />
+          </iis:WebSite>
+        </Component>
+      </Directory>
+    </DirectoryRef>
+
+  </Fragment>
+</Wix>
diff --git a/UVtools.Installer/Code/Product.wxs b/UVtools.Installer/Code/Product.wxs
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <!-- 
+  MSIProductVersion is defined in UVtools.Installer.wixproj as 0.0.1 for local desktop builds.  
+  You should pass in the MSBuild Property 'MSIProductVersion' to override it during an automated build.
+  See http://msdn.microsoft.com/en-us/library/windows/desktop/aa370859%28v=vs.85%29.aspx for information on allowable values.
+  
+  The Product@Id attribute (ProductCode Property) will be a random GUID for each build.  This is to support "Major Upgrades" where each install 
+  is a seamless uninstall/reinstall.
+  -->
+  <Product Id="*" Name="UVtools" Language="1033" Version="$(var.MSIProductVersion)" Manufacturer="PTRTECH" UpgradeCode="1ea6d212-15c0-425e-b2ec-4b6c60817552">
+    <Package InstallerVersion="301" Compressed="yes" InstallScope="perMachine" />
+    <MediaTemplate EmbedCab="yes" />
+    <!-- Major Upgrade Rule to disallow downgrades -->
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+    <!--Common Launch Condition-->
+    <!-- Examples at http://wixtoolset.org/documentation/manual/v3/customactions/wixnetfxextension.html -->
+    <PropertyRef Id="NETFRAMEWORK45" />
+    <Condition Message="[ProductName] requires .NET Framework 4.8.">Installed OR NETFRAMEWORK45</Condition>
+    <!-- Include User Interface Experience -->
+    <Icon Id="Icon.ico" SourceFile="..\UVtools.GUI\UVtools.ico" />
+    <Property Id="ARPPRODUCTICON" Value="Icon.ico"></Property>
+    <UIRef Id="UI" />
+    <!-- Include Features and Directories Fragment -->
+    <DirectoryRef Id="INSTALLLOCATION" />
+  </Product>
+</Wix>
diff --git a/UVtools.Installer/Code/UI-CustomDialog.wxs b/UVtools.Installer/Code/UI-CustomDialog.wxs
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <UI Id="CustomDlg">
+      <Dialog Id="CustomDlg" Height="270" Width="370" Title="[ProductName] Setup">
+
+        <!-- Header -->
+        <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" Text="WixUI_Bmp_Banner"/>
+        <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Text="{\WixUI_Font_Title}Custom Dialog" Transparent="yes"/>
+        <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Text="Place your custom description here" Transparent="yes"/>
+        <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0"/>
+
+        <!-- Body  -->
+        <Control Id="CustomLabel" Type="Text" X="20" Y="60" Width="290" Height="15" Text="Customer:" TabSkip="yes"/>
+        <Control Id="Custom" Type="Edit" X="20" Y="80" Width="320" Height="18" Property="CUSTOM"/>
+
+
+        <!-- Footer -->
+        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0"/>
+        <Control Id="Next" Type="PushButton" Text="&amp;Next" TabSkip="no" Default="yes" Height="17" Width="56" X="236" Y="243">
+          <Publish Event="NewDialog" Value="CustomizeDlg"/>
+        </Control>
+        <Control Id="Cancel" Type="PushButton"  Text="Cancel" TabSkip="no" Height="17" Width="56" X="304" Y="243" Cancel="yes">
+          <Publish Event="SpawnDialog" Value="CancelDlg"/>
+        </Control>
+        <Control Id="Back" Type="PushButton"  Text="&amp;Back" TabSkip="no" Height="17" Width="56" X="180" Y="243">
+          <Publish Event="NewDialog" Value="LicenseAgreementDlg"/>
+        </Control>
+
+      </Dialog>
+
+      <!-- Insert into dialog sequencing by inserting control events on previous and next dialogs-->
+      <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="CustomDlg">1</Publish>
+      <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="CustomDlg" Order="3">NOT Installed</Publish>
+
+    </UI>
+
+    <!-- Make Property a SecureCustom Property-->
+    <Property Id="CUSTOM" Secure="yes"/>
+
+    <!-- Note: You must author a registry component somewhere in your installer to persist the property for later retrieval
+    Example:
+    ...
+    <Component Id='RememberCustom' Guid='{????????-????-????-????-????????????}' KeyPath='yes' Permanent='yes'>
+      <RegistryValue Root='HKLM' Key='SOFTWARE\CompanyName\ProductName' Name='Custom' Type='string' Value='[CUSTOM]'/>
+    </Component>
+    ...
+    -->
+
+    <!-- Attempt to retrieve previously persisted property -->
+    <Property Id='FINDCUSTOM' Secure='yes'>
+      <RegistrySearch Id='CustomerNumber' Root='HKLM'
+                   Key='SOFTWARE\CompanyName\ProductName'
+                   Name='Custom' Type='raw' />
+    </Property>
+
+    <!-- Assign default value if retrieval failed -->
+    <SetProperty Id='FINDCUSTOM' Value='default value' After='AppSearch' Sequence='first'>Not FINDCUSTOM</SetProperty>
+
+    <!-- Assign retrieved / defaulted value to actual property if it doesn't already have a value -->
+    <SetProperty Id='CUSTOM' Value='[FINDCUSTOM]' After='SetFINDCUSTOM' Sequence='first'>Not CUSTOM</SetProperty>
+
+  </Fragment>
+</Wix>
diff --git a/UVtools.Installer/Code/UI.wxs b/UVtools.Installer/Code/UI.wxs
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <UI Id="UI">
+
+      <!-- See http://wix.sourceforge.net/manual-wix3/WixUI_index.htm for more information-->
+      <UIRef Id="WixUI_FeatureTree"/>
+
+      <!--Uncomment to inject a custom dialog into the install wizard loop -->
+      <!--<UIRef Id="CustomDlg"/>-->
+
+    </UI>
+   </Fragment>
+</Wix>
diff --git a/UVtools.Installer/Resources/Banner.jpg b/UVtools.Installer/Resources/Banner.jpg
diff --git a/UVtools.Installer/Resources/Dialog.jpg b/UVtools.Installer/Resources/Dialog.jpg
-Original file line number
+Diff line change
@@ Expand Up / @@ -161,7 +161,7 @@ private void ItemClicked(object sender, EventArgs e) @@
                         return;
                     }
-                    if (!cbRepairIslands.Enabled && !cbRepairResinTraps.Enabled)
+                    if (!RepairIslands && !RepairResinTraps)
                     {
                         MessageBox.Show("You must select at least one repair operation.", Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
                         return;
@@ Expand Down @@