juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-27 12:52:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make pattern actually move with handle

Browse Source
This commit is contained in:
thewildmage
2023-07-10 21:56:34 -06:00
parent e11d409455
commit 9883cee7c1
4 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/libslic3r/calib.cpp
View File

@@ -1,4 +1,5 @@
#include "calib.hpp"
#include "BoundingBox.hpp"
#include "Model.hpp"
namespace Slic3r {
@@ -376,11 +377,21 @@ CalibPressureAdvancePattern::CalibPressureAdvancePattern(
this->m_draw_digit_mode = DrawDigitMode::Bottom_To_Top;
};
void CalibPressureAdvancePattern::starting_point(Vec3d pt, Model& model)
void CalibPressureAdvancePattern::starting_point(const Model& model)
{
ModelObject* obj = model.objects.front();
BoundingBoxf3 bbox =
obj->instance_bounding_box(
*obj->instances.front(),
false
)
;
Vec3d pt(bbox.min.x(), bbox.max.y(), 0);
m_starting_point = pt;
if (is_delta(model)) {
if (m_is_delta) {
m_starting_point.x() *= -1;
m_starting_point.y() -= (frame_size_y() / 2);
}
@@ -388,12 +399,6 @@ void CalibPressureAdvancePattern::starting_point(Vec3d pt, Model& model)
m_last_pos = m_starting_point;
}
void CalibPressureAdvancePattern::translate_starting_point(const Vec3d displacement)
{
m_starting_point += displacement;
m_last_pos = m_starting_point;
};
void CalibPressureAdvancePattern::generate_gcodes(Model& model)
{
std::stringstream gcode;
@@ -558,6 +563,10 @@ DynamicPrintConfig CalibPressureAdvancePattern::pattern_config(const Model& mode
updated_config.apply(model.objects.front()->config.get(), true);
updated_config.apply(model.objects.front()->volumes.front()->config.get(), true);
m_is_delta = (updated_config.option<ConfigOptionPoints>("printable_area")->values.size() > 4);
starting_point(model);
m_nozzle_diameter = updated_config.option<ConfigOptionFloats>("nozzle_diameter")->values[0];
m_line_width = line_width();
m_pattern_settings = PatternSettings(*this);