mirror of
https://github.com/QIDITECH/QIDISlicer.git
synced 2026-02-04 01:48:44 +03:00
Merge prusa 2.6.1
This commit is contained in:
@@ -17,7 +17,6 @@
|
||||
#include "Jobs/Worker.hpp"
|
||||
#include "Search.hpp"
|
||||
|
||||
|
||||
class wxButton;
|
||||
class ScalableButton;
|
||||
class wxScrolledWindow;
|
||||
@@ -139,7 +138,6 @@ class Plater: public wxPanel
|
||||
public:
|
||||
using fs_path = boost::filesystem::path;
|
||||
|
||||
|
||||
Plater(wxWindow *parent, MainFrame *main_frame);
|
||||
Plater(Plater &&) = delete;
|
||||
Plater(const Plater &) = delete;
|
||||
@@ -283,8 +281,7 @@ public:
|
||||
void convert_unit(ConversionType conv_type);
|
||||
void toggle_layers_editing(bool enable);
|
||||
|
||||
void cut(size_t obj_idx, size_t instance_idx, const Transform3d& cut_matrix, ModelObjectCutAttributes attributes);
|
||||
void cut(size_t init_obj_idx, const ModelObjectPtrs& cut_objects);
|
||||
void apply_cut_object_to_model(size_t init_obj_idx, const ModelObjectPtrs& cut_objects);
|
||||
|
||||
void export_gcode(bool prefer_removable);
|
||||
void export_stl_obj(bool extended = false, bool selection_only = false);
|
||||
@@ -357,6 +354,7 @@ public:
|
||||
GLCanvas3D* get_current_canvas3D();
|
||||
|
||||
void arrange();
|
||||
void arrange(Worker &w, bool selected);
|
||||
|
||||
void set_current_canvas_as_dirty();
|
||||
void unbind_canvas_event_handlers();
|
||||
@@ -454,7 +452,6 @@ public:
|
||||
}
|
||||
private:
|
||||
Plater *m_plater;
|
||||
|
||||
};
|
||||
|
||||
// RAII wrapper for taking an Undo / Redo snapshot while disabling the snapshot taking by the methods called from inside this snapshot.
|
||||
|
||||
Reference in New Issue
Block a user