3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/dev_native' into ys_dev_native

Browse source
This commit is contained in:
YuSanka 2018-10-09 08:30:48 +02:00
commit 9f1613bffb
36 changed files with 1993 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/slic3r/GUI/Plater.hpp
View file

@ -2,11 +2,16 @@
#define slic3r_Plater_hpp_
#include <memory>
#include <vector>
#include <boost/filesystem/path.hpp>
#include <wx/panel.h>
#include "Preset.hpp"
class wxButton;
namespace Slic3r {
class Model;
@ -20,10 +25,12 @@ class ObjectList;
using t_optgroups = std::vector <std::shared_ptr<ConfigOptionsGroup>>;
class Plater;
class Sidebar : public wxPanel
{
public:
Sidebar(wxWindow *parent);
Sidebar(Plater *parent);
Sidebar(Sidebar &&) = delete;
Sidebar(const Sidebar &) = delete;
Sidebar &operator=(Sidebar &&) = delete;
@ -41,12 +48,11 @@ public:
int get_ol_selection();
void show_info_sizers(const bool show);
void show_buttons(const bool show);
void enable_buttons(bool enable);
private:
struct priv;
std::unique_ptr<priv> p;
friend class Plater; // XXX: better encapsulation?
};
@ -63,11 +69,20 @@ public:
Sidebar& sidebar();
Model& model();
// TODO: use fs::path
// Note: empty string means request default path
std::string export_gcode(const std::string &output_path);
void update(bool force_autocenter = false);
void remove(size_t obj_idx);
void remove_selected();
void load_files(const std::vector<boost::filesystem::path> &input_files);
// Note: empty path means "use the default"
boost::filesystem::path export_gcode(const boost::filesystem::path &output_path = boost::filesystem::path());
void export_stl();
void export_amf();
void export_3mf();
void reslice();
void changed_object_settings(int obj_idx);
void send_gcode();
private:
struct priv;
std::unique_ptr<priv> p;