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

#2535 Use the MainWindowTools class instead of MainWindow directly (part 2)

Browse Source
This commit is contained in:
Jacob Støren
2018-02-27 15:53:33 +01:00
parent d74807d669
commit 72013f4ff8
16 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@
#include "RimSummaryPlot.h"
#include "RimSummaryPlotCollection.h"
#include "RiuMainPlotWindow.h"
#include "RiuPlotMainWindowTools.h"
#include "WellLogCommands/RicWellLogPlotCurveFeatureImpl.h"
@@ -65,8 +65,8 @@ void RicDuplicateSummaryCurveFeature::onActionTriggered(bool isChecked)
if (curve)
{
RimSummaryCurve* newCurve = RicPasteSummaryCurveFeature::copyCurveAndAddToPlot(curve);
RiaApplication::instance()->getOrCreateAndShowMainPlotWindow()->selectAsCurrentItem(newCurve);
RiuPlotMainWindowTools::showPlotMainWindow();
RiuPlotMainWindowTools::selectAsCurrentItem(newCurve);
}
}

11
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCrossPlotFeature.cpp
View File

@@ -31,7 +31,7 @@
#include "RimSummaryCurveFilter.h"
#include "RimSummaryPlot.h"
#include "RiuMainPlotWindow.h"
#include "RiuPlotMainWindowTools.h"
#include "cvfAssert.h"
@@ -65,12 +65,9 @@ void RicNewSummaryCrossPlotFeature::onActionTriggered(bool isChecked)
summaryCrossPlotColl->updateConnectedEditors();
summaryPlot->loadDataAndUpdate();
RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
if (mainPlotWindow)
{
mainPlotWindow->selectAsCurrentItem(summaryPlot);
mainPlotWindow->setExpanded(summaryPlot);
}
RiuPlotMainWindowTools::showPlotMainWindow();
RiuPlotMainWindowTools::selectAsCurrentItem(summaryPlot);
RiuPlotMainWindowTools::setExpanded(summaryPlot);
}
}