GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-12 19:39:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
supermerill 2020-11-22 17:05:27 +01:00
parent 0fe20a6dc4
commit 373d1b8f7d
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/CalibrationAbstractDialog.hpp
View File

@ -49,7 +49,7 @@ protected:
}; };
class ProgressIndicatorStub : ProgressIndicator { class ProgressIndicatorStub : public ProgressIndicator {
public: public:
virtual ~ProgressIndicatorStub() override = default; virtual ~ProgressIndicatorStub() override = default;

4
tests/fff_print/test_data.cpp
View File

@ -165,7 +165,7 @@ void init_print(std::vector<TriangleMesh> &&meshes, Slic3r::Print &print, Slic3r
for (const TriangleMesh &t : meshes) { for (const TriangleMesh &t : meshes) {
ModelObject *object = model.add_object(); ModelObject *object = model.add_object();
object->name += "object.stl"; object->name += "object.stl";
object->add_volume(std::move(t)); object->add_volume(t);
object->add_instance(); object->add_instance();
} }
@ -175,7 +175,7 @@ void init_print(std::vector<TriangleMesh> &&meshes, Slic3r::Print &print, Slic3r
} }
print.apply(model, config); print.apply(model, config);
arrange_objects(&print, model, InfiniteBed{}, ArrangeParams{ scaled(print.config().min_object_distance()) }); arrange_objects(model, InfiniteBed{}, ArrangeParams{ scaled(print.config().min_object_distance()) });
print.apply(model, config); print.apply(model, config);
print.validate(); print.validate();
print.set_status_silent(); print.set_status_silent();

2
tests/fff_print/test_model.cpp
View File

@ -43,7 +43,7 @@ SCENARIO("Model construction", "[Model]") {
} }
model_object->add_instance(); model_object->add_instance();
print.apply(model, config); // apply config for arrange_objects print.apply(model, config); // apply config for arrange_objects
arrange_objects(&print, model, InfiniteBed{ scaled(Vec2d(100, 100)) }, ArrangeParams{ scaled(print.config().min_object_distance()) }); arrange_objects(model, InfiniteBed{ scaled(Vec2d(100, 100)) }, ArrangeParams{ scaled(print.config().min_object_distance()) });
model_object->ensure_on_bed(); model_object->ensure_on_bed();
print.auto_assign_extruders(model_object); print.auto_assign_extruders(model_object);
THEN("Print works?") { THEN("Print works?") {

2
tests/superslicerlibslic3r/test_complete_objects.cpp
View File

@ -38,7 +38,7 @@ std::unique_ptr<Print> init_print_with_dist(DynamicPrintConfig &config, float di
if (distance <= 0) { if (distance <= 0) {
print->apply(model, config); print->apply(model, config);
arrange_objects(print.get(), model, InfiniteBed{}, ArrangeParams{ scaled(/*min_object_distance(config)) });/*/ print->config().min_object_distance(&print->config(), 999999)) }); arrange_objects(model, InfiniteBed{}, ArrangeParams{ scaled(/*min_object_distance(config)) });/*/ PrintConfig::min_object_distance(&print->config(), 999999)) });
model.center_instances_around_point(Slic3r::Vec2d(100, 100)); model.center_instances_around_point(Slic3r::Vec2d(100, 100));
} }

4
tests/superslicerlibslic3r/test_data.cpp
View File

@ -288,7 +288,7 @@ void init_print(Print& print, std::initializer_list<TestMesh> meshes, Slic3r::Mo
} }
print.apply(model, config); // apply config for the arrange_objects print.apply(model, config); // apply config for the arrange_objects
arrange_objects(&print, model, InfiniteBed{}, ArrangeParams{ scaled(print.config().min_object_distance()) }); arrange_objects(model, InfiniteBed{}, ArrangeParams{ scaled(print.config().min_object_distance()) });
model.center_instances_around_point(Slic3r::Vec2d(100,100)); model.center_instances_around_point(Slic3r::Vec2d(100,100));
for (auto* mo : model.objects) { for (auto* mo : model.objects) {
print.auto_assign_extruders(mo); print.auto_assign_extruders(mo);
@ -324,7 +324,7 @@ void init_print(Print& print, std::vector<TriangleMesh> meshes, Slic3r::Model& m
} }
print.apply(model, config); // apply config for the arrange_objects print.apply(model, config); // apply config for the arrange_objects
arrange_objects(&print, model, InfiniteBed{}, ArrangeParams{ scaled(print.config().min_object_distance()) }); arrange_objects(model, InfiniteBed{}, ArrangeParams{ scaled(print.config().min_object_distance()) });
model.center_instances_around_point(Slic3r::Vec2d(100,100)); model.center_instances_around_point(Slic3r::Vec2d(100,100));
print.apply(model, config); print.apply(model, config);
for (ModelObject* mo : model.objects) { for (ModelObject* mo : model.objects) {