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

#739 Moved windowsGeometry data to the RimViewWindow base class

Browse Source 
Introduced an interface for setting and getting mdiWindow Geometry
Changed file keywords from GraphPlot etc to SummaryPlot
Added a summary plot QwtPlot descendant
Added handling of delete of the MDI window
This commit is contained in:
Jacob Støren
2016-05-26 13:17:26 +02:00
parent 38c15f57f2
commit ae615901b8
17 changed files with 311 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -210,7 +210,7 @@ void RimEclipseView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
{
if (m_viewer)
{
windowGeometry = RiuMainWindow::instance()->windowGeometryForViewer(m_viewer->layoutWidget());
this->setMdiWindowGeometry( RiuMainWindow::instance()->windowGeometryForViewer(m_viewer->layoutWidget()));
RiuMainWindow::instance()->removeViewer(m_viewer->layoutWidget());
delete m_viewer;

2
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@@ -500,7 +500,7 @@ void RimGeoMechView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
{
if (m_viewer)
{
windowGeometry = RiuMainWindow::instance()->windowGeometryForViewer(m_viewer->layoutWidget());
this->setMdiWindowGeometry( RiuMainWindow::instance()->windowGeometryForViewer(m_viewer->layoutWidget()));
RiuMainWindow::instance()->removeViewer(m_viewer->layoutWidget());
delete m_viewer;

2
ApplicationCode/ProjectDataModel/RimSummaryCurve.cpp
View File

@@ -25,7 +25,7 @@
#include "RimProject.h"
#include "RimSummaryPlot.h"
#include "RimSummaryPlotCollection.h"
#include "RiuResultQwtPlot.h"
#include "RiuSummaryQwtPlot.h"
#include "cafPdmUiComboBoxEditor.h"
#include "cafPdmUiListEditor.h"

42
ApplicationCode/ProjectDataModel/RimSummaryPlot.cpp
View File

@@ -21,7 +21,7 @@
#include "RimSummaryCurve.h"
#include "RimSummaryPlotCollection.h"
#include "RiuResultQwtPlot.h"
#include "RiuSummaryQwtPlot.h"
#include "RiuSelectionColors.h"
#include "cvfBase.h"
@@ -31,14 +31,14 @@
#include "RiuMainWindow.h"
CAF_PDM_SOURCE_INIT(RimSummaryPlot, "GraphPlot");
CAF_PDM_SOURCE_INIT(RimSummaryPlot, "SummaryPlot");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryPlot::RimSummaryPlot()
{
CAF_PDM_InitObject("Graph", ":/WellLogPlot16x16.png", "", "");
CAF_PDM_InitObject("Summary Plot", ":/WellLogPlot16x16.png", "", "");
CAF_PDM_InitField(&m_showWindow, "ShowWindow", true, "Show Summary Plot", "", "", "");
m_showWindow.uiCapability()->setUiHidden(true);
@@ -53,6 +53,8 @@ RimSummaryPlot::RimSummaryPlot()
//--------------------------------------------------------------------------------------------------
RimSummaryPlot::~RimSummaryPlot()
{
RiuMainWindow::instance()->removeViewer(m_qwtPlot);
deletePlotWidget();
m_curves.deleteAllChildObjects();
@@ -70,12 +72,21 @@ void RimSummaryPlot::deletePlotWidget()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuResultQwtPlot* RimSummaryPlot::viewer()
void RimSummaryPlot::handleViewerDeletion()
{
return m_qwtPlot;
m_showWindow = false;
if (m_qwtPlot)
{
detachAllCurves();
}
uiCapability()->updateUiIconFromToggleField();
updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------
@@ -113,6 +124,17 @@ void RimSummaryPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::setupBeforeSave()
{
if (m_qwtPlot)
{
this->setMdiWindowGeometry(RiuMainWindow::instance()->windowGeometryForViewer(m_qwtPlot));
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -147,14 +169,14 @@ void RimSummaryPlot::updateViewerWidget()
{
if (!m_qwtPlot)
{
m_qwtPlot = new RiuResultQwtPlot(RiuMainWindow::instance());
m_qwtPlot = new RiuSummaryQwtPlot(this, RiuMainWindow::instance());
for (size_t cIdx = 0; cIdx < m_curves.size(); ++cIdx )
{
m_curves[cIdx]->setParentQwtPlot(m_qwtPlot);
}
RiuMainWindow::instance()->addViewer(m_qwtPlot, std::vector<int>());
RiuMainWindow::instance()->addViewer(m_qwtPlot, this->mdiWindowGeometry());
RiuMainWindow::instance()->setActiveViewer(m_qwtPlot);
}
@@ -165,14 +187,12 @@ void RimSummaryPlot::updateViewerWidget()
{
if (m_qwtPlot)
{
//windowGeometry = RiuMainWindow::instance()->windowGeometryForViewer(m_viewer);
this->setMdiWindowGeometry( RiuMainWindow::instance()->windowGeometryForViewer(m_qwtPlot));
RiuMainWindow::instance()->removeViewer(m_qwtPlot);
detachAllCurves();
delete m_qwtPlot;
m_qwtPlot = NULL;
deletePlotWidget();
}
}
}

20
ApplicationCode/ProjectDataModel/RimSummaryPlot.h
View File

@@ -28,7 +28,7 @@
#include "RimViewWindow.h"
class RiuResultQwtPlot;
class RiuSummaryQwtPlot;
class RimSummaryCurve;
//==================================================================================================
@@ -44,29 +44,25 @@ public:
virtual ~RimSummaryPlot();
void setDescription(const QString& description);
void loadDataAndUpdate();
RiuResultQwtPlot* viewer();
void addCurve(RimSummaryCurve* curve);
void loadDataAndUpdate();
void handleViewerDeletion();
protected:
// Overridden PDM methods
virtual caf::PdmFieldHandle* objectToggleField() { return &m_showWindow; }
virtual caf::PdmFieldHandle* userDescriptionField() { return &m_userName; }
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
virtual void setupBeforeSave() override;
private:
void updateViewerWidget();
void detachAllCurves();
void deletePlotWidget();
caf::PdmChildArrayField<RimSummaryCurve*> m_curves;
void deletePlotWidget();
caf::PdmField<bool> m_showWindow;
caf::PdmField<QString> m_userName;
caf::PdmChildArrayField<RimSummaryCurve*> m_curves;
QPointer<RiuResultQwtPlot> m_qwtPlot;
QPointer<RiuSummaryQwtPlot> m_qwtPlot;
};

2
ApplicationCode/ProjectDataModel/RimSummaryPlotCollection.cpp
View File

@@ -31,7 +31,7 @@
#include "RiuMainWindow.h"
CAF_PDM_SOURCE_INIT(RimSummaryPlotCollection, "RimGraphPlotCollection");
CAF_PDM_SOURCE_INIT(RimSummaryPlotCollection, "SummaryPlotCollection");
//--------------------------------------------------------------------------------------------------
///

8
ApplicationCode/ProjectDataModel/RimView.cpp
View File

@@ -109,8 +109,6 @@ RimView::RimView(void)
CAF_PDM_InitField(&m_disableLighting, "DisableLighting", false, "Disable Results Lighting", "", "Disable light model for scalar result colors", "");
CAF_PDM_InitFieldNoDefault(&windowGeometry, "WindowGeometry", "", "", "", "");
windowGeometry.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_rangeFilterCollection, "RangeFilters", "Range Filters", "", "", "");
m_rangeFilterCollection.uiCapability()->setUiHidden(true);
@@ -205,7 +203,7 @@ void RimView::updateViewerWidget()
m_viewer = new RiuViewer(glFormat, NULL);
m_viewer->setOwnerReservoirView(this);
RiuMainWindow::instance()->addViewer(m_viewer->layoutWidget(), windowGeometry());
RiuMainWindow::instance()->addViewer(m_viewer->layoutWidget(), mdiWindowGeometry());
m_viewer->setMinNearPlaneDistance(10);
this->resetLegendsInViewer();
@@ -341,8 +339,8 @@ void RimView::setupBeforeSave()
hasUserRequestedAnimation = m_viewer->isAnimationActive(); // JJS: This is not conceptually correct. The variable is updated as we go, and store the user intentions. But I guess that in practice...
cameraPosition = m_viewer->mainCamera()->viewMatrix();
windowGeometry = RiuMainWindow::instance()->windowGeometryForViewer(m_viewer->layoutWidget());
}
setMdiWindowGeometry(RiuMainWindow::instance()->windowGeometryForViewer(m_viewer->layoutWidget()));
}
}
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/RimView.h
View File

@@ -93,7 +93,6 @@ public:
void setOverrideRangeFilterCollection(RimCellRangeFilterCollection* rfc);
void replaceRangeFilterCollectionWithOverride();
caf::PdmField< std::vector<int> > windowGeometry;
caf::PdmChildField<RimCrossSectionCollection*> crossSectionCollection;

38
ApplicationCode/ProjectDataModel/RimViewWindow.cpp
View File

@@ -8,6 +8,8 @@ CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimViewWindow, "ViewWindow"); // Do not use. Ab
//--------------------------------------------------------------------------------------------------
RimViewWindow::RimViewWindow(void)
{
CAF_PDM_InitFieldNoDefault(&m_windowGeometry, "WindowGeometry", "", "", "", "");
m_windowGeometry.uiCapability()->setUiHidden(true);
}
@@ -27,4 +29,40 @@ void RimViewWindow::setViewWidget(QWidget* viewWidget)
m_viewWidget = viewWidget;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewWindow::setMdiWindowGeometry(const RimMdiWindowGeometry& windowGeometry)
{
std::vector<int> geom;
geom.clear();
if (windowGeometry.isValid())
{
geom.push_back(windowGeometry.x);
geom.push_back(windowGeometry.y);
geom.push_back(windowGeometry.width);
geom.push_back(windowGeometry.height);
geom.push_back(windowGeometry.isMaximized);
}
m_windowGeometry.setValue(geom);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimMdiWindowGeometry RimViewWindow::mdiWindowGeometry()
{
RimMdiWindowGeometry wg;
if (m_windowGeometry.value().size() == 5)
{
wg.x = m_windowGeometry.value()[0];
wg.y = m_windowGeometry.value()[1];
wg.width = m_windowGeometry.value()[2];
wg.height = m_windowGeometry.value()[3];
wg.isMaximized = m_windowGeometry.value()[4];
}
return wg;
}

21
ApplicationCode/ProjectDataModel/RimViewWindow.h
View File

@@ -22,6 +22,18 @@
#include "cafPdmField.h"
#include "QPointer"
struct RimMdiWindowGeometry
{
RimMdiWindowGeometry() : x(0), y(0), width(-1), height(-1) {}
bool isValid() const { return (width >= 0 && height >= 0);}
int x;
int y;
int width;
int height;
bool isMaximized;
};
class RimViewWindow : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
@@ -29,19 +41,20 @@ public:
RimViewWindow(void);
virtual ~RimViewWindow(void);
void setMdiWindowGeometry(const RimMdiWindowGeometry& windowGeometry);
RimMdiWindowGeometry mdiWindowGeometry();
protected:
void setViewWidget(QWidget* viewWidget);
void setViewWidget(QWidget* viewWidget);
// Possible abilities of this class
//caf::PdmField< std::vector<int> > windowGeometry;
//virtual QImage snapshotWindowContent() = 0;
//caf::PdmField<QString> name;
//caf::PdmField<bool> showWindow;
private:
QPointer<QWidget> m_viewWidget;
caf::PdmField< std::vector<int> > m_windowGeometry;
QPointer<QWidget> m_viewWidget;
};

9
ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp
View File

@@ -76,9 +76,6 @@ RimWellLogPlot::RimWellLogPlot()
CAF_PDM_InitFieldNoDefault(&m_tracks, "Tracks", "", "", "", "");
m_tracks.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&windowGeometry, "WindowGeometry", "", "", "", "");
windowGeometry.uiCapability()->setUiHidden(true);
m_minAvailableDepth = HUGE_VAL;
m_maxAvailableDepth = -HUGE_VAL;
}
@@ -109,7 +106,7 @@ void RimWellLogPlot::updateViewerWidget()
recreateTrackPlots();
RiuMainWindow::instance()->addViewer(m_viewer, windowGeometry());
RiuMainWindow::instance()->addViewer(m_viewer, this->mdiWindowGeometry());
RiuMainWindow::instance()->setActiveViewer(m_viewer);
}
@@ -119,7 +116,7 @@ void RimWellLogPlot::updateViewerWidget()
{
if (m_viewer)
{
windowGeometry = RiuMainWindow::instance()->windowGeometryForViewer(m_viewer);
this->setMdiWindowGeometry( RiuMainWindow::instance()->windowGeometryForViewer(m_viewer));
RiuMainWindow::instance()->removeViewer(m_viewer);
detachAllCurves();
@@ -368,7 +365,7 @@ void RimWellLogPlot::setupBeforeSave()
{
if (m_viewer)
{
windowGeometry = RiuMainWindow::instance()->windowGeometryForViewer(m_viewer);
this->setMdiWindowGeometry( RiuMainWindow::instance()->windowGeometryForViewer(m_viewer));
}
}

2
ApplicationCode/ProjectDataModel/RimWellLogPlot.h
View File

@@ -61,8 +61,6 @@ public:
QString depthPlotTitle() const;
caf::PdmField< std::vector<int> > windowGeometry;
void addTrack(RimWellLogTrack* track);
void insertTrack(RimWellLogTrack* track, size_t index);
size_t trackCount() { return m_tracks.size();}