diff options
author | Tiago Conceição <Tiago_caza@hotmail.com> | 2020-10-24 00:51:37 +0300 |
---|---|---|
committer | Tiago Conceição <Tiago_caza@hotmail.com> | 2020-10-24 00:51:37 +0300 |
commit | 78a5e0f66359634b303165c69e9ad1ceefc22d43 (patch) | |
tree | 7d646dc104e6b0b1b30c84fd3f64bd43f8970024 | |
parent | 42fc845a50603225830d34e7154046d5ed5a4894 (diff) |
v1.0.0.2v1.0.0.2
* (Fix) ROI selection button on bottom was always disabled even when a region is selected
* (Fix) Settings - Issues- "Pixel intensity threshold" defaults to 0, but can't be set back to 0 after change (minimum is 1). (#78)
* (Fix) Settings - Issues - "Supporting safe pixels..." is present twice (#78)
* (Fix) Settings - Layer repair - Empty layers / Resin traps texts are swapped in the settings window (#78)
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | UVtools.Core/UVtools.Core.csproj | 4 | ||||
-rw-r--r-- | UVtools.WPF/MainWindow.LayerPreview.cs | 4 | ||||
-rw-r--r-- | UVtools.WPF/MainWindow.axaml | 2 | ||||
-rw-r--r-- | UVtools.WPF/MainWindow.axaml.cs | 1 | ||||
-rw-r--r-- | UVtools.WPF/Structures/PixelPicker.cs | 9 | ||||
-rw-r--r-- | UVtools.WPF/UVtools.WPF.csproj | 3 | ||||
-rw-r--r-- | UVtools.WPF/Windows/SettingsWindow.axaml | 32 |
8 files changed, 32 insertions, 30 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 309ff07..dc692a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 23/10/2020 - v1.0.0.2 + +* (Fix) ROI selection button on bottom was always disabled even when a region is selected +* (Fix) Settings - Issues- "Pixel intensity threshold" defaults to 0, but can't be set back to 0 after change (minimum is 1). (#78) +* (Fix) Settings - Issues - "Supporting safe pixels..." is present twice (#78) +* (Fix) Settings - Layer repair - Empty layers / Resin traps texts are swapped in the settings window (#78) + ## 23/10/2020 - v1.0.0.1 * (Change) Checked and click buttons highlight color for better distinguish diff --git a/UVtools.Core/UVtools.Core.csproj b/UVtools.Core/UVtools.Core.csproj index 958c8cf..a665052 100644 --- a/UVtools.Core/UVtools.Core.csproj +++ b/UVtools.Core/UVtools.Core.csproj @@ -10,12 +10,10 @@ <RepositoryUrl>https://github.com/sn4k3/UVtools</RepositoryUrl> <PackageProjectUrl>https://github.com/sn4k3/UVtools</PackageProjectUrl> <Description>MSLA/DLP, file analysis, repair, conversion and manipulation</Description> - <Version>1.0.0.0</Version> + <Version>1.0.0.2</Version> <Copyright>Copyright © 2020 PTRTECH</Copyright> <PackageIcon>UVtools.png</PackageIcon> <Platforms>AnyCPU;x64</Platforms> - <AssemblyVersion>1.0.0.1</AssemblyVersion> - <FileVersion>1.0.0.1</FileVersion> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> diff --git a/UVtools.WPF/MainWindow.LayerPreview.cs b/UVtools.WPF/MainWindow.LayerPreview.cs index b7639ff..c9bc4f1 100644 --- a/UVtools.WPF/MainWindow.LayerPreview.cs +++ b/UVtools.WPF/MainWindow.LayerPreview.cs @@ -33,7 +33,6 @@ using UVtools.WPF.Structures; using Color = UVtools.WPF.Structures.Color; using Helpers = UVtools.WPF.Controls.Helpers; using Point = System.Drawing.Point; -using Size = Avalonia.Size; namespace UVtools.WPF { @@ -49,7 +48,8 @@ namespace UVtools.WPF Selection }; #endregion - public AdvancedImageBox LayerImageBox; + + public AdvancedImageBox LayerImageBox { get; private set; } public SliderEx LayerSlider; public Panel LayerNavigationTooltipPanel; public Border LayerNavigationTooltipBorder; diff --git a/UVtools.WPF/MainWindow.axaml b/UVtools.WPF/MainWindow.axaml index 2f30434..a604610 100644 --- a/UVtools.WPF/MainWindow.axaml +++ b/UVtools.WPF/MainWindow.axaml @@ -1556,7 +1556,7 @@ </Button> <Button - IsEnabled="{Binding #LayerImage.HaveSelection}" + IsEnabled="{Binding IsFileLoaded}" Command="{Binding OnROIClick}" ToolTip.Tip="Region of interest selection over layer. 
(NS): Not selected diff --git a/UVtools.WPF/MainWindow.axaml.cs b/UVtools.WPF/MainWindow.axaml.cs index 2610484..45bef69 100644 --- a/UVtools.WPF/MainWindow.axaml.cs +++ b/UVtools.WPF/MainWindow.axaml.cs @@ -483,7 +483,6 @@ namespace UVtools.WPF TooltipOverlayText = "Pixel editing is on:\n" + "» Click over a pixel to draw\n" + "» Hold CTRL to clear pixels"; - UpdatePixelEditorCursor(); } else diff --git a/UVtools.WPF/Structures/PixelPicker.cs b/UVtools.WPF/Structures/PixelPicker.cs index 38bd3f5..ae7f03b 100644 --- a/UVtools.WPF/Structures/PixelPicker.cs +++ b/UVtools.WPF/Structures/PixelPicker.cs @@ -1,9 +1,10 @@ using System.Drawing; using ReactiveUI; +using UVtools.Core.Objects; namespace UVtools.WPF.Structures { - public class PixelPicker : ReactiveObject + public class PixelPicker : BindableBase { private bool _isSet; private Point _location = new Point(0,0); @@ -12,19 +13,19 @@ namespace UVtools.WPF.Structures public bool IsSet { get => _isSet; - private set => this.RaiseAndSetIfChanged(ref _isSet, value); + private set => RaiseAndSetIfChanged(ref _isSet, value); } public Point Location { get => _location; - set => this.RaiseAndSetIfChanged(ref _location, value); + set => RaiseAndSetIfChanged(ref _location, value); } public byte Brightness { get => _brightness; - private set => this.RaiseAndSetIfChanged(ref _brightness, value); + private set => RaiseAndSetIfChanged(ref _brightness, value); } public void Set(Point location, byte brightness) diff --git a/UVtools.WPF/UVtools.WPF.csproj b/UVtools.WPF/UVtools.WPF.csproj index bddd33f..76f8ae4 100644 --- a/UVtools.WPF/UVtools.WPF.csproj +++ b/UVtools.WPF/UVtools.WPF.csproj @@ -13,8 +13,7 @@ <RepositoryUrl>https://github.com/sn4k3/UVtools</RepositoryUrl> <RepositoryType>Git</RepositoryType> <Nullable>enable</Nullable> - <Version>1.0.0.1</Version> - <AssemblyVersion>1.0.0.1</AssemblyVersion> + <Version>1.0.0.2</Version> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> diff --git a/UVtools.WPF/Windows/SettingsWindow.axaml b/UVtools.WPF/Windows/SettingsWindow.axaml index 6aa1475..74595a9 100644 --- a/UVtools.WPF/Windows/SettingsWindow.axaml +++ b/UVtools.WPF/Windows/SettingsWindow.axaml @@ -664,7 +664,7 @@ <StackPanel Orientation="Horizontal" Margin="15,0,15,15" Spacing="10"> <NumericUpDown Width="60" - Minimum="1" + Minimum="0" Maximum="254" Value="{Binding Settings.Issues.IslandBinaryThreshold}" /> @@ -718,23 +718,21 @@ /> </StackPanel> - - <StackPanel Orientation="Horizontal" Margin="15,0,15,15" Spacing="10"> - <NumericUpDown Width="60" - Minimum="0.05" - Maximum="0.95" - Increment="0.05" - Value="{Binding Settings.Issues.IslandRequiredPixelsToSupportMultiplier}" + + <StackPanel Orientation="Horizontal" Margin="15,0,15,15" Spacing="10"> + <NumericUpDown Width="60" + Minimum="50" + Maximum="255" + Value="{Binding Settings.Issues.IslandRequiredPixelBrightnessToSupport}" /> - <TextBlock - VerticalAlignment="Center" - Text="Supporting safe pixels required over a multiplier on island pixels" - ToolTip.Tip="An island supported by at least it pixels multiplied by this value will always be considered supported. -
Formula: Supporting pixels >= Island pixels * this value" + <TextBlock + VerticalAlignment="Center" + Text="Minimum intensity of a supporting pixel before it is considered safe" + ToolTip.Tip="Pixels below this threshold will not be considered when counting supporting pixels for an island." /> - </StackPanel> + </StackPanel> - <!-- + <!-- <StackPanel Orientation="Horizontal" Margin="15,0,15,15" Spacing="10"> <NumericUpDown Width="60" Minimum="1" @@ -1018,9 +1016,9 @@ <CheckBox IsChecked="{Binding Settings.LayerRepair.RepairIslands}" Margin="15,0" Content="Attempt to repair islands by default"/> <CheckBox IsChecked="{Binding Settings.LayerRepair.RepairResinTraps}" - Margin="15,0" Content="Remove empty layers by default"/> - <CheckBox IsChecked="{Binding Settings.LayerRepair.RemoveEmptyLayers}" Margin="15,0" Content="Attempt to repair resin traps by default"/> + <CheckBox IsChecked="{Binding Settings.LayerRepair.RemoveEmptyLayers}" + Margin="15,0" Content="Remove empty layers by default"/> <StackPanel Orientation="Horizontal" Margin="15,0" Spacing="10"> <NumericUpDown |