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

Removed method update_bed_size from 3D perl class

Browse source
This commit is contained in:
Enrico Turri 2018-06-06 15:17:10 +02:00
parent 66b4620d9b
commit f6ef28becc
3 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/Slic3r/GUI/Plater.pm
View file

@ -408,14 +408,18 @@ sub new {
$self->{canvas}->update_bed_size;
if ($self->{canvas3D}) {
$self->{canvas3D}->update_bed_size;
#==============================================================================================================================
Slic3r::GUI::_3DScene::set_bed_shape($self->{canvas3D}, $self->{config}->bed_shape);
Slic3r::GUI::_3DScene::zoom_to_bed($self->{canvas3D});
# $self->{canvas3D}->update_bed_size;
# $self->{canvas3D}->zoom_to_bed;
#==============================================================================================================================
}
if ($self->{preview3D}) {
$self->{preview3D}->set_bed_shape($self->{config}->bed_shape);
#==============================================================================================================================
Slic3r::GUI::_3DScene::set_bed_shape($self->{preview3D}->canvas, $self->{config}->bed_shape);
# $self->{preview3D}->set_bed_shape($self->{config}->bed_shape);
#==============================================================================================================================
}
$self->update;
@ -1830,9 +1834,13 @@ sub on_config_change {
$self->{config}->set($opt_key, $config->get($opt_key));
if ($opt_key eq 'bed_shape') {
$self->{canvas}->update_bed_size;
$self->{canvas3D}->update_bed_size if $self->{canvas3D};
$self->{preview3D}->set_bed_shape($self->{config}->bed_shape)
if $self->{preview3D};
#==============================================================================================================================
Slic3r::GUI::_3DScene::set_bed_shape($self->{canvas3D}, $self->{config}->bed_shape) if $self->{canvas3D};
Slic3r::GUI::_3DScene::set_bed_shape($self->{preview3D}->canvas, $self->{config}->bed_shape) if $self->{preview3D};
# $self->{canvas3D}->update_bed_size if $self->{canvas3D};
# $self->{preview3D}->set_bed_shape($self->{config}->bed_shape)
# if $self->{preview3D};
#==============================================================================================================================
$update_scheduled = 1;
} elsif ($opt_key =~ '^wipe_tower' || $opt_key eq 'single_extruder_multi_material') {
$update_scheduled = 1;

10
lib/Slic3r/GUI/Plater/3D.pm
View file

@ -228,9 +228,10 @@ sub reload_scene {
#==============================================================================================================================
Slic3r::GUI::_3DScene::reset_volumes($self);
Slic3r::GUI::_3DScene::set_bed_shape($self, $self->{config}->bed_shape);
# $self->reset_objects;
# $self->update_bed_size;
#==============================================================================================================================
$self->update_bed_size;
if (! $self->IsShown && ! $force) {
$self->{reload_delayed} = 1;
@ -306,13 +307,12 @@ sub reload_scene {
}
}
sub update_bed_size {
my ($self) = @_;
#==============================================================================================================================
Slic3r::GUI::_3DScene::set_bed_shape($self, $self->{config}->bed_shape);
#sub update_bed_size {
# my ($self) = @_;
# $self->set_bed_shape($self->{config}->bed_shape);
#}
#==============================================================================================================================
}
# Called by the Platter wxNotebook when this page is activated.
sub OnActivate {

7
lib/Slic3r/GUI/Plater/3DPreview.pm
View file

@ -546,13 +546,12 @@ sub set_z_idx_high
}
}
sub set_bed_shape {
my ($self, $bed_shape) = @_;
#==============================================================================================================================
Slic3r::GUI::_3DScene::set_bed_shape($self->canvas, $bed_shape);
#sub set_bed_shape {
# my ($self, $bed_shape) = @_;
# $self->canvas->set_bed_shape($bed_shape);
#}
#==============================================================================================================================
}
sub set_number_extruders {
my ($self, $number_extruders) = @_;