Changeset 660

Timestamp:

04/24/17 18:17:56 (7 years ago)

Author:

Maciej Komosinski

Message:

Model shape conversion no longer requires const Model&

Location:

cpp/frams/model

Files:

• geometry/modelgeometryinfo.cpp (modified) (3 diffs)
• geometry/modelgeometryinfo.h (modified) (1 diff)
• model.cpp (modified) (1 diff)
• model.h (modified) (1 diff)

cpp/frams/model/geometry/modelgeometryinfo.cpp

@@ -7 +7 @@
 #include <frams/model/geometry/meshbuilder.h>
 
-void ModelGeometryInfo::findSizesAndAxes(const Model &input_model, const double density,
+void ModelGeometryInfo::findSizesAndAxes(Model &input_model, const double density,
         Pt3D &sizes, Orient &axes)
 {
@@ -66 +66 @@
 }
 
-double ModelGeometryInfo::volume(const Model &input_model, const double density)
+double ModelGeometryInfo::volume(Model &input_model, const double density)
 {
         SolidsShapeTypeModel model(input_model);
@@ -92 +92 @@
 }
 
-double ModelGeometryInfo::area(const Model &input_model, const double density)
+double ModelGeometryInfo::area(Model &input_model, const double density)
 {
         SolidsShapeTypeModel model(input_model);

cpp/frams/model/geometry/modelgeometryinfo.h

@@ -24 +24 @@
 namespace ModelGeometryInfo
 {
-        double area(const Model &model, const double density);
-        double volume(const Model &model, const double density);
-        void findSizesAndAxes(const Model &model, const double density, Pt3D &sizes, Orient &axes);
+        double area(Model &model, const double density);
+        double volume(Model &model, const double density);
+        void findSizesAndAxes(Model &model, const double density, Pt3D &sizes, Orient &axes);
 
         void boundingBox(const Model &model, Pt3D &lowerBoundary, Pt3D &upperBoundary);

cpp/frams/model/model.cpp

@@ -1393 +1393 @@
 }
 
-SolidsShapeTypeModel::SolidsShapeTypeModel(const Model& m, Part::Shape use_shape, float thickness)
+SolidsShapeTypeModel::SolidsShapeTypeModel(Model& m, Part::Shape use_shape, float thickness)
 {
         using_model = converted_model = NULL;

cpp/frams/model/model.h

@@ -471 +471 @@
 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; }
+        Model *using_model;
+        SolidsShapeTypeModel(Model& m, Part::Shape use_shape = Part::SHAPE_CYLINDER, float thickness = 0.2);
+        operator Model&() { return *using_model; }
+        Model& getModel() { return *using_model; }
         ~SolidsShapeTypeModel() { if (converted_model) delete converted_model; }
 };