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

Timestamp:

07/28/16 01:09:29 (7 years ago)

Author:

Maciej Komosinski

Message:

Renamed:
Model::getShape() ==> Model::getShapeType()
Model::SHAPE_OLD ==> Model::SHAPE_BALL_AND_STICK
Model::SHAPE_NEW ==> Model::SHAPE_SOLIDS
Part::SHAPE_DEFAULT ==> Part::SHAPE_BALL_AND_STICK
Joint::SHAPE_DEFAULT ==> Joint::SHAPE_BALL_AND_STICK
Joint::SHAPE_SOLID ==> Joint::SHAPE_FIXED

File:

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

cpp/frams/model/model.h

@@ -119 +119 @@
 
 public:
-        enum Shape { SHAPE_UNKNOWN, SHAPE_ILLEGAL, SHAPE_OLD, SHAPE_NEW };
+        enum ShapeType { SHAPE_UNKNOWN, SHAPE_ILLEGAL, SHAPE_BALL_AND_STICK, SHAPE_SOLIDS };
 protected:
-        Shape shape;
+        ShapeType shape;
 
         void updateNeuroRefno(); // set Neuro::refno for all neurons
@@ -156 +156 @@
         int isValid() const { return buildstatus == valid; }
         int getErrorPosition(bool includingwarnings = false);
-        Shape getShape() { return shape; }
+        ShapeType getShapeType() const { return shape; }
 
         void updateRefno(); // set ::refno for all elements
@@ -359 +359 @@
 
         /** create new Part and add it to the model. @see addPart()  */
-        Part *addNewPart(Part::Shape shape = Part::SHAPE_DEFAULT) { return addPart(new Part(shape)); }
+        Part *addNewPart(Part::Shape shape = Part::SHAPE_BALL_AND_STICK) { return addPart(new Part(shape)); }
         /** create new Joint and add it to the model. @see addJoint() */
-        Joint *addNewJoint(Part *p1 = NULL, Part *p2 = NULL, Joint::Shape shape = Joint::SHAPE_DEFAULT) { Joint *j = addJoint(new Joint()); j->shape = shape; if ((p1 != NULL) && (p2 != NULL)) j->attachToParts(p1, p2); return j; }
+        Joint *addNewJoint(Part *p1 = NULL, Part *p2 = NULL, Joint::Shape shape = Joint::SHAPE_BALL_AND_STICK) { Joint *j = addJoint(new Joint()); j->shape = shape; if ((p1 != NULL) && (p2 != NULL)) j->attachToParts(p1, p2); return j; }
         /** create new Neuro and add it to the model. @see addNeuro() */
         Neuro *addNewNeuro() { return addNeuro(new Neuro()); }