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

AppController reachable trough Plater.pm

Browse Source
This commit is contained in:
tamasmeszaros 2018-06-28 19:16:36 +02:00
parent 85474e5803
commit d3b19382fe
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,8 @@ sub new {
$appController->set_model($self->{plater}->{model}); $appController->set_model($self->{plater}->{model});
$appController->set_print($self->{plater}->{print}); $appController->set_print($self->{plater}->{print});
$self->{plater}->{appController} = $appController;
$self->{loaded} = 1; $self->{loaded} = 1;
# initialize layout # initialize layout

8
lib/Slic3r/GUI/Plater.pm
View File

@ -45,6 +45,7 @@ use constant FILAMENT_CHOOSERS_SPACING => 0;
use constant PROCESS_DELAY => 0.5 * 1000; # milliseconds use constant PROCESS_DELAY => 0.5 * 1000; # milliseconds
my $PreventListEvents = 0; my $PreventListEvents = 0;
our $appController;
sub new { sub new {
my ($class, $parent) = @_; my ($class, $parent) = @_;
@ -1188,8 +1189,11 @@ sub arrange {
$self->pause_background_process; $self->pause_background_process;
my $bb = Slic3r::Geometry::BoundingBoxf->new_from_points($self->{config}->bed_shape); # 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); # my $success = $self->{model}->arrange_objects(wxTheApp->{preset_bundle}->full_config->min_object_distance, $bb);
$self->{appController}->arrange_model;
# ignore arrange failures on purpose: user has visual feedback and we don't need to warn him # ignore arrange failures on purpose: user has visual feedback and we don't need to warn him
# when parts don't fit in print bed # when parts don't fit in print bed

1
xs/CMakeLists.txt
View File

@ -409,6 +409,7 @@ set(XS_XSP_FILES
${XSP_DIR}/TriangleMesh.xsp ${XSP_DIR}/TriangleMesh.xsp
${XSP_DIR}/Utils_OctoPrint.xsp ${XSP_DIR}/Utils_OctoPrint.xsp
${XSP_DIR}/Utils_PresetUpdater.xsp ${XSP_DIR}/Utils_PresetUpdater.xsp
${XSP_DIR}/AppController.xsp
${XSP_DIR}/XS.xsp ${XSP_DIR}/XS.xsp
) )
foreach (file ${XS_XSP_FILES}) foreach (file ${XS_XSP_FILES})

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

@ -296,14 +296,17 @@ void IProgressIndicator::message_fmt(
void AppController::arrange_model() void AppController::arrange_model()
{ {
std::async(supports_asynch()? std::launch::async : std::launch::deferred, std::async(supports_asynch()? std::launch::async : std::launch::deferred,
[this](){ [this]()
auto pind = progress_indicator(); {
// auto pind = progress_indicator();
// my $bb = Slic3r::Geometry::BoundingBoxf->new_from_points($self->{config}->bed_shape); // 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); // 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(); // double dist = GUI::get_preset_bundle()->full_config().option("min_object_distance")->getFloat();
std::cout << dist << std::endl; // std::cout << dist << std::endl;
std::cout << "ITTT vagyok" << std::endl;
}); });
} }