fix(fix-orientation): apply manual trim with Apply to… (#129)

Apply to… only copied rotation; propagate ImageTrim from the panel
to the selected pages (or clear trim when disabled), mirroring
applyRotation. Add Settings::applyTrim and currentTrimFromControls().

Author: pablogventura

src/core/filters/fix_orientation/OptionsWidget.cpp

@@ -83,6 +83,7 @@ void OptionsWidget::appliedTo(const std::set<PageId>& pages) {
   }
 
   m_settings->applyRotation(pages, m_rotation);
+  m_settings->applyTrim(pages, currentTrimFromControls());
 
   if (pages.size() > 1) {
     emit invalidateAllThumbnails();
@@ -95,6 +96,7 @@ void OptionsWidget::appliedTo(const std::set<PageId>& pages) {
 
 void OptionsWidget::appliedToAllPages(const std::set<PageId>& pages) {
   m_settings->applyRotation(pages, m_rotation);
+  m_settings->applyTrim(pages, currentTrimFromControls());
   emit invalidateAllThumbnails();
 }
 
@@ -172,14 +174,25 @@ void OptionsWidget::pullTrimToControls() {
 }
 
 void OptionsWidget::pushTrimFromControls() {
+  const ImageTrim trim(currentTrimFromControls());
+  if (!trim.enabled) {
+    return;
+  }
+  m_settings->setTrim(m_pageId.imageId(), trim);
+  emit invalidateThumbnail(m_pageId);
+}
+
+ImageTrim OptionsWidget::currentTrimFromControls() const {
   ImageTrim trim;
-  trim.enabled = true;
+  trim.enabled = trimEnabledCheck->isChecked();
+  if (!trim.enabled) {
+    return trim;
+  }
   trim.left = trimLeftSpin->value();
   trim.right = trimRightSpin->value();
   trim.top = trimTopSpin->value();
   trim.bottom = trimBottomSpin->value();
-  m_settings->setTrim(m_pageId.imageId(), trim);
-  emit invalidateThumbnail(m_pageId);
+  return trim;
 }
 
 void OptionsWidget::setRotationPixmap() {

src/core/filters/fix_orientation/OptionsWidget.h

@@ -69,6 +69,8 @@ class OptionsWidget : public FilterOptionsWidget, private Ui::OptionsWidget {
 
   void pushTrimFromControls();
 
+  ImageTrim currentTrimFromControls() const;
+
   std::shared_ptr<Settings> m_settings;
   PageSelectionAccessor m_pageSelectionAccessor;
   PageId m_pageId;

src/core/filters/fix_orientation/Settings.cpp

@@ -56,6 +56,19 @@ void Settings::applyRotation(const std::set<PageId>& pages, const OrthogonalRota
   }
 }
 
+void Settings::applyTrim(const std::set<PageId>& pages, const ImageTrim& trim) {
+  QMutexLocker locker(&m_mutex);
+
+  for (const PageId& page : pages) {
+    const ImageId imageId(page.imageId());
+    if (!trim.enabled) {
+      m_perImageTrim.erase(imageId);
+    } else {
+      Utils::mapSetValue(m_perImageTrim, imageId, trim);
+    }
+  }
+}
+
 OrthogonalRotation Settings::getRotationFor(const ImageId& imageId) const {
   QMutexLocker locker(&m_mutex);
 

src/core/filters/fix_orientation/Settings.h

@@ -33,6 +33,8 @@ class Settings {
 
   void applyRotation(const std::set<PageId>& pages, OrthogonalRotation rotation);
 
+  void applyTrim(const std::set<PageId>& pages, const ImageTrim& trim);
+
   OrthogonalRotation getRotationFor(const ImageId& imageId) const;
 
   bool isRotationNull(const ImageId& imageId) const;