diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-11-06 14:26:59 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-11-06 14:26:59 (GMT) |
| commit | 31a97f34e1122690cbad2c9bf01f3ede6d3da135 (patch) | |
| tree | d34435cb6eada42b83aed18a9e83083b43efd8cb /src | |
| parent | 9ab95e6d7230dc5deb06a8e6e3f647e8b48b87c6 (diff) | |
| parent | a221eeee99ca772605c0ac6473cae2466e4cc07a (diff) | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'src')
| -rw-r--r-- | src/PolySetCGALEvaluator.cc | 2 | ||||
| -rw-r--r-- | src/linearextrude.cc | 2 | ||||
| -rw-r--r-- | src/node.cc | 4 | ||||
| -rw-r--r-- | src/node.h | 1 | ||||
| -rw-r--r-- | src/rotateextrude.cc | 2 | ||||
| -rw-r--r-- | src/value.cc | 1 |
6 files changed, 7 insertions, 5 deletions
diff --git a/src/PolySetCGALEvaluator.cc b/src/PolySetCGALEvaluator.cc index 190d75a..ddb9771 100644 --- a/src/PolySetCGALEvaluator.cc +++ b/src/PolySetCGALEvaluator.cc @@ -262,7 +262,7 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const LinearExtrudeNode &node) if (v->modinst->tag_background) continue; CGAL_Nef_polyhedron N = this->cgalevaluator.evaluateCGALMesh(*v); if (N.dim != 2) { - PRINT("ERROR: rotate_extrude() is not defined for 3D child objects!"); + PRINT("ERROR: linear_extrude() is not defined for 3D child objects!"); } else { if (sum.empty()) sum = N.copy(); diff --git a/src/linearextrude.cc b/src/linearextrude.cc index 9c3557b..019f606 100644 --- a/src/linearextrude.cc +++ b/src/linearextrude.cc @@ -146,7 +146,7 @@ std::string LinearExtrudeNode::toString() const "file = \"" << this->filename << "\", " "cache = \"" << QFileInfo(QString::fromStdString(this->filename)) << "\", " "layer = \"" << this->layername << "\", " - "origin = [ " << this->origin_x << " " << this->origin_y << " ], " + "origin = [" << this->origin_x << ", " << this->origin_y << "], " "scale = " << this->scale << ", "; } stream << diff --git a/src/node.cc b/src/node.cc index 12a7ca4..a4d70be 100644 --- a/src/node.cc +++ b/src/node.cc @@ -78,7 +78,9 @@ std::string AbstractIntersectionNode::toString() const std::string AbstractIntersectionNode::name() const { - return "intersection_for"; + // We write intersection here since the module will have to be evaluated + // before we get here and it will not longer retain the intersection_for parameters + return "intersection"; } void AbstractNode::progress_prepare() @@ -38,7 +38,6 @@ public: /*! Should return a PolySet of the given geometry. Returns NULL if smth. goes wrong */ virtual class PolySet *evaluate_polyset(class PolySetEvaluator *) const { return NULL; } - // FIXME: Make return value a reference const std::vector<AbstractNode*> &getChildren() const { return this->children; } diff --git a/src/rotateextrude.cc b/src/rotateextrude.cc index 4d6de73..13e5db0 100644 --- a/src/rotateextrude.cc +++ b/src/rotateextrude.cc @@ -124,7 +124,7 @@ std::string RotateExtrudeNode::toString() const "file = \"" << this->filename << "\", " "cache = \"" << QFileInfo(QString::fromStdString(this->filename)) << "\", " "layer = \"" << this->layername << "\", " - "origin = [ " << std::dec << this->origin_x << " " << this->origin_y << " ], " + "origin = [" << std::dec << this->origin_x << ", " << this->origin_y << "], " "scale = " << this->scale << ", "; } stream << diff --git a/src/value.cc b/src/value.cc index 6685594..44a4b88 100644 --- a/src/value.cc +++ b/src/value.cc @@ -341,6 +341,7 @@ std::string Value::toString() const switch (this->type) { case STRING: + // FIXME: Escape special characters when outputting stream << '"' << this->text << '"'; break; case VECTOR: |