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

Separating wx and the app controller.

Browse source
This commit is contained in:
Tamás Mészáros 2018-06-25 12:40:01 +02:00
parent 8dcf789d4b
commit 6737506b14
4 changed files with 247 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,9 @@
#include <string>
#include <vector>
#include <memory>
#include <iostream>
#include <thread>
#include <unordered_map>
namespace Slic3r {
@ -68,22 +71,25 @@ public:
using ProgresIndicatorPtr = std::shared_ptr<ProgressIndicator>;
inline void progressIndicator(ProgresIndicatorPtr progrind) {
progressind_ = progrind;
progressind_[std::this_thread::get_id()] = progrind;
}
inline void progressIndicator(unsigned statenum,
const std::string& title,
const std::string& firstmsg = "") {
progressind_ = createProgressIndicator(statenum, title, firstmsg);
progressind_[std::this_thread::get_id()] =
createProgressIndicator(statenum, title, firstmsg);
}
inline ProgresIndicatorPtr progressIndicator() {
if(!progressind_)
progressind_ = createProgressIndicator(100, "Progress");
return progressind_;
ProgresIndicatorPtr ret;
if( progressind_.find(std::this_thread::get_id()) == progressind_.end())
progressind_[std::this_thread::get_id()] = ret =
= createProgressIndicator(100, "Progress");
return ret;
}
protected:
@ -94,7 +100,7 @@ protected:
const std::string& firstmsg = "") const;
private:
ProgresIndicatorPtr progressind_;
std::unordered_map<std::thread::id, ProgresIndicatorPtr> progressind_;
};
class PrintController: public AppControllerBoilerplate {
@ -105,6 +111,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>;
@ -116,13 +126,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 {