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-12-24 21:41:13 +0300
committerTiago Conceição <Tiago_caza@hotmail.com>2021-12-24 21:41:13 +0300
commit91e1929ba9ed06422ba8d4e57cf08a4a11883140 (patch)
tree7744d56e816c674199828f420686226a7ffaf47a
parenta8deeae0f526833326ae3c7a322e0d05a7884365 (diff)
v2.27.3v2.27.3
- **Encrypted CTB:** - (Add) Allow convert files to this format in the UI - (Fix) Converting files with a null machine name would cause an exception - (Fix) Converting files was generating malformed files - **UI:** - (Change) CTB: Extension display order (Will require readjust settings for default extension if you are using any of them) - (Fix) 'File - Open recent file' would not enable first item when closing the file
-rw-r--r--CHANGELOG.md10
-rw-r--r--UVtools.Core/FileFormats/CTBEncryptedFile.cs96
-rw-r--r--UVtools.Core/FileFormats/ChituboxFile.cs4
-rw-r--r--UVtools.Core/FileFormats/ZCodeFile.cs2
-rw-r--r--UVtools.Core/UVtools.Core.csproj2
-rw-r--r--UVtools.WPF/MainWindow.axaml.cs9
-rw-r--r--UVtools.WPF/UVtools.WPF.csproj2
7 files changed, 66 insertions, 59 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57cf7bb..8212f7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
# Changelog
+## 24/12/2021 - v2.27.3
+
+- **Encrypted CTB:**
+ - (Add) Allow convert files to this format in the UI
+ - (Fix) Converting files with a null machine name would cause an exception
+ - (Fix) Converting files was generating malformed files
+- **UI:**
+ - (Change) CTB: Extension display order (Will require readjust settings for default extension if you are using any of them)
+ - (Fix) 'File - Open recent file' would not enable first item when closing the file
+
## 23/12/2021 - v2.27.2
- **(Core) Layer:**
diff --git a/UVtools.Core/FileFormats/CTBEncryptedFile.cs b/UVtools.Core/FileFormats/CTBEncryptedFile.cs
index 1973127..3403072 100644
--- a/UVtools.Core/FileFormats/CTBEncryptedFile.cs
+++ b/UVtools.Core/FileFormats/CTBEncryptedFile.cs
@@ -581,56 +581,10 @@ namespace UVtools.Core.FileFormats
public override FileFormatType FileType => FileFormatType.Binary;
public override FileExtension[] FileExtensions { get; } = {
- new(typeof(CTBEncryptedFile), "ctb", "Chitubox CTB (Encrypted)", true
-#if !DEBUG
- , false
-#endif
- ),
+ new(typeof(CTBEncryptedFile), "ctb", "Chitubox CTB (Encrypted)"),
new(typeof(CTBEncryptedFile), "encrypted.ctb", "Chitubox CTB (Encrypted)", false, false),
};
- public override string MachineName
- {
- get => Settings.MachineName;
- set
- {
- Settings.MachineName = value;
- Settings.MachineNameSize = (uint)value.Length;
- }
- }
-
- public override uint ResolutionX
- {
- get => Settings.ResolutionX;
- set
- {
- Settings.ResolutionX = value;
- RaisePropertyChanged();
- }
- }
-
- public override uint ResolutionY
- {
- get => Settings.ResolutionY;
- set
- {
- Settings.ResolutionY = value;
- RaisePropertyChanged();
- }
- }
-
- public override float LayerHeight
- {
- get => Settings.LayerHeight;
- set
- {
- Settings.LayerHeight = value;
- RaisePropertyChanged();
- }
- }
-
- public override byte AntiAliasing { get => 8; set { } }
-
public override Size[] ThumbnailsOriginalSize { get; } =
{
new(400, 300),
@@ -682,9 +636,7 @@ namespace UVtools.Core.FileFormats
PrintParameterModifier.BottomLightPWM,
PrintParameterModifier.LightPWM
};
-
-
-
+
public override PrintParameterModifier[] PrintParameterPerLayerModifiers { get; } = {
PrintParameterModifier.LightOffDelay,
PrintParameterModifier.WaitTimeBeforeCure,
@@ -701,7 +653,37 @@ namespace UVtools.Core.FileFormats
PrintParameterModifier.LightPWM
};
+ public override uint ResolutionX
+ {
+ get => Settings.ResolutionX;
+ set
+ {
+ Settings.ResolutionX = value;
+ RaisePropertyChanged();
+ }
+ }
+
+ public override uint ResolutionY
+ {
+ get => Settings.ResolutionY;
+ set
+ {
+ Settings.ResolutionY = value;
+ RaisePropertyChanged();
+ }
+ }
+
+ public override float LayerHeight
+ {
+ get => Settings.LayerHeight;
+ set
+ {
+ Settings.LayerHeight = value;
+ RaisePropertyChanged();
+ }
+ }
+ public override byte AntiAliasing { get => 8; set { } }
public override float DisplayWidth
{
@@ -1012,6 +994,12 @@ namespace UVtools.Core.FileFormats
}
}
+ public override string MachineName
+ {
+ get => Settings.MachineName;
+ set => base.MachineName = Settings.MachineName = value;
+ }
+
public override float MaterialMilliliters
{
get => base.MaterialMilliliters;
@@ -1315,9 +1303,11 @@ namespace UVtools.Core.FileFormats
};
var previewBytes = preview.Encode(image);
+
#if !DEBUG
- Bigfoot = new byte[32]; CookieMonster = new byte[16];
+ if (Settings.LayerPointersOffset > 0) { Bigfoot = new byte[32]; CookieMonster = new byte[16]; }
#endif
+
if (previewBytes.Length == 0) continue;
if (i == 0)
@@ -1369,9 +1359,13 @@ namespace UVtools.Core.FileFormats
progress.LockAndIncrement();
});
+
+ /*
#if !DEBUG
Bigfoot = new byte[32]; CookieMonster = new byte[16];
#endif
+ */
+
progress.Reset(OperationProgress.StatusWritingFile, LayerCount);
for (uint layerIndex = 0; layerIndex < LayerCount; layerIndex++)
{
diff --git a/UVtools.Core/FileFormats/ChituboxFile.cs b/UVtools.Core/FileFormats/ChituboxFile.cs
index 51f4526..1c13442 100644
--- a/UVtools.Core/FileFormats/ChituboxFile.cs
+++ b/UVtools.Core/FileFormats/ChituboxFile.cs
@@ -1066,13 +1066,13 @@ namespace UVtools.Core.FileFormats
public override FileFormatType FileType => FileFormatType.Binary;
public override FileExtension[] FileExtensions { get; } = {
+ new(typeof(ChituboxFile), "photon", "Chitubox Photon"),
+ new(typeof(ChituboxFile), "cbddlp", "Chitubox CBDDLP"),
new(typeof(ChituboxFile), "ctb", $"Chitubox CTBv{USED_VERSION}"),
//new(typeof(ChituboxFile), "v2.ctb", "Chitubox CTBv2"),
//new(typeof(ChituboxFile), "v3.ctb", "Chitubox CTBv3"),
new(typeof(ChituboxFile), "v4.ctb", "Chitubox CTBv4", false),
//new(typeof(ChituboxFile), "encrypted.ctb", "Chitubox encrypted CTB"),
- new(typeof(ChituboxFile), "cbddlp", "Chitubox CBDDLP"),
- new(typeof(ChituboxFile), "photon", "Chitubox Photon"),
};
public override PrintParameterModifier[] PrintParameterModifiers
diff --git a/UVtools.Core/FileFormats/ZCodeFile.cs b/UVtools.Core/FileFormats/ZCodeFile.cs
index a2b6e4f..6841e32 100644
--- a/UVtools.Core/FileFormats/ZCodeFile.cs
+++ b/UVtools.Core/FileFormats/ZCodeFile.cs
@@ -177,7 +177,7 @@ namespace UVtools.Core.FileFormats
public override FileFormatType FileType => FileFormatType.Archive;
public override FileExtension[] FileExtensions { get; } = {
- new(typeof(ZCodeFile), "zcode", "UnizMaker ZCode")
+ new(typeof(ZCodeFile), "zcode", "UnizMaker IBEE (ZCode)")
};
public override PrintParameterModifier[] PrintParameterModifiers { get; } = {
diff --git a/UVtools.Core/UVtools.Core.csproj b/UVtools.Core/UVtools.Core.csproj
index 601de06..b6446e6 100644
--- a/UVtools.Core/UVtools.Core.csproj
+++ b/UVtools.Core/UVtools.Core.csproj
@@ -10,7 +10,7 @@
<RepositoryUrl>https://github.com/sn4k3/UVtools</RepositoryUrl>
<PackageProjectUrl>https://github.com/sn4k3/UVtools</PackageProjectUrl>
<Description>MSLA/DLP, file analysis, calibration, repair, conversion and manipulation</Description>
- <Version>2.27.2</Version>
+ <Version>2.27.3</Version>
<Copyright>Copyright © 2020 PTRTECH</Copyright>
<PackageIcon>UVtools.png</PackageIcon>
<Platforms>AnyCPU;x64</Platforms>
diff --git a/UVtools.WPF/MainWindow.axaml.cs b/UVtools.WPF/MainWindow.axaml.cs
index 2b5d1ab..35fbe7b 100644
--- a/UVtools.WPF/MainWindow.axaml.cs
+++ b/UVtools.WPF/MainWindow.axaml.cs
@@ -1327,8 +1327,11 @@ namespace UVtools.WPF
ClearROIAndMask();
- if(!Settings.Tools.LastUsedSettingsKeepOnCloseFile)
- OperationSessionManager.Instance.Clear();
+ if(!Settings.Tools.LastUsedSettingsKeepOnCloseFile) OperationSessionManager.Instance.Clear();
+ if(_menuFileOpenRecentItems.Length > 0)
+ {
+ _menuFileOpenRecentItems[0].IsEnabled = true; // Re-enable last file
+ }
ResetDataContext();
}
@@ -2320,7 +2323,7 @@ namespace UVtools.WPF
{
Header = Path.GetFileName(file),
Tag = file,
- IsEnabled = SlicerFile?.FileFullPath != file
+ IsEnabled = !IsFileLoaded || SlicerFile.FileFullPath != file
};
ToolTip.SetTip(item, file);
ToolTip.SetPlacement(item, PlacementMode.Right);
diff --git a/UVtools.WPF/UVtools.WPF.csproj b/UVtools.WPF/UVtools.WPF.csproj
index ae6db37..8517234 100644
--- a/UVtools.WPF/UVtools.WPF.csproj
+++ b/UVtools.WPF/UVtools.WPF.csproj
@@ -12,7 +12,7 @@
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<RepositoryUrl>https://github.com/sn4k3/UVtools</RepositoryUrl>
<RepositoryType>Git</RepositoryType>
- <Version>2.27.2</Version>
+ <Version>2.27.3</Version>
<Platforms>AnyCPU;x64</Platforms>
<PackageIcon>UVtools.png</PackageIcon>
<PackageReadmeFile>README.md</PackageReadmeFile>