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

Added include files because of known include problems related to PDM.

Browse Source 
p4#: 21845
This commit is contained in:
Vidar Lundberg 2013-06-06 15:02:35 +02:00
parent ec98af4354
commit 691f24e7a7
9 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.cpp
View File

@ -35,6 +35,8 @@
#include "RivWellPathPartMgr.h"
#include "RimWellPathCollection.h"
#include "RimCellRangeFilterCollection.h"
#include "RimOilField.h"
#include "RimAnalysisModels.h"
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
View File

@ -48,6 +48,8 @@
#include "cvfRay.h"
#include "cafEffectGenerator.h"
#include "cvfqtUtils.h"
#include "RimOilField.h"
#include "RimAnalysisModels.h"
//--------------------------------------------------------------------------------------------------
///
@ -249,6 +251,7 @@ void RivWellPathPartMgr::appendStaticGeometryPartsToModel(cvf::ModelBasicList* m
{
if (it->m_surfacePart.notNull())
{
//printf("a");
model->addPart(it->m_surfacePart.p());
}
if (it->m_centerLinePart.notNull())

2
ApplicationCode/ProjectDataModel/RimCase.cpp
View File

@ -57,6 +57,8 @@
#include "RimCellPropertyFilterCollection.h"
#include "RimCellEdgeResultSlot.h"
#include "RimCaseCollection.h"
#include "RimOilField.h"
#include "RimAnalysisModels.h"
CAF_PDM_SOURCE_INIT(RimCase, "RimReservoir");

2
ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp
View File

@ -45,6 +45,8 @@
#include "RimWellCollection.h"
#include "Rim3dOverlayInfoConfig.h"
#include "RimWellPathCollection.h"
#include "RimOilField.h"
#include "RimAnalysisModels.h"
CAF_PDM_SOURCE_INIT(RimReservoirCellResultsStorage, "ReservoirCellResultStorage");

2
ApplicationCode/ProjectDataModel/RimResultCase.cpp
View File

@ -42,6 +42,8 @@
#include "RimCellPropertyFilterCollection.h"
#include "RimWellCollection.h"
#include "Rim3dOverlayInfoConfig.h"
#include "RimOilField.h"
#include "RimAnalysisModels.h"
CAF_PDM_SOURCE_INIT(RimResultCase, "EclipseCase");
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
View File

@ -63,6 +63,9 @@
#include "cafPdmFieldCvfColor.h"
#include "cafPdmFieldCvfMat4d.h"
#include "RimProject.h"
#include "RimOilField.h"
#include "RimAnalysisModels.h"
//--------------------------------------------------------------------------------------------------
///

2
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@ -38,6 +38,8 @@
#include "RimCellPropertyFilterCollection.h"
#include "RimWellCollection.h"
#include "Rim3dOverlayInfoConfig.h"
#include "RimOilField.h"
#include "RimAnalysisModels.h"
CAF_PDM_SOURCE_INIT(RimWellPath, "WellPath");

2
ApplicationCode/SocketInterface/RiaSocketServer.cpp
View File

@ -47,6 +47,8 @@
#include "cafFactory.h"
#include "RigGridBase.h"
#include "RimOilField.h"
#include "RimAnalysisModels.h"
//--------------------------------------------------------------------------------------------------

13
cafUserInterface/cafUiTreeModelPdm.cpp
View File

@ -526,7 +526,17 @@ PdmUiTreeItem* UiTreeItemBuilderPdm::buildViewItems(PdmUiTreeItem* parentTreeIte
}
// NOTE: if position is -1, the item is appended to the parent tree item
PdmUiTreeItem* objectTreeItem = new PdmUiTreeItem(parentTreeItem, position, object);
PdmUiTreeItem* objectTreeItem = NULL;
std::vector<caf::PdmFieldHandle*> parentFields;
object->parentFields(parentFields);
if (parentFields.size() == 1 && parentFields[0]->isUiHidden())
{
objectTreeItem = parentTreeItem;
}
else
{
objectTreeItem = new PdmUiTreeItem(parentTreeItem, position, object);
}
std::vector<caf::PdmFieldHandle*> fields;
object->fields(fields);
@ -535,7 +545,6 @@ PdmUiTreeItem* UiTreeItemBuilderPdm::buildViewItems(PdmUiTreeItem* parentTreeIte
for (it = fields.begin(); it != fields.end(); it++)
{
caf::PdmFieldHandle* field = *it;
if (field->isUiHidden()) continue;
std::vector<caf::PdmObject*> children;
field->childObjects(&children);