3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop the ongoing slicing process when attempting to export.

Browse Source
This commit is contained in:
tamasmeszaros 2018-07-03 13:12:15 +02:00
parent 033b7eb8ad
commit 797c812f31
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Slic3r/GUI/MainFrame.pm
View File

@ -398,6 +398,7 @@ sub on_plater_selection_changed {
sub slice_to_png {
my $self = shift;
$self->{plater}->stop_background_process;
$self->{plater}->async_apply_config;
$appController->print_ctl()->slice_to_png();
}

10
xs/src/slic3r/AppController.cpp
View File

@ -20,9 +20,7 @@ namespace Slic3r {
class AppControllerBoilerplate::PriData {
public:
// using M = std::unordered_map<std::thread::id, ProgresIndicatorPtr>;
std::mutex m;
// M store;
std::thread::id ui_thread;
inline explicit PriData(std::thread::id uit): ui_thread(uit) {}
@ -328,9 +326,9 @@ void PrintController::slice_to_png()
}
}
std::async(supports_asynch()? std::launch::async : std::launch::deferred,
[this, exd, scale_back]()
{
// std::async(supports_asynch()? std::launch::async : std::launch::deferred,
// [this, exd, scale_back]()
// {
auto pri = create_progress_indicator(
200, _(L("Slicing to zipped png files...")));
@ -362,7 +360,7 @@ void PrintController::slice_to_png()
print_->progressindicator = pbak;
scale_back();
});
// });
}
void IProgressIndicator::message_fmt(