Saving fixes.

ggarra13 · Apr 27, 2023 · 697329e · 697329e
1 parent dfc2c7d
commit 697329e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -149,7 +149,7 @@ jobs:
       run: brew install ninja
 
     - name: Install openssl
-      run: sudo brew install openssl
+      run: brew install openssl
 
     - name: Install automake
       run: brew install automake

diff --git a/mrv2/lib/mrvFl/mrvSaving.cpp b/mrv2/lib/mrvFl/mrvSaving.cpp
@@ -124,6 +124,7 @@ namespace mrv
                     X = (viewportSize.w - renderSize.w) / 2;
                     Y = (viewportSize.h - renderSize.h) / 2;
 
+                    view->setFrameView(false);
                     view->setViewZoom(1.0);
                     view->centerView();
                 }
@@ -135,6 +136,15 @@ namespace mrv
                     LOG_WARNING(_("Image too big.  "
                                   "Will save the viewport size."));
                 }
+                std::string msg = tl::string::Format(
+                                      _("Viewport Size: {0}  Render Size: {1}  "
+                                        "viewZoom: {2} X: {3} Y: {4}"))
+                                      .arg(viewportSize)
+                                      .arg(renderSize)
+                                      .arg(view->viewZoom())
+                                      .arg(X)
+                                      .arg(Y);
+                LOG_INFO(msg);
             }
 
             imaging::Info outputInfo;
@@ -146,6 +156,10 @@ namespace mrv
             {
                 outputInfo.pixelType = imaging::PixelType::RGB_U8;
             }
+            std::string msg = tl::string::Format(_("Output info: {0} {1}"))
+                                  .arg(outputInfo.size)
+                                  .arg(outputInfo.pixelType);
+            LOG_INFO(msg);
 
             auto outputImage = imaging::Image::create(outputInfo);
 

diff --git a/mrv2/lib/mrvWidgets/SaveOptionsUI.fl b/mrv2/lib/mrvWidgets/SaveOptionsUI.fl
@@ -12,10 +12,10 @@ snap {
   current_suite FLTK
   current_preset 0
 }
-decl {\#include <string>} {public global
+decl {\#include <string>} {selected public global
 }
 
-decl {\#include "mrvCore/mrvSequence.h"} {selected public global
+decl {\#include "mrvCore/mrvSequence.h"} {public global
 }
 
 class SaveOptionsUI {open
@@ -24,7 +24,7 @@ class SaveOptionsUI {open
   } {
     Fl_Window uiMain {
       label {Saving Options}
-      xywh {285 453 508 402} type Double align 5 visible
+      xywh {285 453 508 402} type Double align 5 modal visible
     } {
       Fl_Group {} {
         label {Common Settings}

diff --git a/tlRender b/tlRender