v2.14.3v2.14.3

- (Add) Exposure time finder: Base layers print modes, a option to speed up the print process and merge all base layers in the same height
- (Add) GCode tab: Allow to temporarily edit and use custom gcode
- (Change) Zcode: Omit M18 at end of the gcode to prevent carrier goes up and crash to the limit at a end of a print

5 files changed, 55 insertions, 8 deletions

diff --git a/UVtools.WPF/Assets/Icons/pencil-alt-16x16.png b/UVtools.WPF/Assets/Icons/pencil-alt-16x16.png
new file mode 100644
index 0000000..a6002a8
--- /dev/null
+++ b/UVtools.WPF/Assets/Icons/pencil-alt-16x16.png
diff --git a/UVtools.WPF/Controls/Calibrators/CalibrateExposureFinderControl.axaml b/UVtools.WPF/Controls/Calibrators/CalibrateExposureFinderControl.axaml
index f15720a..2ffeb4b 100644
--- a/UVtools.WPF/Controls/Calibrators/CalibrateExposureFinderControl.axaml
+++ b/UVtools.WPF/Controls/Calibrators/CalibrateExposureFinderControl.axaml
@@ -1096,8 +1096,44 @@
 
                 </DataGrid>
 
+                <Grid RowDefinitions="Auto" ColumnDefinitions="Auto,10,*" Margin="0,10,0,0">
+                  <TextBlock Grid.Row="0" Grid.Column="0"
+                             ToolTip.Tip="Print mode for non-bottom base layers.
+&#x0a;A option other than 'Iterative' will speed up the print process and merge all base layers in the same height.
+&#x0a;The referred exposures come from the generated table."
+                             Text="Base layers print mode:"
+                             VerticalAlignment="Center"/>
+
+                  <ComboBox Grid.Row="0" Grid.Column="2"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Center"
+                            Items="{Binding Operation.MultipleExposuresBaseLayersPrintMode, Converter={StaticResource EnumToCollectionConverter}, Mode=OneTime}"
+                            SelectedItem="{Binding Operation.MultipleExposuresBaseLayersPrintMode, Converter={StaticResource FromValueDescriptionToEnumConverter}}"/>
+                </Grid>
+
+                <Grid RowDefinitions="Auto" ColumnDefinitions="Auto,10,Auto,5,Auto">
+                    <TextBlock Grid.Row="0" Grid.Column="0"
+                               Text="Base layers exposure:  "
+                               ToolTip.Tip="Use this custom exposure time for base layers"
+                               IsEnabled="{Binding Operation.IsMultipleExposuresBaseLayersPrintModeCustom}"
+                               VerticalAlignment="Center"/>
+
+                    <NumericUpDown Grid.Row="0" Grid.Column="2"
+                                   Increment="0.5"
+                                   Minimum="0.1"
+                                   Maximum="1000"
+                                   FormatString="F2"
+                                   IsEnabled="{Binding Operation.IsMultipleExposuresBaseLayersPrintModeCustom}"
+                                   Value="{Binding Operation.MultipleExposuresBaseLayersCustomExposure}"/>
+
+                    <TextBlock Grid.Row="0" Grid.Column="4"
+                               Text="s  (For 'custom' mode only)"
+                               IsEnabled="{Binding Operation.IsMultipleExposuresBaseLayersPrintModeCustom}"
+                               VerticalAlignment="Center"/>
+                </Grid>
+
 
-                <StackPanel Orientation="Vertical" Spacing="10"
+                <StackPanel Orientation="Vertical" Margin="0,10,0,0" Spacing="10"
                             IsEnabled="{Binding Operation.MultipleExposures}"
                             IsVisible="{Binding SlicerFile.SupportPerLayerSettings}">
 
diff --git a/UVtools.WPF/MainWindow.GCode.cs b/UVtools.WPF/MainWindow.GCode.cs
index 3ab6c65..58b8f33 100644
--- a/UVtools.WPF/MainWindow.GCode.cs
+++ b/UVtools.WPF/MainWindow.GCode.cs
@@ -19,15 +19,16 @@ namespace UVtools.WPF
     {
         public bool HaveGCode => IsFileLoaded && SlicerFile.SupportsGCode;
 
-        public string GCodeStr => SlicerFile?.GCodeStr;
         public uint GCodeLines => !HaveGCode ? 0 : SlicerFile.GCode.LineCount;
 
         public void OnClickRebuildGcode()
         {
             if (!HaveGCode) return;
+            var temp = SlicerFile.SuppressRebuildGCode;
+            SlicerFile.SuppressRebuildGCode = false;
             SlicerFile.RebuildGCode();
+            SlicerFile.SuppressRebuildGCode = temp;
             RaisePropertyChanged(nameof(GCodeLines));
-            RaisePropertyChanged(nameof(GCodeStr));
 
             CanSave = true;
         }
@@ -69,7 +70,7 @@ namespace UVtools.WPF
         public void OnClickGCodeSaveClipboard()
         {
             if (!HaveGCode) return;
-            Application.Current.Clipboard.SetTextAsync(GCodeStr);
+            Application.Current.Clipboard.SetTextAsync(SlicerFile.GCodeStr);
         }
     }
 }
diff --git a/UVtools.WPF/MainWindow.axaml b/UVtools.WPF/MainWindow.axaml
index 9e0efbc..3507618 100644
--- a/UVtools.WPF/MainWindow.axaml
+++ b/UVtools.WPF/MainWindow.axaml
@@ -586,7 +586,16 @@
             HorizontalAlignment="Right"
             VerticalAlignment="Center">
 
-            <Button
+              <ToggleButton
+                  IsChecked="{Binding SlicerFile.SuppressRebuildGCode}"
+                  ToolTip.Tip="Enable this to directly edit and use custom gcode.
+&#x0a;While this is active, UVtools won't update/generate the gcode, meaning any future change won't be replicated to gcode, unless you press the 'Refresh' button.
+&#x0a;To save the file with your custom gcode this setting must remain active while saving the file or else it will be re-generated.
+&#x0a;Use with caution and only if you know what you are doing!">
+                  <Image Source="/Assets/Icons/pencil-alt-16x16.png"/>
+              </ToggleButton>
+
+              <Button
              ToolTip.Tip="Rebuild GCode with current settings"
              Command="{Binding OnClickRebuildGcode}">
               <Image Source="/Assets/Icons/refresh-16x16.png"/>
@@ -627,8 +636,9 @@
           <TextBox 
             Name="GCodeText"
             Grid.Row="1"
-            IsReadOnly="True"
-            Text="{Binding GCodeStr}" />
+            IsReadOnly="{Binding !SlicerFile.SuppressRebuildGCode}"
+            AcceptsReturn="True"
+            Text="{Binding SlicerFile.GCodeStr}" />
         </Grid>
         
       </TabItem>
diff --git a/UVtools.WPF/UVtools.WPF.csproj b/UVtools.WPF/UVtools.WPF.csproj
index 37b9bfc..917c2f0 100644
--- a/UVtools.WPF/UVtools.WPF.csproj
+++ b/UVtools.WPF/UVtools.WPF.csproj
@@ -12,7 +12,7 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <RepositoryUrl>https://github.com/sn4k3/UVtools</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
-    <Version>2.14.2</Version>
+    <Version>2.14.3</Version>
   </PropertyGroup>
   
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">