Partial perl code cleanup
This commit is contained in:
Enrico Turri
parent
c624d6bb0a
commit
52a7d7ed09
8 changed files with 2 additions and 270 deletions
|
|
@ -24,10 +24,7 @@ sub new {
|
|||
|
||||
# init GUI elements
|
||||
my $canvas = Slic3r::GUI::3DScene->new($self);
|
||||
#===================================================================================================================================
|
||||
Slic3r::GUI::_3DScene::enable_shader($canvas, 1);
|
||||
# $canvas->use_plain_shader(1);
|
||||
#===================================================================================================================================
|
||||
$self->canvas($canvas);
|
||||
my $slider_low = Wx::Slider->new(
|
||||
$self, -1,
|
||||
|
|
@ -281,10 +278,7 @@ sub new {
|
|||
sub reload_print {
|
||||
my ($self, $force) = @_;
|
||||
|
||||
#==============================================================================================================================
|
||||
Slic3r::GUI::_3DScene::reset_volumes($self->canvas);
|
||||
# $self->canvas->reset_objects;
|
||||
#==============================================================================================================================
|
||||
$self->_loaded(0);
|
||||
|
||||
if (! $self->IsShown && ! $force) {
|
||||
|
|
@ -310,10 +304,7 @@ sub refresh_print {
|
|||
sub reset_gcode_preview_data {
|
||||
my ($self) = @_;
|
||||
$self->gcode_preview_data->reset;
|
||||
#==============================================================================================================================
|
||||
Slic3r::GUI::_3DScene::reset_legend_texture();
|
||||
# $self->canvas->reset_legend_texture();
|
||||
#==============================================================================================================================
|
||||
}
|
||||
|
||||
sub load_print {
|
||||
|
|
@ -338,10 +329,7 @@ sub load_print {
|
|||
|
||||
if ($n_layers == 0) {
|
||||
$self->reset_sliders;
|
||||
#==============================================================================================================================
|
||||
Slic3r::GUI::_3DScene::reset_legend_texture();
|
||||
# $self->canvas->reset_legend_texture();
|
||||
#==============================================================================================================================
|
||||
$self->canvas->Refresh; # clears canvas
|
||||
return;
|
||||
}
|
||||
|
|
@ -376,42 +364,25 @@ sub load_print {
|
|||
|
||||
if ($self->gcode_preview_data->empty) {
|
||||
# load skirt and brim
|
||||
#==============================================================================================================================
|
||||
Slic3r::GUI::_3DScene::set_print($self->canvas, $self->print);
|
||||
Slic3r::GUI::_3DScene::load_print_toolpaths($self->canvas);
|
||||
Slic3r::GUI::_3DScene::load_wipe_tower_toolpaths($self->canvas, \@colors);
|
||||
# $self->canvas->load_print_toolpaths($self->print, \@colors);
|
||||
# $self->canvas->load_wipe_tower_toolpaths($self->print, \@colors);
|
||||
#==============================================================================================================================
|
||||
foreach my $object (@{$self->print->objects}) {
|
||||
#==============================================================================================================================
|
||||
Slic3r::GUI::_3DScene::load_print_object_toolpaths($self->canvas, $object, \@colors);
|
||||
# $self->canvas->load_print_object_toolpaths($object, \@colors);
|
||||
#==============================================================================================================================
|
||||
# Show the objects in very transparent color.
|
||||
#my @volume_ids = $self->canvas->load_object($object->model_object);
|
||||
#$self->canvas->volumes->[$_]->color->[3] = 0.2 for @volume_ids;
|
||||
}
|
||||
$self->show_hide_ui_elements('simple');
|
||||
#==============================================================================================================================
|
||||
Slic3r::GUI::_3DScene::reset_legend_texture();
|
||||
# $self->canvas->reset_legend_texture();
|
||||
#==============================================================================================================================
|
||||
} else {
|
||||
#==============================================================================================================================
|
||||
$self->{force_sliders_full_range} = (Slic3r::GUI::_3DScene::get_volumes_count($self->canvas) == 0);
|
||||
Slic3r::GUI::_3DScene::set_print($self->canvas, $self->print);
|
||||
Slic3r::GUI::_3DScene::load_gcode_preview($self->canvas, $self->gcode_preview_data, \@colors);
|
||||
# $self->{force_sliders_full_range} = (scalar(@{$self->canvas->volumes}) == 0);
|
||||
# $self->canvas->load_gcode_preview($self->print, $self->gcode_preview_data, \@colors);
|
||||
#==============================================================================================================================
|
||||
$self->show_hide_ui_elements('full');
|
||||
|
||||
# recalculates zs and update sliders accordingly
|
||||
#==============================================================================================================================
|
||||
$self->{layers_z} = Slic3r::GUI::_3DScene::get_current_print_zs($self->canvas, 1);
|
||||
# $self->{layers_z} = $self->canvas->get_current_print_zs(1);
|
||||
#==============================================================================================================================
|
||||
$n_layers = scalar(@{$self->{layers_z}});
|
||||
if ($n_layers == 0) {
|
||||
# all layers filtered out
|
||||
|
|
@ -497,10 +468,7 @@ sub set_z_range
|
|||
$self->{z_label_low}->SetLabel(sprintf '%.2f', $z_low);
|
||||
$self->{z_label_high}->SetLabel(sprintf '%.2f', $z_high);
|
||||
|
||||
#==============================================================================================================================
|
||||
my $layers_z = Slic3r::GUI::_3DScene::get_current_print_zs($self->canvas, 0);
|
||||
# my $layers_z = $self->canvas->get_current_print_zs(0);
|
||||
#==============================================================================================================================
|
||||
for (my $i = 0; $i < scalar(@{$layers_z}); $i += 1) {
|
||||
if (($z_low - 1e-6 < @{$layers_z}[$i]) && (@{$layers_z}[$i] < $z_low + 1e-6)) {
|
||||
$self->{z_label_low_idx}->SetLabel(sprintf '%d', $i + 1);
|
||||
|
|
@ -514,10 +482,7 @@ sub set_z_range
|
|||
}
|
||||
}
|
||||
|
||||
#==============================================================================================================================
|
||||
Slic3r::GUI::_3DScene::set_toolpaths_range($self->canvas, $z_low - 1e-6, $z_high + 1e-6);
|
||||
# $self->canvas->set_toolpaths_range($z_low - 1e-6, $z_high + 1e-6);
|
||||
#==============================================================================================================================
|
||||
$self->canvas->Refresh if $self->IsShown;
|
||||
}
|
||||
|
||||
|
|
@ -547,13 +512,6 @@ sub set_z_idx_high
|
|||
}
|
||||
}
|
||||
|
||||
#==============================================================================================================================
|
||||
#sub set_bed_shape {
|
||||
# my ($self, $bed_shape) = @_;
|
||||
# $self->canvas->set_bed_shape($bed_shape);
|
||||
#}
|
||||
#==============================================================================================================================
|
||||
|
||||
sub set_number_extruders {
|
||||
my ($self, $number_extruders) = @_;
|
||||
if ($self->{number_extruders} != $number_extruders) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue