diff options
| author | enricoturri1966 <enricoturri@seznam.cz> | 2020-04-24 11:59:03 +0300 |
|---|---|---|
| committer | enricoturri1966 <enricoturri@seznam.cz> | 2020-04-24 11:59:03 +0300 |
| commit | e5c45405d4b7ce60b061f79bd213c05c8f253039 (patch) | |
| tree | 483d0a17ba95b7259f9dc355d1aa8c3e95d3965f /tests/fff_print | |
| parent | 81a29169aee1e9af381c360a8005897189b06b6e (diff) | |
| parent | 4f622e4541d3e3da0be0203776c5b7c03aef7eaf (diff) | |
Fixed conflicts after merge with master
Diffstat (limited to 'tests/fff_print')
| -rw-r--r-- | tests/fff_print/test_data.cpp | 4 | ||||
| -rw-r--r-- | tests/fff_print/test_model.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/fff_print/test_data.cpp b/tests/fff_print/test_data.cpp index 4ee43e2b1..09ca730ec 100644 --- a/tests/fff_print/test_data.cpp +++ b/tests/fff_print/test_data.cpp @@ -12,6 +12,7 @@ #include <boost/nowide/cstdio.hpp> #include <boost/filesystem.hpp> +#include <libslic3r/ModelArrange.hpp> using namespace std; @@ -167,8 +168,7 @@ void init_print(std::vector<TriangleMesh> &&meshes, Slic3r::Print &print, Slic3r object->add_volume(std::move(t)); object->add_instance(); } - model.arrange_objects(PrintConfig::min_object_distance(&config)); - model.center_instances_around_point(Slic3r::Vec2d(100, 100)); + arrange_objects(model, InfiniteBed{}, ArrangeParams{ scaled(min_object_distance(config))}); for (ModelObject *mo : model.objects) { mo->ensure_on_bed(); print.auto_assign_extruders(mo); diff --git a/tests/fff_print/test_model.cpp b/tests/fff_print/test_model.cpp index 3d3b54ef0..45a080f31 100644 --- a/tests/fff_print/test_model.cpp +++ b/tests/fff_print/test_model.cpp @@ -2,6 +2,7 @@ #include "libslic3r/libslic3r.h" #include "libslic3r/Model.hpp" +#include "libslic3r/ModelArrange.hpp" #include <boost/nowide/cstdio.hpp> #include <boost/filesystem.hpp> @@ -41,8 +42,7 @@ SCENARIO("Model construction", "[Model]") { } } model_object->add_instance(); - model.arrange_objects(PrintConfig::min_object_distance(&config)); - model.center_instances_around_point(Slic3r::Vec2d(100, 100)); + arrange_objects(model, InfiniteBed{scaled(Vec2d(100, 100))}, ArrangeParams{scaled(min_object_distance(config))}); model_object->ensure_on_bed(); print.auto_assign_extruders(model_object); THEN("Print works?") { |