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

(#638) Changed title to "Result Plot" and renamed files

Browse Source
This commit is contained in:
Magne Sjaastad 2015-11-11 14:07:21 +01:00
parent 6063ca1b54
commit 6f4a4e16c6
6 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/CMakeLists.txt
View File

@ -90,8 +90,8 @@ set( USER_INTERFACE_FILES
UserInterface/RiuWellLogTrack.h UserInterface/RiuWellLogTrack.h
UserInterface/RiuProjectPropertyView.h UserInterface/RiuProjectPropertyView.h
UserInterface/RiuProjectPropertyView.cpp UserInterface/RiuProjectPropertyView.cpp
UserInterface/RiuTimeHistoryQwtPlot.h UserInterface/RiuResultQwtPlot.h
UserInterface/RiuTimeHistoryQwtPlot.cpp UserInterface/RiuResultQwtPlot.cpp
UserInterface/RiuSelectionManager.h UserInterface/RiuSelectionManager.h
UserInterface/RiuSelectionManager.cpp UserInterface/RiuSelectionManager.cpp
UserInterface/RiuSelectionColors.h UserInterface/RiuSelectionColors.h

14
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -58,7 +58,7 @@
#include "RiuProcessMonitor.h" #include "RiuProcessMonitor.h"
#include "RiuProjectPropertyView.h" #include "RiuProjectPropertyView.h"
#include "RiuResultInfoPanel.h" #include "RiuResultInfoPanel.h"
#include "RiuTimeHistoryQwtPlot.h" #include "RiuResultQwtPlot.h"
#include "RiuTreeViewEventFilter.h" #include "RiuTreeViewEventFilter.h"
#include "RiuViewer.h" #include "RiuViewer.h"
#include "RiuWellImportWizard.h" #include "RiuWellImportWizard.h"
@ -182,7 +182,7 @@ void RiuMainWindow::cleanupGuiBeforeProjectClose()
setPdmRoot(NULL); setPdmRoot(NULL);
setResultInfo(""); setResultInfo("");
m_timeHistoryQwtPlot->deleteAllCurves(); m_resultQwtPlot->deleteAllCurves();
if (m_pdmUiPropertyView) 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->setObjectName("dockTimeHistoryPanel");
dockPanel->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea | Qt::BottomDockWidgetArea); dockPanel->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea | Qt::BottomDockWidgetArea);
m_timeHistoryQwtPlot = new RiuTimeHistoryQwtPlot(dockPanel); m_resultQwtPlot = new RiuResultQwtPlot(dockPanel);
dockPanel->setWidget(m_timeHistoryQwtPlot); dockPanel->setWidget(m_resultQwtPlot);
addDockWidget(Qt::RightDockWidgetArea, dockPanel); 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;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

6
ApplicationCode/UserInterface/RiuMainWindow.h
View File

@ -42,7 +42,7 @@ class RiuProcessMonitor;
class RiuResultInfoPanel; class RiuResultInfoPanel;
class RiuViewer; class RiuViewer;
class RiuWellLogPlot; class RiuWellLogPlot;
class RiuTimeHistoryQwtPlot; class RiuResultQwtPlot;
namespace caf namespace caf
{ {
@ -113,7 +113,7 @@ public:
bool isAnyMdiSubWindowVisible(); bool isAnyMdiSubWindowVisible();
QMdiSubWindow* findMdiSubWindow(QWidget* viewer); QMdiSubWindow* findMdiSubWindow(QWidget* viewer);
RiuTimeHistoryQwtPlot* timeHistoryPlot(); RiuResultQwtPlot* resultPlot();
protected: protected:
virtual void closeEvent(QCloseEvent* event); virtual void closeEvent(QCloseEvent* event);
@ -201,7 +201,7 @@ private:
RiuResultInfoPanel* m_resultInfoPanel; RiuResultInfoPanel* m_resultInfoPanel;
RiuProcessMonitor* m_processMonitor; RiuProcessMonitor* m_processMonitor;
RiuTimeHistoryQwtPlot* m_timeHistoryQwtPlot; RiuResultQwtPlot* m_resultQwtPlot;
QMenu* m_windowMenu; QMenu* m_windowMenu;

18
ApplicationCode/UserInterface/RiuTimeHistoryQwtPlot.cpp → ApplicationCode/UserInterface/RiuResultQwtPlot.cpp
View File

@ -17,7 +17,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RiuTimeHistoryQwtPlot.h" #include "RiuResultQwtPlot.h"
#include "RigCurveDataTools.h" #include "RigCurveDataTools.h"
@ -39,7 +39,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuTimeHistoryQwtPlot::RiuTimeHistoryQwtPlot(QWidget* parent) RiuResultQwtPlot::RiuResultQwtPlot(QWidget* parent)
: QwtPlot(parent) : QwtPlot(parent)
{ {
m_grid = new QwtPlotGrid; m_grid = new QwtPlotGrid;
@ -51,7 +51,7 @@ RiuTimeHistoryQwtPlot::RiuTimeHistoryQwtPlot(QWidget* parent)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuTimeHistoryQwtPlot::~RiuTimeHistoryQwtPlot() RiuResultQwtPlot::~RiuResultQwtPlot()
{ {
deleteAllCurves(); deleteAllCurves();
@ -62,7 +62,7 @@ RiuTimeHistoryQwtPlot::~RiuTimeHistoryQwtPlot()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuTimeHistoryQwtPlot::addCurve(const QString& curveName, const cvf::Color3f& curveColor, const std::vector<QDateTime>& dateTimes, const std::vector<double>& timeHistoryValues) void RiuResultQwtPlot::addCurve(const QString& curveName, const cvf::Color3f& curveColor, const std::vector<QDateTime>& dateTimes, const std::vector<double>& timeHistoryValues)
{ {
CVF_ASSERT(dateTimes.size() == timeHistoryValues.size()); 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<double>& frameTimes, const std::vector<double>& timeHistoryValues) void RiuResultQwtPlot::addCurve(const QString& curveName, const cvf::Color3f& curveColor, const std::vector<double>& frameTimes, const std::vector<double>& timeHistoryValues)
{ {
std::vector<QDateTime> dateTimes; std::vector<QDateTime> 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++) 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); return QSize(0, 0);
} }
@ -143,7 +143,7 @@ QSize RiuTimeHistoryQwtPlot::sizeHint() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QSize RiuTimeHistoryQwtPlot::minimumSizeHint() const QSize RiuResultQwtPlot::minimumSizeHint() const
{ {
return QSize(0, 0); return QSize(0, 0);
} }
@ -151,7 +151,7 @@ QSize RiuTimeHistoryQwtPlot::minimumSizeHint() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuTimeHistoryQwtPlot::setDefaults() void RiuResultQwtPlot::setDefaults()
{ {
QPalette newPalette(palette()); QPalette newPalette(palette());
newPalette.setColor(QPalette::Background, Qt::white); newPalette.setColor(QPalette::Background, Qt::white);

6
ApplicationCode/UserInterface/RiuTimeHistoryQwtPlot.h → ApplicationCode/UserInterface/RiuResultQwtPlot.h
View File

@ -34,11 +34,11 @@ namespace cvf
// //
// //
//================================================================================================== //==================================================================================================
class RiuTimeHistoryQwtPlot : public QwtPlot class RiuResultQwtPlot : public QwtPlot
{ {
public: public:
RiuTimeHistoryQwtPlot(QWidget* parent = NULL); RiuResultQwtPlot(QWidget* parent = NULL);
virtual ~RiuTimeHistoryQwtPlot(); virtual ~RiuResultQwtPlot();
void addCurve(const QString& curveName, const cvf::Color3f& curveColor, const std::vector<QDateTime>& dateTimes, const std::vector<double>& timeHistoryValues); void addCurve(const QString& curveName, const cvf::Color3f& curveColor, const std::vector<QDateTime>& dateTimes, const std::vector<double>& timeHistoryValues);
void addCurve(const QString& curveName, const cvf::Color3f& curveColor, const std::vector<double>& frameTimes, const std::vector<double>& timeHistoryValues); void addCurve(const QString& curveName, const cvf::Color3f& curveColor, const std::vector<double>& frameTimes, const std::vector<double>& timeHistoryValues);

10
ApplicationCode/UserInterface/RiuSelectionChangedHandler.cpp
View File

@ -39,7 +39,7 @@
#include "RiuMainWindow.h" #include "RiuMainWindow.h"
#include "RiuResultTextBuilder.h" #include "RiuResultTextBuilder.h"
#include "RiuSelectionManager.h" #include "RiuSelectionManager.h"
#include "RiuTimeHistoryQwtPlot.h" #include "RiuResultQwtPlot.h"
#include <QStatusBar> #include <QStatusBar>
@ -65,7 +65,7 @@ RiuSelectionChangedHandler::~RiuSelectionChangedHandler()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuSelectionChangedHandler::handleSelectionDeleted() const void RiuSelectionChangedHandler::handleSelectionDeleted() const
{ {
RiuMainWindow::instance()->timeHistoryPlot()->deleteAllCurves(); RiuMainWindow::instance()->resultPlot()->deleteAllCurves();
updateResultInfo(NULL); updateResultInfo(NULL);
@ -89,7 +89,7 @@ void RiuSelectionChangedHandler::handleItemAppended(const RiuSelectionItem* item
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuSelectionChangedHandler::handleSetSelectedItem(const RiuSelectionItem* item) const void RiuSelectionChangedHandler::handleSetSelectedItem(const RiuSelectionItem* item) const
{ {
RiuMainWindow::instance()->timeHistoryPlot()->deleteAllCurves(); RiuMainWindow::instance()->resultPlot()->deleteAllCurves();
handleItemAppended(item); handleItemAppended(item);
} }
@ -126,7 +126,7 @@ void RiuSelectionChangedHandler::addCurveFromSelectionItem(const RiuEclipseSelec
std::vector<double> timeHistoryValues = timeHistResultAccessor.timeHistoryValues(); std::vector<double> timeHistoryValues = timeHistResultAccessor.timeHistoryValues();
CVF_ASSERT(timeStepDates.size() == timeHistoryValues.size()); 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()); 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);
} }
} }