fixing updating wrong image adjustments.... wip

Author: t0815

MyCBZ/Forms/MainForm.cs

@@ -348,7 +348,7 @@ private void NewProject()
                             selectedImageTasks = Program.ProjectModel.GlobalImageTask;
                             GlobalAlertTableLayout.Visible = false;
 
-                            UpdateImageAdjustments(null, "<Global>");
+                            UpdateImageAdjustments(null, "<Global>", true);
                         }));
 
                         ClearLog();
@@ -425,7 +425,7 @@ private void OpenToolStripMenuItem_Click(object sender, EventArgs e)
                             TextBoxExcludePagesImageProcessing.Text = "";
                             RenamerExcludePages.Text = "";
                             PageCountStatusLabel.Text = "0 Pages";
-                            UpdateImageAdjustments(sender, "<Global>");
+                            UpdateImageAdjustments(sender, "<Global>", true);
                             Program.ProjectModel.IsChanged = false;
                             Program.ProjectModel.Pages.Clear();
                         }));
@@ -4014,15 +4014,16 @@ private void PagesList_ItemSelectionChanged(object sender, ListViewItemSelection
                 }
 
                 selectedImageTasks = ((Page)selectedPages[0].Tag).ImageTask;
+               
+                if (RadioApplyAdjustmentsPage.Checked && RadioApplyAdjustmentsPage.Tag != ((Page)selectedPages[0].Tag).Id)
+                {
+                    UpdateImageAdjustments(sender, ((Page)selectedPages[0].Tag).Id, true);
+                }
 
                 RadioApplyAdjustmentsPage.Text = ((Page)selectedPages[0].Tag).Name;
                 RadioApplyAdjustmentsPage.Tag = ((Page)selectedPages[0].Tag).Id;
                 RadioApplyAdjustmentsPage.Enabled = true;
 
-                if (RadioApplyAdjustmentsPage.Checked)
-                {
-                    UpdateImageAdjustments(sender, ((Page)selectedPages[0].Tag).Id);
-                }
                 //RequestImageInfoSlice();
             }
             else
@@ -5014,6 +5015,9 @@ private void ImageResizeRadioChanged(object sender, EventArgs e)
 
             if (selectedImageTasks != null)
             {
+                Page selectedPage = PagesList.SelectedItem?.Tag as Page;
+                bool dontUpdate = radio.Tag != null ? ((bool)radio.Tag) : true;
+
                 Page page = Program.ProjectModel.GetPageById(selectedImageTasks.PageId);
                 oldValue = page?.ImageTask.ImageAdjustments.ResizeMode;
 
@@ -5033,7 +5037,7 @@ private void ImageResizeRadioChanged(object sender, EventArgs e)
                         break;
                 }
 
-                if (page != null && oldValue != null && oldValue != selectedImageTasks.ImageAdjustments.ResizeMode)
+                if (!dontUpdate && page != null && oldValue != null && oldValue != selectedImageTasks.ImageAdjustments.ResizeMode)
                 {
                     AppEventHandler.OnPageChanged(this, new PageChangedEvent(page, null, PageChangedEvent.IMAGE_STATUS_CHANGED, true));
                 }
@@ -5079,10 +5083,13 @@ private void RadioApplyAdjustments_CheckedChanged(object sender, EventArgs e)
             if (rb.Checked)
             {
                 UpdateImageAdjustments(sender, selected);
+            } else
+            {
+                UpdateImageAdjustments(sender, selected, true);
             }
         }
 
-        private void UpdateImageAdjustments(object sender, string selected)
+        private void UpdateImageAdjustments(object sender, string selected, bool dontUpdate = false)
         {
             ImageTask selectedTask = null;
             Page page = null;
@@ -5113,20 +5120,24 @@ private void UpdateImageAdjustments(object sender, string selected)
                 {
 
                     Invoke(new Action(() =>
-                    {
+                    {                        
                         //ImageQualityTrackBar.Value = selectedTask.ImageAdjustments.Quality;
                         switch (selectedImageTasks.ImageAdjustments.ResizeMode)
                         {
                             case 0:
+                                RadioButtonResizeNever.Tag = dontUpdate;
                                 RadioButtonResizeNever.Checked = true;
                                 break;
                             case 1:
+                                RadioButtonResizeIfLarger.Tag = dontUpdate;
                                 RadioButtonResizeIfLarger.Checked = true;
                                 break;
                             case 2:
+                                RadioButtonResizeTo.Tag = dontUpdate;
                                 RadioButtonResizeTo.Checked = true;
                                 break;
                             case 3:
+                                RadioButtonResizePercent.Tag = dontUpdate;
                                 RadioButtonResizePercent.Checked = true;
                                 break;
 
@@ -5219,6 +5230,7 @@ private void CheckboxKeepAspectratio_CheckedChanged(object sender, EventArgs e)
 
             if (selectedImageTasks != null)
             {
+                Page selectedPage = PagesList.SelectedItem?.Tag as Page;
                 Page page = Program.ProjectModel.GetPageById(selectedImageTasks.PageId);
                 oldValue = page?.ImageTask.ImageAdjustments.KeepAspectRatio;
 
@@ -5300,6 +5312,7 @@ private void TextBoxResizeH_TextChanged(object sender, EventArgs e)
 
             if (selectedImageTasks != null)
             {
+                Page selectedPage = PagesList.SelectedItem?.Tag as Page;
                 Page page = Program.ProjectModel.GetPageById(selectedImageTasks.PageId);
                 oldValue = page?.ImageTask.ImageAdjustments.ResizeTo.Y;
 
@@ -5352,6 +5365,7 @@ private void TextboxResizePercentage_TextChanged(object sender, EventArgs e)
 
             if (selectedImageTasks != null)
             {
+                Page selectedPage = PagesList.SelectedItem?.Tag as Page;
                 Page page = Program.ProjectModel.GetPageById(selectedImageTasks.PageId);
                 oldValue = page?.ImageTask.ImageAdjustments.ResizeToPercentage;
 
@@ -5397,6 +5411,7 @@ private void CheckBoxDontStretch_CheckedChanged(object sender, EventArgs e)
 
             if (selectedImageTasks != null)
             {
+                Page selectedPage = PagesList.SelectedItem?.Tag as Page;
                 Page page = Program.ProjectModel.GetPageById(selectedImageTasks.PageId);
                 oldValue = page?.ImageTask.ImageAdjustments.DontStretch;
 
@@ -5422,6 +5437,7 @@ private void TextBoxSplitPageAt_TextChanged(object sender, EventArgs e)
 
             if (selectedImageTasks != null)
             {
+                Page selectedPage = PagesList.SelectedItem?.Tag as Page;
                 Page page = Program.ProjectModel.GetPageById(selectedImageTasks.PageId);
                 oldValue = page?.ImageTask.ImageAdjustments.SplitPageAt;
 
@@ -5455,6 +5471,7 @@ private void ComboBoxSplitAtType_SelectedIndexChanged(object sender, EventArgs e
 
             if (selectedImageTasks != null)
             {
+                Page selectedPage = PagesList.SelectedItem?.Tag as Page;
                 Page page = Program.ProjectModel.GetPageById(selectedImageTasks.PageId);
                 oldValue = page?.ImageTask.ImageAdjustments.SplitPageAt;
 
@@ -5479,6 +5496,7 @@ private void CheckBoxSplitDoublePages_CheckedChanged(object sender, EventArgs e)
 
             if (selectedImageTasks != null)
             {
+                Page selectedPage = PagesList.SelectedItem?.Tag as Page;
                 Page page = Program.ProjectModel.GetPageById(selectedImageTasks.PageId);
                 oldValue = page?.ImageTask.ImageAdjustments.SplitPage;
 

MyCBZ/Models/Page.cs

@@ -2353,5 +2353,10 @@ public void FreeImage()
 
             Invalidated = true;
         }
+
+        public override string ToString()
+        {
+            return Name;
+        }
     }
 }