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

#1107 Moved showWindow field to RimViewWindow and removed showWindow field from derived classes

Browse Source
This commit is contained in:
Magne Sjaastad
2017-01-20 16:25:05 +01:00
parent 94f94af325
commit cebe5428be
15 changed files with 74 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/ProjectDataModel/RimMdiWindowController.h
-70
View File
@@ -22,74 +22,6 @@
#include "cafPdmChildField.h"
#include "cafPdmField.h"
#if 0
class RimMdiWindowController;
class RimViewWindow : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimViewWindow(void);
virtual ~RimViewWindow(void)
{
if (m_windowController()) delete m_windowController();
}
void handleViewerDeletion() { if (m_windowController()) m_windowController->handleViewerDeletion(); }
void updateViewerWidgetBasic() { if (m_windowController()) m_windowController->updateViewerWidget(); }
void setAs3DMDI() { setAsMDI(0); }
void setAsPlotMDI() { setAsMDI(1); }
void setMdiWindowGeometry(const RimMdiWindowGeometry& windowGeometry);
RimMdiWindowGeometry mdiWindowGeometry();
virtual QImage snapshotWindowContent() = 0;
virtual void zoomAll() = 0;
protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override
{
if ( m_windowController() )
{
if ( changedField == showWindowField() )
{
m_windowController()->showWindowFieldChangedByUi();
}
}
}
private:
///////// Interface for the Window controller
friend class RimMdiWindowController;
virtual QWidget* viewWidget() = 0;
virtual QWidget* createViewWidget(QWidget* mainWindowParent) = 0;
virtual void updateViewWidgetAfterCreation() = 0;
virtual void deleteViewWidget() = 0;
virtual caf::PdmField<bool>* showWindowField() = 0;
//////////
void setAsMDI(int mainWindowID)
{
if (!m_windowController())
{
m_windowController = new RimMdiWindowController;
RimMdiWindowGeometry mwg;
mwg.mainWindowID = mainWindowID;
setMdiWindowGeometry(mwg);
}
}
caf::PdmChildField<RimMdiWindowController*> m_windowController;
// Obsolete field
caf::PdmField< std::vector<int> > m_windowGeometry;
};
#endif
class RimViewWindow;
class RiuMainWindowBase;
@@ -113,12 +45,10 @@ public:
void updateViewerWidget();
void handleViewerDeletion();
void removeWindowFromMDI();
void showWindowFieldChangedByUi();
protected:
RimViewWindow* viewPdmObject();
caf::PdmField<bool>& showWindowField();
QWidget* viewWidget();
RiuMainWindowBase* getMainWindow();