GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 18:55:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed 2D panel

Browse Source
This commit is contained in:
Enrico Turri 2018-07-25 09:42:03 +02:00
parent 2107ea7702
commit 4243c7d84a
1 changed files with 79 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,8 +128,8 @@ sub new {
} }
$_->set_scaling_factor($scale) for @{ $model_object->instances }; $_->set_scaling_factor($scale) for @{ $model_object->instances };
$self->{list}->SetItem($obj_idx, 2, ($model_object->instances->[0]->scaling_factor * 100) . "%"); $self->{list}->SetItem($obj_idx, 2, ($model_object->instances->[0]->scaling_factor * 100) . "%");
$object->transform_thumbnail($self->{model}, $obj_idx); # $object->transform_thumbnail($self->{model}, $obj_idx);
#update print and start background processing #update print and start background processing
$self->{print}->add_model_object($model_object, $obj_idx); $self->{print}->add_model_object($model_object, $obj_idx);
@ -203,13 +203,13 @@ sub new {
Slic3r::GUI::_3DScene::register_on_viewport_changed_callback($self->{canvas3D}, sub { Slic3r::GUI::_3DScene::set_viewport_from_scene($self->{preview3D}->canvas, $self->{canvas3D}); }); Slic3r::GUI::_3DScene::register_on_viewport_changed_callback($self->{canvas3D}, sub { Slic3r::GUI::_3DScene::set_viewport_from_scene($self->{preview3D}->canvas, $self->{canvas3D}); });
} }
# Initialize 2D preview canvas # # Initialize 2D preview canvas
$self->{canvas} = Slic3r::GUI::Plater::2D->new($self->{preview_notebook}, wxDefaultSize, $self->{objects}, $self->{model}, $self->{config}); # $self->{canvas} = Slic3r::GUI::Plater::2D->new($self->{preview_notebook}, wxDefaultSize, $self->{objects}, $self->{model}, $self->{config});
$self->{preview_notebook}->AddPage($self->{canvas}, L('2D')); # $self->{preview_notebook}->AddPage($self->{canvas}, L('2D'));
$self->{canvas}->on_select_object($on_select_object); # $self->{canvas}->on_select_object($on_select_object);
$self->{canvas}->on_double_click($on_double_click); # $self->{canvas}->on_double_click($on_double_click);
$self->{canvas}->on_right_click(sub { $on_right_click->($self->{canvas}, @_); }); # $self->{canvas}->on_right_click(sub { $on_right_click->($self->{canvas}, @_); });
$self->{canvas}->on_instances_moved($on_instances_moved); # $self->{canvas}->on_instances_moved($on_instances_moved);
# Initialize 3D toolpaths preview # Initialize 3D toolpaths preview
if ($Slic3r::GUI::have_OpenGL) { if ($Slic3r::GUI::have_OpenGL) {
@ -401,7 +401,8 @@ sub new {
$_->SetDropTarget(Slic3r::GUI::Plater::DropTarget->new($self)) $_->SetDropTarget(Slic3r::GUI::Plater::DropTarget->new($self))
for grep defined($_), for grep defined($_),
$self, $self->{canvas}, $self->{canvas3D}, $self->{preview3D}, $self->{list}; $self, $self->{canvas3D}, $self->{preview3D}, $self->{list};
# $self, $self->{canvas}, $self->{canvas3D}, $self->{preview3D}, $self->{list};
EVT_COMMAND($self, -1, $PROGRESS_BAR_EVENT, sub { EVT_COMMAND($self, -1, $PROGRESS_BAR_EVENT, sub {
my ($self, $event) = @_; my ($self, $event) = @_;
@ -432,7 +433,7 @@ sub new {
}); });
} }
$self->{canvas}->update_bed_size; # $self->{canvas}->update_bed_size;
if ($self->{canvas3D}) { if ($self->{canvas3D}) {
Slic3r::GUI::_3DScene::set_bed_shape($self->{canvas3D}, $self->{config}->bed_shape); Slic3r::GUI::_3DScene::set_bed_shape($self->{canvas3D}, $self->{config}->bed_shape);
Slic3r::GUI::_3DScene::zoom_to_bed($self->{canvas3D}); Slic3r::GUI::_3DScene::zoom_to_bed($self->{canvas3D});
@ -847,8 +848,8 @@ sub load_model_objects {
$self->{list}->SetItem($obj_idx, 1, $model_object->instances_count); $self->{list}->SetItem($obj_idx, 1, $model_object->instances_count);
$self->{list}->SetItem($obj_idx, 2, ($model_object->instances->[0]->scaling_factor * 100) . "%"); $self->{list}->SetItem($obj_idx, 2, ($model_object->instances->[0]->scaling_factor * 100) . "%");
$self->reset_thumbnail($obj_idx); # $self->reset_thumbnail($obj_idx);
} }
$self->arrange if $need_arrange; $self->arrange if $need_arrange;
$self->update; $self->update;
@ -1057,7 +1058,7 @@ sub rotate {
$inst->set_rotation($rotation); $inst->set_rotation($rotation);
Slic3r::GUI::_3DScene::update_gizmos_data($self->{canvas3D}) if ($self->{canvas3D}); Slic3r::GUI::_3DScene::update_gizmos_data($self->{canvas3D}) if ($self->{canvas3D});
} }
$object->transform_thumbnail($self->{model}, $obj_idx); # $object->transform_thumbnail($self->{model}, $obj_idx);
} else { } else {
# rotation around X and Y needs to be performed on mesh # rotation around X and Y needs to be performed on mesh
# so we first apply any Z rotation # so we first apply any Z rotation
@ -1067,9 +1068,9 @@ sub rotate {
} }
$model_object->rotate(deg2rad($angle), $axis); $model_object->rotate(deg2rad($angle), $axis);
# realign object to Z = 0 # # realign object to Z = 0
$model_object->center_around_origin; # $model_object->center_around_origin;
$self->reset_thumbnail($obj_idx); # $self->reset_thumbnail($obj_idx);
} }
# update print and start background processing # update print and start background processing
@ -1097,9 +1098,9 @@ sub mirror {
$model_object->mirror($axis); $model_object->mirror($axis);
# realign object to Z = 0 # # realign object to Z = 0
$model_object->center_around_origin; # $model_object->center_around_origin;
$self->reset_thumbnail($obj_idx); # $self->reset_thumbnail($obj_idx);
# update print and start background processing # update print and start background processing
$self->stop_background_process; $self->stop_background_process;
@ -1149,7 +1150,7 @@ sub changescale {
#FIXME Scale the layer height profile when $axis == Z? #FIXME Scale the layer height profile when $axis == Z?
#FIXME Scale the layer height ranges $axis == Z? #FIXME Scale the layer height ranges $axis == Z?
# object was already aligned to Z = 0, so no need to realign it # object was already aligned to Z = 0, so no need to realign it
$self->reset_thumbnail($obj_idx); # $self->reset_thumbnail($obj_idx);
} else { } else {
my $scale; my $scale;
if ($tosize) { if ($tosize) {
@ -1173,7 +1174,7 @@ sub changescale {
$range->[1] *= $variation; $range->[1] *= $variation;
} }
$_->set_scaling_factor($scale) for @{ $model_object->instances }; $_->set_scaling_factor($scale) for @{ $model_object->instances };
$object->transform_thumbnail($self->{model}, $obj_idx); # $object->transform_thumbnail($self->{model}, $obj_idx);
} }
# update print and start background processing # update print and start background processing
@ -1804,10 +1805,10 @@ sub _get_export_file {
return $output_file; return $output_file;
} }
sub reset_thumbnail { #sub reset_thumbnail {
my ($self, $obj_idx) = @_; # my ($self, $obj_idx) = @_;
$self->{objects}[$obj_idx]->thumbnail(undef); # $self->{objects}[$obj_idx]->thumbnail(undef);
} #}
# this method gets called whenever print center is changed or the objects' bounding box changes # this method gets called whenever print center is changed or the objects' bounding box changes
# (i.e. when an object is added/removed/moved/rotated/scaled) # (i.e. when an object is added/removed/moved/rotated/scaled)
@ -1831,7 +1832,7 @@ sub update {
$self->resume_background_process; $self->resume_background_process;
} }
$self->{canvas}->reload_scene if $self->{canvas}; # $self->{canvas}->reload_scene if $self->{canvas};
my $selections = $self->collect_selections; my $selections = $self->collect_selections;
Slic3r::GUI::_3DScene::set_objects_selections($self->{canvas3D}, \@$selections); Slic3r::GUI::_3DScene::set_objects_selections($self->{canvas3D}, \@$selections);
Slic3r::GUI::_3DScene::reload_scene($self->{canvas3D}, 0); Slic3r::GUI::_3DScene::reload_scene($self->{canvas3D}, 0);
@ -1888,7 +1889,7 @@ sub on_config_change {
foreach my $opt_key (@{$self->{config}->diff($config)}) { foreach my $opt_key (@{$self->{config}->diff($config)}) {
$self->{config}->set($opt_key, $config->get($opt_key)); $self->{config}->set($opt_key, $config->get($opt_key));
if ($opt_key eq 'bed_shape') { if ($opt_key eq 'bed_shape') {
$self->{canvas}->update_bed_size; # $self->{canvas}->update_bed_size;
Slic3r::GUI::_3DScene::set_bed_shape($self->{canvas3D}, $self->{config}->bed_shape) if $self->{canvas3D}; 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}; Slic3r::GUI::_3DScene::set_bed_shape($self->{preview3D}->canvas, $self->{config}->bed_shape) if $self->{preview3D};
$update_scheduled = 1; $update_scheduled = 1;
@ -1948,7 +1949,7 @@ sub list_item_deselected {
$self->{_lecursor} = Wx::BusyCursor->new(); $self->{_lecursor} = Wx::BusyCursor->new();
if ($self->{list}->GetFirstSelected == -1) { if ($self->{list}->GetFirstSelected == -1) {
$self->select_object(undef); $self->select_object(undef);
$self->{canvas}->Refresh; # $self->{canvas}->Refresh;
Slic3r::GUI::_3DScene::deselect_volumes($self->{canvas3D}) if $self->{canvas3D}; Slic3r::GUI::_3DScene::deselect_volumes($self->{canvas3D}) if $self->{canvas3D};
Slic3r::GUI::_3DScene::render($self->{canvas3D}) if $self->{canvas3D}; Slic3r::GUI::_3DScene::render($self->{canvas3D}) if $self->{canvas3D};
} }
@ -1961,7 +1962,7 @@ sub list_item_selected {
$self->{_lecursor} = Wx::BusyCursor->new(); $self->{_lecursor} = Wx::BusyCursor->new();
my $obj_idx = $event->GetIndex; my $obj_idx = $event->GetIndex;
$self->select_object($obj_idx); $self->select_object($obj_idx);
$self->{canvas}->Refresh; # $self->{canvas}->Refresh;
if ($self->{canvas3D}) { if ($self->{canvas3D}) {
my $selections = $self->collect_selections; my $selections = $self->collect_selections;
Slic3r::GUI::_3DScene::update_volumes_selection($self->{canvas3D}, \@$selections); Slic3r::GUI::_3DScene::update_volumes_selection($self->{canvas3D}, \@$selections);
@ -2058,19 +2059,19 @@ sub object_settings_dialog {
$self->pause_background_process; $self->pause_background_process;
$dlg->ShowModal; $dlg->ShowModal;
# update thumbnail since parts may have changed # # update thumbnail since parts may have changed
if ($dlg->PartsChanged) { # if ($dlg->PartsChanged) {
# recenter and re-align to Z = 0 # # recenter and re-align to Z = 0
$model_object->center_around_origin; # $model_object->center_around_origin;
$self->reset_thumbnail($obj_idx); # $self->reset_thumbnail($obj_idx);
} # }
# update print # update print
if ($dlg->PartsChanged || $dlg->PartSettingsChanged) { if ($dlg->PartsChanged || $dlg->PartSettingsChanged) {
$self->stop_background_process; $self->stop_background_process;
$self->{print}->reload_object($obj_idx); $self->{print}->reload_object($obj_idx);
$self->schedule_background_process; $self->schedule_background_process;
$self->{canvas}->reload_scene if $self->{canvas}; # $self->{canvas}->reload_scene if $self->{canvas};
my $selections = $self->collect_selections; my $selections = $self->collect_selections;
Slic3r::GUI::_3DScene::set_objects_selections($self->{canvas3D}, \@$selections); Slic3r::GUI::_3DScene::set_objects_selections($self->{canvas3D}, \@$selections);
Slic3r::GUI::_3DScene::reload_scene($self->{canvas3D}, 0); Slic3r::GUI::_3DScene::reload_scene($self->{canvas3D}, 0);
@ -2356,48 +2357,48 @@ package Slic3r::GUI::Plater::Object;
use Moo; use Moo;
has 'name' => (is => 'rw', required => 1); has 'name' => (is => 'rw', required => 1);
has 'thumbnail' => (is => 'rw'); # ExPolygon::Collection in scaled model units with no transforms #has 'thumbnail' => (is => 'rw'); # ExPolygon::Collection in scaled model units with no transforms
has 'transformed_thumbnail' => (is => 'rw'); #has 'transformed_thumbnail' => (is => 'rw');
has 'instance_thumbnails' => (is => 'ro', default => sub { [] }); # array of ExPolygon::Collection objects, each one representing the actual placed thumbnail of each instance in pixel units #has 'instance_thumbnails' => (is => 'ro', default => sub { [] }); # array of ExPolygon::Collection objects, each one representing the actual placed thumbnail of each instance in pixel units
has 'selected' => (is => 'rw', default => sub { 0 }); has 'selected' => (is => 'rw', default => sub { 0 });
sub make_thumbnail { #sub make_thumbnail {
my ($self, $model, $obj_idx) = @_; # my ($self, $model, $obj_idx) = @_;
# make method idempotent # # make method idempotent
$self->thumbnail->clear; # $self->thumbnail->clear;
# raw_mesh is the non-transformed (non-rotated, non-scaled, non-translated) sum of non-modifier object volumes. # # raw_mesh is the non-transformed (non-rotated, non-scaled, non-translated) sum of non-modifier object volumes.
my $mesh = $model->objects->[$obj_idx]->raw_mesh; # my $mesh = $model->objects->[$obj_idx]->raw_mesh;
#FIXME The "correct" variant could be extremely slow. ##FIXME The "correct" variant could be extremely slow.
# if ($mesh->facets_count <= 5000) { ## if ($mesh->facets_count <= 5000) {
# # remove polygons with area <= 1mm ## # remove polygons with area <= 1mm
# my $area_threshold = Slic3r::Geometry::scale 1; ## my $area_threshold = Slic3r::Geometry::scale 1;
# $self->thumbnail->append( ## $self->thumbnail->append(
# grep $_->area >= $area_threshold, ## grep $_->area >= $area_threshold,
# @{ $mesh->horizontal_projection }, # horizontal_projection returns scaled expolygons ## @{ $mesh->horizontal_projection }, # horizontal_projection returns scaled expolygons
# ); ## );
# $self->thumbnail->simplify(0.5); ## $self->thumbnail->simplify(0.5);
# } else { ## } else {
my $convex_hull = Slic3r::ExPolygon->new($mesh->convex_hull); # my $convex_hull = Slic3r::ExPolygon->new($mesh->convex_hull);
$self->thumbnail->append($convex_hull); # $self->thumbnail->append($convex_hull);
# } ## }
return $self->thumbnail; # return $self->thumbnail;
} #}
#
sub transform_thumbnail { #sub transform_thumbnail {
my ($self, $model, $obj_idx) = @_; # my ($self, $model, $obj_idx) = @_;
#
return unless defined $self->thumbnail; # return unless defined $self->thumbnail;
#
my $model_object = $model->objects->[$obj_idx]; # my $model_object = $model->objects->[$obj_idx];
my $model_instance = $model_object->instances->[0]; # my $model_instance = $model_object->instances->[0];
#
# the order of these transformations MUST be the same everywhere, including # # the order of these transformations MUST be the same everywhere, including
# in Slic3r::Print->add_model_object() # # in Slic3r::Print->add_model_object()
my $t = $self->thumbnail->clone; # my $t = $self->thumbnail->clone;
$t->rotate($model_instance->rotation, Slic3r::Point->new(0,0)); # $t->rotate($model_instance->rotation, Slic3r::Point->new(0,0));
$t->scale($model_instance->scaling_factor); # $t->scale($model_instance->scaling_factor);
#
$self->transformed_thumbnail($t); # $self->transformed_thumbnail($t);
} #}
1; 1;