3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-19 04:37:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'feature_slice_to_png' of github.com:prusa3d/Slic3r into feature_slice_to_png

Browse source 
# Conflicts:
#	xs/src/slic3r/AppController.cpp
#	xs/src/slic3r/AppController.hpp
This commit is contained in:
tamasmeszaros 2018-06-25 17:13:36 +02:00
commit 99f6866a1d
6 changed files with 414 additions and 239 deletions
Download patch file Download diff file Expand all files Collapse all files

51
xs/src/slic3r/AppController.hpp
View file

@ -4,6 +4,9 @@
#include <string>
#include <vector>
#include <memory>
#include <atomic>
#include <iostream>
#include "IProgressIndicator.hpp"
namespace Slic3r {
@ -13,7 +16,18 @@ class Print;
class PrintObject;
class AppControllerBoilerplate {
class PriMap;
public:
using ProgresIndicatorPtr = std::shared_ptr<IProgressIndicator>;
private:
std::unique_ptr<PriMap> progressind_;
public:
AppControllerBoilerplate();
~AppControllerBoilerplate();
using Path = std::string;
using PathList = std::vector<Path>;
@ -41,35 +55,24 @@ public:
const std::string& description,
const std::string& brief = "");
using ProgresIndicatorPtr = std::shared_ptr<IProgressIndicator>;
void progress_indicator(ProgresIndicatorPtr progrind);
inline void progressIndicator(ProgresIndicatorPtr progrind) {
progressind_ = progrind;
}
inline void progressIndicator(unsigned statenum,
void progress_indicator(unsigned statenum,
const std::string& title,
const std::string& firstmsg = "") {
progressind_ = createProgressIndicator(statenum, title, firstmsg);
}
const std::string& firstmsg = "");
inline ProgresIndicatorPtr progressIndicator() {
if(!progressind_)
progressind_ = createProgressIndicator(100, "Progress");
return progressind_;
}
ProgresIndicatorPtr progress_indicator();
protected:
ProgresIndicatorPtr createProgressIndicator(
ProgresIndicatorPtr create_progress_indicator(
unsigned statenum,
const std::string& title,
const std::string& firstmsg = "") const;
private:
ProgresIndicatorPtr progressind_;
bool is_main_thread() const;
ProgresIndicatorPtr global_progressind_;
};
class PrintController: public AppControllerBoilerplate {
@ -80,6 +83,10 @@ protected:
void make_brim();
void make_wipe_tower();
void make_perimeters(PrintObject *pobj);
void infill(PrintObject *pobj);
void gen_support_material(PrintObject *pobj);
public:
using Ptr = std::unique_ptr<PrintController>;
@ -91,13 +98,9 @@ public:
}
void slice(PrintObject *pobj);
void make_perimeters(PrintObject *pobj);
void infill(PrintObject *pobj);
void gen_support_material(PrintObject *pobj);
void slice();
void slice_to_png();
};
class AppController: protected AppControllerBoilerplate {
@ -111,7 +114,7 @@ public:
void set_print(Print *print) {
printctl = PrintController::create(print);
printctl->progressIndicator(progressIndicator());
printctl->progress_indicator(progress_indicator());
}
void set_global_progress_indicator_id(unsigned gauge_id,