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

Timestamp:

07/28/16 03:39:26 (9 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/model.cpp (modified) (4 diffs)

cpp/frams/model/model.cpp

@@ -973 +973 @@
                                 j->p2_refno = j->part2->refno;
                                 if (checklevel > 0)
-                                        {
+                                {
                                         j->part1->mass += 1.0;
                                         j->part2->mass += 1.0;
-                                        }
+                                }
                                 if ((j->usedelta) && ((j->d.x != JOINT_DELTA_MARKER) || (j->d.y != JOINT_DELTA_MARKER) || (j->d.z != JOINT_DELTA_MARKER)))
                                 { // delta positioning -> calc. orient.
@@ -1336 +1336 @@
 }
 
-void Model::buildUsingNewShapes(const Model& old, Part::Shape default_shape, float thickness)
-{
-        for (int i = 0; i < old.getJointCount(); i++)
-        {
-                Joint *oj = old.getJoint(i);
-                Part *p = addNewPart(default_shape);
+void Model::buildUsingSolidShapeTypes(const Model& src_ballandstick_shapes, Part::Shape use_shape, float thickness)
+{
+        for (int i = 0; i < src_ballandstick_shapes.getJointCount(); i++)
+        {
+                Joint *oj = src_ballandstick_shapes.getJoint(i);
+                Part *p = addNewPart(use_shape);
                 p->p = (oj->part1->p + oj->part2->p) / 2;
                 Orient o;
@@ -1350 +1350 @@
                 p->scale.z = thickness;
         }
-        for (int i = 0; i < old.getPartCount(); i++)
-        {
-                Part *op = old.getPart(i);
-                for (int j = 0; j < old.getJointCount(); j++)
-                {
-                        Joint *oj = old.getJoint(j);
+        for (int i = 0; i < src_ballandstick_shapes.getPartCount(); i++)
+        {
+                Part *op = src_ballandstick_shapes.getPart(i);
+                for (int j = 0; j < src_ballandstick_shapes.getJointCount(); j++)
+                {
+                        Joint *oj = src_ballandstick_shapes.getJoint(j);
                         if ((oj->part1 == op) || (oj->part2 == op))
                         {
-                                for (int j2 = j + 1; j2 < old.getJointCount(); j2++)
+                                for (int j2 = j + 1; j2 < src_ballandstick_shapes.getJointCount(); j2++)
                                 {
-                                        Joint *oj2 = old.getJoint(j2);
+                                        Joint *oj2 = src_ballandstick_shapes.getJoint(j2);
                                         if ((oj2->part1 == op) || (oj2->part2 == op))
                                         {
@@ -1369 +1369 @@
                         }
                 }
+        }
+}
+
+SolidsShapeTypeModel::SolidsShapeTypeModel(const Model& m, Part::Shape use_shape, float thickness)
+{
+        using_model = converted_model = NULL;
+        if (m.getShapeType() == Model::SHAPE_BALL_AND_STICK)
+        {
+                converted_model = new Model;
+                converted_model->open();
+                converted_model->buildUsingSolidShapeTypes(m, use_shape, thickness);
+                converted_model->close();
+                using_model = converted_model;
+        }
+        else
+        {
+                converted_model = NULL;
+                using_model = &m;
         }
 }