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

Merge pull request #4844 from OPM/improve-command-line-

Browse Source 
#4765 Summary : Support command line snapshots without a project file
This commit is contained in:
Magne Sjaastad 2019-10-10 07:52:55 +02:00 committed by GitHub
commit 71760b0e34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ApplicationCode/Application/RiaGuiApplication.cpp
View File

@ -821,36 +821,33 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( cvf::Progr
} }
} }
if ( project() != nullptr && !project()->fileName().isEmpty() ) QString exportFolder = QDir::currentPath() + "/snapshots";
if ( snapshotViews )
{ {
if ( snapshotViews ) RiuMainWindow* mainWnd = RiuMainWindow::instance();
CVF_ASSERT( mainWnd );
mainWnd->hideAllDockWidgets();
RicSnapshotAllViewsToFileFeature::exportSnapshotOfViewsIntoFolder( exportFolder );
mainWnd->loadWinGeoAndDockToolBarLayout();
}
if ( snapshotPlots )
{
if ( mainPlotWindow() )
{ {
RiuMainWindow* mainWnd = RiuMainWindow::instance(); mainPlotWindow()->hideAllDockWidgets();
CVF_ASSERT( mainWnd );
mainWnd->hideAllDockWidgets();
// 2016-11-09 : Location of snapshot folder was previously located in 'snapshot' folder RicSnapshotAllPlotsToFileFeature::exportSnapshotOfPlotsIntoFolder( exportFolder );
// relative to current working folder. Now harmonized to behave as RiuMainWindow::slotSnapshotAllViewsToFile()
QString absolutePathToSnapshotDir = createAbsolutePathFromProjectRelativePath( "snapshots" );
RicSnapshotAllViewsToFileFeature::exportSnapshotOfViewsIntoFolder( absolutePathToSnapshotDir );
mainWnd->loadWinGeoAndDockToolBarLayout(); mainPlotWindow()->loadWinGeoAndDockToolBarLayout();
}
if ( snapshotPlots )
{
if ( mainPlotWindow() )
{
mainPlotWindow()->hideAllDockWidgets();
// Will be saved relative to current directory
RicSnapshotAllPlotsToFileFeature::saveAllPlots();
mainPlotWindow()->loadWinGeoAndDockToolBarLayout();
}
} }
} }
closeProject();
return EXIT_COMPLETED; return EXIT_COMPLETED;
} }