mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 16:57:53 -06:00
AppController integration
This commit is contained in:
tamasmeszaros
parent
5446b9f1e5
commit
ad4d95f60c
17 changed files with 1435 additions and 12 deletions
310
xs/src/slic3r/AppController.cpp
Normal file
310
xs/src/slic3r/AppController.cpp
Normal file
|
|
@ -0,0 +1,310 @@
|
|||
#include "AppController.hpp"
|
||||
|
||||
#include <future>
|
||||
#include <sstream>
|
||||
#include <cstdarg>
|
||||
#include <thread>
|
||||
#include <unordered_map>
|
||||
|
||||
#include <slic3r/GUI/GUI.hpp>
|
||||
#include <slic3r/GUI/PresetBundle.hpp>
|
||||
|
||||
#include <PrintConfig.hpp>
|
||||
#include <Print.hpp>
|
||||
#include <Model.hpp>
|
||||
#include <Utils.hpp>
|
||||
|
||||
namespace Slic3r {
|
||||
|
||||
class AppControllerBoilerplate::PriMap {
|
||||
public:
|
||||
using M = std::unordered_map<std::thread::id, ProgresIndicatorPtr>;
|
||||
std::mutex m;
|
||||
M store;
|
||||
std::thread::id ui_thread;
|
||||
|
||||
inline explicit PriMap(std::thread::id uit): ui_thread(uit) {}
|
||||
};
|
||||
|
||||
AppControllerBoilerplate::AppControllerBoilerplate()
|
||||
:progressind_(new PriMap(std::this_thread::get_id())) {}
|
||||
|
||||
AppControllerBoilerplate::~AppControllerBoilerplate() {
|
||||
progressind_.reset();
|
||||
}
|
||||
|
||||
bool AppControllerBoilerplate::is_main_thread() const
|
||||
{
|
||||
return progressind_->ui_thread == std::this_thread::get_id();
|
||||
}
|
||||
|
||||
namespace GUI {
|
||||
PresetBundle* get_preset_bundle();
|
||||
}
|
||||
|
||||
static const PrintObjectStep STEP_SLICE = posSlice;
|
||||
static const PrintObjectStep STEP_PERIMETERS = posPerimeters;
|
||||
static const PrintObjectStep STEP_PREPARE_INFILL = posPrepareInfill;
|
||||
static const PrintObjectStep STEP_INFILL = posInfill;
|
||||
static const PrintObjectStep STEP_SUPPORTMATERIAL = posSupportMaterial;
|
||||
static const PrintStep STEP_SKIRT = psSkirt;
|
||||
static const PrintStep STEP_BRIM = psBrim;
|
||||
static const PrintStep STEP_WIPE_TOWER = psWipeTower;
|
||||
|
||||
void AppControllerBoilerplate::progress_indicator(
|
||||
AppControllerBoilerplate::ProgresIndicatorPtr progrind) {
|
||||
progressind_->m.lock();
|
||||
progressind_->store[std::this_thread::get_id()] = progrind;
|
||||
progressind_->m.unlock();
|
||||
}
|
||||
|
||||
void AppControllerBoilerplate::progress_indicator(unsigned statenum,
|
||||
const std::string &title,
|
||||
const std::string &firstmsg)
|
||||
{
|
||||
progressind_->m.lock();
|
||||
progressind_->store[std::this_thread::get_id()] =
|
||||
create_progress_indicator(statenum, title, firstmsg);;
|
||||
progressind_->m.unlock();
|
||||
}
|
||||
|
||||
AppControllerBoilerplate::ProgresIndicatorPtr
|
||||
AppControllerBoilerplate::progress_indicator() {
|
||||
|
||||
PriMap::M::iterator pret;
|
||||
ProgresIndicatorPtr ret;
|
||||
|
||||
progressind_->m.lock();
|
||||
if( (pret = progressind_->store.find(std::this_thread::get_id()))
|
||||
== progressind_->store.end())
|
||||
{
|
||||
progressind_->store[std::this_thread::get_id()] = ret =
|
||||
global_progressind_;
|
||||
} else ret = pret->second;
|
||||
progressind_->m.unlock();
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
void PrintController::make_skirt()
|
||||
{
|
||||
assert(print_ != nullptr);
|
||||
|
||||
// prerequisites
|
||||
for(auto obj : print_->objects) make_perimeters(obj);
|
||||
for(auto obj : print_->objects) infill(obj);
|
||||
for(auto obj : print_->objects) gen_support_material(obj);
|
||||
|
||||
if(!print_->state.is_done(STEP_SKIRT)) {
|
||||
print_->state.set_started(STEP_SKIRT);
|
||||
print_->skirt.clear();
|
||||
if(print_->has_skirt()) print_->_make_skirt();
|
||||
|
||||
print_->state.set_done(STEP_SKIRT);
|
||||
}
|
||||
}
|
||||
|
||||
void PrintController::make_brim()
|
||||
{
|
||||
assert(print_ != nullptr);
|
||||
|
||||
// prerequisites
|
||||
for(auto obj : print_->objects) make_perimeters(obj);
|
||||
for(auto obj : print_->objects) infill(obj);
|
||||
for(auto obj : print_->objects) gen_support_material(obj);
|
||||
make_skirt();
|
||||
|
||||
if(!print_->state.is_done(STEP_BRIM)) {
|
||||
print_->state.set_started(STEP_BRIM);
|
||||
|
||||
// since this method must be idempotent, we clear brim paths *before*
|
||||
// checking whether we need to generate them
|
||||
print_->brim.clear();
|
||||
|
||||
if(print_->config.brim_width > 0) print_->_make_brim();
|
||||
|
||||
print_->state.set_done(STEP_BRIM);
|
||||
}
|
||||
}
|
||||
|
||||
void PrintController::make_wipe_tower()
|
||||
{
|
||||
assert(print_ != nullptr);
|
||||
|
||||
// prerequisites
|
||||
for(auto obj : print_->objects) make_perimeters(obj);
|
||||
for(auto obj : print_->objects) infill(obj);
|
||||
for(auto obj : print_->objects) gen_support_material(obj);
|
||||
make_skirt();
|
||||
make_brim();
|
||||
|
||||
if(!print_->state.is_done(STEP_WIPE_TOWER)) {
|
||||
print_->state.set_started(STEP_WIPE_TOWER);
|
||||
|
||||
// since this method must be idempotent, we clear brim paths *before*
|
||||
// checking whether we need to generate them
|
||||
print_->brim.clear();
|
||||
|
||||
if(print_->has_wipe_tower()) print_->_make_wipe_tower();
|
||||
|
||||
print_->state.set_done(STEP_WIPE_TOWER);
|
||||
}
|
||||
}
|
||||
|
||||
void PrintController::slice(PrintObject *pobj)
|
||||
{
|
||||
assert(pobj != nullptr && print_ != nullptr);
|
||||
|
||||
if(pobj->state.is_done(STEP_SLICE)) return;
|
||||
|
||||
pobj->state.set_started(STEP_SLICE);
|
||||
|
||||
pobj->_slice();
|
||||
|
||||
auto msg = pobj->_fix_slicing_errors();
|
||||
if(!msg.empty()) report_issue(IssueType::WARN, msg);
|
||||
|
||||
// simplify slices if required
|
||||
if (print_->config.resolution)
|
||||
pobj->_simplify_slices(scale_(print_->config.resolution));
|
||||
|
||||
|
||||
if(pobj->layers.empty())
|
||||
report_issue(IssueType::ERR,
|
||||
"No layers were detected. You might want to repair your "
|
||||
"STL file(s) or check their size or thickness and retry"
|
||||
);
|
||||
|
||||
pobj->state.set_done(STEP_SLICE);
|
||||
}
|
||||
|
||||
void PrintController::make_perimeters(PrintObject *pobj)
|
||||
{
|
||||
assert(pobj != nullptr);
|
||||
|
||||
slice(pobj);
|
||||
|
||||
auto&& prgind = progress_indicator();
|
||||
|
||||
if (!pobj->state.is_done(STEP_PERIMETERS)) {
|
||||
pobj->_make_perimeters();
|
||||
}
|
||||
}
|
||||
|
||||
void PrintController::infill(PrintObject *pobj)
|
||||
{
|
||||
assert(pobj != nullptr);
|
||||
|
||||
make_perimeters(pobj);
|
||||
|
||||
if (!pobj->state.is_done(STEP_PREPARE_INFILL)) {
|
||||
pobj->state.set_started(STEP_PREPARE_INFILL);
|
||||
|
||||
pobj->_prepare_infill();
|
||||
|
||||
pobj->state.set_done(STEP_PREPARE_INFILL);
|
||||
}
|
||||
|
||||
pobj->_infill();
|
||||
}
|
||||
|
||||
void PrintController::gen_support_material(PrintObject *pobj)
|
||||
{
|
||||
assert(pobj != nullptr);
|
||||
|
||||
// prerequisites
|
||||
slice(pobj);
|
||||
|
||||
if(!pobj->state.is_done(STEP_SUPPORTMATERIAL)) {
|
||||
pobj->state.set_started(STEP_SUPPORTMATERIAL);
|
||||
|
||||
pobj->clear_support_layers();
|
||||
|
||||
if((pobj->config.support_material || pobj->config.raft_layers > 0)
|
||||
&& pobj->layers.size() > 1) {
|
||||
pobj->_generate_support_material();
|
||||
}
|
||||
|
||||
pobj->state.set_done(STEP_SUPPORTMATERIAL);
|
||||
}
|
||||
}
|
||||
|
||||
void PrintController::slice()
|
||||
{
|
||||
Slic3r::trace(3, "Starting the slicing process.");
|
||||
|
||||
progress_indicator()->update(20u, "Generating perimeters");
|
||||
for(auto obj : print_->objects) make_perimeters(obj);
|
||||
|
||||
progress_indicator()->update(60u, "Infilling layers");
|
||||
for(auto obj : print_->objects) infill(obj);
|
||||
|
||||
progress_indicator()->update(70u, "Generating support material");
|
||||
for(auto obj : print_->objects) gen_support_material(obj);
|
||||
|
||||
progress_indicator()->message_fmt("Weight: %.1fg, Cost: %.1f",
|
||||
print_->total_weight,
|
||||
print_->total_cost);
|
||||
|
||||
progress_indicator()->state(85u);
|
||||
|
||||
|
||||
progress_indicator()->update(88u, "Generating skirt");
|
||||
make_skirt();
|
||||
|
||||
|
||||
progress_indicator()->update(90u, "Generating brim");
|
||||
make_brim();
|
||||
|
||||
progress_indicator()->update(95u, "Generating wipe tower");
|
||||
make_wipe_tower();
|
||||
|
||||
progress_indicator()->update(100u, "Done");
|
||||
|
||||
// time to make some statistics..
|
||||
|
||||
Slic3r::trace(3, "Slicing process finished.");
|
||||
}
|
||||
|
||||
void IProgressIndicator::message_fmt(
|
||||
const std::string &fmtstr, ...) {
|
||||
std::stringstream ss;
|
||||
va_list args;
|
||||
va_start(args, fmtstr);
|
||||
|
||||
auto fmt = fmtstr.begin();
|
||||
|
||||
while (*fmt != '\0') {
|
||||
if (*fmt == 'd') {
|
||||
int i = va_arg(args, int);
|
||||
ss << i << '\n';
|
||||
} else if (*fmt == 'c') {
|
||||
// note automatic conversion to integral type
|
||||
int c = va_arg(args, int);
|
||||
ss << static_cast<char>(c) << '\n';
|
||||
} else if (*fmt == 'f') {
|
||||
double d = va_arg(args, double);
|
||||
ss << d << '\n';
|
||||
}
|
||||
++fmt;
|
||||
}
|
||||
|
||||
va_end(args);
|
||||
message(ss.str());
|
||||
}
|
||||
|
||||
void AppController::arrange_model()
|
||||
{
|
||||
std::async(supports_asynch()? std::launch::async : std::launch::deferred,
|
||||
[this](){
|
||||
auto pind = progress_indicator();
|
||||
|
||||
// my $bb = Slic3r::Geometry::BoundingBoxf->new_from_points($self->{config}->bed_shape);
|
||||
// my $success = $self->{model}->arrange_objects(wxTheApp->{preset_bundle}->full_config->min_object_distance, $bb);
|
||||
double dist = GUI::get_preset_bundle()->full_config().option("min_object_distance")->getFloat();
|
||||
|
||||
std::cout << dist << std::endl;
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue