Fix selection in Qt viewer example

Author: ifcapps

IfcPlusPlus/src/ifcpp/geometry/Carve/Sweeper.h

@@ -20,7 +20,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 #include <array>
 #include <ifcpp/model/BasicTypes.h>
 #include <ifcpp/model/StatusCallback.h>
-#include "earcut.hpp/include/mapbox/earcut.hpp"
+#include <earcut.hpp/include/mapbox/earcut.hpp>
 
 #include "IncludeCarveHeaders.h"
 #include "GeometryInputData.h"

examples/SimpleViewerExampleQt/SimpleViewerExampleQt.vcxproj

@@ -84,6 +84,10 @@
     <OutDir>bin\</OutDir>
     <IntDir>bin\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <CopyLocalDeploymentContent>true</CopyLocalDeploymentContent>
+    <CopyLocalProjectReference>true</CopyLocalProjectReference>
+    <CopyLocalDebugSymbols>true</CopyLocalDebugSymbols>
+    <CopyCppRuntimeToOutputDir>true</CopyCppRuntimeToOutputDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

examples/SimpleViewerExampleQt/src/IfcPlusPlusSystem.cpp

@@ -239,7 +239,11 @@ void IfcPlusPlusSystem::setObjectSelected( shared_ptr<BuildingEntity> ifc_object
 					selected_entity->m_material_previous = material_previous;
 				}
 
-				stateset->setAttribute( m_material_selected, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE );
+				//stateset->setAttribute( m_material_selected, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE );
+
+				osg::ref_ptr<osg::StateSet> statesetSelected = new osg::StateSet();
+				statesetSelected->setAttribute(m_material_selected, osg::StateAttribute::ON | osg::StateAttribute::OVERRIDE);
+				grp->setStateSet(statesetSelected);
 				selected_entity->m_material_selected = m_material_selected;
 			}
 

examples/SimpleViewerExampleQt/src/gui/IfcTreeWidget.cpp

@@ -18,16 +18,17 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
 #include <ifcpp/model/BasicTypes.h>
 #include <ifcpp/model/BuildingObject.h>
 #include <ifcpp/model/BuildingModel.h>
-#include <ifcpp/IFC4/include/IfcObjectDefinition.h>
-#include <ifcpp/IFC4/include/IfcSpatialStructureElement.h>
-#include <ifcpp/IFC4/include/IfcRelContainedInSpatialStructure.h>
-#include <ifcpp/IFC4/include/IfcRelAggregates.h>
 #include <ifcpp/IFC4/include/IfcAxis2Placement.h>
 #include <ifcpp/IFC4/include/IfcAxis2Placement3D.h>
-#include <ifcpp/IFC4/include/IfcGeometricRepresentationContext.h>
 #include <ifcpp/IFC4/include/IfcDirection.h>
-#include <ifcpp/IFC4/include/IfcProject.h>
+#include <ifcpp/IFC4/include/IfcGeometricRepresentationContext.h>
 #include <ifcpp/IFC4/include/IfcLabel.h>
+#include <ifcpp/IFC4/include/IfcObjectDefinition.h>
+#include <ifcpp/IFC4/include/IfcProject.h>
+#include <ifcpp/IFC4/include/IfcRelAggregates.h>
+#include <ifcpp/IFC4/include/IfcRelContainedInSpatialStructure.h>
+#include <ifcpp/IFC4/include/IfcSpatialStructureElement.h>
+#include <ifcpp/IFC4/include/IfcTypeProduct.h>
 
 #include "IncludeGeometryHeaders.h"
 #include "IfcPlusPlusSystem.h"
@@ -196,6 +197,55 @@ void IfcTreeWidget::slotModelLoadingStart()
 	slotModelCleared();
 }
 
+bool hasParentInBuildingStructure(shared_ptr<BuildingObject> obj)
+{
+	shared_ptr<IfcObjectDefinition> obj_def = dynamic_pointer_cast<IfcObjectDefinition>(obj);
+	if (!obj_def)
+	{
+		return true;
+	}
+
+	shared_ptr<IfcTypeProduct> typeProduct = dynamic_pointer_cast<IfcTypeProduct>(obj);
+	if (typeProduct)
+	{
+		return true;
+	}
+
+	if (obj_def->m_Decomposes_inverse.size() > 0)
+	{
+		return true;
+	}
+
+	shared_ptr<IfcSpatialStructureElement> spatial_ele = dynamic_pointer_cast<IfcSpatialStructureElement>(obj_def);
+	if (spatial_ele)
+	{
+		std::vector<weak_ptr<IfcRelContainedInSpatialStructure> >& vec_contained = spatial_ele->m_ContainsElements_inverse;
+		if (vec_contained.size() > 0)
+		{
+
+			for (auto it_rel_contained = vec_contained.begin(); it_rel_contained!=vec_contained.end(); ++it_rel_contained)
+			{
+				shared_ptr<IfcRelContainedInSpatialStructure> rel_contained(*it_rel_contained);
+
+				//std::vector<shared_ptr<IfcProduct> >	m_RelatedElements;
+				//shared_ptr<IfcSpatialElement>			m_RelatingStructure;
+
+				std::vector<shared_ptr<IfcProduct> >& vec_related_elements = rel_contained->m_RelatedElements;
+
+				if (rel_contained->m_RelatingStructure == spatial_ele)
+				{
+					if (vec_related_elements.size() > 0)
+					{
+						return true;
+					}
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
 QTreeWidgetItem* resolveTreeItems( shared_ptr<BuildingObject> obj, std::unordered_set<int>& set_visited )
 {
 	QTreeWidgetItem* item = nullptr;
@@ -229,8 +279,7 @@ QTreeWidgetItem* resolveTreeItems( shared_ptr<BuildingObject> obj, std::unordere
 		if( obj_def->m_IsDecomposedBy_inverse.size() > 0 )
 		{
 			std::vector<weak_ptr<IfcRelAggregates> >& vec_IsDecomposedBy = obj_def->m_IsDecomposedBy_inverse;
-			std::vector<weak_ptr<IfcRelAggregates> >::iterator it;
-			for( it=vec_IsDecomposedBy.begin(); it!=vec_IsDecomposedBy.end(); ++it )
+			for( auto it=vec_IsDecomposedBy.begin(); it!=vec_IsDecomposedBy.end(); ++it )
 			{
 				shared_ptr<IfcRelAggregates> rel_agg( *it );
 				std::vector<shared_ptr<IfcObjectDefinition> >& vec = rel_agg->m_RelatedObjects;
@@ -307,6 +356,12 @@ void IfcTreeWidget::slotModelLoadingDone()
 		for( auto it = map_outside.begin(); it != map_outside.end(); ++it )
 		{
 			shared_ptr<BuildingObject>& ifc_object = it->second;
+
+			if (hasParentInBuildingStructure(ifc_object))
+			{
+				continue;
+			}
+
 			QTreeWidgetItem* object_item = resolveTreeItems( ifc_object, set_visited );
 			if( object_item != NULL )
 			{

examples/SimpleViewerExampleQt/src/viewer/OrbitCameraManipulator.cpp

@@ -527,6 +527,7 @@ bool OrbitCameraManipulator::intersectSceneSelect( const osgGA::GUIEventAdapter&
 									m_system->clearSelection();
 								}
 								m_system->setObjectSelected(entitiy_selected, true, group);
+								break;
 							}
 						}
 						return true;