Changeset 546 for cpp/frams/model/geometry/modelgeometryinfo.cpp

Timestamp:

07/28/16 03:39:26 (8 years ago)

Author:

Maciej Komosinski

Message:

Renamed: Model::buildUsingNewShapes -> Model::buildUsingSolidShapeTypes()
Added class SolidsShapeTypeModel? (for making ball-and-stick Models look like solids-type Models)
ModelGeometryInfo? functions: findSizesAndAxesOfModel(), volume() and area() now accept ball-and-stick Models (using SolidsShapeTypeModel? class)
[refs #46] and possibly closes this issue (needs verification)

File:

• cpp/frams/model/geometry/modelgeometryinfo.cpp (modified) (3 diffs)

cpp/frams/model/geometry/modelgeometryinfo.cpp

@@ -7 +7 @@
 #include <frams/model/geometry/meshbuilder.h>
 
-void ModelGeometryInfo::findSizesAndAxesOfModel(const Model &model, const double density,
+void ModelGeometryInfo::findSizesAndAxesOfModel(const Model &input_model, const double density,
         Pt3D &sizes, Orient &axes)
 {
+        SolidsShapeTypeModel model(input_model);
         SListTempl<Pt3D> points;
         MeshBuilder::ModelApices apices(density);
-        apices.initialize(&model);
+        apices.initialize(&model.getModel());
         apices.addAllPointsToList(points);
         if (points.size() < 1) //maybe 1 or 2 points are also not enough for findSizesAndAxesOfPointsGroup() to work...
         {
-                logPrintf("ModelGeometryInfo", "findSizesAndAxesOfModel", LOG_ERROR, "Empty points sample for model with %d part(s)", model.getPartCount());
+                logPrintf("ModelGeometryInfo", "findSizesAndAxesOfModel", LOG_ERROR, "Empty points sample for model with %d part(s)", model.getModel().getPartCount());
                 sizes = Pt3D_0;
                 axes = Orient_1;
@@ -65 +66 @@
 }
 
-double ModelGeometryInfo::volume(const Model &model, const double density)
+double ModelGeometryInfo::volume(const Model &input_model, const double density)
 {
+        SolidsShapeTypeModel model(input_model);
         Pt3D lowerBoundary, upperBoundary;
         boundingBox(model, lowerBoundary, upperBoundary);
@@ -90 +92 @@
 }
 
-double ModelGeometryInfo::area(const Model &model, const double density)
+double ModelGeometryInfo::area(const Model &input_model, const double density)
 {
+        SolidsShapeTypeModel model(input_model);
         double area = 0.0;
         
-        for (int partIndex = 0; partIndex < model.getPartCount(); partIndex+=1)
+        for (int partIndex = 0; partIndex < model.getModel().getPartCount(); partIndex+=1)
         {
                 area += externalAreaOfPart(model, partIndex, density);