diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 716af7792..8512f08cc 100644 --- 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 index 2896dcb74..b29caf824 100644 --- 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 index 346231522..87d66b30a 100644 --- 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 } {public global +decl {\#include } {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 index 2a3a29cba..d745d2d3e 160000 --- a/tlRender +++ b/tlRender @@ -1 +1 @@ -Subproject commit 2a3a29cba110bf78af7b139804581ea045c9ed92 +Subproject commit d745d2d3ee4e82e130d6e0ee736854dee1904afd