diff --git a/CHANGELOG.md b/CHANGELOG.md index f9f1ad2..6121d9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,10 +9,11 @@ * (Improvement) GUI is now scalable * (Fix) Some bug found and fixed during convertion -## /10/2020 - v0.8.4.2 +## 10/10/2020 - v0.8.4.2 * (Fix) pws and pw0: Error when try to save or copy to clipboard the slicer information / properties -* (Fix) phton, ctb, cbbdlp, pws, pw0, phz: Rare cases were decoding image generate noise and malformed image +* (Fix) photon, ctb, cbbdlp, phz, pws, pw0: Rare cases were decoding image generate noise and malformed image +* (Fix) Rare cases where manipulation of images generate areas with noise ## 10/10/2020 - v0.8.4.1 diff --git a/UVtools.Core/UVtools.Core.csproj b/UVtools.Core/UVtools.Core.csproj index 4c3e802..786f667 100644 --- a/UVtools.Core/UVtools.Core.csproj +++ b/UVtools.Core/UVtools.Core.csproj @@ -10,12 +10,12 @@ https://github.com/sn4k3/UVtools https://github.com/sn4k3/UVtools MSLA/DLP, file analysis, repair, conversion and manipulation - 0.8.4.1 + 0.8.4.2 Copyright © 2020 PTRTECH UVtools.png AnyCPU;x64 - 0.8.4.1 - 0.8.4.1 + 0.8.4.2 + 0.8.4.2 diff --git a/UVtools.GUI/Properties/AssemblyInfo.cs b/UVtools.GUI/Properties/AssemblyInfo.cs index b1782bb..20c38ad 100644 --- a/UVtools.GUI/Properties/AssemblyInfo.cs +++ b/UVtools.GUI/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ using System.Runtime.InteropServices; // 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.8.4.1")] -[assembly: AssemblyFileVersion("0.8.4.1")] +[assembly: AssemblyVersion("0.8.4.2")] +[assembly: AssemblyFileVersion("0.8.4.2")] diff --git a/UVtools.WPF/Controls/AdvancedImageBox.cs b/UVtools.WPF/Controls/AdvancedImageBox.cs index e33ca7e..7fda650 100644 --- a/UVtools.WPF/Controls/AdvancedImageBox.cs +++ b/UVtools.WPF/Controls/AdvancedImageBox.cs @@ -1119,6 +1119,15 @@ namespace UVtools.WPF.Controls } + /// + /// Zooms to current selection region + /// + public void ZoomToSelectionRegion() + { + if (!HaveSelection) return; + ZoomToRegion(SelectionRegion); + } + /// /// Centers the given point in the image in the center of the control /// diff --git a/UVtools.WPF/MainWindow.LayerPreview.cs b/UVtools.WPF/MainWindow.LayerPreview.cs index d23a1ee..da94ab2 100644 --- a/UVtools.WPF/MainWindow.LayerPreview.cs +++ b/UVtools.WPF/MainWindow.LayerPreview.cs @@ -57,11 +57,15 @@ namespace UVtools.WPF private bool _showLayerOutlineHollowAreas; private bool _showLayerOutlineEdgeDetection; + private bool _isTooltipOverlayVisible; + private string _tooltipOverlayText; + private long _showLayerRenderMs; public LayerCache LayerCache = new LayerCache(); private Point _lastPixelMouseLocation = Point.Empty; + public void InitLayerPreview() { LayerImageBox = this.FindControl("LayerImage"); @@ -265,6 +269,18 @@ namespace UVtools.WPF public bool CanGoUp => _actualLayer < SliderMaximumValue; public bool CanGoDown => _actualLayer > 0; + public bool IsTooltipOverlayVisible + { + get => _isTooltipOverlayVisible; + set => RaiseAndSetIfChanged(ref _isTooltipOverlayVisible, value); + } + + public string TooltipOverlayText + { + get => _tooltipOverlayText; + set => RaiseAndSetIfChanged(ref _tooltipOverlayText, value); + } + public string LayerPixelCountStr { get @@ -362,6 +378,11 @@ namespace UVtools.WPF } set => LayerImageBox.SelectionRegion = value.ToAvalonia(); } + + public void OnROIClick() + { + LayerImageBox.ZoomToSelectionRegion(); + } #endregion public void GoFirstLayer() diff --git a/UVtools.WPF/MainWindow.PixelEditor.cs b/UVtools.WPF/MainWindow.PixelEditor.cs index 991e113..59ec244 100644 --- a/UVtools.WPF/MainWindow.PixelEditor.cs +++ b/UVtools.WPF/MainWindow.PixelEditor.cs @@ -101,6 +101,7 @@ namespace UVtools.WPF private void DrawingsGridOnKeyUp(object? sender, KeyEventArgs e) { + switch (e.Key) { case Key.Escape: @@ -264,7 +265,7 @@ namespace UVtools.WPF //if (PixelHistory.Contains(operation)) continue; //PixelHistory.Add(operation); Drawings.Add(operationText); - + /*var color = isAdd ? Settings.PixelEditor.AddPixelColor : Settings.PixelEditor.RemovePixelColor; diff --git a/UVtools.WPF/MainWindow.axaml b/UVtools.WPF/MainWindow.axaml index 86c2473..3e56e71 100644 --- a/UVtools.WPF/MainWindow.axaml +++ b/UVtools.WPF/MainWindow.axaml @@ -641,7 +641,7 @@ - + - - - - - - - - @@ -1127,7 +1093,7 @@