Merge pull request #63 from mvrdevelopment/Bug-FIx-62-Library-doesnt-…

…have-provider-providerVersion Bug-FIx-62-Library-doesnt-have-provider-providerVersion
mvrdevelopment · Oct 24, 2024 · a9e3a15 · a9e3a15
2 parents 74db848 + 3c0df4d
commit a9e3a15
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 6 deletions.
diff --git a/src/Implementation/CMediaRessourceVectorImpl.cpp b/src/Implementation/CMediaRessourceVectorImpl.cpp
@@ -23,7 +23,6 @@ SceneData::SceneDataExchange* VectorworksMVR::CMediaRessourceVectorImpl::GetExch
 	return & fExchangeObj;
 }
 
-
 VectorworksMVR::VCOMError VectorworksMVR::CMediaRessourceVectorImpl::AddFileToMvrFile(MvrString fullPath)
 {
     TXString strFullPath(fullPath);
@@ -74,6 +73,17 @@ VectorworksMVR::VCOMError VectorworksMVR::CMediaRessourceVectorImpl::AddGdtfFold
 	return kVCOMError_NoError;
 }
 
+VectorworksMVR::VCOMError VectorworksMVR::CMediaRessourceVectorImpl::AddProviderAndProviderVersion( MvrString provider, MvrString providerVersion )
+{
+	TXString strProvider(provider);
+	TXString strProviderVersion(providerVersion);
+
+	fExchangeObj.AddProviderAndProviderVersion(strProvider, strProviderVersion);
+
+	return kVCOMError_NoError;
+
+}
+
 VectorworksMVR::VCOMError VectorworksMVR::CMediaRessourceVectorImpl::OpenForWrite(MvrString fullPath)
 {
 	//---------------------------------------------------------------------------

diff --git a/src/Implementation/CMediaRessourceVectorImpl.h b/src/Implementation/CMediaRessourceVectorImpl.h
@@ -43,7 +43,8 @@ namespace VectorworksMVR
 		virtual VCOMError VCOM_CALLTYPE	AddGdtfFolderLocation(MvrString fullPathToFolder);
         virtual VCOMError VCOM_CALLTYPE	AddFileToMvrFile(MvrString fullPath);
 		virtual VCOMError VCOM_CALLTYPE AddBufferToMvrFile(MvrString filename, char* buffer, size_t length);
-
+		virtual VCOMError VCOM_CALLTYPE	AddProviderAndProviderVersion( MvrString provider, MvrString providerVersion );
+
 		// After this you can generate Aux Objects
 		virtual VCOMError VCOM_CALLTYPE		CreateDataProviderObject(		MvrString provider,		MvrString version, 	ISceneDataProvider** outSceneDataProvider);
 		virtual VCOMError VCOM_CALLTYPE		CreatePositionObject(	 		const MvrUUID& guid,	MvrString name,		IPosition** outPositionObj);

diff --git a/src/Include/IMediaRessourceVectorInterface.h b/src/Include/IMediaRessourceVectorInterface.h
@@ -395,7 +395,8 @@ namespace VectorworksMVR
 		virtual VCOMError VCOM_CALLTYPE		AddGdtfFolderLocation(MvrString fullPathToFolder) = 0;
         virtual VCOMError VCOM_CALLTYPE		AddFileToMvrFile(MvrString fullPath) = 0;
 		virtual VCOMError VCOM_CALLTYPE		AddBufferToMvrFile(MvrString filename, char* buffer, size_t length) = 0;
-
+		virtual VCOMError VCOM_CALLTYPE		AddProviderAndProviderVersion( MvrString provider, MvrString providerVersion ) = 0;
+
 		// After this you can generate Aux Objects
 		virtual VCOMError VCOM_CALLTYPE		CreateDataProviderObject(		MvrString provider,		MvrString version,	ISceneDataProvider** outSceneDataProvider) = 0;
 		virtual VCOMError VCOM_CALLTYPE		CreatePositionObject(	 		const MvrUUID& guid,	MvrString name,		IPosition** outPositionObj) = 0;

diff --git a/src/Prefix/CommonPrefix.h b/src/Prefix/CommonPrefix.h
@@ -62,6 +62,8 @@
 #define XML_Val_RootNodeName			"GeneralSceneDescription"
 #define XML_Val_RootAttrMainVersion		"verMajor"
 #define XML_Val_RootAttrMinorVersion	"verMinor"
+#define XML_Val_RootAttrProvider		"provider"
+#define XML_Val_RootAttrProviderVersion	"providerVersion"
 
 #define XML_Val_UserDataNodeName		"UserData"
 #define XML_Val_UserDataVWEntry			"VWEntry"

diff --git a/src/SceneDataExchange.cpp b/src/SceneDataExchange.cpp
@@ -3377,6 +3377,12 @@ bool SceneDataExchange::WriteToFile(const IFileIdentifierPtr& file)
 	return true;
 }
 
+void SceneDataExchange::AddProviderAndProviderVersion(const TXString& provider, const TXString& providerVersion)
+{
+	fProvider = provider;
+	fProviderVersion = providerVersion;
+}
+
 bool SceneDataExchange::WriteXml(const IFolderIdentifierPtr& folder, IXMLFileIOBufferImpl& outBuffer)
 {
 
@@ -3395,8 +3401,10 @@ bool SceneDataExchange::WriteXml(const IFolderIdentifierPtr& folder, IXMLFileIOB
 		{
 			//-------------------------------------------------------------------------------------------------
 			// Set Version for the export Format
-			pDatabaseRoot->SetNodeAttributeValue(XML_Val_RootAttrMainVersion,	TXString() << kMVR_MajorVersion);
-			pDatabaseRoot->SetNodeAttributeValue(XML_Val_RootAttrMinorVersion,	TXString() << kMVR_MinorVersion);
+			pDatabaseRoot->SetNodeAttributeValue(XML_Val_RootAttrMainVersion,		TXString() << kMVR_MajorVersion);
+			pDatabaseRoot->SetNodeAttributeValue(XML_Val_RootAttrMinorVersion,		TXString() << kMVR_MinorVersion);
+			pDatabaseRoot->SetNodeAttributeValue(XML_Val_RootAttrProvider,			fProvider);
+			pDatabaseRoot->SetNodeAttributeValue(XML_Val_RootAttrProviderVersion,	fProviderVersion);
 
 
 			//-------------------------------------------------------------------------------------------------

diff --git a/src/SceneDataExchange.h b/src/SceneDataExchange.h
@@ -991,6 +991,8 @@ namespace SceneData
 
 		//
 		size_t							fCountExportedGeometryProviders;
+		TXString						fProvider;
+		TXString						fProviderVersion;
 
 		//Duplicated Uuids flag
 		bool fDuplicatedUuids;
@@ -1068,7 +1070,8 @@ namespace SceneData
         void AddFileToZip(const IFileIdentifierPtr& file, ERessourceType resType);
 		void AddBufferToZip(const TXString& fileName, ISceneDataZipBuffer* buffer);
 		void AddLocationForGdtfFiles(IFolderIdentifierPtr folder);
-
+		void AddProviderAndProviderVersion(const TXString& provider, const TXString& providerVersion );
+
 	private:
 
 		bool WriteXml(const IFolderIdentifierPtr& folder , IXMLFileIOBufferImpl& outBuffer);