From 8149cdf7f15703e57f9da321de353b2a56adff2f Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Wed, 9 Jun 2021 08:54:48 +0200 Subject: [PATCH] fix some Scalarm in ioe57 --- src/meshlabplugins/io_e57/io_e57.cpp | 26 ++++++++++++-------------- src/meshlabplugins/io_e57/io_e57.h | 3 +-- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/meshlabplugins/io_e57/io_e57.cpp b/src/meshlabplugins/io_e57/io_e57.cpp index 266bcaca5..65253f7fe 100755 --- a/src/meshlabplugins/io_e57/io_e57.cpp +++ b/src/meshlabplugins/io_e57/io_e57.cpp @@ -70,9 +70,7 @@ static inline std::string filenameToString(const QString& fileName) noexcept; */ static inline QString formatImageFilename(const std::string& fileName) noexcept; -void E57IOPlugin::initPreOpenParameter(const QString &format, RichParameterList & parlst) {} - -unsigned int E57IOPlugin::numberMeshesContainedInFile(const QString& format, const QString& fileName) const { +unsigned int E57IOPlugin::numberMeshesContainedInFile(const QString& format, const QString& fileName, const RichParameterList&) const { unsigned int count; @@ -152,20 +150,20 @@ void E57IOPlugin::open(const QString &formatName, const QString &fileName, const continue; } - auto rotationMatrix = vcg::Matrix44f::Identity(); - auto translateMatrix = vcg::Matrix44f::Identity(); + auto rotationMatrix = Matrix44m::Identity(); + auto translateMatrix = Matrix44m::Identity(); - auto quaternion = vcg::Quaternion{ - static_cast(scanHeader.pose.rotation.w), - static_cast(scanHeader.pose.rotation.x), - static_cast(scanHeader.pose.rotation.y), - static_cast(scanHeader.pose.rotation.z), + auto quaternion = vcg::Quaternion{ + static_cast(scanHeader.pose.rotation.w), + static_cast(scanHeader.pose.rotation.x), + static_cast(scanHeader.pose.rotation.y), + static_cast(scanHeader.pose.rotation.z), }; quaternion.ToMatrix(rotationMatrix); - translateMatrix.ElementAt(0, 3) = static_cast(scanHeader.pose.translation.x); - translateMatrix.ElementAt(1, 3) = static_cast(scanHeader.pose.translation.y); - translateMatrix.ElementAt(2, 3) = static_cast(scanHeader.pose.translation.z); + translateMatrix.ElementAt(0, 3) = static_cast(scanHeader.pose.translation.x); + translateMatrix.ElementAt(1, 3) = static_cast(scanHeader.pose.translation.y); + translateMatrix.ElementAt(2, 3) = static_cast(scanHeader.pose.translation.z); meshModel->cm.Tr = translateMatrix * rotationMatrix; @@ -365,7 +363,7 @@ void E57IOPlugin::loadMesh(MeshModel &m, int &mask, int scanIndex, size_t buffSi } // set the mask - m.Enable(mask); + m.enable(mask); // read the data from the E57 file try { diff --git a/src/meshlabplugins/io_e57/io_e57.h b/src/meshlabplugins/io_e57/io_e57.h index 81a824fd5..1c802a73a 100755 --- a/src/meshlabplugins/io_e57/io_e57.h +++ b/src/meshlabplugins/io_e57/io_e57.h @@ -136,9 +136,8 @@ public: std::list exportFormats() const; virtual void exportMaskCapability(const QString &format, int &capability, int &defaultBits) const; - virtual void initPreOpenParameter(const QString &/*format*/, RichParameterList & /*par*/); - unsigned int numberMeshesContainedInFile(const QString& format, const QString& fileName) const; + unsigned int numberMeshesContainedInFile(const QString& format, const QString& fileName, const RichParameterList& preParams) const; void open(const QString &formatName, const QString &fileName, MeshModel &m, int& mask, const RichParameterList &, vcg::CallBackPos *cb = 0);