lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-13 08:09:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix save crash on e57, setting min and max quality on scanheader

Browse Source
This commit is contained in:
alemuntoni 2021-10-22 12:06:38 +02:00
parent e81b4b14fc
commit f5533656f1
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/meshlabplugins/io_e57/io_e57.cpp
View File

@ -284,7 +284,7 @@ void E57IOPlugin::save(const QString& formatName, const QString& fileName, MeshM
scanHeader.pose.rotation = quaternion;
scanHeader.pointFields.cartesianInvalidStateField = true;
scanHeader.pointFields.cartesianInvalidStateField = false;
scanHeader.pointFields.cartesianXField = true;
scanHeader.pointFields.cartesianYField = true;
scanHeader.pointFields.cartesianZField = true;
@ -295,6 +295,7 @@ void E57IOPlugin::save(const QString& formatName, const QString& fileName, MeshM
scanHeader.pointFields.normalZ = true;
}
if ((mask & Mask::IOM_VERTCOLOR) != 0) {
scanHeader.pointFields.isColorInvalidField = false;
scanHeader.pointFields.colorRedField = true;
scanHeader.pointFields.colorGreenField = true;
scanHeader.pointFields.colorBlueField = true;
@ -306,6 +307,16 @@ void E57IOPlugin::save(const QString& formatName, const QString& fileName, MeshM
scanHeader.colorLimits.colorBlueMaximum = e57::E57_UINT8_MAX;
}
if ((mask & Mask::IOM_VERTQUALITY) != 0) {
float min = std::numeric_limits<float>::max();
float max = std::numeric_limits<float>::min();
for (size_t i = 0; i < m.cm.vert.size(); ++i) {
if (m.cm.vert[i].Q() < min)
min = m.cm.vert[i].Q();
if (m.cm.vert[i].Q() > max)
max = m.cm.vert[i].Q();
}
scanHeader.intensityLimits.intensityMinimum = min;
scanHeader.intensityLimits.intensityMaximum = max;
scanHeader.pointFields.intensityField = true;
}
@ -326,14 +337,10 @@ void E57IOPlugin::save(const QString& formatName, const QString& fileName, MeshM
pointsData.cartesianY[i] = vertices[i].P().Y();
pointsData.cartesianZ[i] = vertices[i].P().Z();
pointsData.cartesianInvalidState[i] = 0;
if (data3DPoints.areColorsAvailable()) {
pointsData.colorRed[i] = static_cast<uint8_t>(vertices[i].C().X());
pointsData.colorGreen[i] = static_cast<uint8_t>(vertices[i].C().Y());
pointsData.colorBlue[i] = static_cast<uint8_t>(vertices[i].C().Z());
if (scanHeader.pointFields.isColorInvalidField)
pointsData.isColorInvalid[i] = 0;
}
if (data3DPoints.areNormalsAvailable()) {
@ -344,7 +351,6 @@ void E57IOPlugin::save(const QString& formatName, const QString& fileName, MeshM
if (data3DPoints.isQualityAvailable()) {
pointsData.intensity[i] = vertices[i].Q();
pointsData.isIntensityInvalid[i] = 0;
}
}