From dbd987deadd1799815d307edff79c821a0466bdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tiago=20Concei=C3=A7=C3=A3o?= <Tiago_caza@hotmail.com>
Date: Tue, 21 Sep 2021 22:13:11 +0100
Subject: [PATCH 1/2] Ensure correct order of issues

---
 UVtools.Core/Layers/MainIssue.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/UVtools.Core/Layers/MainIssue.cs b/UVtools.Core/Layers/MainIssue.cs
index 9a5801b..14ca0dd 100644
--- a/UVtools.Core/Layers/MainIssue.cs
+++ b/UVtools.Core/Layers/MainIssue.cs
@@ -11,7 +11,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using MoreLinq;
 using UVtools.Core.Extensions;
 
 namespace UVtools.Core.Layers
@@ -125,7 +124,7 @@ namespace UVtools.Core.Layers
 
             BoundingRectangle = boundingRectangle;
             Area = area;
-            Childs = issues.ToArray();
+            Childs = issues.OrderBy(issue => issue.LayerIndex).ToArray();
             Sort();
         }
 

From ec67e2f2305639b985e3038554d233a09c42c505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tiago=20Concei=C3=A7=C3=A3o?= <Tiago_caza@hotmail.com>
Date: Tue, 21 Sep 2021 22:13:24 +0100
Subject: [PATCH 2/2] Add the missing value labels

---
 UVtools.Core/Managers/IssueManager.cs    |   7 +-
 UVtools.WPF/Assets/Styles/Styles.xaml    |  16 ++
 UVtools.WPF/Windows/SettingsWindow.axaml | 210 ++++++++++++-----------
 3 files changed, 125 insertions(+), 108 deletions(-)

diff --git a/UVtools.Core/Managers/IssueManager.cs b/UVtools.Core/Managers/IssueManager.cs
index c84e2fc..18366e6 100644
--- a/UVtools.Core/Managers/IssueManager.cs
+++ b/UVtools.Core/Managers/IssueManager.cs
@@ -151,7 +151,7 @@ namespace UVtools.Core.Managers
 
             List<MainIssue> GetResult()
             {
-                return result.OrderBy(issue => issue.Type).ThenBy(issue => issue.StartLayerIndex).ThenByDescending(issue => issue.Area).ToList();
+                return result.OrderBy(mainIssue => mainIssue.Type).ThenBy(issue => issue.StartLayerIndex).ThenByDescending(issue => issue.Area).ToList();
             }
 
             void GenerateAirMap(IInputArray input, IInputOutputArray output, VectorOfVectorOfPoint externals)
@@ -966,10 +966,7 @@ namespace UVtools.Core.Managers
                             var mainIssue = new MainIssue(MainIssue.IssueType.SuctionCup, group);
                             if ((decimal)mainIssue.TotalHeight >= resinTrapConfig.RequiredHeightToConsiderSuctionCup) { 
                                 AddIssue(mainIssue);
-                            } else
-                            {
-                                mainIssue = null;
-                            }
+                            } 
                         }
                     }
                 });
diff --git a/UVtools.WPF/Assets/Styles/Styles.xaml b/UVtools.WPF/Assets/Styles/Styles.xaml
index e38012e..fc27179 100644
--- a/UVtools.WPF/Assets/Styles/Styles.xaml
+++ b/UVtools.WPF/Assets/Styles/Styles.xaml
@@ -111,6 +111,14 @@
         </Setter>
     </Style>
 
+    <Style Selector="TextBox.ValueLabel_diametermm, NumericUpDown.ValueLabel_diametermm /template/ TextBox">
+        <Setter Property="InnerRightContent">
+            <Template>
+                <TextBox Classes="NumericUpDownValueLabel" Text="⌀mm" ToolTip.Tip="Diameter Millimeter(s)" />
+            </Template>
+        </Setter>
+    </Style>
+
     <Style Selector="TextBox.ValueLabel_mmmin, NumericUpDown.ValueLabel_mmmin /template/ TextBox">
         <Setter Property="InnerRightContent">
             <Template>
@@ -143,6 +151,14 @@
         </Setter>
     </Style>
 
+    <Style Selector="TextBox.ValueLabel_diameterpx, NumericUpDown.ValueLabel_diameterpx /template/ TextBox">
+        <Setter Property="InnerRightContent">
+            <Template>
+                <TextBox Classes="NumericUpDownValueLabel" Text="⌀px" ToolTip.Tip="Diameter Pixel(s)" />
+            </Template>
+        </Setter>
+    </Style>
+
     <Style Selector="TextBox.ValueLabel_sun, NumericUpDown.ValueLabel_sun /template/ TextBox">
         <Setter Property="InnerRightContent">
             <Template>
diff --git a/UVtools.WPF/Windows/SettingsWindow.axaml b/UVtools.WPF/Windows/SettingsWindow.axaml
index 171bdf0..75b9518 100644
--- a/UVtools.WPF/Windows/SettingsWindow.axaml
+++ b/UVtools.WPF/Windows/SettingsWindow.axaml
@@ -7,7 +7,7 @@
         x:Class="UVtools.WPF.Windows.SettingsWindow"
         WindowStartupLocation="Manual"
         MinWidth="600"
-        Width="740"
+        Width="780"
         SizeToContent="Height"
         CanResize="False"
         Title="UVtools - Settings"
@@ -184,7 +184,7 @@
                 <TextBlock Padding="10" Background="LightBlue" FontWeight="Bold" Text="File dialog"/>
                 <Grid Margin="10" 
                       RowDefinitions="Auto,10,Auto,10,Auto,10,Auto,10,Auto,10,Auto" 
-                      ColumnDefinitions="Auto,10,429,Auto,Auto">
+                      ColumnDefinitions="Auto,10,449,Auto,Auto">
                   <TextBlock
                     VerticalAlignment="Center"
                     Grid.Row="0" Grid.Column="0"
@@ -192,7 +192,7 @@
                   <ComboBox Items="{Binding FileOpenDialogFilters}"
                             SelectedIndex="{Binding Settings.General.DefaultOpenFileExtensionIndex}"
                             HorizontalAlignment="Left"
-                            Width="490"
+                            Width="517"
                             MaxDropDownHeight="350"
                             Grid.ColumnSpan="3" Grid.Row="0" Grid.Column="2"/>
 
@@ -1087,12 +1087,12 @@
 
 
                 <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10">
-                  <NumericUpDown Width="60"
-                                 
-                                  Minimum="0"
-                                  Maximum="254"
+                  <NumericUpDown Width="150"
+                                 Classes="ValueLabel ValueLabel_sun"
+                                 Minimum="0"
+                                 Maximum="254"
                                  Value="{Binding Settings.Issues.IslandBinaryThreshold}"
-                                />
+                  />
                   <TextBlock
                     VerticalAlignment="Center"
                     Text="Pixel intensity threshold for island detection"
@@ -1103,12 +1103,12 @@
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10">
-                  <NumericUpDown Width="60"
-                                 
-                                  Minimum="1"
-                                  Maximum="255"
+                  <NumericUpDown Width="150"
+                                 Classes="ValueLabel ValueLabel_px2"
+                                 Minimum="1"
+                                 Maximum="255"
                                  Value="{Binding Settings.Issues.IslandRequiredAreaToProcessCheck}"
-                                />
+                  />
                   <TextBlock
                     VerticalAlignment="Center"
                     Text="Bounding area required for an object to be considered an island"
@@ -1117,12 +1117,12 @@
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10">
-                  <NumericUpDown Width="60"
-                                 
-                                  Minimum="1"
-                                  Maximum="255"
+                  <NumericUpDown Width="150"
+                                 Classes="ValueLabel ValueLabel_sun"
+                                 Minimum="1"
+                                 Maximum="255"
                                  Value="{Binding Settings.Issues.IslandRequiredPixelBrightnessToProcessCheck}"
-                                />
+                  />
                   <TextBlock
                     VerticalAlignment="Center"
                     Text="Minimum pixel intensity to consider a pixel part of an island"
@@ -1131,13 +1131,14 @@
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10">
-                  <NumericUpDown Width="60"
-                                 
-                                  Minimum="0.05"
-                                  Maximum="0.95"
-                                  Increment="0.05"
-                                  Value="{Binding Settings.Issues.IslandRequiredPixelsToSupportMultiplier}"
-                                />
+                  <NumericUpDown Width="150"
+                                 Classes="ValueLabel ValueLabel_times"
+                                 Minimum="0.05"
+                                 Maximum="0.95"
+                                 Increment="0.05"
+                                 FormatString="F2"
+                                 Value="{Binding Settings.Issues.IslandRequiredPixelsToSupportMultiplier}"
+                  />
                   <TextBlock
                     VerticalAlignment="Center"
                     Text="Supporting safe pixels required over a multiplier on island pixels"
@@ -1148,12 +1149,12 @@
 
 
                 <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10">
-                  <NumericUpDown Width="60"
-                                 
-                                  Minimum="50"
-                                  Maximum="255"
+                  <NumericUpDown Width="150"
+                                 Classes="ValueLabel ValueLabel_sun"
+                                 Minimum="50"
+                                 Maximum="255"
                                  Value="{Binding Settings.Issues.IslandRequiredPixelBrightnessToSupport}"
-                                />
+                  />
                   <TextBlock
                     VerticalAlignment="Center"
                     Text="Minimum intensity of a supporting pixel before it is considered safe"
@@ -1213,12 +1214,12 @@
                   IsChecked="{Binding Settings.Issues.OverhangIndependentFromIslands}"/>
 
                 <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10">
-                  <NumericUpDown Width="60"
-                                 
-                                  Minimum="2"
-                                  Maximum="255"
-                                  Value="{Binding Settings.Issues.OverhangErodeIterations}"
-                                />
+                  <NumericUpDown Width="150"
+                                 Classes="ValueLabel ValueLabel_px"
+                                 Minimum="2"
+                                 Maximum="255"
+                                 Value="{Binding Settings.Issues.OverhangErodeIterations}"
+                  />
                   <TextBlock
                     VerticalAlignment="Center"
                     Text="Minimum overhang depth"
@@ -1239,10 +1240,10 @@
                            Text="Resin traps"/>
 
                 <StackPanel Orientation="Horizontal" Margin="10" Spacing="10">
-                  <NumericUpDown Width="60"
-                                 
-                                  Minimum="0"
-                                  Maximum="254"
+                  <NumericUpDown Width="150"
+                                 Classes="ValueLabel ValueLabel_sun"
+                                 Minimum="0"
+                                 Maximum="254"
                                  Value="{Binding Settings.Issues.ResinTrapBinaryThreshold}"/>
                   <TextBlock
                     VerticalAlignment="Center"
@@ -1255,10 +1256,10 @@
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10">
-                  <NumericUpDown Width="60"
-                                 
-                                  Minimum="1"
-                                  Maximum="255"
+                  <NumericUpDown Width="150"
+                                 Classes="ValueLabel ValueLabel_px2"
+                                 Minimum="1"
+                                 Maximum="255"
                                  Value="{Binding Settings.Issues.ResinTrapRequiredAreaToProcessCheck}"/>
                   <TextBlock
                     VerticalAlignment="Center"
@@ -1267,12 +1268,12 @@
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10">
-                  <NumericUpDown Width="60"
-                                 
-                                  Minimum="1"
-                                  Maximum="255"
+                  <NumericUpDown Width="150"
+                                 Classes="ValueLabel ValueLabel_px"
+                                 Minimum="1"
+                                 Maximum="255"
                                  Value="{Binding Settings.Issues.ResinTrapRequiredBlackPixelsToDrain}"
-                                />
+                  />
                   <TextBlock
                     VerticalAlignment="Center"
                     Text="Number of drain pixels required to disqualify a potential resin trap"
@@ -1281,12 +1282,12 @@
                 </StackPanel>
 
                 <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10">
-                  <NumericUpDown Width="60"
-                                 
-                                  Minimum="1"
-                                  Maximum="150"
+                  <NumericUpDown Width="150"
+                                 Classes="ValueLabel ValueLabel_sun"
+                                 Minimum="1"
+                                 Maximum="150"
                                  Value="{Binding Settings.Issues.ResinTrapMaximumPixelBrightnessToDrain}"
-                                />
+                  />
                   <TextBlock
                     VerticalAlignment="Center"
                     Text="Maximum pixel intensity for a pixel to be considered a drain pixel"
@@ -1306,7 +1307,8 @@
                                  Text="Suction cups"/>
 
                       <StackPanel Orientation="Horizontal" Margin="10" Spacing="10">
-                          <NumericUpDown Width="60"
+                          <NumericUpDown Width="150"
+                                         Classes="ValueLabel ValueLabel_px2"
                                          Minimum="1"
                                          Maximum="4294967295"
                                          Value="{Binding Settings.Issues.SuctionCupRequiredAreaToConsider}"/>
@@ -1316,15 +1318,17 @@
                             ToolTip.Tip="Objects with bounding area smaller than this value will not be processed during suction cup detection."/>
                       </StackPanel>
 					  <StackPanel Orientation="Horizontal" Margin="10" Spacing="10">
-						  <NumericUpDown Width="60" 
+						  <NumericUpDown Width="150" 
+                            Classes="ValueLabel ValueLabel_mm"
 										 Minimum="0.05" 
 										 Maximum="4294967295" 
 										 Increment="0.05" 
+                            FormatString="F2"
 										 Value="{Binding Settings.Issues.SuctionCupRequiredHeightToConsider}"
                                 />
 						  <TextBlock
 							  VerticalAlignment="Center"
-							  Text="Minimum height required (mm) for a suction cup detection to be reported"
+							  Text="Minimum height required for a suction cup detection to be reported"
 							  ToolTip.Tip="Objects with a smaller height than this value will not be reported during suction cup detection."/>
 					  </StackPanel>
                     </StackPanel>
@@ -1340,8 +1344,8 @@
                            Text="Touching boundary"/>
 
                 <StackPanel Orientation="Horizontal" Margin="10" Spacing="10">
-                  <NumericUpDown Width="60"
-                                 
+                  <NumericUpDown Width="150"
+                                 Classes="ValueLabel ValueLabel_sun"
                                   Minimum="1"
                                   Maximum="255"
                                   Value="{Binding Settings.Issues.TouchingBoundMinimumPixelBrightness}"
@@ -1397,15 +1401,14 @@
                     Grid.Row="2"
                     VerticalAlignment="Center"
                     Text="Left " />
-                  <NumericUpDown
-                    Grid.Column="1"
-                    Grid.Row="2"
-                    Width="70"
-                    Minimum="1"
-                    Maximum="255"
-                    Margin="0,0,5,0"
+                  <NumericUpDown Grid.Column="1" Grid.Row="2"
+                                 Width="150"
+                                 Classes="ValueLabel ValueLabel_px"
+                                 Minimum="1"
+                                 Maximum="255"
+                                 Margin="0,0,5,0"
                     
-                    Value="{Binding Settings.Issues.TouchingBoundMarginLeft}" />
+                                 Value="{Binding Settings.Issues.TouchingBoundMarginLeft}" />
 
                  
                   <TextBlock
@@ -1415,15 +1418,14 @@
                     HorizontalAlignment="Center"
                     Margin="0,0,0,2"
                     Text="Top" />
-                  <NumericUpDown
-                    Grid.Column="2"
-                    Grid.Row="1"
-                    Width="70"
-                    Minimum="1"
-                    Maximum="255"
-                    Margin="0,0,0,5"
+                  <NumericUpDown Grid.Column="2"  Grid.Row="1"
+                                 Width="150"
+                                 Classes="ValueLabel ValueLabel_px"
+                                 Minimum="1"
+                                 Maximum="255"
+                                 Margin="0,0,0,5"
                     
-                    Value="{Binding Settings.Issues.TouchingBoundMarginTop}" />
+                                 Value="{Binding Settings.Issues.TouchingBoundMarginTop}" />
 
                   <TextBlock
                     Grid.Column="4"
@@ -1431,15 +1433,14 @@
                     VerticalAlignment="Center"
                     HorizontalAlignment="Center"
                     Text=" Right" />
-                  <NumericUpDown
-                    Grid.Column="3"
-                    Grid.Row="2"
-                    Width="70"
-                    Minimum="1"
-                    Maximum="255"
-                    Margin="5,0,0,0"
+                  <NumericUpDown Grid.Column="3" Grid.Row="2"
+                                 Width="150"
+                                 Classes="ValueLabel ValueLabel_px"
+                                 Minimum="1"
+                                 Maximum="255"
+                                 Margin="5,0,0,0"
                     
-                    Value="{Binding Settings.Issues.TouchingBoundMarginRight}" />
+                                 Value="{Binding Settings.Issues.TouchingBoundMarginRight}" />
 
                   <TextBlock
                     Grid.Column="2"
@@ -1448,15 +1449,14 @@
                     HorizontalAlignment="Center"
                     Margin="0,2,0,0"
                     Text="Bottom" />
-                  <NumericUpDown
-                    Grid.Column="2"
-                    Grid.Row="3"
-                    Width="70"
-                    Minimum="1"
-                    Maximum="255"
-                    Margin="0,5,0,0"
+                  <NumericUpDown Grid.Column="2" Grid.Row="3"
+                                 Width="150"
+                                 Classes="ValueLabel ValueLabel_px"
+                                 Minimum="1"
+                                 Maximum="255"
+                                 Margin="0,5,0,0"
                     
-                    Value="{Binding Settings.Issues.TouchingBoundMarginBottom}" />
+                                 Value="{Binding Settings.Issues.TouchingBoundMarginBottom}" />
 
                   <CheckBox
                     Grid.Row="2"
@@ -1480,11 +1480,12 @@
                                  Text="Print height"/>
 
                       <StackPanel Orientation="Horizontal" Margin="10" Spacing="10">
-                          <NumericUpDown Width="60"
+                          <NumericUpDown Width="150"
                                          Classes="ValueLabel ValueLabel_mm"
                                          Minimum="-50"
                                          Maximum="50"
                                          Increment="0.1"
+                                         FormatString="F2"
                                          Value="{Binding Settings.Issues.PrintHeightOffset}"/>
                           <TextBlock
                               VerticalAlignment="Center"
@@ -1658,8 +1659,8 @@
                 <StackPanel Orientation="Horizontal" Margin="10,0" Spacing="10">
                   <NumericUpDown
                     Value="{Binding Settings.LayerRepair.RemoveIslandsBelowEqualPixels}"
-                    Width="70"
-                    
+                    Width="150"
+                    Classes="ValueLabel ValueLabel_px2"
                     Minimum="0"
                     Maximum="255"/>
                   <TextBlock VerticalAlignment="Center" Text="Islands: Maximum pixel area for Island removal (0 = disable)"/>
@@ -1668,8 +1669,8 @@
                 <StackPanel Orientation="Horizontal" Margin="10,0" Spacing="10">
                   <NumericUpDown
                     Value="{Binding Settings.LayerRepair.RemoveIslandsRecursiveIterations}"
-                    Width="70"
-                    
+                    Width="150"
+                    Classes="ValueLabel ValueLabel_layers"
                     Minimum="0"
                     Maximum="65535"/>
                   <TextBlock VerticalAlignment="Center" Text="Islands: Maximum layers for recursive island removal (0 = All)"/>
@@ -1678,7 +1679,8 @@
                 <StackPanel Orientation="Horizontal" Margin="10,0" Spacing="10">
                     <NumericUpDown
                         Value="{Binding Settings.LayerRepair.AttachIslandsBelowLayers}"
-                        Width="70"
+                        Width="150"
+                        Classes="ValueLabel ValueLabel_layers"
                         Minimum="0"
                         Maximum="65535"/>
                     <TextBlock VerticalAlignment="Center" Text="Islands: Attempt to attach islands down to this layers (0 = Disabled)"/>
@@ -1687,7 +1689,8 @@
                 <StackPanel Orientation="Horizontal" Margin="10,0" Spacing="10">
                     <NumericUpDown
                         Value="{Binding Settings.LayerRepair.ResinTrapsOverlapBy}"
-                        Width="70"
+                        Width="150"
+                        Classes="ValueLabel ValueLabel_px"
                         Minimum="0"
                         Maximum="255"/>
                     <TextBlock VerticalAlignment="Center" Text="Resin traps: Overlap and expand resin trap area by this value in pixels (0 = Disabled)"/>
@@ -1696,7 +1699,8 @@
                 <StackPanel Orientation="Horizontal" Margin="10,0" Spacing="10">
                     <NumericUpDown
                         Value="{Binding Settings.LayerRepair.SuctionCupsVentHole}"
-                        Width="70"
+                        Width="150"
+                        Classes="ValueLabel ValueLabel_px2"
                         Minimum="4"
                         Maximum="255"/>
                     <TextBlock VerticalAlignment="Center" Text="Suction cups: Hole diameter to drill the layers with"/>
@@ -1705,8 +1709,8 @@
                 <StackPanel Orientation="Horizontal" Margin="10,0" Spacing="10">
                   <NumericUpDown
                     Value="{Binding Settings.LayerRepair.ClosingIterations}"
-                    Width="70"
-                    
+                    Width="150"
+                    Classes="ValueLabel ValueLabel_px"
                     Minimum="0"
                     Maximum="255"/>
                   <TextBlock VerticalAlignment="Center" Text="'Gap Closing' iterations"/>
@@ -1715,8 +1719,8 @@
                 <StackPanel Orientation="Horizontal" Margin="10,0,10,10" Spacing="10">
                   <NumericUpDown
                     Value="{Binding Settings.LayerRepair.OpeningIterations}"
-                    Width="70"
-                    
+                    Width="150"
+                    Classes="ValueLabel ValueLabel_px"
                     Minimum="0"
                     Maximum="255"/>
                   <TextBlock VerticalAlignment="Center" Text="'Noise Removal' iterations"/>