#739 Added a common base class to represent and handle ViewWindows

This commit is contained in:
Jacob Støren 2016-05-24 10:37:10 +02:00
parent cb8f2e47f5
commit c32bad52ff
6 changed files with 89 additions and 3 deletions

View File

@ -57,6 +57,7 @@ ${CEE_CURRENT_LIST_DIR}RimGeoMechPropertyFilter.h
${CEE_CURRENT_LIST_DIR}RimGeoMechPropertyFilterCollection.h
${CEE_CURRENT_LIST_DIR}RimGeoMechResultDefinition.h
${CEE_CURRENT_LIST_DIR}RimGeoMechCellColors.h
${CEE_CURRENT_LIST_DIR}RimViewWindow.h
${CEE_CURRENT_LIST_DIR}RimView.h
${CEE_CURRENT_LIST_DIR}RimCase.h
${CEE_CURRENT_LIST_DIR}RimTreeViewStateSerializer.h
@ -136,6 +137,7 @@ ${CEE_CURRENT_LIST_DIR}RimGeoMechPropertyFilter.cpp
${CEE_CURRENT_LIST_DIR}RimGeoMechPropertyFilterCollection.cpp
${CEE_CURRENT_LIST_DIR}RimGeoMechResultDefinition.cpp
${CEE_CURRENT_LIST_DIR}RimGeoMechCellColors.cpp
${CEE_CURRENT_LIST_DIR}RimViewWindow.cpp
${CEE_CURRENT_LIST_DIR}RimView.cpp
${CEE_CURRENT_LIST_DIR}RimCase.cpp
${CEE_CURRENT_LIST_DIR}RimTreeViewStateSerializer.cpp

View File

@ -26,6 +26,8 @@
#include <QPointer>
#include "RimViewWindow.h"
class RiuResultQwtPlot;
class RimSummaryCurve;
@ -33,7 +35,7 @@ class RimSummaryCurve;
///
///
//==================================================================================================
class RimSummaryPlot : public caf::PdmObject
class RimSummaryPlot : public RimViewWindow
{
CAF_PDM_HEADER_INIT;

View File

@ -29,6 +29,8 @@
#include "RivCellSetEnum.h"
#include "RimViewWindow.h"
#include "cvfArray.h"
#include "cvfBase.h"
#include "cvfCollection.h"
@ -36,6 +38,7 @@
#include <QPointer>
class Rim3dOverlayInfoConfig;
class RimCase;
class RimCellRangeFilter;
@ -61,7 +64,7 @@ namespace cvf
///
///
//==================================================================================================
class RimView : public caf::PdmObject
class RimView : public RimViewWindow
{
CAF_PDM_HEADER_INIT;
public:

View File

@ -0,0 +1,30 @@
#include "RimViewWindow.h"
#include "QWidget"
CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimViewWindow, "ViewWindow"); // Do not use. Abstract class
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimViewWindow::RimViewWindow(void)
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimViewWindow::~RimViewWindow(void)
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewWindow::setViewWidget(QWidget* viewWidget)
{
m_viewWidget = viewWidget;
}

View File

@ -0,0 +1,47 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2016 Statoil ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "cafPdmObject.h"
#include "cafPdmField.h"
#include "QPointer"
class RimViewWindow : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimViewWindow(void);
virtual ~RimViewWindow(void);
protected:
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;
};

View File

@ -27,6 +27,8 @@
#include <QPointer>
#include "RimDefines.h"
#include "RimViewWindow.h"
class RiuWellLogPlot;
class RimWellLogTrack;
@ -35,7 +37,7 @@ class RimWellLogTrack;
///
///
//==================================================================================================
class RimWellLogPlot : public caf::PdmObject
class RimWellLogPlot : public RimViewWindow
{
CAF_PDM_HEADER_INIT;