diff --git a/ApplicationCode/CMakeLists.txt b/ApplicationCode/CMakeLists.txt index 5486f996b1..f4ef776cee 100644 --- a/ApplicationCode/CMakeLists.txt +++ b/ApplicationCode/CMakeLists.txt @@ -90,8 +90,8 @@ set( USER_INTERFACE_FILES UserInterface/RiuWellLogTrack.h UserInterface/RiuProjectPropertyView.h UserInterface/RiuProjectPropertyView.cpp - UserInterface/RiuTimeHistoryQwtPlot.h - UserInterface/RiuTimeHistoryQwtPlot.cpp + UserInterface/RiuResultQwtPlot.h + UserInterface/RiuResultQwtPlot.cpp UserInterface/RiuSelectionManager.h UserInterface/RiuSelectionManager.cpp UserInterface/RiuSelectionColors.h diff --git a/ApplicationCode/UserInterface/RiuMainWindow.cpp b/ApplicationCode/UserInterface/RiuMainWindow.cpp index c3a4c07cfa..457b983934 100644 --- a/ApplicationCode/UserInterface/RiuMainWindow.cpp +++ b/ApplicationCode/UserInterface/RiuMainWindow.cpp @@ -58,7 +58,7 @@ #include "RiuProcessMonitor.h" #include "RiuProjectPropertyView.h" #include "RiuResultInfoPanel.h" -#include "RiuTimeHistoryQwtPlot.h" +#include "RiuResultQwtPlot.h" #include "RiuTreeViewEventFilter.h" #include "RiuViewer.h" #include "RiuWellImportWizard.h" @@ -182,7 +182,7 @@ void RiuMainWindow::cleanupGuiBeforeProjectClose() setPdmRoot(NULL); setResultInfo(""); - m_timeHistoryQwtPlot->deleteAllCurves(); + m_resultQwtPlot->deleteAllCurves(); if (m_pdmUiPropertyView) { @@ -665,11 +665,11 @@ void RiuMainWindow::createDockPanels() } { - QDockWidget* dockPanel = new QDockWidget("Time History Plot", this); + QDockWidget* dockPanel = new QDockWidget("Result Plot", this); dockPanel->setObjectName("dockTimeHistoryPanel"); dockPanel->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea | Qt::BottomDockWidgetArea); - m_timeHistoryQwtPlot = new RiuTimeHistoryQwtPlot(dockPanel); - dockPanel->setWidget(m_timeHistoryQwtPlot); + m_resultQwtPlot = new RiuResultQwtPlot(dockPanel); + dockPanel->setWidget(m_resultQwtPlot); addDockWidget(Qt::RightDockWidgetArea, dockPanel); } @@ -1170,9 +1170,9 @@ QMdiSubWindow* RiuMainWindow::findMdiSubWindow(QWidget* viewer) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiuTimeHistoryQwtPlot* RiuMainWindow::timeHistoryPlot() +RiuResultQwtPlot* RiuMainWindow::resultPlot() { - return m_timeHistoryQwtPlot; + return m_resultQwtPlot; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/UserInterface/RiuMainWindow.h b/ApplicationCode/UserInterface/RiuMainWindow.h index d2755cffd5..88d034a6ca 100644 --- a/ApplicationCode/UserInterface/RiuMainWindow.h +++ b/ApplicationCode/UserInterface/RiuMainWindow.h @@ -42,7 +42,7 @@ class RiuProcessMonitor; class RiuResultInfoPanel; class RiuViewer; class RiuWellLogPlot; -class RiuTimeHistoryQwtPlot; +class RiuResultQwtPlot; namespace caf { @@ -113,7 +113,7 @@ public: bool isAnyMdiSubWindowVisible(); QMdiSubWindow* findMdiSubWindow(QWidget* viewer); - RiuTimeHistoryQwtPlot* timeHistoryPlot(); + RiuResultQwtPlot* resultPlot(); protected: virtual void closeEvent(QCloseEvent* event); @@ -201,7 +201,7 @@ private: RiuResultInfoPanel* m_resultInfoPanel; RiuProcessMonitor* m_processMonitor; - RiuTimeHistoryQwtPlot* m_timeHistoryQwtPlot; + RiuResultQwtPlot* m_resultQwtPlot; QMenu* m_windowMenu; diff --git a/ApplicationCode/UserInterface/RiuTimeHistoryQwtPlot.cpp b/ApplicationCode/UserInterface/RiuResultQwtPlot.cpp similarity index 90% rename from ApplicationCode/UserInterface/RiuTimeHistoryQwtPlot.cpp rename to ApplicationCode/UserInterface/RiuResultQwtPlot.cpp index f672f21ce2..d7f955910a 100644 --- a/ApplicationCode/UserInterface/RiuTimeHistoryQwtPlot.cpp +++ b/ApplicationCode/UserInterface/RiuResultQwtPlot.cpp @@ -17,7 +17,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RiuTimeHistoryQwtPlot.h" +#include "RiuResultQwtPlot.h" #include "RigCurveDataTools.h" @@ -39,7 +39,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiuTimeHistoryQwtPlot::RiuTimeHistoryQwtPlot(QWidget* parent) +RiuResultQwtPlot::RiuResultQwtPlot(QWidget* parent) : QwtPlot(parent) { m_grid = new QwtPlotGrid; @@ -51,7 +51,7 @@ RiuTimeHistoryQwtPlot::RiuTimeHistoryQwtPlot(QWidget* parent) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiuTimeHistoryQwtPlot::~RiuTimeHistoryQwtPlot() +RiuResultQwtPlot::~RiuResultQwtPlot() { deleteAllCurves(); @@ -62,7 +62,7 @@ RiuTimeHistoryQwtPlot::~RiuTimeHistoryQwtPlot() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuTimeHistoryQwtPlot::addCurve(const QString& curveName, const cvf::Color3f& curveColor, const std::vector& dateTimes, const std::vector& timeHistoryValues) +void RiuResultQwtPlot::addCurve(const QString& curveName, const cvf::Color3f& curveColor, const std::vector& dateTimes, const std::vector& timeHistoryValues) { CVF_ASSERT(dateTimes.size() == timeHistoryValues.size()); @@ -106,7 +106,7 @@ void RiuTimeHistoryQwtPlot::addCurve(const QString& curveName, const cvf::Color3 //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuTimeHistoryQwtPlot::addCurve(const QString& curveName, const cvf::Color3f& curveColor, const std::vector& frameTimes, const std::vector& timeHistoryValues) +void RiuResultQwtPlot::addCurve(const QString& curveName, const cvf::Color3f& curveColor, const std::vector& frameTimes, const std::vector& timeHistoryValues) { std::vector dateTimes; @@ -121,7 +121,7 @@ void RiuTimeHistoryQwtPlot::addCurve(const QString& curveName, const cvf::Color3 //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuTimeHistoryQwtPlot::deleteAllCurves() +void RiuResultQwtPlot::deleteAllCurves() { for (size_t i = 0; i < m_plotCurves.size(); i++) { @@ -135,7 +135,7 @@ void RiuTimeHistoryQwtPlot::deleteAllCurves() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QSize RiuTimeHistoryQwtPlot::sizeHint() const +QSize RiuResultQwtPlot::sizeHint() const { return QSize(0, 0); } @@ -143,7 +143,7 @@ QSize RiuTimeHistoryQwtPlot::sizeHint() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QSize RiuTimeHistoryQwtPlot::minimumSizeHint() const +QSize RiuResultQwtPlot::minimumSizeHint() const { return QSize(0, 0); } @@ -151,7 +151,7 @@ QSize RiuTimeHistoryQwtPlot::minimumSizeHint() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuTimeHistoryQwtPlot::setDefaults() +void RiuResultQwtPlot::setDefaults() { QPalette newPalette(palette()); newPalette.setColor(QPalette::Background, Qt::white); diff --git a/ApplicationCode/UserInterface/RiuTimeHistoryQwtPlot.h b/ApplicationCode/UserInterface/RiuResultQwtPlot.h similarity index 92% rename from ApplicationCode/UserInterface/RiuTimeHistoryQwtPlot.h rename to ApplicationCode/UserInterface/RiuResultQwtPlot.h index 4a7ad625da..687aab0cc9 100644 --- a/ApplicationCode/UserInterface/RiuTimeHistoryQwtPlot.h +++ b/ApplicationCode/UserInterface/RiuResultQwtPlot.h @@ -34,11 +34,11 @@ namespace cvf // // //================================================================================================== -class RiuTimeHistoryQwtPlot : public QwtPlot +class RiuResultQwtPlot : public QwtPlot { public: - RiuTimeHistoryQwtPlot(QWidget* parent = NULL); - virtual ~RiuTimeHistoryQwtPlot(); + RiuResultQwtPlot(QWidget* parent = NULL); + virtual ~RiuResultQwtPlot(); void addCurve(const QString& curveName, const cvf::Color3f& curveColor, const std::vector& dateTimes, const std::vector& timeHistoryValues); void addCurve(const QString& curveName, const cvf::Color3f& curveColor, const std::vector& frameTimes, const std::vector& timeHistoryValues); diff --git a/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp b/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp index 33019f4437..b6fe284201 100644 --- a/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp +++ b/ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp @@ -39,7 +39,7 @@ #include "RiuMainWindow.h" #include "RiuResultTextBuilder.h" #include "RiuSelectionManager.h" -#include "RiuTimeHistoryQwtPlot.h" +#include "RiuResultQwtPlot.h" #include @@ -65,7 +65,7 @@ RiuSelectionChangedHandler::~RiuSelectionChangedHandler() //-------------------------------------------------------------------------------------------------- void RiuSelectionChangedHandler::handleSelectionDeleted() const { - RiuMainWindow::instance()->timeHistoryPlot()->deleteAllCurves(); + RiuMainWindow::instance()->resultPlot()->deleteAllCurves(); updateResultInfo(NULL); @@ -89,7 +89,7 @@ void RiuSelectionChangedHandler::handleItemAppended(const RiuSelectionItem* item //-------------------------------------------------------------------------------------------------- void RiuSelectionChangedHandler::handleSetSelectedItem(const RiuSelectionItem* item) const { - RiuMainWindow::instance()->timeHistoryPlot()->deleteAllCurves(); + RiuMainWindow::instance()->resultPlot()->deleteAllCurves(); handleItemAppended(item); } @@ -126,7 +126,7 @@ void RiuSelectionChangedHandler::addCurveFromSelectionItem(const RiuEclipseSelec std::vector timeHistoryValues = timeHistResultAccessor.timeHistoryValues(); CVF_ASSERT(timeStepDates.size() == timeHistoryValues.size()); - RiuMainWindow::instance()->timeHistoryPlot()->addCurve(curveName, eclipseSelectionItem->m_color, timeStepDates, timeHistoryValues); + RiuMainWindow::instance()->resultPlot()->addCurve(curveName, eclipseSelectionItem->m_color, timeStepDates, timeHistoryValues); } } @@ -164,7 +164,7 @@ void RiuSelectionChangedHandler::addCurveFromSelectionItem(const RiuGeoMechSelec CVF_ASSERT(frameTimes.size() == timeHistoryValues.size()); - RiuMainWindow::instance()->timeHistoryPlot()->addCurve(curveName, geomSelectionItem->m_color, frameTimes, timeHistoryValues); + RiuMainWindow::instance()->resultPlot()->addCurve(curveName, geomSelectionItem->m_color, frameTimes, timeHistoryValues); } }