From 29ef15276e2985c6b79a51adb70516f990abc4d1 Mon Sep 17 00:00:00 2001 From: SaraP Date: Fri, 1 Oct 2021 12:15:18 +0200 Subject: [PATCH] lib3mf : - modifiche per gestire assenza UUID. --- Source/Model/Reader/v100/NMR_ModelReaderNode100_Build.cpp | 4 ++-- Source/Model/Reader/v100/NMR_ModelReaderNode100_BuildItem.cpp | 2 +- Source/Model/Reader/v100/NMR_ModelReaderNode100_Object.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Model/Reader/v100/NMR_ModelReaderNode100_Build.cpp b/Source/Model/Reader/v100/NMR_ModelReaderNode100_Build.cpp index c7ae2de..399ef47 100644 --- a/Source/Model/Reader/v100/NMR_ModelReaderNode100_Build.cpp +++ b/Source/Model/Reader/v100/NMR_ModelReaderNode100_Build.cpp @@ -65,9 +65,9 @@ namespace NMR { { m_pWarnings->addException(CNMRException(NMR_ERROR_MISSINGUUID), mrwMissingMandatoryValue); } - m_UUID = std::make_shared(); + // m_UUID = std::make_shared(); } - m_pModel->setBuildUUID(m_UUID); + m_pModel->setBuildUUID(m_UUID); } void CModelReaderNode100_Build::OnAttribute(_In_z_ const nfChar * pAttributeName, _In_z_ const nfChar * pAttributeValue) diff --git a/Source/Model/Reader/v100/NMR_ModelReaderNode100_BuildItem.cpp b/Source/Model/Reader/v100/NMR_ModelReaderNode100_BuildItem.cpp index 702d974..4fc7e25 100644 --- a/Source/Model/Reader/v100/NMR_ModelReaderNode100_BuildItem.cpp +++ b/Source/Model/Reader/v100/NMR_ModelReaderNode100_BuildItem.cpp @@ -110,7 +110,7 @@ namespace NMR { if (pXMLReader->NamespaceRegistered(XML_3MF_NAMESPACE_PRODUCTIONSPEC)) { m_pWarnings->addException(CNMRException(NMR_ERROR_MISSINGUUID), mrwMissingMandatoryValue); } - m_UUID = std::make_shared(); + // m_UUID = std::make_shared(); } pBuildItem->setUUID(m_UUID); pBuildItem->setPath(m_sPath); diff --git a/Source/Model/Reader/v100/NMR_ModelReaderNode100_Object.cpp b/Source/Model/Reader/v100/NMR_ModelReaderNode100_Object.cpp index 504e42d..c035d33 100644 --- a/Source/Model/Reader/v100/NMR_ModelReaderNode100_Object.cpp +++ b/Source/Model/Reader/v100/NMR_ModelReaderNode100_Object.cpp @@ -122,7 +122,7 @@ namespace NMR { if (pXMLReader->NamespaceRegistered(XML_3MF_NAMESPACE_PRODUCTIONSPEC)) { m_pWarnings->addException(CNMRException(NMR_ERROR_MISSINGUUID), mrwMissingMandatoryValue); } - m_UUID = std::make_shared(); + // m_UUID = std::make_shared(); } m_pObject->setUUID(m_UUID); }