From 2b352bde38de2815d0cffc427e2b4f87fd86b927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20Concei=C3=A7=C3=A3o?= Date: Thu, 22 Oct 2020 04:20:11 +0100 Subject: [PATCH] v1.0.0.0 --- .../Operations/OperationArithmetic.cs | 2 +- UVtools.Core/UVtools.Core.csproj | 6 +- UVtools.InstallerMM/UVtools.InstallerMM.wxs | 685 +++++++++++------- UVtools.WPF/Controls/AdvancedImageBox.axaml | 2 + .../Tools/ToolArithmeticControl.axaml | 4 +- UVtools.WPF/MainWindow.axaml.cs | 10 +- UVtools.WPF/UVtools.WPF.csproj | 3 +- UVtools.WPF/Windows/BenchmarkWindow.axaml.cs | 12 +- UVtools.WPF/Windows/SettingsWindow.axaml | 561 +++++++------- UVtools.WPF/Windows/SettingsWindow.axaml.cs | 15 +- UVtools.WPF/Windows/ToolWindow.axaml | 8 +- UVtools.WPF/Windows/ToolWindow.axaml.cs | 32 +- 12 files changed, 797 insertions(+), 543 deletions(-) diff --git a/UVtools.Core/Operations/OperationArithmetic.cs b/UVtools.Core/Operations/OperationArithmetic.cs index 3a2a3ca..bb55b8a 100644 --- a/UVtools.Core/Operations/OperationArithmetic.cs +++ b/UVtools.Core/Operations/OperationArithmetic.cs @@ -47,7 +47,7 @@ namespace UVtools.Core.Operations "Perform arithmetic operations over the layers pixels.\n\n" + "Available operators:\n" + " + - * / = Add, Subtract, Multiply, Divide\n" + - " && | ^ = Bitwise AND, OR, XOR\n\n" + + " & | ^ = Bitwise AND, OR, XOR\n\n" + "Syntax: = \n" + "When: \" =\" is omitted, the result will assign to the first layer on the sentence.\n\n" + "Example 1: 10+11\n" + diff --git a/UVtools.Core/UVtools.Core.csproj b/UVtools.Core/UVtools.Core.csproj index 6e3f206..efecf73 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.6.0 + 1.0.0.0 Copyright © 2020 PTRTECH UVtools.png AnyCPU;x64 - 0.8.6.0 - 0.8.6.0 + 1.0.0.0 + 1.0.0.0 diff --git a/UVtools.InstallerMM/UVtools.InstallerMM.wxs b/UVtools.InstallerMM/UVtools.InstallerMM.wxs index 360f50e..29a9443 100644 --- a/UVtools.InstallerMM/UVtools.InstallerMM.wxs +++ b/UVtools.InstallerMM/UVtools.InstallerMM.wxs @@ -2,89 +2,155 @@ - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + - - + + - - + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - + + @@ -92,208 +158,341 @@ + + + + + + - - + + - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/UVtools.WPF/Controls/AdvancedImageBox.axaml b/UVtools.WPF/Controls/AdvancedImageBox.axaml index 3cdd4a5..3b2d361 100644 --- a/UVtools.WPF/Controls/AdvancedImageBox.axaml +++ b/UVtools.WPF/Controls/AdvancedImageBox.axaml @@ -20,6 +20,7 @@ Orientation="Vertical" ViewportSize="{Binding #ViewPort.Bounds.Height}" Minimum="0" + Maximum="0" Visibility="Auto" /> @@ -29,6 +30,7 @@ Orientation="Horizontal" ViewportSize="{Binding #ViewPort.Bounds.Width}" Minimum="0" + Maximum="0" Visibility="Auto" /> diff --git a/UVtools.WPF/Controls/Tools/ToolArithmeticControl.axaml b/UVtools.WPF/Controls/Tools/ToolArithmeticControl.axaml index d75d53c..d6797be 100644 --- a/UVtools.WPF/Controls/Tools/ToolArithmeticControl.axaml +++ b/UVtools.WPF/Controls/Tools/ToolArithmeticControl.axaml @@ -3,7 +3,9 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" - x:Class="UVtools.WPF.Controls.Tools.ToolArithmeticControl"> + x:Class="UVtools.WPF.Controls.Tools.ToolArithmeticControl" + Width="720" + > diff --git a/UVtools.WPF/MainWindow.axaml.cs b/UVtools.WPF/MainWindow.axaml.cs index 714671a..2610484 100644 --- a/UVtools.WPF/MainWindow.axaml.cs +++ b/UVtools.WPF/MainWindow.axaml.cs @@ -579,10 +579,18 @@ namespace UVtools.WPF public async void OpenFile(bool newWindow = false) { + var filters = Helpers.ToAvaloniaFileFilter(FileFormat.AllFileFiltersAvalonia); + var orderedFilters = new List {filters[Settings.General.DefaultOpenFileExtensionIndex]}; + for (int i = 0; i < filters.Count; i++) + { + if(i == Settings.General.DefaultOpenFileExtensionIndex) continue; + orderedFilters.Add(filters[i]); + } + var dialog = new OpenFileDialog { AllowMultiple = true, - Filters = Helpers.ToAvaloniaFileFilter(FileFormat.AllFileFiltersAvalonia), + Filters = orderedFilters, Directory = Settings.General.DefaultDirectoryOpenFile }; var files = await dialog.ShowAsync(this); diff --git a/UVtools.WPF/UVtools.WPF.csproj b/UVtools.WPF/UVtools.WPF.csproj index 2705e11..dd4bd78 100644 --- a/UVtools.WPF/UVtools.WPF.csproj +++ b/UVtools.WPF/UVtools.WPF.csproj @@ -13,7 +13,8 @@ https://github.com/sn4k3/UVtools Git enable - 0.99.0.0 + 1.0.0.0 + 1.0.0.0 true diff --git a/UVtools.WPF/Windows/BenchmarkWindow.axaml.cs b/UVtools.WPF/Windows/BenchmarkWindow.axaml.cs index 39528dd..1b8a499 100644 --- a/UVtools.WPF/Windows/BenchmarkWindow.axaml.cs +++ b/UVtools.WPF/Windows/BenchmarkWindow.axaml.cs @@ -41,12 +41,12 @@ namespace UVtools.WPF.Windows public static BenchmarkTest[] Tests => new[] { - new BenchmarkTest("4K Random CBBDLP Enconde", "Test4KRandomCBBDLPEncode", 40.30f, 246.30f), - new BenchmarkTest("8K Random CBBDLP Enconde", "Test8KRandomCBBDLPEncode", 9.70f, 64.10f), - new BenchmarkTest("4K Random CBT Enconde", "Test4KRandomCBTEncode", 13.50f, 113.30f), - new BenchmarkTest("8K Random CBT Enconde", "Test8KRandomCBTEncode", 3.40f, 28.20f), - new BenchmarkTest("4K Random PW0 Enconde", "Test4KRandomPW0Encode", 14.10f, 89.00f), - new BenchmarkTest("8K Random PW0 Enconde", "Test8KRandomPW0Encode", 3.50f, 22.40f), + new BenchmarkTest("4K Random CBBDLP Enconde", "Test4KRandomCBBDLPEncode", 57.14f, 401.61f), + new BenchmarkTest("8K Random CBBDLP Enconde", "Test8KRandomCBBDLPEncode", 12.03f, 99.80f), + new BenchmarkTest("4K Random CBT Enconde", "Test4KRandomCBTEncode", 19.05f, 124.38f), + new BenchmarkTest("8K Random CBT Enconde", "Test8KRandomCBTEncode", 4.03f, 35.64f), + new BenchmarkTest("4K Random PW0 Enconde", "Test4KRandomPW0Encode", 18.85f, 103.00f), + new BenchmarkTest("8K Random PW0 Enconde", "Test8KRandomPW0Encode", 4.07f, 26.65f), new BenchmarkTest(StressCPUTestName, "Test4KRandomCBTEncode", 0, 0), }; diff --git a/UVtools.WPF/Windows/SettingsWindow.axaml b/UVtools.WPF/Windows/SettingsWindow.axaml index 1f9a1ed..6aa1475 100644 --- a/UVtools.WPF/Windows/SettingsWindow.axaml +++ b/UVtools.WPF/Windows/SettingsWindow.axaml @@ -3,146 +3,149 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:cp="clr-namespace:ThemeEditor.Controls.ColorPicker;assembly=ThemeEditor.Controls.ColorPicker" - mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" + mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="450" x:Class="UVtools.WPF.Windows.SettingsWindow" WindowStartupLocation="CenterOwner" - SizeToContent="WidthAndHeight" - CanResize="false" - MinWidth="500" + MinWidth="600" + Width="700" + SizeToContent="Height" + CanResize="False" Title="UVtools - Settings" Icon="/Assets/Icons/UVtools.ico" > - + - - + + - - - - - + + + + + + + + - - + - - - - - - - - - + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + - - - - - - - + + + + + + + + + + - - - + + + @@ -865,197 +868,201 @@ - - + + + - - + + - - + + -