mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-14 17:12:07 +00:00
* fixed logic error in PLA jamming gcode for P1S
* Fix use after free bug in LinesBucketQueue::emplace_back_bucket
I found a use after free bug in LinesBucketQueue::emplace_back_bucket. This was found by enabling address sanitizer.
The LinesBucketQueue class has two related members:
std::vector<LinesBucket> line_buckets;
std::priority_queue<LinesBucket *, std::vector<LinesBucket *>, LinesBucketPtrComp> line_bucket_ptr_queue;
line_bucket_ptr_queue holds pointers into line_buckets. However, since items are inserted into line_buckets one at a time, existing pointers that were stored inside line_bucket_ptr_queue become invalid. Specifically:
void LinesBucketQueue::emplace_back_bucket(ExtrusionLayers &&els, const void *objPtr, Point offset)
{
auto oldSize = line_buckets.capacity();
line_buckets.emplace_back(std::move(els), objPtr, offset); <--- Causes a reallocation, making previous pointers invalid
line_bucket_ptr_queue.push(&line_buckets.back()); <-- priority queue compares against old, now invalid pointers
...
The proposed fix is to calculate the required number of entries in ConflictChecker::find_inter_of_lines_in_diff_objs, and then calling line_buckets.reserve(count). This ensures that sufficient buffer is allocated up front and the pointers are stable as items are added.
* Updated to fix the handling of the capacity change, and removed the code I previously added to reserve upfront since it is not really needed
* Remove accidentally added whitespace
* Removed unused method
* ENH:add mz_zip_reader_extract_to_file_w api
to solove plugin install failed problem by special wide char
jira: none
Change-Id: Ic7d3efe3fdf852387650abf9df65803da9e46a60
(cherry picked from commit b68ad03717a63675fef2f3ef73d4058bf311adea)
* FIX: PrinterFileSystem report real connect error
Change-Id: I99d6ff7f6dcb1f53ccf59854f5f19d0bd39fa9fc
Jira: none
* rename preference name
* FIX:Relax restrictions on importing obj files
jira: none
Change-Id: I61a0156a8424a5f59922956918d37d38e2c3306a
* FIX: [6469] popup dialog too mach when reload object
Jira: 6469
Change-Id: I4097e3a3b018c7a676fea93bf63f8f778bb3148b
* FIX:fixed incorrect display of printer options page on Linux
jira:[STUDIO-6220]
Change-Id: Id1f084658b0b340b7f17ab97ba82c0fd3ae83fae
* FIX: handle exception of dividing by zero in arranging
jira: none
Change-Id: I0d20464dbe81a80293539100f06d72dee456a27b
(cherry picked from commit 94746ae9bf7f467243849570450567b4fdc78e3a)
* ENH:delete no use code
jira: none
Change-Id: I40e7ffa7ea47bb3cd4039eef9f6c28c604eb3abc
* FIX: PrinterFileSystem::FileRemoved
Change-Id: I891aaa8d58ff379dc1ebd8581064865a33388f74
* FIX: resend ttcode to printer on -90 error
Change-Id: I96dc45102a2759a9f1a0002f42c3a91b2c6b2d75
Jira: STUDIO-5947
(cherry picked from commit 97d687b7c88f8cd51b8eddd39120349d8eac42b1)
* FIX: fix some issue in multi machine
JIRA: STUDIO-6934 STUDIO-6888
1. Fix the issue of incomplete display caused by excessively long file names
2. Fix the issue of icon display being too large
3. Fix the issue of garbled Chinese characters in the task list
Change-Id: I36bc10bf2067f44aaa7e3651b58e526ea323c8ad
* FIX: Incorrect multiplier, when the multiplier is set to below 1
github: #3987 #3805
1. In some languages that use commas as decimal points, setting multiplier below 1 will resolve to 0
2. Unable to save multiplier correctly
Change-Id: I62bc55e270929ebb5e910eb79c6f97106e842b93
* Arrange
* FIX: wrong wipe tower when open 3mf file
1.wipe tower pos in 3mf was overwritten by default pos when opening 3mf
with a different printer profile.This patch fix it
jira: STUDIO-5890
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I12e5d4b80a0ad86194db0682c1763ba4a9492521
* ENH: update A1 machine gcode
1.Adjust the y position of the A1 extrusion compensation line
jira:NEW
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iea690a0184ae10a47f53e1532272c31fc0a04cfa
* FIX: minor spelling mistake in gcode
github:#3477
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Id3201bf8b8125ce060e2cac102ab2525877e27c1
* FIX: slice crash with height_range
github: 3917
Change-Id: Icdf83013213b47935b7a795ed75cc3d49057665d
* FIX: ERROR_RES_BUSY text
Change-Id: Ifde1a7b0c6ab915eb226c2072c46edd40f60cf9a
Jira: STUDIO-6436
* ENH:Unable to send printing without selecting a device
jira:[STUDIO-6850]
Change-Id: Ic537579727fd1618af364db93fce8fbbe4cd635a
* FIX:add exit_gizmo before slice model
jira: STUDIO-5531
Change-Id: Icddc9d73b3d91bb68e9768d13e48cbae0680e58e
* FIX: PrinterFileSystem report real connect error
Change-Id: Id6750cfa2a98fe8325ba677dabb606a0a701b495
* FIX: add can slice judgement in slice all plates processing
jira: STUDIO-6325
Change-Id: Ic7fb8cef000c03210bb77289a570ee6b60b6083e
* FIX:Fixed error in displaying the name of Bambu filaments
Change-Id: Ib42194c07b6eefe793eec81a588debc9d622d951
* FIX: text hidden in calibration tab
jira: STUDIO-6264
Change-Id: I24fbc590638a3213d948a973422e010486113923
* FIX: logic error in PLA fan control
github PR: #3948
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I28e4a673e590e83d151e92cc82caab45012aeabe
* FIX:upgrade cluster algorithm to remove duplicate labels
jira: none
Change-Id: I4d68d8cd8e080932c7c308bc8f69e27546ffe309
* FIX: can not parse json float in ES on macOS
jira: STUDIO-5889
Change-Id: I622f4b474c378d77b0e43d67a320f023be2d5811
* ENH:Clear the value of the previous nozzle type
jira:[for nozzle check]
Change-Id: I9a932b833fb07de6cb0a91abe6372b0e91f273f1
* ENH: update A1 gcode
1.Modify the width of extrusion compensation line
jira:NEW
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I90543758c866d74f2154e3135d7569109def84b8
* FIX: the height range is not valid in assemble object
github: 3876
Change-Id: Id38672bbf0c01bc9b9f0a3e2bf1052d945b45131
* FIX: calibration page text hidden in linux
jira: STUDIO-6264
Change-Id: If210abf64057eb2e9c2c5b11d41fa33f18684c72
* ENH:clear nozzle information
jira:[STUDIO-7050]
Change-Id: I15ca4973d09132ddb5cb5a56bedd795ba6976b27
* update plugin version
---------
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Co-authored-by: afriede <me@afriede.dev>
Co-authored-by: Momin Al-Ghosien <momin@sanestudios.com>
Co-authored-by: zhou.xu <zhou.xu@bambulab.com>
Co-authored-by: chunmao.guo <chunmao.guo@bambulab.com>
Co-authored-by: maosheng.wei <maosheng.wei@bambulab.com>
Co-authored-by: tao wang <tao.wang@bambulab.com>
Co-authored-by: Arthur <arthur.tang@bambulab.com>
Co-authored-by: Kunlong Ma <kunlong.ma@bambulab.com>
Co-authored-by: xun.zhang <xun.zhang@bambulab.com>
Co-authored-by: zhimin.zeng <zhimin.zeng@bambulab.com>
Co-authored-by: liz.li <liz.li@bambulab.com>
212 lines
6.1 KiB
C++
212 lines
6.1 KiB
C++
#ifndef slic3r_GUI_Preview_hpp_
|
|
#define slic3r_GUI_Preview_hpp_
|
|
|
|
#include <wx/panel.h>
|
|
|
|
#include "libslic3r/Point.hpp"
|
|
#include "libslic3r/CustomGCode.hpp"
|
|
|
|
//BBS: add print base
|
|
#include "libslic3r/PrintBase.hpp"
|
|
|
|
#include <string>
|
|
#include "libslic3r/GCode/GCodeProcessor.hpp"
|
|
#include <slic3r/GUI/GCodeViewer.hpp>
|
|
|
|
class wxGLCanvas;
|
|
class wxBoxSizer;
|
|
class wxStaticText;
|
|
class wxComboBox;
|
|
class wxComboCtrl;
|
|
class wxCheckBox;
|
|
|
|
namespace Slic3r {
|
|
|
|
class DynamicPrintConfig;
|
|
class Print;
|
|
class BackgroundSlicingProcess;
|
|
class Model;
|
|
|
|
namespace GUI {
|
|
|
|
class GLCanvas3D;
|
|
class GLToolbar;
|
|
class Bed3D;
|
|
struct Camera;
|
|
class Plater;
|
|
#ifdef _WIN32
|
|
class BitmapComboBox;
|
|
#endif
|
|
|
|
class View3D : public wxPanel
|
|
{
|
|
wxGLCanvas* m_canvas_widget;
|
|
GLCanvas3D* m_canvas;
|
|
|
|
public:
|
|
View3D(wxWindow* parent, Bed3D& bed, Model* model, DynamicPrintConfig* config, BackgroundSlicingProcess* process);
|
|
virtual ~View3D();
|
|
|
|
wxGLCanvas* get_wxglcanvas() { return m_canvas_widget; }
|
|
GLCanvas3D* get_canvas3d() { return m_canvas; }
|
|
|
|
void set_as_dirty();
|
|
void bed_shape_changed();
|
|
void plates_count_changed();
|
|
|
|
void select_view(const std::string& direction);
|
|
|
|
//BBS
|
|
void select_curr_plate_all();
|
|
void select_object_from_idx(std::vector<int> &object_idxs);
|
|
void remove_curr_plate_all();
|
|
|
|
void select_all();
|
|
void deselect_all();
|
|
void exit_gizmo();
|
|
void delete_selected();
|
|
void center_selected();
|
|
void center_selected_plate(const int plate_idx);
|
|
void mirror_selection(Axis axis);
|
|
|
|
bool is_layers_editing_enabled() const;
|
|
bool is_layers_editing_allowed() const;
|
|
void enable_layers_editing(bool enable);
|
|
|
|
bool is_dragging() const;
|
|
bool is_reload_delayed() const;
|
|
|
|
void reload_scene(bool refresh_immediately, bool force_full_scene_refresh = false);
|
|
void render();
|
|
|
|
private:
|
|
bool init(wxWindow* parent, Bed3D& bed, Model* model, DynamicPrintConfig* config, BackgroundSlicingProcess* process);
|
|
};
|
|
|
|
class Preview : public wxPanel
|
|
{
|
|
wxGLCanvas* m_canvas_widget { nullptr };
|
|
GLCanvas3D* m_canvas { nullptr };
|
|
DynamicPrintConfig* m_config;
|
|
BackgroundSlicingProcess* m_process;
|
|
GCodeProcessorResult* m_gcode_result;
|
|
|
|
#ifdef __linux__
|
|
// We are getting mysterious crashes on Linux in gtk due to OpenGL context activation GH #1874 #1955.
|
|
// So we are applying a workaround here.
|
|
bool m_volumes_cleanup_required { false };
|
|
#endif /* __linux__ */
|
|
|
|
// Calling this function object forces Plater::schedule_background_process.
|
|
std::function<void()> m_schedule_background_process;
|
|
|
|
unsigned int m_number_extruders { 1 };
|
|
bool m_keep_current_preview_type{ false };
|
|
|
|
//bool m_loaded { false };
|
|
//BBS: add logic for preview print
|
|
const Slic3r::PrintBase* m_loaded_print { nullptr };
|
|
//BBS: add only gcode mode
|
|
bool m_only_gcode { false };
|
|
bool m_reload_paint_after_background_process_apply{false};
|
|
|
|
public:
|
|
enum class OptionType : unsigned int
|
|
{
|
|
Travel,
|
|
Wipe,
|
|
Retractions,
|
|
Unretractions,
|
|
Seams,
|
|
ToolChanges,
|
|
ColorChanges,
|
|
PausePrints,
|
|
CustomGCodes,
|
|
Shells,
|
|
ToolMarker,
|
|
Legend
|
|
};
|
|
|
|
Preview(wxWindow* parent, Bed3D& bed, Model* model, DynamicPrintConfig* config, BackgroundSlicingProcess* process,
|
|
GCodeProcessorResult* gcode_result, std::function<void()> schedule_background_process = []() {});
|
|
virtual ~Preview();
|
|
|
|
//BBS: update gcode_result
|
|
void update_gcode_result(GCodeProcessorResult* gcode_result);
|
|
|
|
wxGLCanvas* get_wxglcanvas() { return m_canvas_widget; }
|
|
GLCanvas3D* get_canvas3d() { return m_canvas; }
|
|
|
|
void set_as_dirty();
|
|
|
|
void bed_shape_changed();
|
|
void select_view(const std::string& direction);
|
|
void set_drop_target(wxDropTarget* target);
|
|
|
|
//BBS: add only gcode mode
|
|
void load_print(bool keep_z_range = false, bool only_gcode = false);
|
|
void reload_print(bool keep_volumes = false, bool only_gcode = false);
|
|
void refresh_print();
|
|
//BBS: always load shell at preview
|
|
void load_shells(const Print& print, bool force_previewing = false);
|
|
void reset_shells();
|
|
|
|
void msw_rescale();
|
|
void sys_color_changed();
|
|
|
|
//BBS: add m_loaded_print logic
|
|
bool is_loaded() const { return (m_loaded_print != nullptr); }
|
|
//BBS
|
|
void on_tick_changed(Type type);
|
|
|
|
void show_sliders(bool show = true);
|
|
void show_moves_sliders(bool show = true);
|
|
void show_layers_sliders(bool show = true);
|
|
void set_reload_paint_after_background_process_apply(bool flag) { m_reload_paint_after_background_process_apply = flag; }
|
|
bool get_reload_paint_after_background_process_apply() { return m_reload_paint_after_background_process_apply; }
|
|
|
|
private:
|
|
bool init(wxWindow* parent, Bed3D& bed, Model* model);
|
|
|
|
void bind_event_handlers();
|
|
void unbind_event_handlers();
|
|
void on_size(wxSizeEvent& evt);
|
|
// Create/Update/Reset double slider on 3dPreview
|
|
void check_layers_slider_values(std::vector<CustomGCode::Item>& ticks_from_model,
|
|
const std::vector<double>& layers_z);
|
|
|
|
void update_layers_slider(const std::vector<double>& layers_z, bool keep_z_range = false);
|
|
void update_layers_slider_mode();
|
|
void update_layers_slider_from_canvas(wxKeyEvent &event);
|
|
//BBS: add only gcode mode
|
|
void load_print_as_fff(bool keep_z_range = false, bool only_gcode = false);
|
|
};
|
|
|
|
|
|
class AssembleView : public wxPanel
|
|
{
|
|
wxGLCanvas* m_canvas_widget{ nullptr };
|
|
GLCanvas3D* m_canvas{ nullptr };
|
|
public:
|
|
AssembleView(wxWindow* parent, Bed3D& bed, Model* model, DynamicPrintConfig* config, BackgroundSlicingProcess* process);
|
|
~AssembleView();
|
|
|
|
wxGLCanvas* get_wxglcanvas() { return m_canvas_widget; }
|
|
GLCanvas3D* get_canvas3d() { return m_canvas; }
|
|
|
|
void set_as_dirty();
|
|
void render();
|
|
|
|
bool is_reload_delayed() const;
|
|
void reload_scene(bool refresh_immediately, bool force_full_scene_refresh = false);
|
|
void select_view(const std::string& direction);
|
|
|
|
private:
|
|
bool init(wxWindow* parent, Bed3D& bed, Model* model, DynamicPrintConfig* config, BackgroundSlicingProcess* process);
|
|
};
|
|
|
|
} // namespace GUI
|
|
} // namespace Slic3r
|
|
|
|
#endif // slic3r_GUI_Preview_hpp_
|