QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-01-31 16:08:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge prusa 2.6.1

Browse Source
This commit is contained in:
QIDI TECH
2023-09-16 16:26:29 +08:00
parent 1338e60f8b
commit 963e22db99
203 changed files with 25254 additions and 6453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/slic3r/GUI/GCodeViewer.hpp
View File

@@ -378,6 +378,7 @@ class GCodeViewer
{
GLVolumeCollection volumes;
bool visible{ false };
bool force_visible{ false };
};
// helper to render center of gravity
@@ -752,7 +753,9 @@ private:
std::vector<TBuffer> m_buffers{ static_cast<size_t>(EMoveType::Extrude) };
// bounding box of toolpaths
BoundingBoxf3 m_paths_bounding_box;
// bounding box of toolpaths + marker tools
// bounding box of shells
BoundingBoxf3 m_shells_bounding_box;
// bounding box of toolpaths + marker tools + shells
BoundingBoxf3 m_max_bounding_box;
float m_max_print_height{ 0.0f };
std::vector<ColorRGBA> m_tool_colors;
@@ -811,7 +814,16 @@ public:
bool can_export_toolpaths() const;
const BoundingBoxf3& get_paths_bounding_box() const { return m_paths_bounding_box; }
const BoundingBoxf3& get_max_bounding_box() const { return m_max_bounding_box; }
const BoundingBoxf3& get_shells_bounding_box() const { return m_shells_bounding_box; }
const BoundingBoxf3& get_max_bounding_box() const {
BoundingBoxf3& max_bounding_box = const_cast<BoundingBoxf3&>(m_max_bounding_box);
if (!max_bounding_box.defined) {
max_bounding_box = m_shells_bounding_box;
max_bounding_box.merge(m_paths_bounding_box);
max_bounding_box.merge(m_paths_bounding_box.max + m_sequential_view.marker.get_bounding_box().size().z() * Vec3d::UnitZ());
}
return m_max_bounding_box;
}
const std::vector<double>& get_layers_zs() const { return m_layers.get_zs(); }
const SequentialView& get_sequential_view() const { return m_sequential_view; }
@@ -838,6 +850,8 @@ public:
bool is_legend_enabled() const { return m_legend_enabled; }
void enable_legend(bool enable) { m_legend_enabled = enable; }
void set_force_shells_visible(bool visible) { m_shells.force_visible = visible; }
void export_toolpaths_to_obj(const char* filename) const;
void toggle_gcode_window_visibility() { m_sequential_view.gcode_window.toggle_visibility(); }
@@ -849,9 +863,11 @@ public:
const ConflictResultOpt& get_conflict_result() const { return m_conflict_result; }
void load_shells(const Print& print);
private:
void load_toolpaths(const GCodeProcessorResult& gcode_result);
void load_shells(const Print& print);
void load_wipetower_shell(const Print& print);
void render_toolpaths();
void render_shells();
void render_legend(float& legend_height);