Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/sn4k3/UVtools.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Conceição <Tiago_caza@hotmail.com>2021-11-06 02:57:06 +0300
committerTiago Conceição <Tiago_caza@hotmail.com>2021-11-06 02:57:06 +0300
commit84b52104dfe390e29426d794679560408f34fdbe (patch)
tree5dbd7afa04e70cd4477de60d0e954047699779b6
parenta5d979ca00a5a5d957a6b32e10293b1eaf982b20 (diff)
v2.24.2v2.24.2
- **Export layers to mesh:** - (Add) Mesh format: 3MF - 3D Manufacturing Format - (Add) Mesh format: AMF - Additive Manufacturing Format - (Add) Mesh format: WRL - Virtual Reality Modeling Language - (Add) Mesh format: PLY - Polygon File Format / Stanford Triangle Format - (Add) Mesh format: OFF - Object File Format - (Add) File format (Binary or ASCII) option selection on the UI - (Improvement) ASCII file types strict use \n instead of \r\n - **Exposure time finder:** - (Add) Option to enable/disable bottom text on 'pattern model' mode - (Fix) Importing a profile with 'Pattern loaded model' enabled, will trigger an error and prevent the import - **About box:** - (Add) AvaloniaUI version information - (Add) Copy loaded assemblies to clipboard - (Downgrade) AvaloniaUI from 0.10.10 to 0.10.8 to fix macOS menus
-rw-r--r--CHANGELOG.md17
-rw-r--r--UVtools.AvaloniaControls/UVtools.AvaloniaControls.csproj2
-rw-r--r--UVtools.WPF/UVtools.WPF.csproj8
-rw-r--r--UVtools.WPF/Windows/AboutWindow.axaml20
-rw-r--r--UVtools.WPF/Windows/AboutWindow.axaml.cs14
5 files changed, 52 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95707aa..ab3c011 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
# Changelog
+## 05/11/2021 - v2.24.2
+
+- **Export layers to mesh:**
+ - (Add) Mesh format: 3MF - 3D Manufacturing Format
+ - (Add) Mesh format: AMF - Additive Manufacturing Format
+ - (Add) Mesh format: WRL - Virtual Reality Modeling Language
+ - (Add) Mesh format: PLY - Polygon File Format / Stanford Triangle Format
+ - (Add) Mesh format: OFF - Object File Format
+ - (Add) File format (Binary or ASCII) option selection on the UI
+ - (Improvement) ASCII file types strict use \n instead of \r\n
+- **Exposure time finder:**
+ - (Add) Option to enable/disable bottom text on 'pattern model' mode
+ - (Fix) Importing a profile with 'Pattern loaded model' enabled, will trigger an error and prevent the import
+- **About box:**
+ - (Add) AvaloniaUI version information
+ - (Add) Copy loaded assemblies to clipboard
+- (Downgrade) AvaloniaUI from 0.10.10 to 0.10.8 to fix macOS menus
## 03/11/2021 - v2.24.1
diff --git a/UVtools.AvaloniaControls/UVtools.AvaloniaControls.csproj b/UVtools.AvaloniaControls/UVtools.AvaloniaControls.csproj
index 3eabae2..e7ba28e 100644
--- a/UVtools.AvaloniaControls/UVtools.AvaloniaControls.csproj
+++ b/UVtools.AvaloniaControls/UVtools.AvaloniaControls.csproj
@@ -34,7 +34,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Avalonia" Version="0.10.10" />
+ <PackageReference Include="Avalonia" Version="0.10.8" />
</ItemGroup>
<ItemGroup>
diff --git a/UVtools.WPF/UVtools.WPF.csproj b/UVtools.WPF/UVtools.WPF.csproj
index 9e6acbc..84b1904 100644
--- a/UVtools.WPF/UVtools.WPF.csproj
+++ b/UVtools.WPF/UVtools.WPF.csproj
@@ -34,11 +34,11 @@
<NoWarn>1701;1702;</NoWarn>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Avalonia" Version="0.10.10" />
+ <PackageReference Include="Avalonia" Version="0.10.8" />
<PackageReference Include="Avalonia.Angle.Windows.Natives" Version="2.1.0.2020091801" />
- <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.10" />
- <PackageReference Include="Avalonia.Desktop" Version="0.10.10" />
- <PackageReference Include="Avalonia.Diagnostics" Version="0.10.10" />
+ <PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.8" />
+ <PackageReference Include="Avalonia.Desktop" Version="0.10.8" />
+ <PackageReference Include="Avalonia.Diagnostics" Version="0.10.8" />
<PackageReference Include="Emgu.CV.runtime.windows" Version="4.5.4.4788" />
<PackageReference Include="MessageBox.Avalonia" Version="1.5.5" />
<PackageReference Include="ThemeEditor.Controls.ColorPicker" Version="0.10.8" />
diff --git a/UVtools.WPF/Windows/AboutWindow.axaml b/UVtools.WPF/Windows/AboutWindow.axaml
index 654dae7..d9cc68b 100644
--- a/UVtools.WPF/Windows/AboutWindow.axaml
+++ b/UVtools.WPF/Windows/AboutWindow.axaml
@@ -44,11 +44,19 @@
UseFloatingWatermark="True"/>
<TextBox
+ Text="{Binding AvaloniaUIDescription}"
+ IsReadOnly="True"
+ BorderBrush="Transparent"
+ CaretBrush="Transparent"
+ Watermark="AvaloniaUI:"
+ UseFloatingWatermark="True"/>
+
+ <TextBox
Text="{Binding OpenCVDescription}"
IsReadOnly="True"
BorderBrush="Transparent"
CaretBrush="Transparent"
- Watermark="OpenCV Version:"
+ Watermark="OpenCV:"
UseFloatingWatermark="True"/>
<TextBox
@@ -71,7 +79,13 @@
Margin="0,20,0,0"
HorizontalAlignment="Stretch"
Content="Copy OpenCV build information to clipboard"
- Command="{Binding SetOpenCVInformationToClipboard}" />
+ Command="{Binding CopyOpenCVInformationToClipboard}" />
+
+ <Button
+ Margin="0,10,0,0"
+ HorizontalAlignment="Stretch"
+ Content="Copy loaded assemblies to clipboard"
+ Command="{Binding CopyLoadedAssembliesToClipboard}" />
</StackPanel>
</Border>
<Grid
@@ -93,7 +107,7 @@
<TextBox Grid.Row="10"
IsReadOnly="True"
- MaxHeight="550"
+ MaxHeight="560"
Text="{Binding Description}"/>
</Grid>
</StackPanel>
diff --git a/UVtools.WPF/Windows/AboutWindow.axaml.cs b/UVtools.WPF/Windows/AboutWindow.axaml.cs
index 51cbcf1..7bdfd99 100644
--- a/UVtools.WPF/Windows/AboutWindow.axaml.cs
+++ b/UVtools.WPF/Windows/AboutWindow.axaml.cs
@@ -24,6 +24,7 @@ namespace UVtools.WPF.Windows
public string RuntimeDescription => RuntimeInformation.RuntimeIdentifier;
public string FrameworkDescription => RuntimeInformation.FrameworkDescription;
+ public string AvaloniaUIDescription => typeof(AvaloniaObject).Assembly.GetName().Version.ToString(3);
public string OpenCVDescription
{
@@ -71,11 +72,22 @@ namespace UVtools.WPF.Windows
AvaloniaXamlLoader.Load(this);
}
- public void SetOpenCVInformationToClipboard()
+ public void CopyOpenCVInformationToClipboard()
{
Application.Current.Clipboard.SetTextAsync(CvInvoke.BuildInformation);
}
+ public void CopyLoadedAssembliesToClipboard()
+ {
+ var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies();
+ var sb = new StringBuilder();
+ foreach (var assembly in loadedAssemblies)
+ {
+ sb.AppendLine(assembly.FullName);
+ }
+ Application.Current.Clipboard.SetTextAsync(sb.ToString());
+ }
+
public void OpenLicense() => App.OpenBrowser(About.LicenseUrl);
}
}