maker/UVtools
1
0
Fork 0
mirror of https://github.com/riegera2412/UVtools.git synced 2026-07-09 01:52:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

v1.3.3

Browse Source 
* (Add) Improved island detection: Combines the island and overhang detections for a better more realistic detection and to discard false-positives. (Slower)
   If enabled, and when a island is found, it will check for overhangs on that same island, if no overhang found then the island will be discarded and considered safe, otherwise it will flag as an island issue.
   Note: Overhangs settings will be used to configure the detection. Enabling Overhangs is not required for this procedure to work.
   Enabled by default,
* (Add) More information on the About box: Operative system and architecture, framework, processor count and screens
* (Fix) Overhangs: Include islands when detecting overhangs were not skip when found a island
* (Fix) Decode CWS from Wanhao Workshop fails on number of slices (#102)
This commit is contained in:
Tiago Conceição
2020-11-25 00:52:12 +00:00
parent a4bdf8f9f3
commit 00179581dd
15 changed files with 1787 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+10
View File
@@ -1,5 +1,15 @@
# Changelog
## 25/11/2020 - v1.3.3
* (Add) Improved island detection: Combines the island and overhang detections for a better more realistic detection and to discard false-positives. (Slower)
If enabled, and when a island is found, it will check for overhangs on that same island, if no overhang found then the island will be discarded and considered safe, otherwise it will flag as an island issue.
Note: Overhangs settings will be used to configure the detection. Enabling Overhangs is not required for this procedure to work.
Enabled by default,
* (Add) More information on the About box: Operative system and architecture, framework, processor count and screens
* (Fix) Overhangs: Include islands when detecting overhangs were not skip when found a island
* (Fix) Decode CWS from Wanhao Workshop fails on number of slices (#102)
## 19/11/2020 - v1.3.2
* (Add) Tools: Warn where layer preview is critical for use the tool, must disable layer rotation first (#100)
CREDITS.md
+2
View File
@@ -38,3 +38,5 @@
* illest twitch
* Khalil Nurullah
* Nahin Mulla
* Jorge diego Robles Ayerbe
* Timothy Gray
UVtools.CAD/UVtools_fb_cover.ai
+1474
View File
File diff suppressed because one or more lines are too long
UVtools.CAD/UVtools_fb_cover.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 36 KiB

UVtools.Core/FileFormats/CWSFile.cs
+27 -2
View File
@@ -9,6 +9,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.IO.Compression;
@@ -662,6 +663,23 @@ namespace UVtools.Core.FileFormats
{
//DecodeXML(fileFullPath, inputFile, progress);
Printer = PrinterType.Wanhao;
try
{
var serializer = new XmlSerializer(typeof(CWSManifest));
using (var stream = entry.Open())
{
var manifest = (CWSManifest)serializer.Deserialize(stream);
OutputSettings.LayersNum = (uint) manifest.Slices.Length;
}
}
catch (Exception e)
{
Clear();
throw new FileLoadException($"Unable to deserialize '{entry.Name}'\n{e}", fileFullPath);
}
entry = inputFile.Entries.FirstOrDefault(e => e.Name.EndsWith(".slicing"));
if (!(entry is null))
@@ -746,14 +764,21 @@ namespace UVtools.Core.FileFormats
var displayNameAttribute = propertyInfo.GetCustomAttributes(false).OfType<DisplayNameAttribute>().FirstOrDefault();
if (ReferenceEquals(displayNameAttribute, null)) continue;
if (!splitLine[0].Trim(' ', ';', '(').Equals(displayNameAttribute.DisplayName)) continue;
Helpers.SetPropertyValue(propertyInfo, OutputSettings, splitLine[1].Trim(' ', ')', 'p', 'x', 'm', 'n', 's', '/'));
try
{
Helpers.SetPropertyValue(propertyInfo, OutputSettings, splitLine[1].Trim(' ', ')', 'p', 'x', 'm', 'n', 's', '/'));
}
catch
{
// ignored
}
//Debug.WriteLine(splitLine[1].Trim(' ', ')', 'm', 'n', '/'));
}
}
tr.Close();
}
LayerManager = new LayerManager(OutputSettings.LayersNum, this);
progress.ItemCount = OutputSettings.LayersNum;
UVtools.Core/Layer/LayerIssue.cs
+15 -8
View File
@@ -47,6 +47,21 @@ namespace UVtools.Core
/// </summary>
public List<uint> WhiteListLayers { get; set; } = null;
/// <summary>
/// Combines the island and overhang detections for a better more realistic detection and to discard false-positives. (Slower)
/// If enabled, and when a island is found, it will check for overhangs on that same island, if no overhang found then the island will be discarded and considered safe, otherwise it will flag as an island issue.
/// Note: Overhangs settings will be used to configure the detection.Enabling Overhangs is not required for this procedure to work.
/// </summary>
public bool EnhancedDetection { get; set; } = true;
/// <summary>
/// Gets the setting for whether or not diagonal bonds are considered when evaluation islands.
/// If true, all 8 neighbors of a pixel (including diagonals) will be considered when finding
/// individual components on the layer, if false only 4 neighbors (right, left, above, below)
/// will be considered..
/// </summary>
public bool AllowDiagonalBonds { get; set; } = false;
/// <summary>
/// Gets or sets the binary threshold, all pixels below this value will turn in black, otherwise white
/// Set to 0 to disable this operation
@@ -78,14 +93,6 @@ namespace UVtools.Core
/// </summary>
public byte RequiredPixelBrightnessToSupport { get; set; } = 150;
/// <summary>
/// Gets the setting for whether or not diagonal bonds are considered when evaluation islands.
/// If true, all 8 neighbors of a pixel (including diagonals) will be considered when finding
/// individual components on the layer, if false only 4 neighbors (right, left, above, below)
/// will be considered..
/// </summary>
public bool AllowDiagonalBonds { get; set; } = false;
public IslandDetectionConfiguration(bool enabled = true)
{
Enabled = enabled;
UVtools.Core/Layer/LayerManager.cs
+17 -5
View File
@@ -1056,16 +1056,21 @@ namespace UVtools.Core
pixelsSupportingIsland >= Math.Max(1, points.Count / 2))
isIsland = false; // Not a island, but maybe weak bounding...*/
LayerIssue island = null;
if (pixelsSupportingIsland < requiredSupportingPixels)
{
AddIssue(new LayerIssue(layer, LayerIssue.IssueType.Island,
island = new LayerIssue(layer, LayerIssue.IssueType.Island,
points.ToArray(),
rect));
rect);
/*AddIssue(new LayerIssue(layer, LayerIssue.IssueType.Island,
points.ToArray(),
rect));*/
}
// Check for overhangs
if (overhangConfig.Enabled && !overhangConfig.IndependentFromIslands)
if (overhangConfig.Enabled && !overhangConfig.IndependentFromIslands && island is null
|| !ReferenceEquals(island, null) && islandConfig.EnhancedDetection && pixelsSupportingIsland >= 10
)
{
points.Clear();
using (var imageRoi = new Mat(image, rect))
@@ -1095,14 +1100,21 @@ namespace UVtools.Core
points.Add(new Point(labelX, labelY));
}
if (points.Count >= overhangConfig.RequiredPixelsToConsider)
if (points.Count >= overhangConfig.RequiredPixelsToConsider) // Overhang
{
AddIssue(new LayerIssue(
layer, LayerIssue.IssueType.Overhang, points.ToArray(), rect
));
}
else if(islandConfig.EnhancedDetection) // No overhang
{
island = null;
}
}
}
if(!ReferenceEquals(island, null))
AddIssue(island);
}
UVtools.Core/UVtools.Core.csproj
+1 -1
View File
@@ -10,7 +10,7 @@
<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.3.2</Version>
<Version>1.3.3</Version>
<Copyright>Copyright © 2020 PTRTECH</Copyright>
<PackageIcon>UVtools.png</PackageIcon>
<Platforms>AnyCPU;x64</Platforms>
UVtools.WPF/MainWindow.Issues.cs
+1
View File
@@ -523,6 +523,7 @@ namespace UVtools.WPF
return new IslandDetectionConfiguration
{
Enabled = Settings.Issues.ComputeIslands,
EnhancedDetection = Settings.Issues.IslandEnhancedDetection,
AllowDiagonalBonds = Settings.Issues.IslandAllowDiagonalBonds,
BinaryThreshold = Settings.Issues.IslandBinaryThreshold,
RequiredAreaToProcessCheck = Settings.Issues.IslandRequiredAreaToProcessCheck,
UVtools.WPF/MainWindow.axaml
+20 -17
View File
@@ -138,6 +138,15 @@
<MenuItem Header="_Help">
<MenuItem
Header="_About"
InputGesture="F1" HotKey="F1"
Command="{Binding MenuHelpAboutClicked}">
<MenuItem.Icon>
<Image Source="\Assets\Icons\button-info-16x16.png"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem
Header="_Website"
InputGesture="Ctrl + F1" HotKey="Ctrl + F1"
@@ -156,14 +165,7 @@
</MenuItem.Icon>
</MenuItem>
<MenuItem
Header="_About"
InputGesture="F1" HotKey="F1"
Command="{Binding MenuHelpAboutClicked}">
<MenuItem.Icon>
<Image Source="\Assets\Icons\button-info-16x16.png"/>
</MenuItem.Icon>
</MenuItem>
<Separator/>
<MenuItem
Header="_Benchmark"
@@ -173,14 +175,6 @@
</MenuItem.Icon>
</MenuItem>
<MenuItem
Header="_Open settings folder"
Command="{Binding MenuHelpOpenSettingsFolderClicked}">
<MenuItem.Icon>
<Image Source="\Assets\Icons\open-16x16.png"/>
</MenuItem.Icon>
</MenuItem>
<Separator/>
<MenuItem
@@ -189,7 +183,16 @@
<MenuItem.Icon>
<Image Source="\Assets\Icons\CNCMachine-16x16.png"/>
</MenuItem.Icon>
</MenuItem>
</MenuItem>
<MenuItem
Header="_Open settings folder"
Command="{Binding MenuHelpOpenSettingsFolderClicked}">
<MenuItem.Icon>
<Image Source="\Assets\Icons\open-16x16.png"/>
</MenuItem.Icon>
</MenuItem>
</MenuItem>
<MenuItem
UVtools.WPF/UVtools.WPF.csproj
+1 -1
View File
@@ -12,7 +12,7 @@
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<RepositoryUrl>https://github.com/sn4k3/UVtools</RepositoryUrl>
<RepositoryType>Git</RepositoryType>
<Version>1.3.2</Version>
<Version>1.3.3</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
UVtools.WPF/UserSettings.cs
+118 -111
View File
@@ -48,67 +48,67 @@ namespace UVtools.WPF
public bool StartMaximized
{
get => _startMaximized;
set => this.RaiseAndSetIfChanged(ref _startMaximized, value);
set => RaiseAndSetIfChanged(ref _startMaximized, value);
}
public bool CheckForUpdatesOnStartup
{
get => _checkForUpdatesOnStartup;
set => this.RaiseAndSetIfChanged(ref _checkForUpdatesOnStartup, value);
set => RaiseAndSetIfChanged(ref _checkForUpdatesOnStartup, value);
}
public bool LoadDemoFileOnStartup
{
get => _loadDemoFileOnStartup;
set => this.RaiseAndSetIfChanged(ref _loadDemoFileOnStartup, value);
set => RaiseAndSetIfChanged(ref _loadDemoFileOnStartup, value);
}
public byte DefaultOpenFileExtensionIndex
{
get => _defaultOpenFileExtensionIndex;
set => this.RaiseAndSetIfChanged(ref _defaultOpenFileExtensionIndex, value);
set => RaiseAndSetIfChanged(ref _defaultOpenFileExtensionIndex, value);
}
public string DefaultDirectoryOpenFile
{
get => _defaultDirectoryOpenFile;
set => this.RaiseAndSetIfChanged(ref _defaultDirectoryOpenFile, value);
set => RaiseAndSetIfChanged(ref _defaultDirectoryOpenFile, value);
}
public string DefaultDirectorySaveFile
{
get => _defaultDirectorySaveFile;
set => this.RaiseAndSetIfChanged(ref _defaultDirectorySaveFile, value);
set => RaiseAndSetIfChanged(ref _defaultDirectorySaveFile, value);
}
public string DefaultDirectoryExtractFile
{
get => _defaultDirectoryExtractFile;
set => this.RaiseAndSetIfChanged(ref _defaultDirectoryExtractFile, value);
set => RaiseAndSetIfChanged(ref _defaultDirectoryExtractFile, value);
}
public string DefaultDirectoryConvertFile
{
get => _defaultDirectoryConvertFile;
set => this.RaiseAndSetIfChanged(ref _defaultDirectoryConvertFile, value);
set => RaiseAndSetIfChanged(ref _defaultDirectoryConvertFile, value);
}
public bool PromptOverwriteFileSave
{
get => _promptOverwriteFileSave;
set => this.RaiseAndSetIfChanged(ref _promptOverwriteFileSave, value);
set => RaiseAndSetIfChanged(ref _promptOverwriteFileSave, value);
}
public string FileSaveNamePrefix
{
get => _fileSaveNamePrefix;
set => this.RaiseAndSetIfChanged(ref _fileSaveNamePrefix, value);
set => RaiseAndSetIfChanged(ref _fileSaveNamePrefix, value);
}
public string FileSaveNameSuffix
{
get => _fileSaveNameSuffix;
set => this.RaiseAndSetIfChanged(ref _fileSaveNameSuffix, value);
set => RaiseAndSetIfChanged(ref _fileSaveNameSuffix, value);
}
/// <summary>
@@ -117,7 +117,7 @@ namespace UVtools.WPF
public int MaxDegreeOfParallelism
{
get => _maxDegreeOfParallelism;
set => this.RaiseAndSetIfChanged(ref _maxDegreeOfParallelism, value);
set => RaiseAndSetIfChanged(ref _maxDegreeOfParallelism, value);
}
public GeneralUserSettings()
@@ -175,8 +175,8 @@ namespace UVtools.WPF
get => _tooltipOverlayBackgroundColor;
set
{
this.RaiseAndSetIfChanged(ref _tooltipOverlayBackgroundColor, value);
this.RaisePropertyChanged(nameof(TooltipOverlayBackgroundBrush));
RaiseAndSetIfChanged(ref _tooltipOverlayBackgroundColor, value);
RaisePropertyChanged(nameof(TooltipOverlayBackgroundBrush));
}
}
@@ -190,7 +190,7 @@ namespace UVtools.WPF
public bool TooltipOverlay
{
get => _tooltipOverlay;
set => this.RaiseAndSetIfChanged(ref _tooltipOverlay, value);
set => RaiseAndSetIfChanged(ref _tooltipOverlay, value);
}
public Color VolumeBoundsOutlineColor
@@ -198,8 +198,8 @@ namespace UVtools.WPF
get => _volumeBoundsOutlineColor;
set
{
this.RaiseAndSetIfChanged(ref _volumeBoundsOutlineColor, value);
this.RaisePropertyChanged(nameof(VolumeBoundsOutlineBrush));
RaiseAndSetIfChanged(ref _volumeBoundsOutlineColor, value);
RaisePropertyChanged(nameof(VolumeBoundsOutlineBrush));
}
}
@@ -213,13 +213,13 @@ namespace UVtools.WPF
public byte VolumeBoundsOutlineThickness
{
get => _volumeBoundsOutlineThickness;
set => this.RaiseAndSetIfChanged(ref _volumeBoundsOutlineThickness, value);
set => RaiseAndSetIfChanged(ref _volumeBoundsOutlineThickness, value);
}
public bool VolumeBoundsOutline
{
get => _volumeBoundsOutline;
set => this.RaiseAndSetIfChanged(ref _volumeBoundsOutline, value);
set => RaiseAndSetIfChanged(ref _volumeBoundsOutline, value);
}
public Color LayerBoundsOutlineColor
@@ -227,8 +227,8 @@ namespace UVtools.WPF
get => _layerBoundsOutlineColor;
set
{
this.RaiseAndSetIfChanged(ref _layerBoundsOutlineColor, value);
this.RaisePropertyChanged(nameof(LayerBoundsOutlineBrush));
RaiseAndSetIfChanged(ref _layerBoundsOutlineColor, value);
RaisePropertyChanged(nameof(LayerBoundsOutlineBrush));
}
}
@@ -242,13 +242,13 @@ namespace UVtools.WPF
public byte LayerBoundsOutlineThickness
{
get => _layerBoundsOutlineThickness;
set => this.RaiseAndSetIfChanged(ref _layerBoundsOutlineThickness, value);
set => RaiseAndSetIfChanged(ref _layerBoundsOutlineThickness, value);
}
public bool LayerBoundsOutline
{
get => _layerBoundsOutline;
set => this.RaiseAndSetIfChanged(ref _layerBoundsOutline, value);
set => RaiseAndSetIfChanged(ref _layerBoundsOutline, value);
}
public Color HollowOutlineColor
@@ -256,8 +256,8 @@ namespace UVtools.WPF
get => _hollowOutlineColor;
set
{
this.RaiseAndSetIfChanged(ref _hollowOutlineColor, value);
this.RaisePropertyChanged(nameof(HollowOutlineBrush));
RaiseAndSetIfChanged(ref _hollowOutlineColor, value);
RaisePropertyChanged(nameof(HollowOutlineBrush));
}
}
@@ -271,13 +271,13 @@ namespace UVtools.WPF
public byte HollowOutlineLineThickness
{
get => _hollowOutlineLineThickness;
set => this.RaiseAndSetIfChanged(ref _hollowOutlineLineThickness, value);
set => RaiseAndSetIfChanged(ref _hollowOutlineLineThickness, value);
}
public bool HollowOutline
{
get => _hollowOutline;
set => this.RaiseAndSetIfChanged(ref _hollowOutline, value);
set => RaiseAndSetIfChanged(ref _hollowOutline, value);
}
public Color PreviousLayerDifferenceColor
@@ -285,8 +285,8 @@ namespace UVtools.WPF
get => _previousLayerDifferenceColor;
set
{
this.RaiseAndSetIfChanged(ref _previousLayerDifferenceColor, value);
this.RaisePropertyChanged(nameof(PreviousLayerDifferenceBrush));
RaiseAndSetIfChanged(ref _previousLayerDifferenceColor, value);
RaisePropertyChanged(nameof(PreviousLayerDifferenceBrush));
}
}
@@ -302,8 +302,8 @@ namespace UVtools.WPF
get => _nextLayerDifferenceColor;
set
{
this.RaiseAndSetIfChanged(ref _nextLayerDifferenceColor, value);
this.RaisePropertyChanged(nameof(NextLayerDifferenceBrush));
RaiseAndSetIfChanged(ref _nextLayerDifferenceColor, value);
RaisePropertyChanged(nameof(NextLayerDifferenceBrush));
}
}
@@ -319,8 +319,8 @@ namespace UVtools.WPF
get => _bothLayerDifferenceColor;
set
{
this.RaiseAndSetIfChanged(ref _bothLayerDifferenceColor, value);
this.RaisePropertyChanged(nameof(BothLayerDifferenceBrush));
RaiseAndSetIfChanged(ref _bothLayerDifferenceColor, value);
RaisePropertyChanged(nameof(BothLayerDifferenceBrush));
}
}
@@ -334,7 +334,7 @@ namespace UVtools.WPF
public bool ShowLayerDifference
{
get => _showLayerDifference;
set => this.RaiseAndSetIfChanged(ref _showLayerDifference, value);
set => RaiseAndSetIfChanged(ref _showLayerDifference, value);
}
public Color IslandColor
@@ -342,8 +342,8 @@ namespace UVtools.WPF
get => _islandColor;
set
{
this.RaiseAndSetIfChanged(ref _islandColor, value);
this.RaisePropertyChanged(nameof(IslandBrush));
RaiseAndSetIfChanged(ref _islandColor, value);
RaisePropertyChanged(nameof(IslandBrush));
}
}
@@ -359,8 +359,8 @@ namespace UVtools.WPF
get => _islandHighlightColor;
set
{
this.RaiseAndSetIfChanged(ref _islandHighlightColor, value);
this.RaisePropertyChanged(nameof(IslandHighlightBrush));
RaiseAndSetIfChanged(ref _islandHighlightColor, value);
RaisePropertyChanged(nameof(IslandHighlightBrush));
}
}
@@ -376,8 +376,8 @@ namespace UVtools.WPF
get => _overhangColor;
set
{
this.RaiseAndSetIfChanged(ref _overhangColor, value);
this.RaisePropertyChanged(nameof(OverhangBrush));
RaiseAndSetIfChanged(ref _overhangColor, value);
RaisePropertyChanged(nameof(OverhangBrush));
}
}
@@ -393,8 +393,8 @@ namespace UVtools.WPF
get => _overhangHighlightColor;
set
{
this.RaiseAndSetIfChanged(ref _overhangHighlightColor, value);
this.RaisePropertyChanged(nameof(OverhangHighlightBrush));
RaiseAndSetIfChanged(ref _overhangHighlightColor, value);
RaisePropertyChanged(nameof(OverhangHighlightBrush));
}
}
@@ -410,8 +410,8 @@ namespace UVtools.WPF
get => _resinTrapColor;
set
{
this.RaiseAndSetIfChanged(ref _resinTrapColor, value);
this.RaisePropertyChanged(nameof(ResinTrapBrush));
RaiseAndSetIfChanged(ref _resinTrapColor, value);
RaisePropertyChanged(nameof(ResinTrapBrush));
}
}
@@ -427,8 +427,8 @@ namespace UVtools.WPF
get => _resinTrapHighlightColor;
set
{
this.RaiseAndSetIfChanged(ref _resinTrapHighlightColor, value);
this.RaisePropertyChanged(nameof(ResinTrapHighlightBrush));
RaiseAndSetIfChanged(ref _resinTrapHighlightColor, value);
RaisePropertyChanged(nameof(ResinTrapHighlightBrush));
}
}
@@ -443,8 +443,8 @@ namespace UVtools.WPF
get => _touchingBoundsColor;
set
{
this.RaiseAndSetIfChanged(ref _touchingBoundsColor, value);
this.RaisePropertyChanged(nameof(TouchingBoundsBrush));
RaiseAndSetIfChanged(ref _touchingBoundsColor, value);
RaisePropertyChanged(nameof(TouchingBoundsBrush));
}
}
@@ -460,8 +460,8 @@ namespace UVtools.WPF
get => _crosshairColor;
set
{
this.RaiseAndSetIfChanged(ref _crosshairColor, value);
this.RaisePropertyChanged(nameof(CrosshairBrush));
RaiseAndSetIfChanged(ref _crosshairColor, value);
RaisePropertyChanged(nameof(CrosshairBrush));
}
}
@@ -475,61 +475,61 @@ namespace UVtools.WPF
public bool ZoomToFitPrintVolumeBounds
{
get => _zoomToFitPrintVolumeBounds;
set => this.RaiseAndSetIfChanged(ref _zoomToFitPrintVolumeBounds, value);
set => RaiseAndSetIfChanged(ref _zoomToFitPrintVolumeBounds, value);
}
public byte ZoomLockLevelIndex
{
get => _zoomLockLevelIndex;
set => this.RaiseAndSetIfChanged(ref _zoomLockLevelIndex, value);
set => RaiseAndSetIfChanged(ref _zoomLockLevelIndex, value);
}
public bool ZoomIssues
{
get => _zoomIssues;
set => this.RaiseAndSetIfChanged(ref _zoomIssues, value);
set => RaiseAndSetIfChanged(ref _zoomIssues, value);
}
public bool CrosshairShowOnlyOnSelectedIssues
{
get => _crosshairShowOnlyOnSelectedIssues;
set => this.RaiseAndSetIfChanged(ref _crosshairShowOnlyOnSelectedIssues, value);
set => RaiseAndSetIfChanged(ref _crosshairShowOnlyOnSelectedIssues, value);
}
public byte CrosshairFadeLevelIndex
{
get => _crosshairFadeLevelIndex;
set => this.RaiseAndSetIfChanged(ref _crosshairFadeLevelIndex, value);
set => RaiseAndSetIfChanged(ref _crosshairFadeLevelIndex, value);
}
public uint CrosshairLength
{
get => _crosshairLength;
set => this.RaiseAndSetIfChanged(ref _crosshairLength, value);
set => RaiseAndSetIfChanged(ref _crosshairLength, value);
}
public byte CrosshairMargin
{
get => _crosshairMargin;
set => this.RaiseAndSetIfChanged(ref _crosshairMargin, value);
set => RaiseAndSetIfChanged(ref _crosshairMargin, value);
}
public bool AutoRotateLayerBestView
{
get => _autoRotateLayerBestView;
set => this.RaiseAndSetIfChanged(ref _autoRotateLayerBestView, value);
set => RaiseAndSetIfChanged(ref _autoRotateLayerBestView, value);
}
public bool LayerZoomToFitOnLoad
{
get => _layerZoomToFitOnLoad;
set => this.RaiseAndSetIfChanged(ref _layerZoomToFitOnLoad, value);
set => RaiseAndSetIfChanged(ref _layerZoomToFitOnLoad, value);
}
public bool ShowBackgroudGrid
{
get => _showBackgroudGrid;
set => this.RaiseAndSetIfChanged(ref _showBackgroudGrid, value);
set => RaiseAndSetIfChanged(ref _showBackgroudGrid, value);
}
public LayerPreviewUserSettings Clone()
@@ -551,6 +551,7 @@ namespace UVtools.WPF
private bool _computeResinTraps = true;
private bool _computeTouchingBounds = true;
private bool _computeEmptyLayers = true;
private bool _islandEnhancedDetection = true;
private bool _islandAllowDiagonalBonds = false;
private byte _islandBinaryThreshold = 0;
private byte _islandRequiredAreaToProcessCheck = 1;
@@ -574,121 +575,127 @@ namespace UVtools.WPF
public bool ComputeIssuesOnLoad
{
get => _computeIssuesOnLoad;
set => this.RaiseAndSetIfChanged(ref _computeIssuesOnLoad, value);
set => RaiseAndSetIfChanged(ref _computeIssuesOnLoad, value);
}
public bool ComputeIssuesOnClickTab
{
get => _computeIssuesOnClickTab;
set => this.RaiseAndSetIfChanged(ref _computeIssuesOnClickTab, value);
set => RaiseAndSetIfChanged(ref _computeIssuesOnClickTab, value);
}
public bool ComputeIslands
{
get => _computeIslands;
set => this.RaiseAndSetIfChanged(ref _computeIslands, value);
set => RaiseAndSetIfChanged(ref _computeIslands, value);
}
public bool ComputeOverhangs
{
get => _computeOverhangs;
set => this.RaiseAndSetIfChanged(ref _computeOverhangs, value);
set => RaiseAndSetIfChanged(ref _computeOverhangs, value);
}
public bool ComputeResinTraps
{
get => _computeResinTraps;
set => this.RaiseAndSetIfChanged(ref _computeResinTraps, value);
set => RaiseAndSetIfChanged(ref _computeResinTraps, value);
}
public bool ComputeTouchingBounds
{
get => _computeTouchingBounds;
set => this.RaiseAndSetIfChanged(ref _computeTouchingBounds, value);
set => RaiseAndSetIfChanged(ref _computeTouchingBounds, value);
}
public bool ComputeEmptyLayers
{
get => _computeEmptyLayers;
set => this.RaiseAndSetIfChanged(ref _computeEmptyLayers, value);
set => RaiseAndSetIfChanged(ref _computeEmptyLayers, value);
}
public bool IslandEnhancedDetection
{
get => _islandEnhancedDetection;
set => RaiseAndSetIfChanged(ref _islandEnhancedDetection, value);
}
public bool IslandAllowDiagonalBonds
{
get => _islandAllowDiagonalBonds;
set => this.RaiseAndSetIfChanged(ref _islandAllowDiagonalBonds, value);
set => RaiseAndSetIfChanged(ref _islandAllowDiagonalBonds, value);
}
public byte IslandBinaryThreshold
{
get => _islandBinaryThreshold;
set => this.RaiseAndSetIfChanged(ref _islandBinaryThreshold, value);
set => RaiseAndSetIfChanged(ref _islandBinaryThreshold, value);
}
public byte IslandRequiredAreaToProcessCheck
{
get => _islandRequiredAreaToProcessCheck;
set => this.RaiseAndSetIfChanged(ref _islandRequiredAreaToProcessCheck, value);
set => RaiseAndSetIfChanged(ref _islandRequiredAreaToProcessCheck, value);
}
public decimal IslandRequiredPixelsToSupportMultiplier
{
get => _islandRequiredPixelsToSupportMultiplier;
set => this.RaiseAndSetIfChanged(ref _islandRequiredPixelsToSupportMultiplier, value);
set => RaiseAndSetIfChanged(ref _islandRequiredPixelsToSupportMultiplier, value);
}
public byte IslandRequiredPixelsToSupport
{
get => _islandRequiredPixelsToSupport;
set => this.RaiseAndSetIfChanged(ref _islandRequiredPixelsToSupport, value);
set => RaiseAndSetIfChanged(ref _islandRequiredPixelsToSupport, value);
}
public byte IslandRequiredPixelBrightnessToProcessCheck
{
get => _islandRequiredPixelBrightnessToProcessCheck;
set => this.RaiseAndSetIfChanged(ref _islandRequiredPixelBrightnessToProcessCheck, value);
set => RaiseAndSetIfChanged(ref _islandRequiredPixelBrightnessToProcessCheck, value);
}
public byte IslandRequiredPixelBrightnessToSupport
{
get => _islandRequiredPixelBrightnessToSupport;
set => this.RaiseAndSetIfChanged(ref _islandRequiredPixelBrightnessToSupport, value);
set => RaiseAndSetIfChanged(ref _islandRequiredPixelBrightnessToSupport, value);
}
public bool OverhangIndependentFromIslands
{
get => _overhangIndependentFromIslands;
set => this.RaiseAndSetIfChanged(ref _overhangIndependentFromIslands, value);
set => RaiseAndSetIfChanged(ref _overhangIndependentFromIslands, value);
}
public byte OverhangErodeIterations
{
get => _overhangErodeIterations;
set => this.RaiseAndSetIfChanged(ref _overhangErodeIterations, value);
set => RaiseAndSetIfChanged(ref _overhangErodeIterations, value);
}
public byte ResinTrapBinaryThreshold
{
get => _resinTrapBinaryThreshold;
set => this.RaiseAndSetIfChanged(ref _resinTrapBinaryThreshold, value);
set => RaiseAndSetIfChanged(ref _resinTrapBinaryThreshold, value);
}
public byte ResinTrapRequiredAreaToProcessCheck
{
get => _resinTrapRequiredAreaToProcessCheck;
set => this.RaiseAndSetIfChanged(ref _resinTrapRequiredAreaToProcessCheck, value);
set => RaiseAndSetIfChanged(ref _resinTrapRequiredAreaToProcessCheck, value);
}
public byte ResinTrapRequiredBlackPixelsToDrain
{
get => _resinTrapRequiredBlackPixelsToDrain;
set => this.RaiseAndSetIfChanged(ref _resinTrapRequiredBlackPixelsToDrain, value);
set => RaiseAndSetIfChanged(ref _resinTrapRequiredBlackPixelsToDrain, value);
}
public byte ResinTrapMaximumPixelBrightnessToDrain
{
get => _resinTrapMaximumPixelBrightnessToDrain;
set => this.RaiseAndSetIfChanged(ref _resinTrapMaximumPixelBrightnessToDrain, value);
set => RaiseAndSetIfChanged(ref _resinTrapMaximumPixelBrightnessToDrain, value);
}
public byte TouchingBoundMinimumPixelBrightness
@@ -784,8 +791,8 @@ namespace UVtools.WPF
get => _addPixelColor;
set
{
this.RaiseAndSetIfChanged(ref _addPixelColor, value);
this.RaisePropertyChanged(nameof(AddPixelBrush));
RaiseAndSetIfChanged(ref _addPixelColor, value);
RaisePropertyChanged(nameof(AddPixelBrush));
}
}
@@ -801,8 +808,8 @@ namespace UVtools.WPF
get => _addPixelHighlightColor;
set
{
this.RaiseAndSetIfChanged(ref _addPixelHighlightColor, value);
this.RaisePropertyChanged(nameof(AddPixelHighlightBrush));
RaiseAndSetIfChanged(ref _addPixelHighlightColor, value);
RaisePropertyChanged(nameof(AddPixelHighlightBrush));
}
}
@@ -818,8 +825,8 @@ namespace UVtools.WPF
get => _removePixelColor;
set
{
this.RaiseAndSetIfChanged(ref _removePixelColor, value);
this.RaisePropertyChanged(nameof(RemovePixelBrush));
RaiseAndSetIfChanged(ref _removePixelColor, value);
RaisePropertyChanged(nameof(RemovePixelBrush));
}
}
@@ -835,8 +842,8 @@ namespace UVtools.WPF
get => _removePixelHighlightColor;
set
{
this.RaiseAndSetIfChanged(ref _removePixelHighlightColor, value);
this.RaisePropertyChanged(nameof(RemovePixelHighlightBrush));
RaiseAndSetIfChanged(ref _removePixelHighlightColor, value);
RaisePropertyChanged(nameof(RemovePixelHighlightBrush));
}
}
@@ -852,8 +859,8 @@ namespace UVtools.WPF
get => _supportsColor;
set
{
this.RaiseAndSetIfChanged(ref _supportsColor, value);
this.RaisePropertyChanged(nameof(SupportsBrush));
RaiseAndSetIfChanged(ref _supportsColor, value);
RaisePropertyChanged(nameof(SupportsBrush));
}
}
@@ -869,8 +876,8 @@ namespace UVtools.WPF
get => _supportsHighlightColor;
set
{
this.RaiseAndSetIfChanged(ref _supportsHighlightColor, value);
this.RaisePropertyChanged(nameof(SupportsHighlightBrush));
RaiseAndSetIfChanged(ref _supportsHighlightColor, value);
RaisePropertyChanged(nameof(SupportsHighlightBrush));
}
}
@@ -886,8 +893,8 @@ namespace UVtools.WPF
get => _drainHoleColor;
set
{
this.RaiseAndSetIfChanged(ref _drainHoleColor, value);
this.RaisePropertyChanged(nameof(DrainHoleBrush));
RaiseAndSetIfChanged(ref _drainHoleColor, value);
RaisePropertyChanged(nameof(DrainHoleBrush));
}
}
@@ -903,8 +910,8 @@ namespace UVtools.WPF
get => _drainHoleHighlightColor;
set
{
this.RaiseAndSetIfChanged(ref _drainHoleHighlightColor, value);
this.RaisePropertyChanged(nameof(DrainHoleHighlightBrush));
RaiseAndSetIfChanged(ref _drainHoleHighlightColor, value);
RaisePropertyChanged(nameof(DrainHoleHighlightBrush));
}
}
@@ -920,8 +927,8 @@ namespace UVtools.WPF
get => _cursorColor;
set
{
this.RaiseAndSetIfChanged(ref _cursorColor, value);
this.RaisePropertyChanged(nameof(CursorBrush));
RaiseAndSetIfChanged(ref _cursorColor, value);
RaisePropertyChanged(nameof(CursorBrush));
}
}
@@ -935,13 +942,13 @@ namespace UVtools.WPF
public bool PartialUpdateIslandsOnEditing
{
get => _partialUpdateIslandsOnEditing;
set => this.RaiseAndSetIfChanged(ref _partialUpdateIslandsOnEditing, value);
set => RaiseAndSetIfChanged(ref _partialUpdateIslandsOnEditing, value);
}
public bool CloseEditorOnApply
{
get => _closeEditorOnApply;
set => this.RaiseAndSetIfChanged(ref _closeEditorOnApply, value);
set => RaiseAndSetIfChanged(ref _closeEditorOnApply, value);
}
public PixelEditorUserSettings Clone()
@@ -966,43 +973,43 @@ namespace UVtools.WPF
public bool RepairIslands
{
get => _repairIslands;
set => this.RaiseAndSetIfChanged(ref _repairIslands, value);
set => RaiseAndSetIfChanged(ref _repairIslands, value);
}
public bool RepairResinTraps
{
get => _repairResinTraps;
set => this.RaiseAndSetIfChanged(ref _repairResinTraps, value);
set => RaiseAndSetIfChanged(ref _repairResinTraps, value);
}
public bool RemoveEmptyLayers
{
get => _removeEmptyLayers;
set => this.RaiseAndSetIfChanged(ref _removeEmptyLayers, value);
set => RaiseAndSetIfChanged(ref _removeEmptyLayers, value);
}
public byte RemoveIslandsBelowEqualPixels
{
get => _removeIslandsBelowEqualPixels;
set => this.RaiseAndSetIfChanged(ref _removeIslandsBelowEqualPixels, value);
set => RaiseAndSetIfChanged(ref _removeIslandsBelowEqualPixels, value);
}
public ushort RemoveIslandsRecursiveIterations
{
get => _removeIslandsRecursiveIterations;
set => this.RaiseAndSetIfChanged(ref _removeIslandsRecursiveIterations, value);
set => RaiseAndSetIfChanged(ref _removeIslandsRecursiveIterations, value);
}
public byte ClosingIterations
{
get => _closingIterations;
set => this.RaiseAndSetIfChanged(ref _closingIterations, value);
set => RaiseAndSetIfChanged(ref _closingIterations, value);
}
public byte OpeningIterations
{
get => _openingIterations;
set => this.RaiseAndSetIfChanged(ref _openingIterations, value);
set => RaiseAndSetIfChanged(ref _openingIterations, value);
}
public LayerRepairUserSettings Clone()
@@ -1109,7 +1116,7 @@ namespace UVtools.WPF
public ushort SettingsVersion
{
get => _settingsVersion;
set => this.RaiseAndSetIfChanged(ref _settingsVersion, value);
set => RaiseAndSetIfChanged(ref _settingsVersion, value);
}
/// <summary>
@@ -1119,7 +1126,7 @@ namespace UVtools.WPF
public string AppVersion
{
get => _appVersion ??= App.Version.ToString();
set => this.RaiseAndSetIfChanged(ref _appVersion, value);
set => RaiseAndSetIfChanged(ref _appVersion, value);
}
/// <summary>
@@ -1128,7 +1135,7 @@ namespace UVtools.WPF
public uint SavesCount
{
get => _savesCount;
set => this.RaiseAndSetIfChanged(ref _savesCount, value);
set => RaiseAndSetIfChanged(ref _savesCount, value);
}
/// <summary>
@@ -1137,7 +1144,7 @@ namespace UVtools.WPF
public DateTime ModifiedDateTime
{
get => _modifiedDateTime;
set => this.RaiseAndSetIfChanged(ref _modifiedDateTime, value);
set => RaiseAndSetIfChanged(ref _modifiedDateTime, value);
}
#endregion
UVtools.WPF/Windows/AboutWindow.axaml
+62 -1
View File
@@ -12,7 +12,68 @@
<StackPanel Orientation="Vertical">
<StackPanel VerticalAlignment="Center" Orientation="Horizontal">
<Image Margin="20,0,0,0" Source="/Assets/Icons/UVtools_alt.ico" Width="256"/>
<Border Margin="20,20,0,20">
<StackPanel Spacing="5">
<Image Margin="0,0,0,15" HorizontalAlignment="Center" Source="/Assets/Icons/UVtools_alt.ico" Width="256"/>
<TextBox
Text="{Binding OSDescription}"
IsReadOnly="True"
BorderBrush="Transparent"
CaretBrush="Transparent"
Watermark="Operative System:"
UseFloatingWatermark="True"/>
<TextBox
Text="{Binding FrameworkDescription}"
IsReadOnly="True"
BorderBrush="Transparent"
CaretBrush="Transparent"
Watermark="Framework:"
UseFloatingWatermark="True"/>
<TextBox
Text="{Binding ProcessorCount}"
IsReadOnly="True"
BorderBrush="Transparent"
CaretBrush="Transparent"
Watermark="Processor Count:"
UseFloatingWatermark="True"/>
<TextBox
Text="{Binding ScreensDescription}"
IsReadOnly="True"
BorderBrush="Transparent"
CaretBrush="Transparent"
Watermark="Screens, resolution, working area, usable area:"
UseFloatingWatermark="True"/>
<!--
<TextBox
Text="{Binding ScreenResolution}"
IsReadOnly="True"
BorderBrush="Transparent"
CaretBrush="Transparent"
Watermark="Resolution:"
UseFloatingWatermark="True"/>
<TextBox
Text="{Binding WorkingArea}"
IsReadOnly="True"
BorderBrush="Transparent"
CaretBrush="Transparent"
Watermark="Working Area:"
UseFloatingWatermark="True"/>
<TextBox
Text="{Binding RealWorkingArea}"
IsReadOnly="True"
BorderBrush="Transparent"
CaretBrush="Transparent"
Watermark="Real Working Area:"
UseFloatingWatermark="True"/>
-->
</StackPanel>
</Border>
<Grid
RowDefinitions="Auto,10,Auto,10,Auto,10,Auto,10,*"
Margin="20"
UVtools.WPF/Windows/AboutWindow.axaml.cs
+30 -2
View File
@@ -1,4 +1,8 @@
using Avalonia.Markup.Xaml;
using System;
using System.Runtime.InteropServices;
using System.Text;
using Avalonia;
using Avalonia.Markup.Xaml;
using UVtools.Core;
using UVtools.WPF.Controls;
@@ -7,16 +11,40 @@ namespace UVtools.WPF.Windows
public class AboutWindow : WindowEx
{
public string Software => About.Software;
public string Version => $"Version: {App.VersionStr}";
public string Version => $"Version: {App.VersionStr} {RuntimeInformation.ProcessArchitecture}";
public string Copyright => App.AssemblyCopyright;
public string Company => App.AssemblyCompany;
public string Description => App.AssemblyDescription;
public string OSDescription => $"{RuntimeInformation.OSDescription} {RuntimeInformation.OSArchitecture}";
public string FrameworkDescription => RuntimeInformation.FrameworkDescription;
public int ProcessorCount => Environment.ProcessorCount;
public int ScreenCount => Screens.ScreenCount;
public string ScreenResolution => $"{Screens.Primary.Bounds.Width} x {Screens.Primary.Bounds.Height} @ {Screens.Primary.PixelDensity*100}%";
public string WorkingArea => $"{Screens.Primary.WorkingArea.Width} x {Screens.Primary.WorkingArea.Height}";
public string RealWorkingArea => $"{Math.Round(Screens.Primary.WorkingArea.Width / Screens.Primary.PixelDensity)} x {Math.Round(Screens.Primary.WorkingArea.Height / Screens.Primary.PixelDensity)}";
public string ScreensDescription
{
get
{
var result = new StringBuilder();
for (int i = 0; i < Screens.All.Count; i++)
{
var screen = Screens.All[i];
result.AppendLine($"{i+1}: {screen.Bounds.Width} x {screen.Bounds.Height} @ {screen.PixelDensity * 100}%");
result.AppendLine($" WA: {screen.WorkingArea.Width} x {screen.WorkingArea.Height} UA: {Math.Round(screen.WorkingArea.Width / screen.PixelDensity)} x {Math.Round(screen.WorkingArea.Height / screen.PixelDensity)}");
}
return result.ToString().TrimEnd();
}
}
public AboutWindow()
{
InitializeComponent();
DataContext = this;
Environment.OSVersion.Version.ToString();
}
private void InitializeComponent()
UVtools.WPF/Windows/SettingsWindow.axaml
+9
View File
@@ -659,7 +659,16 @@
<StackPanel Orientation="Vertical">
<TextBlock Padding="10" Background="LightBlue" FontWeight="Bold" Text="Islands"/>
<CheckBox Margin="15"
Content="Enhance island detection with an combined overhang check"
IsChecked="{Binding Settings.Issues.IslandEnhancedDetection}"
ToolTip.Tip="Combines the island and overhang detections for a better and more realistic detection, also to discard false-positives. (Slower)
&#x0a;If enabled, and when a island is found, it will check for overhangs on that same island, if no overhang found then the island will be discarded and considered safe, otherwise it will flag as an island issue.
&#x0a;Note: Overhangs settings will be used to configure the detection. Enabling Overhangs is not required for this procedure to work."
/>
<CheckBox Margin="15,0,15,15"
Content="Allow diagonal bonds during island detection"
IsChecked="{Binding Settings.Issues.IslandAllowDiagonalBonds}"
ToolTip.Tip="If enabled, components touching by even a single diagonal bond will be considered a single component for the purposes of island detection.