Tree viewer

CMakeLists.txt

@@ -391,6 +391,7 @@ set(OpenInfraPlatform_UserInterface_Forms
 	UserInterface/Forms/MainWindow.ui
 	UserInterface/Forms/LicenseAndCopyrightInformation.ui
 	UserInterface/Forms/PreferencesDialog.ui
+	UserInterface/Forms/IfcTreeDialog.ui
 
 	# Currently not included.
 	#UserInterface/Forms/CreateAccidentReport.ui

Core/src/IfcGeometryConverter/IfcGeometryModel.cpp

@@ -19,6 +19,7 @@
 #include "IfcGeometryModel.h"
 #include "Exception\UnhandledException.h"
 
+
 void OpenInfraPlatform::Core::IfcGeometryConverter::IfcModel::reset() 
 { 
 	for( auto geom : geometries_ ) 
@@ -37,6 +38,11 @@ void OpenInfraPlatform::Core::IfcGeometryConverter::IfcModel::addGeometry(std::s
 	geometryMutex_.unlock();
 }
 
+void OpenInfraPlatform::Core::IfcGeometryConverter::IfcModel::addExpressModel(std::shared_ptr<OpenInfraPlatform::EarlyBinding::EXPRESSModel> expressModel)
+{
+	expressModel_ = expressModel;
+}
+
 // ---------------------------------------------------------------------------------------------------------------------------------------------------
 // Interface IModel implementation
 bool OpenInfraPlatform::Core::IfcGeometryConverter::IfcModel::isEmpty() const

Core/src/IfcGeometryConverter/IfcGeometryModel.h

@@ -30,6 +30,7 @@
 #include <IModel.h>
 
 #include "namespace.h"
+#include "EXPRESS/EXPRESSModel.h"
 
 typedef buw::VertexPosition3Color3Normal3 VertexLayout;
 
@@ -80,15 +81,20 @@ namespace OpenInfraPlatform
 				std::vector<std::shared_ptr<GeometryDescription>>	geometries_;
 				std::mutex											geometryMutex_;
 
-				std::string			                filename_;
-				oip::GeorefMetadata					georefMeta_;
+				std::string											filename_;
+				oip::GeorefMetadata									georefMeta_;
+
+				std::shared_ptr<oip::EXPRESSModel>					expressModel_;
 
 			public:
 				void reset();
 
 				void addGeometry(std::shared_ptr<GeometryDescription> geometry);
 				std::vector<std::shared_ptr<GeometryDescription>> const &geometries() const { return geometries_; }
 
+				void addExpressModel(std::shared_ptr<OpenInfraPlatform::EarlyBinding::EXPRESSModel> expressModel);
+				std::shared_ptr<OpenInfraPlatform::EarlyBinding::EXPRESSModel> const getExpressModel() const { return expressModel_; }
+
 				// ---------------------------------------------------------------------------------------------------------------------------------------------------
 				// Interface IModel implementation
 				// ---------------------------------------------------------------------------------------------------------------------------------------------------

Core/src/IfcGeometryConverter/IfcImporter.h

@@ -77,6 +77,9 @@ class IfcImporterT
 			georefConverter->init(expressModel);
 			ifcModel->setGeoref(georefConverter->getGeorefMetadata());
 
+			//store a pointer to the express model in the in the ifc model (used for the tree viewer)
+			ifcModel->addExpressModel(expressModel);
+
 			// collect all geometries
 			if (!collectGeometryData(expressModel))
 				return ifcModel;

UserInterface/Dialogues/IfcTreeDialog.cpp

@@ -0,0 +1,53 @@
+/*
+	Copyright (c) 2021 Technical University of Munich
+	Chair of Computational Modeling and Simulation.
+
+	TUM Open Infra Platform is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License Version 3
+	as published by the Free Software Foundation.
+
+	TUM Open Infra Platform 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 for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "IfcTreeDialog.h"
+#include "IfcTreeModel.h"
+#include "ui_IfcTreeDialog.h"
+#include "DataManagement/General/Data.h"
+
+OpenInfraPlatform::UserInterface::IfcTreeDialog::IfcTreeDialog(OpenInfraPlatform::UserInterface::View* view, QWidget *parent /*= nullptr*/) :
+	QDialog(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint),
+	ui_(new Ui::IfcTreeDialog),
+	view_(view)
+{
+	ui_->setupUi(this);
+	//ui_->ifcTreeWidget->setAnimated(true);
+	//ui_->ifcTreeView->setModel(new IfcTreeModel());
+}
+
+OpenInfraPlatform::UserInterface::IfcTreeDialog::~IfcTreeDialog()
+{
+
+}
+
+void OpenInfraPlatform::UserInterface::IfcTreeDialog::show()
+{
+	//for first testing just get last model, later this will be changed to selecting the model need
+	auto model = Core::DataManagement::DocumentManager::getInstance().getData().getLastModel();
+	auto ifcModel = std::static_pointer_cast<OpenInfraPlatform::Core::IfcGeometryConverter::IfcModel>(model);
+	auto expressModel = ifcModel->getExpressModel();
+	auto treeModel = new IfcTreeModel(expressModel);
+	ui_->ifcTreeView->setModel(treeModel);
+	((QDialog*)this)->show();
+}
+
+
+void OpenInfraPlatform::UserInterface::IfcTreeDialog::on_pushButtonClose_clicked()
+{
+	hide();
+}

UserInterface/Dialogues/IfcTreeDialog.h

@@ -0,0 +1,55 @@
+/*
+	Copyright (c) 2021 Technical University of Munich
+	Chair of Computational Modeling and Simulation.
+
+	TUM Open Infra Platform is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License Version 3
+	as published by the Free Software Foundation.
+
+	TUM Open Infra Platform 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 for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "ui_IfcTreeDialog.h"
+#include "ViewPanel/View.h"
+
+#include <QDialog>
+#include <iostream>
+
+namespace OpenInfraPlatform
+{
+	namespace UserInterface
+	{
+		class IfcTreeDialog : public QDialog
+		{
+			Q_OBJECT;
+
+		public:
+			IfcTreeDialog(OpenInfraPlatform::UserInterface::View* view, QWidget *parent = nullptr);
+
+			//! Virtual destructor.
+			virtual ~IfcTreeDialog();
+
+			void show();
+
+		private Q_SLOTS:
+			void on_pushButtonClose_clicked();
+
+		private:
+			Ui::IfcTreeDialog* ui_;
+			OpenInfraPlatform::UserInterface::View* view_;
+		}; // end class IfcTree
+	} // end namespace UserInterface
+} // end namespace OpenInfraPlatform
+
+namespace oip
+{
+	using OpenInfraPlatform::UserInterface::IfcTreeDialog;
+}

UserInterface/Dialogues/IfcTreeItem.cpp

@@ -0,0 +1,131 @@
+/*
+	Copyright (c) 2021 Technical University of Munich
+	Chair of Computational Modeling and Simulation.
+
+	TUM Open Infra Platform is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License Version 3
+	as published by the Free Software Foundation.
+
+	TUM Open Infra Platform 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 for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "IfcTreeItem.h"
+#include <QStringList>
+#include <type_traits>
+#include <cstdlib>
+#include "Exception\UnhandledException.h"
+#include "visit_struct\visit_struct.hpp"
+
+
+OpenInfraPlatform::UserInterface::IfcTreeItem::IfcTreeItem(std::shared_ptr<OpenInfraPlatform::EarlyBinding::EXPRESSEntity> data, std::shared_ptr<IfcTreeItem> parentItem)
+	:data_(data), parentItem_(parentItem)
+{}
+
+OpenInfraPlatform::UserInterface::IfcTreeItem::~IfcTreeItem()
+{
+	childItems_.clear();
+}
+
+void OpenInfraPlatform::UserInterface::IfcTreeItem::appendchild(std::shared_ptr<IfcTreeItem> child)
+{
+	childItems_.append(child);
+}
+
+std::shared_ptr<OpenInfraPlatform::UserInterface::IfcTreeItem> OpenInfraPlatform::UserInterface::IfcTreeItem::child(int row)
+{
+	if (row < 0 || row >= childItems_.size())
+		return nullptr;
+	return childItems_.at(row);
+}
+
+int OpenInfraPlatform::UserInterface::IfcTreeItem::childCount() const
+{
+	return childItems_.count();
+}
+
+int OpenInfraPlatform::UserInterface::IfcTreeItem::columnCount() const
+{
+	return 3;
+}
+
+QVariant OpenInfraPlatform::UserInterface::IfcTreeItem::data(int row, int column) const
+{
+	//auto attributes = getAttributeDescription();
+
+	//switch (column)
+	//{
+	//case 0:
+	//	return attributes.names_[row];
+	//	break;
+	//case 1:
+	//	return attributes.value_[row];
+	//	break;
+	//case 2:
+	//	return attributes.typename_[row];
+	//	break;
+	//}
+	return QVariant();
+}
+
+int OpenInfraPlatform::UserInterface::IfcTreeItem::row()
+{
+	if (parentItem_)
+	{	
+		return parentItem_->childItems_.indexOf(shared_from_this());
+	}
+	return 0;
+}
+
+std::shared_ptr<OpenInfraPlatform::UserInterface::IfcTreeItem> OpenInfraPlatform::UserInterface::IfcTreeItem::parentItem()
+{
+	if (parentItem_)
+		return parentItem_;
+
+	return std::shared_ptr<IfcTreeItem>();
+}
+
+QString OpenInfraPlatform::UserInterface::IfcTreeItem::getIfcClassName() const
+{
+	std::string ifcClassName = data_->classname();
+	return QString::fromStdString(ifcClassName);
+}
+
+struct OpenInfraPlatform::UserInterface::IfcTreeItem::getAttributeDescription 
+{
+
+	template <class T> typename std::enable_if<visit_struct::traits::is_visitable<T>::value && std::is_base_of<OpenInfraPlatform::EarlyBinding::EXPRESSEntity, T>::value, void>::type
+		operator()(T entity)
+	{
+		visit_struct::for_each(entity, [&](const char* name, const auto &value) {
+			names_.push_back(name);
+			typename_ = typeid(T).name(entity);
+			value_.push_back(value);
+
+		});
+	}
+
+	//This is a dummy function which should never be called but is required by the compiler since it could theoretically be called. Throws exception.
+	template <class T> typename std::enable_if<!std::is_base_of<OpenInfraPlatform::EarlyBinding::EXPRESSEntity, T>::value, void>::type
+		operator()(T& entity) const
+	{
+		std::string message = "Invalid function call. " + std::string(typeid(entity).name()) + " isn't a member of EXPRESSEntity.";
+		throw buw::Exception(message);
+	}
+
+	//This is a dummy function which should never be called but is required by the compiler since it could theoretically be called. Throws exception.
+	void operator()(OpenInfraPlatform::EarlyBinding::EXPRESSEntity& entity) const
+	{
+		throw oip::UnhandledException("Invalid function call (IfcTreeItem::getAttributeDescription)");
+	}
+
+	std::vector<const char*> names_;
+	std::vector<const char*> typename_;
+	std::vector <QVariant> value_;
+
+};

UserInterface/Dialogues/IfcTreeItem.h

@@ -0,0 +1,60 @@
+/*
+	Copyright (c) 2021 Technical University of Munich
+	Chair of Computational Modeling and Simulation.
+
+	TUM Open Infra Platform is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License Version 3
+	as published by the Free Software Foundation.
+
+	TUM Open Infra Platform 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 for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef IFCTREEITEM_H
+#define IFCTREEITEM_H
+
+#include "EXPRESS/EXPRESSReference.h"
+#include <QVariant>
+
+
+namespace OpenInfraPlatform {
+	namespace UserInterface {
+
+		class IfcTreeItem : public std::enable_shared_from_this<IfcTreeItem>
+		{
+		public:
+			IfcTreeItem(std::shared_ptr<OpenInfraPlatform::EarlyBinding::EXPRESSEntity> data, std::shared_ptr<IfcTreeItem> parentItem = nullptr);
+			~IfcTreeItem();
+
+			void appendchild(std::shared_ptr<IfcTreeItem> child);
+
+			std::shared_ptr<IfcTreeItem> child(int row);
+			int childCount() const;
+			int columnCount() const;
+			QVariant data(int row, int column) const;
+			int row();
+			std::shared_ptr<IfcTreeItem> parentItem();
+			QString getIfcClassName() const;
+
+		private:
+			QList<std::shared_ptr<IfcTreeItem>> childItems_;
+			std::shared_ptr<OpenInfraPlatform::EarlyBinding::EXPRESSEntity> data_;
+			std::shared_ptr<IfcTreeItem> parentItem_;
+
+			struct getAttributeDescription;
+		};
+	}
+}
+
+
+#endif //IFCTREEITEM_H
+
+namespace oip
+{
+	using OpenInfraPlatform::UserInterface::IfcTreeItem;
+}