v0.6.2.0

* (Add) PrusaSlicer Printer: Elegoo Mars 2 Pro * (Add) PrusaSlicer Printer: Creality LD-002H * (Add) PrusaSlicer Printer: Voxelab Polaris * (Add) File Format: UVJ (#8) * (Add) Mutataor: Pixel Dimming * (Add) Pixel Editor tab with new drawing functions * (Add) Pixel Editor: Bursh area and shape * (Add) Pixel Editor: Supports * (Add) Pixel Editor: Drain holes * (Add) Settings for pixel editor * (Add) Setting: File open default directory * (Add) Setting: File save default directory * (Add) Setting: File extract default directory * (Add) Setting: File convert default directory * (Add) Setting: File save prompt for overwrite (#10) * (Add) Setting: File save preffix and suffix name * (Add) Setting: UVtools version to the title bar * (Improvement) Force same directory as input file on dialogs * (Improvement) Pattern: Better positioning when not using an anchor, now it's more center friendly * (Change) Setting: Start maximized defaults to true * (Fix) Pattern: Calculated volume was appending one margin width/height more * (Fix) When cancel a file load, some shortcuts can crash the program as it assume file is loaded * (Fix) pws: Encode using the same count-of-threshold method as CBDDLP (ezrec/uv3dp#79)
sn4k3 · Jul 14, 2020 · b2bd1c4 · b2bd1c4
1 parent 2c514fe
commit b2bd1c4
Show file tree

Hide file tree

Showing 48 changed files with 4,876 additions and 313 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Changelog
 
+## 14/07/2020 - v0.6.2.0
+
+* (Add) PrusaSlicer Printer: Elegoo Mars 2 Pro
+* (Add) PrusaSlicer Printer: Creality LD-002H
+* (Add) PrusaSlicer Printer: Voxelab Polaris
+* (Add) File Format: UVJ (#8)
+* (Add) Mutataor: Pixel Dimming
+* (Add) Pixel Editor tab with new drawing functions
+* (Add) Pixel Editor: Bursh area and shape
+* (Add) Pixel Editor: Supports
+* (Add) Pixel Editor: Drain holes
+* (Add) Settings for pixel editor
+* (Add) Setting: File open default directory
+* (Add) Setting: File save default directory
+* (Add) Setting: File extract default directory
+* (Add) Setting: File convert default directory
+* (Add) Setting: File save prompt for overwrite (#10)
+* (Add) Setting: File save preffix and suffix name
+* (Add) Setting: UVtools version to the title bar
+* (Improvement) Force same directory as input file on dialogs
+* (Improvement) Pattern: Better positioning when not using an anchor, now it's more center friendly
+* (Change) Setting: Start maximized defaults to true
+* (Fix) Pattern: Calculated volume was appending one margin width/height more
+* (Fix) When cancel a file load, some shortcuts can crash the program as it assume file is loaded
+* (Fix) pws: Encode using the same count-of-threshold method as CBDDLP (ezrec/uv3dp#79)
+
 ## 02/07/2020 - v0.6.1.1
 
 * (Add) Allow chitubox, phz, pws, pw0 files convert to cws
@@ -9,7 +35,6 @@
 * (Improvement) UVtools now generate better gcode and detect the lack of Lift and same z position and optimize the commands
 * (Fix) zcodex: Wasn't reporting layer decoding progress
 
-
 ## 02/07/2020 - v0.6.1.0
 
 * (Add) Thumbnail image can now saved to clipboard
@@ -34,7 +59,6 @@
 * (Fix) Force 1 layer scroll when using Mouse Wheel to scroll the tracker bar
 * (Fix) PrusaSlicer printers: Mirror vertically instead to produce equal orientation compared with chitubox
 
-
 ## 29/06/2020 - v0.6.0.1
 
 * (Improvement) Pixel edit now spare a memory cycle per pixel
@@ -105,7 +129,6 @@
 * (Fix) cbddlp: AntiAlias is number of _greys_, not number of significant bits (ezrec/uv3dp#75)
 * (Fix) Outline not working as before, due a forget to remove test code
 
-
 ## 17/06/2020 - v0.5.1.2
 
 * (Add) Able to install only the desired profiles and not the whole lot (Suggested  by: Ingo Strohmenger)

diff --git a/CREDITS.md b/CREDITS.md
@@ -22,4 +22,5 @@
 # Supporters
 
 * Ingo Strohmenger
-* Sven Vogt
+* Sven Vogt
+* Paul Hammerstrom
diff --git a/ImportPrusaSlicerData.bat b/ImportPrusaSlicerData.bat
@@ -17,23 +17,26 @@ SET files[7]=AnyCubic Photon.ini
 SET files[8]=AnyCubic Photon S.ini
 SET files[9]=AnyCubic Photon Zero.ini
 SET files[10]=Elegoo Mars.ini
-SET files[11]=Elegoo Mars Saturn.ini
-SET files[12]=Peopoly Phenom.ini
-SET files[13]=Peopoly Phenom L.ini
-SET files[14]=Peopoly Phenom Noir.ini
-SET files[15]=QIDI Shadow5.5.ini
-SET files[16]=QIDI Shadow6.0 Pro.ini
-SET files[17]=Phrozen Shuffle.ini
-SET files[18]=Phrozen Shuffle Lite.ini
-SET files[19]=Phrozen Shuffle XL.ini
-SET files[20]=Phrozen Shuffle 4K.ini
-SET files[21]=Phrozen Sonic.ini
-SET files[22]=Phrozen Sonic Mini.ini
-SET files[23]=Phrozen Transform.ini
-SET files[24]=Kelant S400.ini
-SET files[25]=Wanhao D7.ini
-SET files[26]=Wanhao D8.ini
-SET files[27]=Creality LD-002R.ini
+SET files[11]=Elegoo Mars 2 Pro.ini
+SET files[12]=Elegoo Mars Saturn.ini
+SET files[13]=Peopoly Phenom.ini
+SET files[14]=Peopoly Phenom L.ini
+SET files[15]=Peopoly Phenom Noir.ini
+SET files[16]=QIDI Shadow5.5.ini
+SET files[17]=QIDI Shadow6.0 Pro.ini
+SET files[18]=Phrozen Shuffle.ini
+SET files[19]=Phrozen Shuffle Lite.ini
+SET files[20]=Phrozen Shuffle XL.ini
+SET files[21]=Phrozen Shuffle 4K.ini
+SET files[22]=Phrozen Sonic.ini
+SET files[24]=Phrozen Sonic Mini.ini
+SET files[25]=Phrozen Transform.ini
+SET files[26]=Kelant S400.ini
+SET files[27]=Wanhao D7.ini
+SET files[28]=Wanhao D8.ini
+SET files[29]=Creality LD-002R.ini
+SET files[30]=Creality LD-002H.ini
+SET files[31]=Voxelab Polaris.ini
 
 echo PrusaSlicer Printers Instalation
 echo This will replace printers, all changes will be discarded

diff --git a/PrusaSlicer/printer/Creality LD-002H.ini b/PrusaSlicer/printer/Creality LD-002H.ini
@@ -0,0 +1,37 @@
+# generated by PrusaSlicer 2.2.0+win64 on 2020-07-13 at 23:26:09 UTC
+absolute_correction = 0
+area_fill = 50
+bed_custom_model = 
+bed_custom_texture = 
+bed_shape = 0x0,130.56x0,130.56x82.62,0x82.62
+default_sla_material_profile = Prusa Orange Tough 0.05
+default_sla_print_profile = 0.05 Normal
+display_height = 82.62
+display_mirror_x = 0
+display_mirror_y = 1
+display_orientation = portrait
+display_pixels_x = 2560
+display_pixels_y = 1620
+display_width = 130.56
+elefant_foot_compensation = 0.2
+elefant_foot_min_width = 0.2
+fast_tilt_time = 5
+gamma_correction = 1
+inherits = Original Prusa SL1
+max_exposure_time = 120
+max_initial_exposure_time = 300
+max_print_height = 160
+min_exposure_time = 1
+min_initial_exposure_time = 1
+print_host = 
+printer_model = SL1
+printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_SL1\nPRINTER_VENDOR_CREALITY\nPRINTER_MODEL_LD-002H\n\nSTART_CUSTOM_VALUES\nFLIP_XY\nLayerOffTime_0\nBottomLightOffDelay_2\nBottomLiftHeight_5\nLiftHeight_7\nBottomLiftSpeed_50\nLiftSpeed_50\nRetractSpeed_150\nBottomLightPWM_255\nLightPWM_255\nAntiAliasing_4 ; Use 0 or 1 for disable AntiAliasing with "printer gamma correction" set to 0, otherwise use multiples of 2 and "gamma correction" set to 1 for enable\nEND_CUSTOM_VALUES
+printer_settings_id = 
+printer_technology = SLA
+printer_variant = default
+printer_vendor = 
+printhost_apikey = 
+printhost_cafile = 
+relative_correction = 1,1
+slow_tilt_time = 8
+thumbnails = 400x400,800x480
diff --git a/PrusaSlicer/printer/Elegoo Mars 2 Pro.ini b/PrusaSlicer/printer/Elegoo Mars 2 Pro.ini
@@ -0,0 +1,37 @@
+# generated by PrusaSlicer 2.2.0+win64 on 2020-07-13 at 23:29:07 UTC
+absolute_correction = 0
+area_fill = 50
+bed_custom_model = 
+bed_custom_texture = 
+bed_shape = 0x0,130.56x0,130.56x82.62,0x82.62
+default_sla_material_profile = Prusa Orange Tough 0.05
+default_sla_print_profile = 0.05 Normal
+display_height = 82.62
+display_mirror_x = 0
+display_mirror_y = 1
+display_orientation = portrait
+display_pixels_x = 2560
+display_pixels_y = 1620
+display_width = 130.56
+elefant_foot_compensation = 0.2
+elefant_foot_min_width = 0.2
+fast_tilt_time = 5
+gamma_correction = 1
+inherits = Original Prusa SL1
+max_exposure_time = 120
+max_initial_exposure_time = 300
+max_print_height = 160
+min_exposure_time = 1
+min_initial_exposure_time = 1
+print_host = 
+printer_model = SL1
+printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_SL1\nPRINTER_VENDOR_ELEGOO\nPRINTER_MODEL_MARS2_PRO\n\nSTART_CUSTOM_VALUES\nFLIP_XY\nLayerOffTime_0\nBottomLightOffDelay_0\nBottomLiftHeight_5\nLiftHeight_5\nBottomLiftSpeed_90\nLiftSpeed_100\nRetractSpeed_150\nBottomLightPWM_255\nLightPWM_255\nAntiAliasing_4 ; Use 0 or 1 for disable AntiAliasing with "printer gamma correction" set to 0, otherwise use multiples of 2 and "gamma correction" set to 1 for enable\nEND_CUSTOM_VALUES
+printer_settings_id = 
+printer_technology = SLA
+printer_variant = default
+printer_vendor = 
+printhost_apikey = 
+printhost_cafile = 
+relative_correction = 1,1
+slow_tilt_time = 8
+thumbnails = 400x400,800x480
diff --git a/PrusaSlicer/printer/Voxelab Polaris.ini b/PrusaSlicer/printer/Voxelab Polaris.ini
@@ -0,0 +1,37 @@
+# generated by PrusaSlicer 2.2.0+win64 on 2020-07-13 at 23:30:41 UTC
+absolute_correction = 0
+area_fill = 50
+bed_custom_model = 
+bed_custom_texture = 
+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 = 68.04
+display_mirror_x = 0
+display_mirror_y = 1
+display_orientation = portrait
+display_pixels_x = 2560
+display_pixels_y = 1440
+display_width = 120.96
+elefant_foot_compensation = 0.2
+elefant_foot_min_width = 0.2
+fast_tilt_time = 5
+gamma_correction = 1
+inherits = Original Prusa SL1
+max_exposure_time = 120
+max_initial_exposure_time = 300
+max_print_height = 155
+min_exposure_time = 1
+min_initial_exposure_time = 1
+print_host = 
+printer_model = SL1
+printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_SL1\nPRINTER_VENDOR_VOXELAB\nPRINTER_MODEL_POLARIS\n\nSTART_CUSTOM_VALUES\nFLIP_XY\nLayerOffTime_0\nBottomLightOffDelay_0\nBottomLiftHeight_5\nLiftHeight_5\nBottomLiftSpeed_65\nLiftSpeed_65\nRetractSpeed_150\nBottomLightPWM_255\nLightPWM_255\nAntiAliasing_4 ; Use 0 or 1 for disable AntiAliasing with "printer gamma correction" set to 0, otherwise use multiples of 2 and "gamma correction" set to 1 for enable\nEND_CUSTOM_VALUES
+printer_settings_id = 
+printer_technology = SLA
+printer_variant = default
+printer_vendor = 
+printhost_apikey = 
+printhost_cafile = 
+relative_correction = 1,1
+slow_tilt_time = 8
+thumbnails = 400x400,800x480
diff --git a/README.md b/README.md
@@ -55,6 +55,8 @@ But also, i need victims for test subject. Proceed at your own risk!
 * PW0 (Photon Workshop)
 * ZCodex (Z-Suite)
 * CWS (NovaMaker)
+* UVJ
+* Image files (png, jpg, jpeg, gif, bmp)
 
 ## Available printers for PrusaSlicer
 
@@ -68,6 +70,7 @@ But also, i need victims for test subject. Proceed at your own risk!
 * AnyCubic Photon S
 * AnyCubic Photon Zero
 * Elegoo Mars
+* Elegoo Mars 2 Pro
 * Elegoo Mars Saturn
 * Peopoly Phenom
 * Peopoly Phenom L
@@ -85,6 +88,8 @@ But also, i need victims for test subject. Proceed at your own risk!
 * Wanhao D7
 * Wanhao D8
 * Creality LD-002R
+* Creality LD-002H
+* Voxelab Polaris
 
 ## Available profiles for PrusaSlicer
 
@@ -130,8 +135,8 @@ After some tests without failure you can increase your confidence and ignore thi
 
 ### Mac and Linux
 
-(Not tested nor compiled)
-1. Latest Mono
+(Not supported yet)
+
 
 ## How to use
 

diff --git a/UVtools.Cmd/UVtools.Cmd.csproj b/UVtools.Cmd/UVtools.Cmd.csproj
@@ -16,6 +16,7 @@
     <Copyright>Copyright © 2020 PTRTECH</Copyright>
     <RepositoryType>Git</RepositoryType>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/UVtools.Core/Extensions/StringExtensions.cs b/UVtools.Core/Extensions/StringExtensions.cs
@@ -9,6 +9,7 @@
 using System;
 using System.ComponentModel;
 using System.Linq;
+using System.Text;
 
 namespace UVtools.Core.Extensions
 {
@@ -29,6 +30,9 @@ public static string FirstCharToUpper(this string input)
             }
         }
 
+        public static string Repeat(this string s, int n)
+            => n <= 0 ? string.Empty : new StringBuilder(s.Length * n).Insert(0, s, n).ToString();
+
         /// <summary>
         /// Converts a string into a target type
         /// </summary>

diff --git a/UVtools.Core/Extensions/ZipArchiveExtensions.cs b/UVtools.Core/Extensions/ZipArchiveExtensions.cs
@@ -311,13 +311,16 @@ public static ZipArchiveEntry PutFileContent(this ZipArchive input, string filen
             }
 
             if (string.IsNullOrEmpty(content)) return entry;
-            Stream stream = entry.Open();
-            if (mode == ZipArchiveMode.Update) stream.SetLength(0);
-            using (TextWriter tw = new StreamWriter(stream))
+            using (Stream stream = entry.Open())
             {
-                tw.Write(content);
-                tw.Close();
+                if (mode == ZipArchiveMode.Update) stream.SetLength(0);
+                using (TextWriter tw = new StreamWriter(stream))
+                {
+                    tw.Write(content);
+                    tw.Close();
+                }
             }
+
             return entry;
         }
 
@@ -341,10 +344,12 @@ public static ZipArchiveEntry PutFileContent(this ZipArchive input, string filen
             }
 
             if (ReferenceEquals(content, null)) return entry;
-            Stream stream = entry.Open();
-            if (mode == ZipArchiveMode.Update) stream.SetLength(0);
-            stream.Write(content, 0, content.Length);
-            stream.Close();
+            using (Stream stream = entry.Open())
+            {
+                if (mode == ZipArchiveMode.Update) stream.SetLength(0);
+                stream.Write(content, 0, content.Length);
+                stream.Close();
+            }
             return entry;
         }
     }