Merge branch 'main' into enh-port-edit-gcode-dlg

This commit is contained in:
Ocraftyone 2024-01-21 14:12:39 -05:00 committed by GitHub
commit 11fd73a90d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
34 changed files with 2622 additions and 745 deletions

View file

@ -23,6 +23,7 @@
#include "GCode/ExtrusionProcessor.hpp"
#include "GCode/PressureEqualizer.hpp"
#include "GCode/SmallAreaInfillFlowCompensator.hpp"
#include <memory>
#include <map>
@ -536,6 +537,8 @@ private:
std::unique_ptr<WipeTowerIntegration> m_wipe_tower;
std::unique_ptr<SmallAreaInfillFlowCompensator> m_small_area_infill_flow_compensator;
// Heights (print_z) at which the skirt has already been extruded.
std::vector<coordf_t> m_skirt_done;
// Has the brim been extruded already? Brim is being extruded only for the first object of a multi-object print.
@ -598,6 +601,7 @@ private:
friend class WipeTowerIntegration;
friend class PressureEqualizer;
friend class Print;
friend class SmallAreaInfillFlowCompensator;
};
std::vector<const PrintInstance*> sort_object_instances_by_model_order(const Print& print, bool init_order = false);