3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix of a regression bug: Update the print bed texture when switching

Browse Source 
between printer profiles.
This commit is contained in:
bubnikv 2018-08-05 22:52:38 +02:00
parent 71b1e09af9
commit c13cd284e4
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xs/src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -305,10 +305,14 @@ const Pointfs& GLCanvas3D::Bed::get_shape() const
return m_shape; return m_shape;
} }
void GLCanvas3D::Bed::set_shape(const Pointfs& shape) bool GLCanvas3D::Bed::set_shape(const Pointfs& shape)
{ {
EType new_type = _detect_type();
if (m_shape == shape && m_type == new_type)
// No change, no need to update the UI.
return false;
m_shape = shape; m_shape = shape;
m_type = _detect_type(); m_type = new_type;
_calc_bounding_box(); _calc_bounding_box();
@ -324,6 +328,8 @@ void GLCanvas3D::Bed::set_shape(const Pointfs& shape)
_calc_gridlines(poly, bed_bbox); _calc_gridlines(poly, bed_bbox);
m_polygon = offset_ex(poly.contour, (float)bed_bbox.radius() * 1.7f, jtRound, scale_(0.5))[0].contour; m_polygon = offset_ex(poly.contour, (float)bed_bbox.radius() * 1.7f, jtRound, scale_(0.5))[0].contour;
// Let the calee to update the UI.
return true;
} }
const BoundingBoxf3& GLCanvas3D::Bed::get_bounding_box() const const BoundingBoxf3& GLCanvas3D::Bed::get_bounding_box() const
@ -1941,9 +1947,7 @@ void GLCanvas3D::set_model(Model* model)
void GLCanvas3D::set_bed_shape(const Pointfs& shape) void GLCanvas3D::set_bed_shape(const Pointfs& shape)
{ {
bool new_shape = (shape != m_bed.get_shape()); bool new_shape = m_bed.set_shape(shape);
if (new_shape)
m_bed.set_shape(shape);
// Set the origin and size for painting of the coordinate system axes. // Set the origin and size for painting of the coordinate system axes.
m_axes.origin = Pointf3(0.0, 0.0, (coordf_t)GROUND_Z); m_axes.origin = Pointf3(0.0, 0.0, (coordf_t)GROUND_Z);

3
xs/src/slic3r/GUI/GLCanvas3D.hpp
View File

@ -162,7 +162,8 @@ public:
bool is_custom() const; bool is_custom() const;
const Pointfs& get_shape() const; const Pointfs& get_shape() const;
void set_shape(const Pointfs& shape); // Return true if the bed shape changed, so the calee will update the UI.
bool set_shape(const Pointfs& shape);
const BoundingBoxf3& get_bounding_box() const; const BoundingBoxf3& get_bounding_box() const;
bool contains(const Point& point) const; bool contains(const Point& point) const;