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

Timestamp:

12/16/14 01:51:06 (10 years ago)

Author:

Maciej Komosinski

Message:

• Model validation checks part/joint shapes for consistency (old/new)
• Model::getShape() returns new/old style
• Model shape conversion (old to new) and sample usage in shapeconvert.cpp

File:

• cpp/frams/model/model.h (modified) (3 diffs)

cpp/frams/model/model.h

@@ -117 +117 @@
 
 int checklevel;
+
+  public:
+enum Shape {SHAPE_UNKNOWN,SHAPE_ILLEGAL,SHAPE_OLD,SHAPE_NEW};
+  protected:
+Shape shape;
 
 void updateNeuroRefno(); // set Neuro::refno for all neurons
@@ -150 +155 @@
 int isValid() const {return buildstatus==valid;}
 int getErrorPosition(bool includingwarnings=false);
+Shape getShape() {return shape;}
 
 void updateRefno(); // set ::refno for all elements
@@ -387 +393 @@
 
 void disturb(double amount);
+
+void buildUsingNewShapes(const Model& src_old_shapes, Part::Shape default_shape = Part::SHAPE_CYLINDER, float thickness = 0.2);
 
 #ifdef EASYMAPDEBUG