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

#846 If plot window is hidden, do not open plot window when loading case with summary data

Browse Source
This commit is contained in:
Magne Sjaastad
2016-10-04 13:14:39 +02:00
parent 6313a06f2e
commit 8277080c2e
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -1437,6 +1437,11 @@ bool RiaApplication::tryCloseMainWindow()
//--------------------------------------------------------------------------------------------------
bool RiaApplication::tryClosePlotWindow()
{
if (!m_mainPlotWindow)
{
return true;
}
if (m_mainPlotWindow && !m_mainPlotWindow->isVisible())
{
m_mainPlotWindow->close();

6
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp
View File

@@ -109,6 +109,10 @@ void RicNewSummaryPlotFeature::createNewSummaryPlot(RimSummaryPlotCollection* su
summaryPlotColl->updateConnectedEditors();
plot->loadDataAndUpdate();
RiaApplication::instance()->getOrCreateAndShowMainPlotWindow()->selectAsCurrentItem(newCurveFilter);
if (RiaApplication::instance()->mainPlotWindow())
{
RiaApplication::instance()->mainPlotWindow()->selectAsCurrentItem(newCurveFilter);
}
}

1
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.h
View File

@@ -38,4 +38,5 @@ protected:
virtual bool isCommandEnabled();
virtual void onActionTriggered( bool isChecked );
virtual void setupActionLook(QAction* actionToSetup);
};

3
ApplicationCode/ProjectDataModel/RimSummaryPlot.cpp
View File

@@ -327,7 +327,8 @@ void RimSummaryPlot::setDescription(const QString& description)
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::updateViewerWidget()
{
RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->mainPlotWindow();
if (!mainPlotWindow) return;
if (m_showWindow())
{