maker/UVtools
1
0
Fork 0
mirror of https://github.com/riegera2412/UVtools.git synced 2026-07-08 17:42:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

v0.8.2.2

Browse Source 
* (Add) Support for PHZ zip files when renamed to .zip
* (Fix) ZIP: Allow to cancel on gather layers stage
* (Fix) ZIP: Thumbnails not showing nor saving
This commit is contained in:
Tiago Conceição
2020-09-16 20:31:49 +01:00
parent 67150bde85
commit 49a6299cef
8 changed files with 88 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+4 -1
View File
@@ -1,9 +1,12 @@
# Changelog
## /09/2020 - v0.8.2.2
## 16/09/2020 - v0.8.2.2
* (Add) Support for PHZ zip files when renamed to .zip
* (Fix) Tools - Move and Pattern: When not selecting a ROI will draw black layers
* (Fix) Tool - Move: When making a cut move and move to a overlap zone it will blackout the source rectangle
* (Fix) ZIP: Allow to cancel on gather layers stage
* (Fix) ZIP: Thumbnails not showing nor saving
## 14/09/2020 - v0.8.2.1
UVtools.Core/FileFormats/ChituboxFile.cs
+2
View File
@@ -1316,6 +1316,8 @@ namespace UVtools.Core.FileFormats
public override void Decode(string fileFullPath, OperationProgress progress = null)
{
base.Decode(fileFullPath, progress);
if(progress is null) progress = new OperationProgress();
progress.Reset(OperationProgress.StatusGatherLayers, LayerCount);
using (var inputFile = new FileStream(fileFullPath, FileMode.Open, FileAccess.Read))
{
UVtools.Core/FileFormats/ChituboxZipFile.cs
+75 -45
View File
@@ -231,16 +231,12 @@ namespace UVtools.Core.FileFormats
public override string MachineName => HeaderSettings.MachineType;
public override object[] Configs => new object[] { HeaderSettings };
public bool IsPHZZip = false;
#endregion
#region Methods
public override void Clear()
{
base.Clear();
GCode = null;
}
public override void Encode(string fileFullPath, OperationProgress progress = null)
{
base.Encode(fileFullPath, progress);
@@ -250,10 +246,12 @@ namespace UVtools.Core.FileFormats
{
using (Stream stream = outputFile.CreateEntry("preview.png").Open())
{
var vec = new VectorOfByte();
CvInvoke.Imencode(".png", Thumbnails[0], vec);
stream.WriteBytes(vec.ToArray());
stream.Close();
using (var vec = new VectorOfByte())
{
CvInvoke.Imencode(".png", Thumbnails[0], vec);
stream.WriteBytes(vec.ToArray());
stream.Close();
}
}
}
@@ -261,21 +259,27 @@ namespace UVtools.Core.FileFormats
{
using (Stream stream = outputFile.CreateEntry("preview_cropping.png").Open())
{
var vec = new VectorOfByte();
CvInvoke.Imencode(".png", Thumbnails[1], vec);
stream.WriteBytes(vec.ToArray());
stream.Close();
using (var vec = new VectorOfByte())
{
CvInvoke.Imencode(".png", Thumbnails[1], vec);
stream.WriteBytes(vec.ToArray());
stream.Close();
}
}
}
RebuildGCode();
outputFile.PutFileContent("run.gcode", GCode.ToString(), ZipArchiveMode.Create);
if (!IsPHZZip)
{
RebuildGCode();
outputFile.PutFileContent("run.gcode", GCode.ToString(), ZipArchiveMode.Create);
}
for (uint layerIndex = 0; layerIndex < LayerCount; layerIndex++)
{
progress.Token.ThrowIfCancellationRequested();
Layer layer = this[layerIndex];
outputFile.PutFileContent($"{layerIndex + 1}.png", layer.CompressedBytes, ZipArchiveMode.Create);
outputFile.PutFileContent($"{layerIndex + 1}.png", layer.CompressedBytes,
ZipArchiveMode.Create);
progress++;
}
}
@@ -286,43 +290,48 @@ namespace UVtools.Core.FileFormats
public override void Decode(string fileFullPath, OperationProgress progress = null)
{
base.Decode(fileFullPath, progress);
if(progress is null) progress = new OperationProgress();
progress.Reset(OperationProgress.StatusGatherLayers, LayerCount);
FileFullPath = fileFullPath;
using (var inputFile = ZipFile.Open(FileFullPath, ZipArchiveMode.Read))
{
var entry = inputFile.GetEntry("run.gcode");
if (ReferenceEquals(entry, null))
if (!ReferenceEquals(entry, null))
{
Clear();
throw new FileLoadException("run.gcode not found", fileFullPath);
}
using (TextReader tr = new StreamReader(entry.Open()))
{
string line;
GCode = new StringBuilder();
while ((line = tr.ReadLine()) != null)
//Clear();
//throw new FileLoadException("run.gcode not found", fileFullPath);
using (TextReader tr = new StreamReader(entry.Open()))
{
GCode.AppendLine(line);
if (string.IsNullOrEmpty(line)) continue;
if (line[0] != ';')
string line;
GCode = new StringBuilder();
while ((line = tr.ReadLine()) != null)
{
continue;
}
GCode.AppendLine(line);
if (string.IsNullOrEmpty(line)) continue;
var splitLine = line.Split(':');
if (splitLine.Length < 2) continue;
if (line[0] != ';')
{
continue;
}
foreach (var propertyInfo in HeaderSettings.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance))
{
var displayNameAttribute = propertyInfo.GetCustomAttributes(false).OfType<DisplayNameAttribute>().FirstOrDefault();
if (ReferenceEquals(displayNameAttribute, null)) continue;
if (!splitLine[0].Trim(' ', ';').Equals(displayNameAttribute.DisplayName)) continue;
Helpers.SetPropertyValue(propertyInfo, HeaderSettings, splitLine[1].Trim());
var splitLine = line.Split(':');
if (splitLine.Length < 2) continue;
foreach (var propertyInfo in HeaderSettings.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance))
{
var displayNameAttribute = propertyInfo.GetCustomAttributes(false).OfType<DisplayNameAttribute>().FirstOrDefault();
if (ReferenceEquals(displayNameAttribute, null)) continue;
if (!splitLine[0].Trim(' ', ';').Equals(displayNameAttribute.DisplayName)) continue;
Helpers.SetPropertyValue(propertyInfo, HeaderSettings, splitLine[1].Trim());
}
}
tr.Close();
}
tr.Close();
}
else
{
IsPHZZip = true;
}
if (HeaderSettings.LayerCount == 0)
@@ -341,10 +350,11 @@ namespace UVtools.Core.FileFormats
progress.ItemCount = LayerCount;
var gcode = GCode.ToString();
var gcode = GCode?.ToString();
for (uint layerIndex = 0; layerIndex < HeaderSettings.LayerCount; layerIndex++)
{
if (progress.Token.IsCancellationRequested) break;
entry = inputFile.GetEntry($"{layerIndex+1}.png");
if (ReferenceEquals(entry, null))
{
@@ -352,6 +362,14 @@ namespace UVtools.Core.FileFormats
throw new FileLoadException($"Layer {layerIndex+1} not found", fileFullPath);
}
if (IsPHZZip) // PHZ file
{
LayerManager[layerIndex] = new Layer(layerIndex, entry.Open(), entry.Name);
progress++;
continue;;
}
var startStr = $";LAYER_START:{layerIndex}";
var stripGcode = gcode.Substring(gcode.IndexOf(startStr, StringComparison.InvariantCultureIgnoreCase) + startStr.Length);
stripGcode = stripGcode.Substring(0, stripGcode.IndexOf(";LAYER_END")).Trim(' ', '\n', '\r', '\t');
@@ -377,6 +395,11 @@ namespace UVtools.Core.FileFormats
progress++;
}
if (GCode is null) // PHZ file
{
LayerManager.RebuildLayersProperties();
}
if (HeaderSettings.LayerCount > 0 && ResolutionX == 0)
{
using (var mat = this[0].LayerMat)
@@ -389,13 +412,16 @@ namespace UVtools.Core.FileFormats
entry = inputFile.GetEntry("preview.png");
if (!ReferenceEquals(entry, null))
{
Thumbnails[0] = new Mat();
CvInvoke.Imdecode(entry.Open().ToArray(), ImreadModes.AnyColor, Thumbnails[0]);
}
entry = inputFile.GetEntry("preview_cropping.png");
if (!ReferenceEquals(entry, null))
{
CvInvoke.Imdecode(entry.Open().ToArray(), ImreadModes.AnyColor, Thumbnails[CreatedThumbnailsCount]);
var count = CreatedThumbnailsCount;
Thumbnails[count] = new Mat();
CvInvoke.Imdecode(entry.Open().ToArray(), ImreadModes.AnyColor, Thumbnails[count]);
}
}
@@ -404,6 +430,7 @@ namespace UVtools.Core.FileFormats
public override void RebuildGCode()
{
if (IsPHZZip) return;
string arch = Environment.Is64BitOperatingSystem ? "64-bits" : "32-bits";
GCode = new StringBuilder();
GCode.AppendLine($"; {About.Website} {About.Software} {Assembly.GetExecutingAssembly().GetName().Version} {arch} {DateTime.Now}");
@@ -493,7 +520,10 @@ namespace UVtools.Core.FileFormats
}
}
outputFile.PutFileContent("run.gcode", GCode.ToString(), ZipArchiveMode.Update);
if (!IsPHZZip)
{
outputFile.PutFileContent("run.gcode", GCode.ToString(), ZipArchiveMode.Update);
}
}
//Decode(FileFullPath, progress);
UVtools.Core/FileFormats/FileFormat.cs
+2 -4
View File
@@ -292,12 +292,12 @@ namespace UVtools.Core.FileFormats
public byte CreatedThumbnailsCount {
get
{
if (ReferenceEquals(Thumbnails, null)) return 0;
if (Thumbnails is null) return 0;
byte count = 0;
foreach (var thumbnail in Thumbnails)
{
if (ReferenceEquals(thumbnail, null)) continue;
if (thumbnail is null) continue;
count++;
}
@@ -572,8 +572,6 @@ namespace UVtools.Core.FileFormats
Clear();
FileValidation(fileFullPath);
FileFullPath = fileFullPath;
if(ReferenceEquals(progress, null)) progress = new OperationProgress();
progress.ItemName = OperationProgress.StatusGatherLayers;
}
public virtual void Extract(string path, bool genericConfigExtract = true, bool genericLayersExtract = true,
UVtools.Core/FileFormats/SL1File.cs
+3
View File
@@ -493,6 +493,9 @@ namespace UVtools.Core.FileFormats
{
base.Decode(fileFullPath, progress);
if (progress is null) progress = new OperationProgress();
progress.ItemName = OperationProgress.StatusGatherLayers;
FileFullPath = fileFullPath;
PrinterSettings = new Printer();
UVtools.Core/Objects/BindableBase.cs
+1 -4
View File
@@ -60,10 +60,7 @@ namespace UVtools.Core.Objects
protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
{
var eventHandler = PropertyChanged;
if (!ReferenceEquals(eventHandler, null))
{
eventHandler(this, new PropertyChangedEventArgs(propertyName));
}
eventHandler?.Invoke(this, new PropertyChangedEventArgs(propertyName));
}
}
}
UVtools.Core/Operations/Operation.cs
-1
View File
@@ -7,7 +7,6 @@
*/
using System.Drawing;
using System.Runtime.CompilerServices;
using Emgu.CV;
using UVtools.Core.Objects;
UVtools.GUI/FrmMain.cs
+1 -4
View File
@@ -1424,10 +1424,6 @@ namespace UVtools.GUI
}
catch (OperationCanceledException)
{
if (File.Exists(dialog.FileName))
{
File.Delete(dialog.FileName);
}
}
catch (Exception ex)
{
@@ -1437,6 +1433,7 @@ namespace UVtools.GUI
extraMessage = "Note: When converting from SL1 make sure you have the correct printer selected, you MUST use a UVtools base printer.\n" +
"Go to \"Help\" -> \"Install profiles into PrusaSlicer\" to install printers.\n";
}
MessageBox.Show($"Convertion was not successful! Maybe not implemented...\n{extraMessage}{ex.Message}",
"Convertion unsuccessful", MessageBoxButtons.OK, MessageBoxIcon.Error);
}