mirror of
https://github.com/riegera2412/UVtools.git
synced 2026-07-10 18:42:33 +02:00
8e4995a6a5
- **UVtoolsCmd:**
- **print-properties:**
- (Change) `-b`, `--base` option to `-a`, `-all` to indicate all properties and sub-properties, now defaults to only show base properties
- (Add) `-r`, `--range` option to prints only the matching layer(s) index(es) in a range
- (Add) `-i`, `--indexes` option to prints only the matching layer(s) index(es)
- (Add) Command: `set-properties <input-file> <property=value> Set properties in a file or to it layers with new values`
- (Add) Command: `print-issues <input-file> Detect and print issues in a file`
- (Add) New option to the `run` command: `-p, --property <property=value> Set a property with a new value (Compatible with operations only)`
- (Remove) Command: `print-layers` as it has been moved to `print-properties`, use `-r :` to obtain same result as default on `print-layers`
- **Issues:**
- (Fix) Issues groups with only one issue was displaying the wrong area value
- (Fix) Volume incorrectly calculated, resulting in a high value for group of issues
- (Fix) Incorrect calculation of the bounding rectangle for a group of issues
- **Repair layers:**
- (Add) Switch to opt between "Re-detect the selected issues before repair" and "Use and repair the previous detected issues" (Default)
- (Improvement) Do not allow to run the tool if there are no detected issues when the option "Use and repair the previous detected issues" is selected
- (Improvement) Linux: Recompile libcvextern.so on a older system to be able to run on both older and newest system (#603)
- (Upgrade) .NET from 6.0.10 to 6.0.11
91 lines
4.0 KiB
C#
91 lines
4.0 KiB
C#
/*
|
|
* GNU AFFERO GENERAL PUBLIC LICENSE
|
|
* Version 3, 19 November 2007
|
|
* Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
|
* Everyone is permitted to copy and distribute verbatim copies
|
|
* of this license document, but changing it is not allowed.
|
|
*/
|
|
|
|
using System;
|
|
using System.CommandLine;
|
|
using System.Linq;
|
|
using UVtools.Core.Layers;
|
|
|
|
namespace UVtools.Cmd.Symbols;
|
|
|
|
internal static class PrintIssuesCommand
|
|
{
|
|
internal static Command CreateCommand()
|
|
{
|
|
var islandsOption = new Option<bool>(new []{ "-i" , "--islands"}, "Enable islands detection");
|
|
var overhangsOption = new Option<bool>(new []{ "-o" , "--overhangs"}, "Enable overhangs detection");
|
|
var resinTrapOption = new Option<bool>(new []{ "-r" , "--resin-traps"}, "Enable resin-traps detection");
|
|
var suctionCupOption = new Option<bool>(new []{ "-s" , "--suction-cups"}, "Enable suction-cups detection");
|
|
var touchingBoundsOption = new Option<bool>(new []{ "-t" , "--touching-bounds"}, "Enable touching bounds detection");
|
|
var printHeightOption = new Option<bool>(new []{ "-p" , "--print-height"}, "Enable print height detection");
|
|
var emptyLayersOption = new Option<bool>(new []{ "-e" , "--empty-layers"}, "Enable empty layer detection");
|
|
|
|
var sortByAreaOption = new Option<bool>(new []{ "--sort-area"}, "Sort by area DESC");
|
|
|
|
var command = new Command("print-issues", "Detect and print issues")
|
|
{
|
|
GlobalArguments.InputFileArgument,
|
|
|
|
islandsOption,
|
|
overhangsOption,
|
|
resinTrapOption,
|
|
suctionCupOption,
|
|
touchingBoundsOption,
|
|
printHeightOption,
|
|
emptyLayersOption,
|
|
|
|
sortByAreaOption
|
|
};
|
|
|
|
command.SetHandler(context =>
|
|
{
|
|
var inputFile = context.ParseResult.GetValueForArgument(GlobalArguments.InputFileArgument);
|
|
var islands = context.ParseResult.GetValueForOption(islandsOption);
|
|
var overhangs = context.ParseResult.GetValueForOption(overhangsOption);
|
|
var resinTraps = context.ParseResult.GetValueForOption(resinTrapOption);
|
|
var suctionCups = context.ParseResult.GetValueForOption(suctionCupOption);
|
|
var touchingBounds = context.ParseResult.GetValueForOption(touchingBoundsOption);
|
|
var printHeight = context.ParseResult.GetValueForOption(printHeightOption);
|
|
var emptyLayers = context.ParseResult.GetValueForOption(emptyLayersOption);
|
|
var sortByArea = context.ParseResult.GetValueForOption(sortByAreaOption);
|
|
|
|
var slicerFile = Program.OpenInputFile(inputFile);
|
|
|
|
var config = new IssuesDetectionConfiguration();
|
|
|
|
if (islands || overhangs || resinTraps || suctionCups || touchingBounds || printHeight || emptyLayers)
|
|
{
|
|
config.DisableAll();
|
|
config.IslandConfig.Enabled = islands;
|
|
config.OverhangConfig.Enabled = overhangs;
|
|
config.ResinTrapConfig.Enabled = resinTraps;
|
|
config.ResinTrapConfig.DetectSuctionCups = suctionCups;
|
|
config.TouchingBoundConfig.Enabled = touchingBounds;
|
|
config.PrintHeightConfig.Enabled = printHeight;
|
|
config.EmptyLayerConfig.Enabled = emptyLayers;
|
|
}
|
|
|
|
var issues = Program.ProgressBarWork("Detecting issues", () => slicerFile.IssueManager.DetectIssues(config, Program.Progress));
|
|
if (sortByArea)
|
|
{
|
|
issues = issues.OrderBy(issue => issue.Type)
|
|
.ThenByDescending(issue => issue.Area)
|
|
.ThenBy(issue => issue.StartLayerIndex).ToList();
|
|
}
|
|
|
|
Console.WriteLine($"Issues: {issues.Count}");
|
|
|
|
foreach (var issue in issues)
|
|
{
|
|
Console.WriteLine($"{issue.Type}, {issue.LayerInfoStr}, {issue.Area:F0}px{issue.AreaChar}, {issue.BoundingRectangle}");
|
|
}
|
|
});
|
|
|
|
return command;
|
|
}
|
|
} |