fix adjustment selection, implement kepp aspect-ratio and resize to p…

…ercentage [#12]
t0815 · Sep 1, 2024 · 9737ccf · 9737ccf
1 parent 88ea142
commit 9737ccf
Show file tree

Hide file tree

Showing 10 changed files with 184 additions and 71 deletions.
diff --git a/MyCBZ/App.config b/MyCBZ/App.config
@@ -135,7 +135,7 @@
     <applicationSettings>
         <Win_CBZ.Win_CBZSettings>
             <setting name="Version" serializeAs="String">
-                <value>0.20.154b</value>
+                <value>0.20.155b</value>
             </setting>
             <setting name="RenamerPlaceholders" serializeAs="Xml">
                 <value>

diff --git a/MyCBZ/Forms/MainForm.Designer.cs b/MyCBZ/Forms/MainForm.Designer.cs
diff --git a/MyCBZ/Forms/MainForm.cs b/MyCBZ/Forms/MainForm.cs
diff --git a/MyCBZ/Forms/MainForm.resx b/MyCBZ/Forms/MainForm.resx
@@ -140,7 +140,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
         LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
         SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAbgoAAAJNU0Z0AUkBTAIBAQMB
-        AAGgAR8BoAEfARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMAAUADAAEQAwABAQEAAQgG
+        AAG4AR8BuAEfARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMAAUADAAEQAwABAQEAAQgG
         AAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEAAfABygGmAQABMwUAATMB
         AAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEAAYABfAH/AQACUAH/AQAB
         kwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFmAwABmQMAAcwCAAEzAwAC
@@ -198,7 +198,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
         LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
         SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAXj4AAAJNU0Z0AUkBTAIBAREB
-        AAGgAR8BoAEfARgBAAEYAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABYAMAAXgDAAEBAQABGAYAAYf/
+        AAG4AR8BuAEfARgBAAEYAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABYAMAAXgDAAEBAQABGAYAAYf/
         AP8A/wB4AALUAdUDJzYlAycD1d4AA70DJTa9AyUDvt4AA70DJRIAA/8B5QHzAfYBvAHqAfMBvAHqAfMB
         5QHzAfYD/xIAAyUDvt4AA70DJQ8AAfQB+AH5AVAB2gH0AQAB0gH6AQAB0gH6AQAB0gH6AQAB0gH6AVAB
         2gL0AfgB+Q8AAyUDvt4AA70DJQwAAfoC+wEuAdcB9wEAAdIB+gHMAe0C9AH4AfkB9AH4AfkBzAHtAfQB
@@ -508,7 +508,7 @@ The page with type 'FrontCover' should be at index 1.</value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
         LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
         SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAACgMAAAJNU0Z0AUkBTAIBAQIB
-        AAEQAR8BEAEfARABAAEQAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAARADAAEBAQABGAYAAQwh
+        AAEoAR8BKAEfARABAAEQAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABQAMAARADAAEBAQABGAYAAQwh
         AAP3A9kDxAO/A9ID7QP+pQAD/gO5AywPJQN/A/0SAAPnAVIBVAFVA/oPAAO4AbYCuG8AA/sDhgYlA0kD
         qwOtA38GJQNEA+MMAAPmA1ADJQN9A/oGAAP9A7QDKwMlA7ppAAP+A2MJJQObBgAD3wklA0QD/QYAA+cM
         JQNGA/oDAAO0DCUBtgK4ZgAD1AwlA5sGAAPfDCUDfwP+AwAD6AM1DCUDfQO0AysJJQMrA7hmAAOGDCUD
@@ -534,7 +534,7 @@ The page with type 'FrontCover' should be at index 1.</value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
         LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
         SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAEAwAAAJNU0Z0AUkBTAIBAQQB
-        AAGoAR8BqAEfARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMAAUADAAEgAwABAQEAAQgG
+        AAHAAR8BwAEfARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMAAUADAAEgAwABAQEAAQgG
         AAEIGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEAAfABygGmAQABMwUAATMB
         AAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEAAYABfAH/AQACUAH/AQAB
         kwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFmAwABmQMAAcwCAAEzAwAC

diff --git a/MyCBZ/Models/ImageAdjustments.cs b/MyCBZ/Models/ImageAdjustments.cs
@@ -58,6 +58,10 @@ public ImageAdjustments(ImageAdjustments copyFrom = null)
                 ConvertFormat = copyFrom.ConvertFormat;
                 Interpolation = copyFrom.Interpolation;
                 MaxDimensions = copyFrom.MaxDimensions;
+                KeepAspectRatio = copyFrom.KeepAspectRatio;
+                ResizeToPercentage = copyFrom.ResizeToPercentage;
+                DontStretch = copyFrom.DontStretch;
+                Grayscale = copyFrom.Grayscale;
             }
         }
     }

diff --git a/MyCBZ/Models/ImageTask.cs b/MyCBZ/Models/ImageTask.cs
@@ -154,19 +154,26 @@ public ImageTask Apply()
 
                             if (ImageAdjustments.KeepAspectRatio)
                             {
+                                float ratio = 1.0f; 
+
+                                //Math.Min(targetFormat.W / SourceFormat.W, targetFormat.H / SourceFormat.H);                               
+
                                 if (targetFormat.H == 0)
                                 {
-                                    targetFormat.H = (int)(targetFormat.W * (ImageAdjustments.ResizeTo.Y / ImageAdjustments.ResizeTo.X));
+                                    ratio = (float)targetFormat.W / SourceFormat.W;
                                 }
                                 else if (targetFormat.W == 0)
                                 {
-                                    targetFormat.W = (int)(targetFormat.H * (ImageAdjustments.ResizeTo.X / ImageAdjustments.ResizeTo.Y));
+                                    ratio = (float)targetFormat.H / SourceFormat.H;
                                 }
                                 else if (targetFormat.W > 0 && targetFormat.H > 0)
                                 {
                                     //targetFormat.W = (int)(targetFormat.H * (ImageAdjustments.ResizeTo.X / ImageAdjustments.ResizeTo.Y));
                                     //targetFormat.H = (int)(targetFormat.W * (ImageAdjustments.ResizeTo.Y / ImageAdjustments.ResizeTo.X));
                                 }
+
+                                targetFormat.W = (int)(SourceFormat.W * ratio);
+                                targetFormat.H = (int)(SourceFormat.H * ratio);
                             }
 
                             if (ImageAdjustments.ResizeMode == 3)  // Resize percentage

diff --git a/MyCBZ/Win_CBZSettings.Designer.cs b/MyCBZ/Win_CBZSettings.Designer.cs
diff --git a/MyCBZ/Win_CBZSettings.settings b/MyCBZ/Win_CBZSettings.settings
@@ -6,7 +6,7 @@
       <Value Profile="(Default)">%APPDATA%\WIN_CBZ\Temp\</Value>
     </Setting>
     <Setting Name="Version" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">0.20.154b</Value>
+      <Value Profile="(Default)">0.20.155b</Value>
     </Setting>
     <Setting Name="RenamerPlaceholders" Type="System.Collections.Specialized.StringCollection" Scope="Application">
       <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;

diff --git a/Readme.md b/Readme.md
@@ -52,7 +52,7 @@ Microsoft Visual Studio [Community] 2022 (64-Bit)
 
 ## Latest Release
 
-v0.20.154b released!
+v0.20.155b released!
 
 
 >[!IMPORTANT]

diff --git a/Win_CBZ-Setup/Win_CBZ-Setup.vdproj b/Win_CBZ-Setup/Win_CBZ-Setup.vdproj
@@ -248,15 +248,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Win_CBZ"
-        "ProductCode" = "8:{9EB3C6FD-7921-47BA-93F6-88893864F722}"
-        "PackageCode" = "8:{0F1ECEAC-2FE7-4C63-AE33-938BCF0127B8}"
+        "ProductCode" = "8:{49599E47-00F9-42C1-B559-55E9C136EAF1}"
+        "PackageCode" = "8:{E0C557C1-47D7-45E4-BE1A-3DC11715FE62}"
         "UpgradeCode" = "8:{66FAEF81-1CAE-4971-9E0F-796310EFEA5E}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:0.20.154"
+        "ProductVersion" = "8:0.20.155"
         "Manufacturer" = "8:Trash_s0Ft"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -808,7 +808,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_1DAB07B3E40248E0B54293E16EE30178"
             {
-            "SourcePath" = "8:..\\MyCBZ\\obj\\x64\\Release\\net8.0-windows7.0\\apphost.exe"
+            "SourcePath" = "8:..\\MyCBZ\\obj\\x64\\Debug\\net8.0-windows7.0\\apphost.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_381C2AC7AD384E1488C6014F95032920"