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

p4#: 21845

ApplicationCode/ModelVisualization/RivWellPathCollectionPartMgr.cpp

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

ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp

@@ -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())

ApplicationCode/ProjectDataModel/RimCase.cpp

@@ -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");
 

ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp

@@ -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");
 

ApplicationCode/ProjectDataModel/RimResultCase.cpp

@@ -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");
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimUiTreeView.cpp

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

ApplicationCode/ProjectDataModel/RimWellPath.cpp

@@ -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");

ApplicationCode/SocketInterface/RiaSocketServer.cpp

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

cafUserInterface/cafUiTreeModelPdm.cpp

@@ -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);