add MESSAGE_TYPE_UNKNOWN_ENTITY

Author: ifcapps

IfcPlusPlus/src/ifcpp/model/StatusCallback.h

@@ -32,13 +32,14 @@ class IFCQUERY_EXPORT StatusCallback
 public:
 	enum MessageType
 	{
-		MESSAGE_TYPE_UNKNOWN,
+		MESSAGE_TYPE_UNDEFINED,
 		MESSAGE_TYPE_GENERAL_MESSAGE,
 		MESSAGE_TYPE_PROGRESS_VALUE,	//\brief Progress mechanism to update progress bar or similar.
 		MESSAGE_TYPE_PROGRESS_TEXT,		//\brief Progress mechanism to update text in progress bar or similar.
 		MESSAGE_TYPE_MINOR_WARNING,
 		MESSAGE_TYPE_WARNING,
 		MESSAGE_TYPE_ERROR,
+		MESSAGE_TYPE_UNKNOWN_ENTITY,
 		MESSAGE_TYPE_CLEAR_MESSAGES,
 		MESSAGE_TYPE_CANCELED
 	};
@@ -51,7 +52,7 @@ class IFCQUERY_EXPORT StatusCallback
 		//\brief Default constructor.
 		Message()
 		{
-			m_message_type = MessageType::MESSAGE_TYPE_UNKNOWN;
+			m_message_type = MessageType::MESSAGE_TYPE_UNDEFINED;
 			m_reporting_function = "";
 			m_entity = nullptr;
 			m_progress_value = -1;
@@ -115,7 +116,7 @@ class IFCQUERY_EXPORT StatusCallback
 			{
 				switch (m->m_message_type)
 				{
-				case MESSAGE_TYPE_UNKNOWN:
+				case MESSAGE_TYPE_UNDEFINED:
 				case MESSAGE_TYPE_GENERAL_MESSAGE:
 				case MESSAGE_TYPE_MINOR_WARNING:
 				case MESSAGE_TYPE_WARNING:

IfcPlusPlus/src/ifcpp/reader/ReaderSTEP.cpp

@@ -812,7 +812,7 @@ void ReaderSTEP::readData(std::istream& read_in, std::streampos file_size, share
 		return;
 	}
 	std::string file_schema_version = model->getIfcSchemaVersionOfLoadedFile();
-	messageCallback(std::string("Detected IFC version: ") + file_schema_version, StatusCallback::MESSAGE_TYPE_GENERAL_MESSAGE, "");
+	messageCallback(std::string("Detected IFC version: ") + file_schema_version, StatusCallback::MESSAGE_TYPE_GENERAL_MESSAGE, __FUNC__);
 
 	size_t read_size = model->getFileHeader().size();
 	std::stringstream err;
@@ -918,11 +918,6 @@ void ReaderSTEP::readData(std::istream& read_in, std::streampos file_size, share
 			++lineCount;
 		}
 	}
-	catch (UnknownEntityException& e)
-	{
-		std::string unknown_keyword = e.m_keyword;
-		err << __FUNC__ << ": unknown entity: " << unknown_keyword.c_str() << std::endl;
-	}
 	catch (BuildingException& e)
 	{
 		err << e.what();
@@ -936,6 +931,11 @@ void ReaderSTEP::readData(std::istream& read_in, std::streampos file_size, share
 		err << __FUNC__ << ": error occurred" << std::endl;
 	}
 
+	if (err_unknown_entity.tellp() > 0)
+	{
+		messageCallback(err_unknown_entity.str(), StatusCallback::MESSAGE_TYPE_UNKNOWN_ENTITY, __FUNC__);
+	}
+
 	// copy entities into map so that they can be found during entity attribute initialization
 	std::unordered_map<int, shared_ptr<BuildingEntity> >& map_entities = model->getMapIfcEntities();
 	for (auto& entity_read_object : vec_entities)