Changeset 262 for cpp/frams

Timestamp:

12/06/14 02:26:47 (10 years ago)

Author:

Maciej Komosinski

Message:

Geometry evaluation no longer crashes for models that contain only unsupported cylinder shapes [refs #46]

Location:

cpp/frams/model/geometry

Files:

• meshbuilder.cpp (modified) (2 diffs)
• modelgeometryinfo.cpp (modified) (1 diff)

cpp/frams/model/geometry/meshbuilder.cpp

@@ -636 +636 @@
                         iterator = &cylinder;
                         break;
+
+                default:
+                        FMprintf("MeshBuilder::PartSurface", "initialize", FMLV_WARN, "Part shape=%d not supported, skipping...", part->shape);
         }
 }
@@ -719 +722 @@
                         iterator = &cylinder;
                         break;
+
+                default:
+                        FMprintf("MeshBuilder::PartApices", "initialize", FMLV_WARN, "Part shape=%d not supported, skipping...", part->shape);
         }
 }

cpp/frams/model/geometry/modelgeometryinfo.cpp

@@ -14 +14 @@
         apices.initialize(&model);
         apices.addAllPointsToList(points);
+        if (points.size() < 1) //maybe 1 or 2 points are also not enough for findSizesAndAxesOfPointsGroup() to work...
+        {
+                FMprintf("ModelGeometryInfo", "findSizesAndAxesOfModel", FMLV_ERROR, "Empty points sample for model with %d part(s)", model.getPartCount());
+                sizes = Pt3D_0;
+                axes = Orient_1;
+                return;
+        }
         GeometryUtils::findSizesAndAxesOfPointsGroup(points, sizes, axes);
 }