OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename to RiuPlotMainWindow

Browse Source
This commit is contained in:
Magne Sjaastad
2018-04-27 06:28:08 +02:00
parent 515ed8a649
commit c267f32638
45 changed files with 111 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/Application/RiaApplication.cpp
+6 -6
View File
@@ -73,7 +73,7 @@
#include "RimWellRftPlot.h"
#include "RiuDockWidgetTools.h"
#include "RiuMainPlotWindow.h"
#include "RiuPlotMainWindow.h"
#include "RiuMainWindow.h"
#include "RiuProcessMonitor.h"
#include "RiuRecentFileActionProvider.h"
@@ -1291,7 +1291,7 @@ void RiaApplication::createMainPlotWindow()
{
CVF_ASSERT(m_mainPlotWindow == nullptr);
m_mainPlotWindow = new RiuMainPlotWindow;
m_mainPlotWindow = new RiuPlotMainWindow;
m_mainPlotWindow->setWindowTitle("Plots - ResInsight");
m_mainPlotWindow->setDefaultWindowSize();
@@ -1314,7 +1314,7 @@ void RiaApplication::deleteMainPlotWindow()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuMainPlotWindow* RiaApplication::getOrCreateAndShowMainPlotWindow()
RiuPlotMainWindow* RiaApplication::getOrCreateAndShowMainPlotWindow()
{
if (!m_mainPlotWindow)
{
@@ -1341,7 +1341,7 @@ RiuMainPlotWindow* RiaApplication::getOrCreateAndShowMainPlotWindow()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuMainPlotWindow* RiaApplication::mainPlotWindow()
RiuPlotMainWindow* RiaApplication::mainPlotWindow()
{
return m_mainPlotWindow;
}
@@ -1369,9 +1369,9 @@ RimViewWindow* RiaApplication::activeViewWindow()
{
viewWindow = RiaApplication::instance()->activeReservoirView();
}
else if (dynamic_cast<RiuMainPlotWindow*>(mainWindowWidget))
else if (dynamic_cast<RiuPlotMainWindow*>(mainWindowWidget))
{
RiuMainPlotWindow* mainPlotWindow = dynamic_cast<RiuMainPlotWindow*>(mainWindowWidget);
RiuPlotMainWindow* mainPlotWindow = dynamic_cast<RiuPlotMainWindow*>(mainWindowWidget);
QList<QMdiSubWindow*> subwindows = mainPlotWindow->subWindowList(QMdiArea::StackingOrder);
if (subwindows.size() > 0)
ApplicationCode/Application/RiaApplication.h
+4 -4
View File
@@ -57,7 +57,7 @@ class RimWellLogPlot;
class RimWellAllocationPlot;
class RiuMainWindowBase;
class RiuMainPlotWindow;
class RiuPlotMainWindow;
class RiuRecentFileActionProvider;
class RiaArgumentParser;
@@ -180,8 +180,8 @@ public:
int launchUnitTests();
int launchUnitTestsWithConsole();
RiuMainPlotWindow* getOrCreateAndShowMainPlotWindow();
RiuMainPlotWindow* mainPlotWindow();
RiuPlotMainWindow* getOrCreateAndShowMainPlotWindow();
RiuPlotMainWindow* mainPlotWindow();
RiuMainWindowBase* mainWindowByID(int mainWindowID);
static RimViewWindow* activeViewWindow();
@@ -249,7 +249,7 @@ private:
bool m_runningWorkerProcess;
RiuMainPlotWindow* m_mainPlotWindow;
RiuPlotMainWindow* m_mainPlotWindow;
std::unique_ptr<RiuRecentFileActionProvider> m_recentFileActionProvider;
};
ApplicationCode/Application/Tools/RiaArgumentParser.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
#include "RimProject.h"
#include "RiuMainWindow.h"
#include "RiuMainPlotWindow.h"
#include "RiuPlotMainWindow.h"
#include "RicfMessages.h"
#include "RicfCommandFileExecutor.h"
ApplicationCode/Application/Tools/RiaImportEclipseCaseTools.cpp
+1 -1
View File
@@ -45,7 +45,7 @@
#include "RimSummaryCurveFilter.h"
#include "RimSummaryPlotCollection.h"
#include "RiuMainPlotWindow.h"
#include "RiuPlotMainWindow.h"
#include "RiuMainWindow.h"
#include "cafUtils.h"
ApplicationCode/Application/Tools/RiaRegressionTestRunner.cpp
+2 -2
View File
@@ -32,7 +32,7 @@
#include "RimMainPlotCollection.h"
#include "RimProject.h"
#include "RiuMainPlotWindow.h"
#include "RiuPlotMainWindow.h"
#include "RiuMainWindow.h"
#include "RiuViewer.h"
@@ -432,7 +432,7 @@ void RiaRegressionTestRunner::resizeMaximizedPlotWindows()
RimProject* proj = RiaApplication::instance()->project();
if (!proj) return;
RiuMainPlotWindow* plotMainWindow = RiaApplication::instance()->mainPlotWindow();
RiuPlotMainWindow* plotMainWindow = RiaApplication::instance()->mainPlotWindow();
if (!plotMainWindow) return;
std::vector<RimViewWindow*> viewWindows;