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-02-07 01:09:55 +0300
committerTiago Conceição <Tiago_caza@hotmail.com>2021-02-07 01:09:55 +0300
commit0ba61780b7ba662814b040d43bcf60847955ba18 (patch)
tree528ab93f0cef04a245545ee2fd7c05bc873e972b /UVtools.Core/FileFormats/PhotonSFile.cs
parent98df5c37f8f9ac806463c722e354661d287b39ce (diff)
v2.4.0v2.4.0
* (Upgrade) EmguCV/OpenCV to v4.5.1 * (Upgrade) AvaloniaUI to 1.0 * (Improvement) GUI re-touched * (Improvement) Make pixel editor tab to disappear when pixel editor is disabled * (Improvement) Simplify the output filename from PrusaSlicer profiles * (Improvement) All operations require a slicer file at constructor rather than on execute, this allow exposure the open file to the operation before run it * (Improvement) Calibrations: Auto set "Mirror Output" if open file have MirrorDisplay set * (Change) Tool - Redraw model/supports icon * (Change) photon and cbddlp to use version 3 by default * (Add) Tool - Dynamic layer height: Analyze and optimize the model with dynamic layer heights, larger angles will slice at lower layer height while more straight angles will slice larger layer height. (#131) * (Add) Calibration - Exposure time finder: Generates test models with various strategies and increments to verify the best exposure time for a given layer height * (Add) File load checks, trigger error when a file have critical errors and attempt to fix non-critical errors * Layers must have an valid image, otherwise trigger an error * Layers must have a incremental or equal position Z than it previous, otherwise trigger an error * If layer 0 starts at 0mm it will auto fix all layers, it will add Layer Height to the current z at every layer * (Add) Tool - Edit print parameters: Allow set parameters to each x layers and skip n layers inside the given range. This allow the use of optimizations in a layer pattern, for example, to set 3s for a layer but 2.5s for the next. * (Add) Layer height property to "Layer Data" table: Shows layer height for the slice * (Fix) When automations applied and file is saved, it will not warn user about file overwrite for the first time save * (Fix) Tool - Redraw model/supports: Disable apply button when no file selected * (Fix) Tool - Infill: Lack of equality member to test if same infill profile already exists * (Fix) Auto converted files from SL1 where clipping filename at first dot (.), now it only strips known extensions * (Fix) SL1 encoded files wasn't generating the right information and lead to printer crash * (Fix) PrusaSlicer printer "Anycubic Photon S" LiftSpeed was missing and contains a typo (#135) * (Fix) PrusaSlicer profile manager wasnt marking missing profiles to be installed (#135) * (Fix) PrusaSlicer folder search on linux to also look at %HOME%/.config/PrusaSlicer (#135, #136) * (Fix) Operations were revised and some bug fixed, most about can't cancel the progress * (Fix) Some typos on tooltips * (Fix) Prevent PhotonS from enconding, it will trigger error now as this format is read-only * **(Fix) Ctrl + Shift + Z to redo the last operation:** * The layer range is reseted instead of pull the used values * Tool - Arithmetic always disabled * Action - Layer import didn't generate info and always disabled
Diffstat (limited to 'UVtools.Core/FileFormats/PhotonSFile.cs')
-rw-r--r--UVtools.Core/FileFormats/PhotonSFile.cs37
1 files changed, 12 insertions, 25 deletions
diff --git a/UVtools.Core/FileFormats/PhotonSFile.cs b/UVtools.Core/FileFormats/PhotonSFile.cs
index 4b14faf..c36ec5f 100644
--- a/UVtools.Core/FileFormats/PhotonSFile.cs
+++ b/UVtools.Core/FileFormats/PhotonSFile.cs
@@ -125,11 +125,12 @@ namespace UVtools.Core.FileFormats
for (int i = 0; i < imageLength; i++)
{
- color = color <= 127 ? 0 : 255; // Sanitize no AA
- if (spanMat[i] != color)
+ //color = color <= 127 ? 0 : 255; // Sanitize no AA
+ byte thisColor = spanMat[i] <= 127 ? 0 : 255; // Sanitize no AA
+ if (thisColor != color)
{
AddRep();
- color = spanMat[i];
+ color = thisColor; // Sanitize no AA
rep = 1;
}
else
@@ -420,12 +421,10 @@ namespace UVtools.Core.FileFormats
return bytes;
}
- public override void Encode(string fileFullPath, OperationProgress progress = null)
- {
- progress ??= new OperationProgress();
- progress.Reset(OperationProgress.StatusEncodeLayers, LayerCount);
- base.Encode(fileFullPath, progress);
+ protected override void EncodeInternally(string fileFullPath, OperationProgress progress)
+ {
+ throw new NotSupportedException("PhotonS is read-only format, please use pws instead!");
//uint currentOffset = (uint)Helpers.Serializer.SizeOf(HeaderSettings);
using (var outputFile = new FileStream(fileFullPath, FileMode.Create, FileAccess.Write))
{
@@ -463,8 +462,6 @@ namespace UVtools.Core.FileFormats
}
}
- AfterEncode();
-
Debug.WriteLine("Encode Results:");
Debug.WriteLine(HeaderSettings);
Debug.WriteLine("-End-");
@@ -495,10 +492,8 @@ namespace UVtools.Core.FileFormats
return mat;
}
- public override void Decode(string fileFullPath, OperationProgress progress = null)
+ protected override void DecodeInternally(string fileFullPath, OperationProgress progress)
{
- base.Decode(fileFullPath, progress);
-
using (var inputFile = new FileStream(fileFullPath, FileMode.Open, FileAccess.Read))
{
HeaderSettings = Helpers.Deserialize<Header>(inputFile);
@@ -546,24 +541,16 @@ namespace UVtools.Core.FileFormats
{
if (progress.Token.IsCancellationRequested) return;
- using (var image = layerData[layerIndex].Decode())
+ using var image = layerData[layerIndex].Decode();
+ this[layerIndex] = new Layer((uint) layerIndex, image, LayerManager);
+ lock (progress.Mutex)
{
- this[layerIndex] = new Layer((uint) layerIndex, image, LayerManager);
- lock (progress.Mutex)
- {
- progress++;
- }
+ progress++;
}
});
LayerManager.RebuildLayersProperties();
-
-
- FileFullPath = fileFullPath;
-
}
-
- progress.Token.ThrowIfCancellationRequested();
}
public override void SaveAs(string filePath = null, OperationProgress progress = null)