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

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.h (modified) (2 diffs)

cpp/frams/model/model.h

@@ -414 +414 @@
         void rotate(const Pt3D& angles) { Orient o = Orient_1; o.rotate(angles); rotate(o); }
 
-        /// build this model using new shapes, based on the provided model that uses old shapes. See also shapeconvert.cpp.
-        void buildUsingNewShapes(const Model& src_old_shapes, Part::Shape default_shape = Part::SHAPE_CYLINDER, float thickness = 0.2);
+        /// build this model using solid shape types, based on the provided ball-and-stick model. See also shapeconvert.cpp.
+        void buildUsingSolidShapeTypes(const Model& src_ballandstick_shapes, Part::Shape use_shape = Part::SHAPE_CYLINDER, float thickness = 0.2);
 
 #ifdef EASYMAPDEBUG
@@ -448 +448 @@
 };
 
+/**
+   An object of this class is created from a Model and returns the solids-type const Model& regardless of the source Model shape type.
+   For solids-type Models, the same source Model reference is returned.
+   For ball-and-stick-type Models, the new temporary Model is created (using Model::buildUsingSolidShapeTypes).
+   Useful for making the solids-only code work for both solids Models and ball-and-stick Models, without if's and special cases, like in this example:
+   
+   void fun(const Model& input) // 'input' can be any shape type
+   {
+      SolidsShapeTypeModel converted(input); // 'converted' contains either 'input' or the new solids-type Model created from 'input'
+      functionAcceptingSolidsTypeModel(converted); // operator const Model&() is called automatically because of the function signature
+      int n=converted.getModel().getPartCount(); // getting the const Model& explicitly (converted.getPartCount() would fail)
+   }
+ */
+class SolidsShapeTypeModel
+{
+public:
+        Model *converted_model;
+        const Model *using_model;
+        SolidsShapeTypeModel(const Model& m, Part::Shape use_shape = Part::SHAPE_CYLINDER, float thickness = 0.2);
+        operator const Model&() const { return *using_model; }
+        const Model& getModel() const { return *using_model; }
+        ~SolidsShapeTypeModel() { if (converted_model) delete converted_model; }
+};
+
 #endif