mirror of
https://github.com/riegera2412/UVtools.git
synced 2026-07-13 20:07:40 +02:00
4600e81b08
- **(Add) Suggestions:**
- A new module that detect bad or parameters out of a defined range and suggest a change on the file, those can be auto applied if configured to do so
- **Avaliable suggestions:**
- **Bottom layer count:** Bottom layers should be kept to a minimum, usually from 2 to 3, it function is to provide a good adhesion to the first layer on the build plate, using a high count have disadvantages.
- **Wait time before cure:** Rest some time before cure the layer is crucial to let the resin settle after the lift sequence and allow some time for the arm settle at the correct Z position as the resin will offer some resistance and push the structure.
This lead to better quality with more successful prints, less lamination problems, better first layers with more success of stick to the build plate and less elephant foot effect.
- **Wait time after cure:** Rest some time after cure the layer and before the lift sequence can be important to allow the layer to cooldown a bit and detach better from the FEP.
- **Layer height:** Using the right layer height is important to get successful prints:
Thin layers may cause problems on adhesion, lamination, will print much slower and have no real visual benefits.
Thick layers may not fully cure no matter the exposure time you use, causing lamination and other hazards. Read your resin dtasheet to know the limits.
Using layer height with too many decimal digits may produce a wrong positioning due stepper step loss and/or Z axis quality.
- **Core:**
- Convert the project to Nullable aware and "null-safe"
- **File Formats:**
- (Add) `Volume` property to get the total model volume
- (Add) `SanitizeLayers` method to reassign indexes and force attribute parent file
- (Improvement) Merge `LayerManager` into `FileFormat` and cleanup: This affects the whole project and external scripts.
If using scripts please update them, search for `.LayerManager.` and replace by `.`
- (Change) Chitubox encrypted format can now be saved as normal
- (Fix) Converted files layers was pointing to the source file and related to it
- **Layers:**
- (Add) Methods: `ResetParameters`, `CopyParametersTo`, `CopyExposureTo`, `CopyWaitTimesTo`
- (Improvement) `IsBottomLayer` property will also return true when the index is inside bottom layer count
- **Scripting:**
- (Add) Configuration variable: `MinimumVersionToRun` - Sets the minimum version able to run the script
- (Improvement) Allow run scripts written in C# 10 with the new namespace; style as well as nullables methods
- (Improvement) Convert scripts to use Nullable code
- **UI:**
- (Add) Fluent Dark theme
- (Add) Default Light theme
- (Add) Default Dark theme
- (Change) Use fontawesome and material design to render the icons instead of static png images
- (Change) Some icons
- (Change) Move log tab to clipboard tab
- (Change) Tooltip overlay default color
- (Improvement) Windows position for tool windows, sometimes framework can return negative values affecting positions, now limits to 0 (#387)
- (Fix) Center image icon for layer action button
- (Fix) Center image icon for save layer image button
- **Tools:**
- (Add) Layer re-height: Offset mode, change layers position by a defined offset (#423)
- (Improvement) Rotate: Unable to use an angle of 0
- (Improvement) Remove layers: Will not recalcualte and reset properties of layers anymore, allowing removing layers on dynamic layer height models and others
- (Improvement) Clone layers: Will not recalcualte and reset properties of layers anymore, allowing cloning layers on dynamic layer height models and others
- (Fix) Exposure time finder: Very small printers may not print the stock object as it is configured, lead to a unknown error while generating the test. It will now show a better error message and advice a solution (#426)
- **Terminal:**
- (Add) More default namespaces
- (Improvement) Set a MinHeight for the rows to prevent spliter from eat the elements
- (Change) Set working space to the MainWindow instead of TerminalWindow
- **(Upgrade) .NET from 5.0.14 to 6.0.3**
- This brings big performance improvements, better JIT, faster I/O operations and others
- Read more: https://devblogs.microsoft.com/dotnet/performance-improvements-in-net-6
- Due this macOS requirement starts at 10.15 (Catalina)
- Read more: https://github.com/dotnet/core/blob/main/release-notes/6.0/supported-os.md
- (Add) Native support for MacOS ARM64 architecture (Mac M1 and upcomming Mac's) (#187)
- (Exchange) Dependency Newtonsoft Json by System.Text.Json to parse the json documents
- (Remove) "Automations - Light-off delay" in favor of new suggestion "wait time before cure" module
- (Fix) File - Send to: Winrar or 7zip have a wrong extension on the list (uvt) when should be (uvj)
- (Upgrade) AvaloniaUI from 0.10.12 to 0.10.13
324 lines
9.3 KiB
C#
324 lines
9.3 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 Emgu.CV;
|
|
using Emgu.CV.CvEnum;
|
|
using Emgu.CV.Util;
|
|
using System;
|
|
using System.Diagnostics;
|
|
using System.Drawing;
|
|
using System.IO;
|
|
using System.IO.Compression;
|
|
using System.Linq;
|
|
using System.Xml.Serialization;
|
|
using UVtools.Core.Extensions;
|
|
using UVtools.Core.Layers;
|
|
using UVtools.Core.Operations;
|
|
|
|
namespace UVtools.Core.FileFormats;
|
|
|
|
#region Sub Classes
|
|
[Serializable]
|
|
[XmlRoot(ElementName = "Manifest")]
|
|
public class GenericZipManifest
|
|
{
|
|
public string CreatedBy { get; set; } = About.SoftwareWithVersion;
|
|
|
|
public string UpdatedBy { get; set; } = About.SoftwareWithVersion;
|
|
|
|
public string CreatedDate { get; set; } = DateTime.UtcNow.ToString("u");
|
|
|
|
public string LastModifiedDate { get; set; } = DateTime.UtcNow.ToString("u");
|
|
|
|
public float LayerHeight { get; set; }
|
|
|
|
public ushort ResolutionX { get; set; }
|
|
|
|
public ushort ResolutionY { get; set; }
|
|
|
|
public float DisplayWidth { get; set; }
|
|
|
|
public float DisplayHeight { get; set; }
|
|
|
|
public float MachineZ { get; set; }
|
|
|
|
public void Update()
|
|
{
|
|
UpdatedBy = About.SoftwareWithVersion;
|
|
LastModifiedDate = DateTime.UtcNow.ToString("u");
|
|
}
|
|
}
|
|
#endregion
|
|
|
|
public class GenericZIPFile : FileFormat
|
|
{
|
|
#region Constants
|
|
private const string ManifestFileName = "manifest.uvtools";
|
|
#endregion
|
|
|
|
#region Properties
|
|
public GenericZipManifest ManifestFile { get; set; } = new ();
|
|
|
|
public override FileFormatType FileType => FileFormatType.Archive;
|
|
|
|
public override FileExtension[] FileExtensions { get; } = {
|
|
new(typeof(GenericZIPFile), "zip", "Generic / Phrozen Zip")
|
|
};
|
|
|
|
public override uint ResolutionX
|
|
{
|
|
get => ManifestFile.ResolutionX;
|
|
set
|
|
{
|
|
ManifestFile.ResolutionX = (ushort) value;
|
|
RaisePropertyChanged();
|
|
}
|
|
}
|
|
|
|
public override uint ResolutionY
|
|
{
|
|
get => ManifestFile.ResolutionY;
|
|
set
|
|
{
|
|
ManifestFile.ResolutionY = (ushort)value;
|
|
RaisePropertyChanged();
|
|
}
|
|
}
|
|
|
|
public override float DisplayWidth
|
|
{
|
|
get => ManifestFile.DisplayWidth;
|
|
set
|
|
{
|
|
ManifestFile.DisplayWidth = value;
|
|
RaisePropertyChanged();
|
|
}
|
|
}
|
|
|
|
public override float DisplayHeight
|
|
{
|
|
get => ManifestFile.DisplayHeight;
|
|
set
|
|
{
|
|
ManifestFile.DisplayHeight = value;
|
|
RaisePropertyChanged();
|
|
}
|
|
}
|
|
|
|
public override float MachineZ
|
|
{
|
|
get => ManifestFile.MachineZ > 0 ? ManifestFile.MachineZ : base.MachineZ;
|
|
set
|
|
{
|
|
ManifestFile.MachineZ = value;
|
|
RaisePropertyChanged();
|
|
}
|
|
}
|
|
|
|
public override float LayerHeight
|
|
{
|
|
get => ManifestFile.LayerHeight;
|
|
set
|
|
{
|
|
ManifestFile.LayerHeight = Layer.RoundHeight(value);
|
|
RaisePropertyChanged();
|
|
}
|
|
}
|
|
|
|
/*public override uint LayerCount
|
|
{
|
|
get => base.LayerCount;
|
|
set => base.LayerCount = ManifestFile.Slices.LayerCount = base.LayerCount;
|
|
}*/
|
|
|
|
public override Size[]? ThumbnailsOriginalSize { get; } =
|
|
{
|
|
new(854, 480),
|
|
new(472, 240)
|
|
};
|
|
|
|
|
|
public override object[] Configs => new object[] {
|
|
ManifestFile
|
|
};
|
|
|
|
#endregion
|
|
|
|
#region Constructor
|
|
public GenericZIPFile()
|
|
{ }
|
|
#endregion
|
|
|
|
#region Methods
|
|
|
|
public override bool CanProcess(string fileFullPath)
|
|
{
|
|
if(!base.CanProcess(fileFullPath)) return false;
|
|
|
|
try
|
|
{
|
|
using var zip = ZipFile.Open(fileFullPath, ZipArchiveMode.Read);
|
|
foreach (var entry in zip.Entries)
|
|
{
|
|
if (entry.Name == ManifestFileName) return true;
|
|
if (entry.Name.EndsWith(".gcode")) return false;
|
|
}
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
Debug.WriteLine(e);
|
|
return false;
|
|
}
|
|
|
|
|
|
return true;
|
|
}
|
|
|
|
protected override void EncodeInternally(OperationProgress progress)
|
|
{
|
|
using var outputFile = ZipFile.Open(FileFullPath!, ZipArchiveMode.Create);
|
|
|
|
if (Thumbnails is not null)
|
|
{
|
|
if (Thumbnails.Length > 0 && Thumbnails[0] is not null)
|
|
{
|
|
using var stream = outputFile.CreateEntry("preview.png").Open();
|
|
stream.WriteBytes(Thumbnails[0]!.GetPngByes());
|
|
stream.Close();
|
|
}
|
|
|
|
if (Thumbnails.Length > 1 && Thumbnails[1] is not null)
|
|
{
|
|
using var stream = outputFile.CreateEntry("preview_cropping.png").Open();
|
|
using var vec = new VectorOfByte();
|
|
stream.WriteBytes(Thumbnails[1]!.GetPngByes());
|
|
stream.Close();
|
|
}
|
|
}
|
|
|
|
for (uint layerIndex = 0; layerIndex < LayerCount; layerIndex++)
|
|
{
|
|
progress.Token.ThrowIfCancellationRequested();
|
|
var layer = this[layerIndex];
|
|
var filename = $"{layerIndex + 1}.png";
|
|
outputFile.PutFileContent(filename, layer.CompressedBytes, ZipArchiveMode.Create);
|
|
progress++;
|
|
}
|
|
|
|
ManifestFile.Update();
|
|
|
|
var entry = outputFile.CreateEntry(ManifestFileName);
|
|
using var streamManifest = entry.Open();
|
|
XmlExtensions.Serialize(ManifestFile, streamManifest, XmlExtensions.SettingsIndent, true);
|
|
}
|
|
|
|
protected override void DecodeInternally(OperationProgress progress)
|
|
{
|
|
using (var inputFile = ZipFile.Open(FileFullPath!, ZipArchiveMode.Read))
|
|
{
|
|
var entry = inputFile.Entries.FirstOrDefault(zipEntry => zipEntry.Name == ManifestFileName);
|
|
if (entry is not null)
|
|
{
|
|
try
|
|
{
|
|
using var stream = entry.Open();
|
|
ManifestFile = XmlExtensions.DeserializeFromStream<GenericZipManifest>(stream);
|
|
}
|
|
catch (Exception)
|
|
{
|
|
// Not required
|
|
//Clear();
|
|
//throw new FileLoadException($"Unable to deserialize '{entry.Name}'\n{e}", FileFullPath);
|
|
}
|
|
}
|
|
|
|
uint layerCount = 0;
|
|
foreach (var zipEntry in inputFile.Entries)
|
|
{
|
|
if (!zipEntry.Name.EndsWith(".png")) continue;
|
|
var filename = Path.GetFileNameWithoutExtension(zipEntry.Name);
|
|
if (!filename.All(char.IsDigit)) continue;
|
|
if (!uint.TryParse(filename, out var layerIndex)) continue;
|
|
layerCount = Math.Max(layerCount, layerIndex);
|
|
}
|
|
|
|
if (layerCount == 0)
|
|
{
|
|
Clear();
|
|
throw new FileLoadException("Unable to detect layer images in the file", FileFullPath);
|
|
}
|
|
|
|
Init(layerCount, DecodeType == FileDecodeType.Partial);
|
|
progress.Reset(OperationProgress.StatusDecodeLayers, LayerCount);
|
|
|
|
|
|
for (uint layerIndex = 0; layerIndex < LayerCount; layerIndex++)
|
|
{
|
|
if (progress.Token.IsCancellationRequested) break;
|
|
var filename = $"{layerIndex + 1}.png";
|
|
entry = inputFile.GetEntry(filename);
|
|
if (entry is null)
|
|
{
|
|
Clear();
|
|
throw new FileLoadException($"Layer {filename} not found", FileFullPath);
|
|
}
|
|
|
|
if (DecodeType == FileDecodeType.Full)
|
|
{
|
|
using var stream = entry.Open();
|
|
this[layerIndex] = new Layer(layerIndex, stream, this);
|
|
}
|
|
|
|
progress++;
|
|
}
|
|
|
|
entry = inputFile.GetEntry("preview.png");
|
|
if (entry is not null)
|
|
{
|
|
Thumbnails[0] = new Mat();
|
|
CvInvoke.Imdecode(entry.Open().ToArray(), ImreadModes.AnyColor, Thumbnails[0]);
|
|
}
|
|
|
|
entry = inputFile.GetEntry("preview_cropping.png");
|
|
if (entry is not null)
|
|
{
|
|
var count = CreatedThumbnailsCount;
|
|
Thumbnails[count] = new Mat();
|
|
CvInvoke.Imdecode(entry.Open().ToArray(), ImreadModes.AnyColor, Thumbnails[count]);
|
|
}
|
|
}
|
|
|
|
GetBoundingRectangle(progress);
|
|
}
|
|
|
|
protected override void PartialSaveInternally(OperationProgress progress)
|
|
{
|
|
using var outputFile = ZipFile.Open(FileFullPath!, ZipArchiveMode.Update);
|
|
bool deleted;
|
|
|
|
do
|
|
{
|
|
deleted = false;
|
|
foreach (var zipEntry in outputFile.Entries)
|
|
{
|
|
if (zipEntry.Name != ManifestFileName) continue;
|
|
zipEntry.Delete();
|
|
deleted = true;
|
|
break;
|
|
}
|
|
} while (deleted);
|
|
|
|
ManifestFile.Update();
|
|
|
|
var entry = outputFile.CreateEntry(ManifestFileName);
|
|
using var stream = entry.Open();
|
|
|
|
XmlExtensions.Serialize(ManifestFile, stream, XmlExtensions.SettingsIndent, true);
|
|
}
|
|
#endregion
|
|
} |