diff --git a/Examples/LPBFSystem/Laser/mcplugin_laser.cpp b/Examples/LPBFSystem/Laser/mcplugin_laser.cpp index 964263aa..944e69f4 100644 --- a/Examples/LPBFSystem/Laser/mcplugin_laser.cpp +++ b/Examples/LPBFSystem/Laser/mcplugin_laser.cpp @@ -276,10 +276,10 @@ __DECLARESTATE(exposure) } auto pContext = pDriver->GetContext(); - auto pRecording = pContext->PrepareRecording(true); + auto pRecording = pContext->PrepareRecording(true, true, true); - pRecording->AddChannel("x", LibMCDriver_ScanLab::eRTCChannelType::ChannelTargetXBacktransformed); - pRecording->AddChannel("y", LibMCDriver_ScanLab::eRTCChannelType::ChannelTargetYBacktransformed); + pRecording->AddChannel("x", LibMCDriver_ScanLab::eRTCChannelType::ChannelTargetX); + pRecording->AddChannel("y", LibMCDriver_ScanLab::eRTCChannelType::ChannelTargetY); pRecording->AddChannel("power", LibMCDriver_ScanLab::eRTCChannelType::ChannelAnalogOut1); pContext->SetStartList(1, 0); diff --git a/Examples/LPBFSystem/UI/mc_userinterface.cpp b/Examples/LPBFSystem/UI/mc_userinterface.cpp index 240ca089..6591d495 100644 --- a/Examples/LPBFSystem/UI/mc_userinterface.cpp +++ b/Examples/LPBFSystem/UI/mc_userinterface.cpp @@ -689,7 +689,7 @@ class CEvent_OnLoadHistoricJournal : public virtual CEvent { uint64_t nLifetimeInMicroseconds = pJournal->GetJournalLifeTimeInMicroseconds(); - auto pVariable = pJournal->RetrieveJournalVariableFromTimeInterval("main.jobinfo.countertest", 0, nLifetimeInMicroseconds); + auto pVariable = pJournal->RetrieveJournalVariable ("main.jobinfo.countertest"); double dValue = pVariable->ComputeDoubleSample(10000000); pUIEnvironment->LogMessage("Double sample: " + std::to_string (dValue)); diff --git a/Framework/HeadersDev/CppDynamic/libmcenv_dynamic.h b/Framework/HeadersDev/CppDynamic/libmcenv_dynamic.h index d7dd1ce7..e8607384 100644 --- a/Framework/HeadersDev/CppDynamic/libmcenv_dynamic.h +++ b/Framework/HeadersDev/CppDynamic/libmcenv_dynamic.h @@ -2902,16 +2902,6 @@ typedef LibMCEnvResult (*PLibMCEnvToolpathLayer_GetSegmentPartUUIDPtr) (LibMCEnv */ typedef LibMCEnvResult (*PLibMCEnvToolpathLayer_GetSegmentLocalPartIDPtr) (LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_uint32 nSegmentIndex, LibMCEnv_uint32 * pLocalPartID); -/** -* Retrieves the local segment part id on the layer. ATTENTION: This ID is only unique within the layer and there is no guarantee to be globally unique or consistent across layers. -* -* @param[in] pToolpathLayer - ToolpathLayer instance. -* @param[in] nIndex - Index. Must be between 0 and Count - 1. -* @param[out] pLocalPartID - Local Part ID of the segment -* @return error code or 0 (success) -*/ -typedef LibMCEnvResult (*PLibMCEnvToolpathLayer_GetSegmentLocalPartIDPtr) (LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_uint32 nIndex, LibMCEnv_uint32 * pLocalPartID); - /** * Retrieves the assigned segment point list. For type hatch, the points are taken pairwise. * diff --git a/Framework/InterfacesCore/libmcenv_abi.hpp b/Framework/InterfacesCore/libmcenv_abi.hpp index 8ce23db6..2367f250 100644 --- a/Framework/InterfacesCore/libmcenv_abi.hpp +++ b/Framework/InterfacesCore/libmcenv_abi.hpp @@ -2915,16 +2915,6 @@ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getsegmentpartuuid(LibMC */ LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getsegmentlocalpartid(LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_uint32 nSegmentIndex, LibMCEnv_uint32 * pLocalPartID); -/** -* Retrieves the local segment part id on the layer. ATTENTION: This ID is only unique within the layer and there is no guarantee to be globally unique or consistent across layers. -* -* @param[in] pToolpathLayer - ToolpathLayer instance. -* @param[in] nIndex - Index. Must be between 0 and Count - 1. -* @param[out] pLocalPartID - Local Part ID of the segment -* @return error code or 0 (success) -*/ -LIBMCENV_DECLSPEC LibMCEnvResult libmcenv_toolpathlayer_getsegmentlocalpartid(LibMCEnv_ToolpathLayer pToolpathLayer, LibMCEnv_uint32 nIndex, LibMCEnv_uint32 * pLocalPartID); - /** * Retrieves the assigned segment point list. For type hatch, the points are taken pairwise. * diff --git a/Framework/InterfacesCore/libmcenv_interfaces.hpp b/Framework/InterfacesCore/libmcenv_interfaces.hpp index 310f2933..4320d16f 100644 --- a/Framework/InterfacesCore/libmcenv_interfaces.hpp +++ b/Framework/InterfacesCore/libmcenv_interfaces.hpp @@ -2530,13 +2530,6 @@ class IToolpathLayer : public virtual IBase { */ virtual LibMCEnv_uint32 GetSegmentLocalPartID(const LibMCEnv_uint32 nSegmentIndex) = 0; - /** - * IToolpathLayer::GetSegmentLocalPartID - Retrieves the local segment part id on the layer. ATTENTION: This ID is only unique within the layer and there is no guarantee to be globally unique or consistent across layers. - * @param[in] nIndex - Index. Must be between 0 and Count - 1. - * @return Local Part ID of the segment - */ - virtual LibMCEnv_uint32 GetSegmentLocalPartID(const LibMCEnv_uint32 nIndex) = 0; - /** * IToolpathLayer::GetSegmentPointData - Retrieves the assigned segment point list. For type hatch, the points are taken pairwise. * @param[in] nSegmentIndex - Index. Must be between 0 and Count - 1. diff --git a/Implementation/Core/amc_scatterplot.cpp b/Implementation/Core/amc_scatterplot.cpp index 0fd46e46..20666310 100644 --- a/Implementation/Core/amc_scatterplot.cpp +++ b/Implementation/Core/amc_scatterplot.cpp @@ -29,25 +29,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -<<<<<<<< HEAD:Implementation/Core/amc_meshsceneitem.cpp -#include "amc_meshsceneitem.hpp" -#include "libmc_exceptiontypes.hpp" -#include "common_utils.hpp" -#include "amc_meshutils.hpp" - -namespace AMC { - - - CMeshSceneItem::CMeshSceneItem(const std::string& sUUID, const std::string& sMeshEntityUUID) - : m_sUUID (AMCCommon::CUtils::normalizeUUIDString (sUUID)), - m_sMeshEntityUUID (AMCCommon::CUtils::normalizeUUIDString (sMeshEntityUUID)) - { - m_Transform = CMeshUtils::createIdentityTransform(); - - } - - CMeshSceneItem::~CMeshSceneItem() -======== #include "amc_scatterplot.hpp" #include "libmc_exceptiontypes.hpp" #include "common_utils.hpp" @@ -61,37 +42,15 @@ namespace AMC { } CScatterplot::~CScatterplot() ->>>>>>>> develop:Implementation/Core/amc_scatterplot.cpp { } -<<<<<<<< HEAD:Implementation/Core/amc_meshsceneitem.cpp - std::string CMeshSceneItem::getUUID() -======== std::string CScatterplot::getUUID() ->>>>>>>> develop:Implementation/Core/amc_scatterplot.cpp { return m_sUUID; } -<<<<<<<< HEAD:Implementation/Core/amc_meshsceneitem.cpp - std::string CMeshSceneItem::getMeshEntityUUID() - { - return m_sMeshEntityUUID; - } - - LibMCEnv::sModelDataTransform CMeshSceneItem::getTransform() - { - return m_Transform; - } - - void CMeshSceneItem::updateTransform(const LibMCEnv::sModelDataTransform newTransform) - { - m_Transform = newTransform; - } - -======== void CScatterplot::clearData() { m_PointEntries.clear(); @@ -154,7 +113,6 @@ namespace AMC { } } ->>>>>>>> develop:Implementation/Core/amc_scatterplot.cpp } diff --git a/Implementation/Core/amc_scatterplot.hpp b/Implementation/Core/amc_scatterplot.hpp index 3cf983c8..980e4fbc 100644 --- a/Implementation/Core/amc_scatterplot.hpp +++ b/Implementation/Core/amc_scatterplot.hpp @@ -29,23 +29,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -<<<<<<<< HEAD:Implementation/Core/amc_meshutils.hpp -#ifndef __AMC_MESHUTILS -#define __AMC_MESHUTILS - -#include "libmcenv_types.hpp" -#include "lib3mf/lib3mf_types.hpp" - -namespace AMC { - - class CMeshUtils { - - public: - - static LibMCEnv::sModelDataTransform map3MFTransform(const Lib3MF::sTransform transform3MF); - - static LibMCEnv::sModelDataTransform createIdentityTransform(); -======== #ifndef __AMC_SCATTERPLOT #define __AMC_SCATTERPLOT @@ -98,21 +81,12 @@ namespace AMC { void computeBoundaries(); ->>>>>>>> develop:Implementation/Core/amc_scatterplot.hpp - static LibMCEnv::sModelDataTransform multiplyTransforms(const LibMCEnv::sModelDataTransform& transform1, const LibMCEnv::sModelDataTransform& transform2); }; -<<<<<<<< HEAD:Implementation/Core/amc_meshutils.hpp - -} - -#endif //__AMC_MESHUTILS -======== } #endif //__AMC_SCATTERPLOT ->>>>>>>> develop:Implementation/Core/amc_scatterplot.hpp diff --git a/Implementation/Core/amc_xmldocumentnode.hpp b/Implementation/Core/amc_xmldocumentnode.hpp index df3270b3..f9e1f8b5 100644 --- a/Implementation/Core/amc_xmldocumentnode.hpp +++ b/Implementation/Core/amc_xmldocumentnode.hpp @@ -70,8 +70,6 @@ namespace AMC { void addChildEx(PXMLDocumentNodeInstance pNode); - void splitNameSpaceName(const std::string & sPrefixedName, std::string & sUnprefixedName, std::string & sNameSpacePrefix); - public: CXMLDocumentNodeInstance(CXMLDocumentInstance* pDocument, CXMLDocumentNodeInstance * pParentNode, PXMLDocumentNameSpace pNameSpace, const std::string& sNodeName);