diff --git a/src/dxfdim.cc b/src/dxfdim.cc index ecdae80e..555ed495 100644 --- a/src/dxfdim.cc +++ b/src/dxfdim.cc @@ -54,7 +54,7 @@ Value builtin_dxf_dim(const Context *ctx, const EvalContext *evalctx) // See issue #217 for (size_t i = 0; i < evalctx->numArgs(); i++) { if (evalctx->getArgName(i) == "file") - filename = ctx->getAbsolutePath(evalctx->getArgValue(i).toString()); + filename = evalctx->getAbsolutePath(evalctx->getArgValue(i).toString()); if (evalctx->getArgName(i) == "layer") layername = evalctx->getArgValue(i).toString(); if (evalctx->getArgName(i) == "origin") diff --git a/src/expr.cc b/src/expr.cc index 985a53a6..746c0e35 100644 --- a/src/expr.cc +++ b/src/expr.cc @@ -142,12 +142,6 @@ Value Expression::evaluate(const Context *context) const } if (this->type == "F") { EvalContext c(context, this->call_arguments); - // Value::VectorType argvalues; - // std::transform(this->children.begin(), this->children.end(), - // std::back_inserter(argvalues), - // boost::bind(&Expression::evaluate, _1, context)); - // for (size_t i=0; i < this->children.size(); i++) - // argvalues.push_back(this->children[i]->evaluate(context)); return context->evaluate_function(this->call_funcname, &c); } abort(); diff --git a/testdata/scad/misc/localfiles_dir/localfiles_module.scad b/testdata/scad/misc/localfiles_dir/localfiles_module.scad index b98a49b4..2611e71d 100644 --- a/testdata/scad/misc/localfiles_dir/localfiles_module.scad +++ b/testdata/scad/misc/localfiles_dir/localfiles_module.scad @@ -5,6 +5,5 @@ module localfiles_module() translate([0,350,0]) rotate_extrude(file="localfile.dxf"); translate([250,0,0]) scale([200,200,50]) surface("localfile.dat"); - // This is not supported: - // echo(dxf_dim(file="localfile.dxf", name="localfile")); + translate([0,-200,0]) sphere(r=dxf_dim(file="localfile.dxf", name="localfile")/2); } diff --git a/tests/regression/cgalpngtest/localfiles-test-expected.png b/tests/regression/cgalpngtest/localfiles-test-expected.png index 3ad3d96a..d0cfd508 100644 Binary files a/tests/regression/cgalpngtest/localfiles-test-expected.png and b/tests/regression/cgalpngtest/localfiles-test-expected.png differ diff --git a/tests/regression/dumptest/localfiles-test-expected.txt b/tests/regression/dumptest/localfiles-test-expected.txt index acdf7e7a..7a84e884 100644 --- a/tests/regression/dumptest/localfiles-test-expected.txt +++ b/tests/regression/dumptest/localfiles-test-expected.txt @@ -13,5 +13,8 @@ surface(file = "localfiles_dir/localfile.dat", center = false); } } + multmatrix([[1, 0, 0, 0], [0, 1, 0, -200], [0, 0, 1, 0], [0, 0, 0, 1]]) { + sphere($fn = 0, $fa = 12, $fs = 2, r = 100); + } } diff --git a/tests/regression/opencsgtest/localfiles-test-expected.png b/tests/regression/opencsgtest/localfiles-test-expected.png index 7bc79090..f280efdb 100644 Binary files a/tests/regression/opencsgtest/localfiles-test-expected.png and b/tests/regression/opencsgtest/localfiles-test-expected.png differ diff --git a/tests/regression/throwntogethertest/localfiles-test-expected.png b/tests/regression/throwntogethertest/localfiles-test-expected.png index 7bc79090..f280efdb 100644 Binary files a/tests/regression/throwntogethertest/localfiles-test-expected.png and b/tests/regression/throwntogethertest/localfiles-test-expected.png differ