Changeset 660
 Timestamp:
 04/24/17 18:17:56 (6 years ago)
 Location:
 cpp/frams/model
 Files:

 4 edited
Legend:
 Unmodified
 Added
 Removed

cpp/frams/model/geometry/modelgeometryinfo.cpp
r658 r660 7 7 #include <frams/model/geometry/meshbuilder.h> 8 8 9 void ModelGeometryInfo::findSizesAndAxes( constModel &input_model, const double density,9 void ModelGeometryInfo::findSizesAndAxes(Model &input_model, const double density, 10 10 Pt3D &sizes, Orient &axes) 11 11 { … … 66 66 } 67 67 68 double ModelGeometryInfo::volume( constModel &input_model, const double density)68 double ModelGeometryInfo::volume(Model &input_model, const double density) 69 69 { 70 70 SolidsShapeTypeModel model(input_model); … … 92 92 } 93 93 94 double ModelGeometryInfo::area( constModel &input_model, const double density)94 double ModelGeometryInfo::area(Model &input_model, const double density) 95 95 { 96 96 SolidsShapeTypeModel model(input_model); 
cpp/frams/model/geometry/modelgeometryinfo.h
r657 r660 24 24 namespace ModelGeometryInfo 25 25 { 26 double area( constModel &model, const double density);27 double volume( constModel &model, const double density);28 void findSizesAndAxes( constModel &model, const double density, Pt3D &sizes, Orient &axes);26 double area(Model &model, const double density); 27 double volume(Model &model, const double density); 28 void findSizesAndAxes(Model &model, const double density, Pt3D &sizes, Orient &axes); 29 29 30 30 void boundingBox(const Model &model, Pt3D &lowerBoundary, Pt3D &upperBoundary); 
cpp/frams/model/model.cpp
r653 r660 1393 1393 } 1394 1394 1395 SolidsShapeTypeModel::SolidsShapeTypeModel( constModel& m, Part::Shape use_shape, float thickness)1395 SolidsShapeTypeModel::SolidsShapeTypeModel(Model& m, Part::Shape use_shape, float thickness) 1396 1396 { 1397 1397 using_model = converted_model = NULL; 
cpp/frams/model/model.h
r611 r660 471 471 public: 472 472 Model *converted_model; 473 constModel *using_model;474 SolidsShapeTypeModel( constModel& m, Part::Shape use_shape = Part::SHAPE_CYLINDER, float thickness = 0.2);475 operator const Model&() const{ return *using_model; }476 const Model& getModel() const{ return *using_model; }473 Model *using_model; 474 SolidsShapeTypeModel(Model& m, Part::Shape use_shape = Part::SHAPE_CYLINDER, float thickness = 0.2); 475 operator Model&() { return *using_model; } 476 Model& getModel() { return *using_model; } 477 477 ~SolidsShapeTypeModel() { if (converted_model) delete converted_model; } 478 478 };
Note: See TracChangeset
for help on using the changeset viewer.