OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1379 Get active view window before displaying file selection dialog

Browse Source
This commit is contained in:
Magne Sjaastad 2017-04-06 10:38:20 +02:00
parent 380de17ae0
commit 6b78d98a74
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/Commands/RicSnapshotViewToClipboardFeature.cpp
View File

@ -19,6 +19,7 @@
#include "RicSnapshotViewToClipboardFeature.h" #include "RicSnapshotViewToClipboardFeature.h"
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaLogging.h"
#include "RimMainPlotCollection.h" #include "RimMainPlotCollection.h"
#include "RimProject.h" #include "RimProject.h"
@ -119,6 +120,17 @@ void RicSnapshotViewToFileFeature::onActionTriggered(bool isChecked)
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
RimProject* proj = app->project(); RimProject* proj = app->project();
// Get active view window before displaying the file selection dialog
// If this is done after the file save dialog is displayed (and closed)
// app->activeViewWindow() returns NULL on Linux
RimViewWindow* viewWindow = app->activeViewWindow();
if (!viewWindow)
{
RiaLogging::error("No view window is available, nothing to do");
return;
}
QString startPath; QString startPath;
if (!proj->fileName().isEmpty()) if (!proj->fileName().isEmpty())
{ {
@ -141,7 +153,6 @@ void RicSnapshotViewToFileFeature::onActionTriggered(bool isChecked)
// Remember the directory to next time // Remember the directory to next time
app->setLastUsedDialogDirectory("IMAGE_SNAPSHOT", QFileInfo(fileName).absolutePath()); app->setLastUsedDialogDirectory("IMAGE_SNAPSHOT", QFileInfo(fileName).absolutePath());
RimViewWindow* viewWindow = app->activeViewWindow();
RicSnapshotViewToFileFeature::saveSnapshotAs(fileName, viewWindow); RicSnapshotViewToFileFeature::saveSnapshotAs(fileName, viewWindow);
} }