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

3DScene volume selection methods moved to c++

Browse source
This commit is contained in:
Enrico Turri 2018-05-25 09:03:55 +02:00
parent f121817501
commit bdbc86167c
10 changed files with 96 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

43
lib/Slic3r/GUI/3DScene.pm
View file

@ -508,16 +508,21 @@ sub mouse_event {
# during the scene manipulation.
#==============================================================================================================================
if (Slic3r::GUI::_3DScene::is_picking_enabled($self) && ($volume_idx != -1 || ! $self->layer_editing_enabled)) {
Slic3r::GUI::_3DScene::deselect_volumes($self);
Slic3r::GUI::_3DScene::select_volume($self, $volume_idx);
# if ($self->enable_picking && ($volume_idx != -1 || ! $self->layer_editing_enabled)) {
# $self->deselect_volumes;
# $self->select_volume($volume_idx);
#==============================================================================================================================
$self->deselect_volumes;
$self->select_volume($volume_idx);
if ($volume_idx != -1) {
my $group_id = $self->volumes->[$volume_idx]->select_group_id;
my @volumes;
if ($group_id != -1) {
$self->select_volume($_)
#==============================================================================================================================
Slic3r::GUI::_3DScene::select_volume($self, $_)
# $self->select_volume($_)
#==============================================================================================================================
for grep $self->volumes->[$_]->select_group_id == $group_id,
0..$#{$self->volumes};
}
@ -1048,23 +1053,21 @@ sub get_zoom_to_bounding_box_factor {
#
# $self->bed_polygon(offset_ex([$expolygon->contour], $bed_bb->radius * 1.7, JT_ROUND, scale(0.5))->[0]->contour->clone);
#}
#==============================================================================================================================
sub deselect_volumes {
my ($self) = @_;
$_->set_selected(0) for @{$self->volumes};
}
sub select_volume {
my ($self, $volume_idx) = @_;
return if ($volume_idx >= scalar(@{$self->volumes}));
$self->volumes->[$volume_idx]->set_selected(1)
if $volume_idx != -1;
}
#==============================================================================================================================
#
#sub deselect_volumes {
# my ($self) = @_;
# $_->set_selected(0) for @{$self->volumes};
#}
#
#sub select_volume {
# my ($self, $volume_idx) = @_;
#
# return if ($volume_idx >= scalar(@{$self->volumes}));
#
# $self->volumes->[$volume_idx]->set_selected(1)
# if $volume_idx != -1;
#}
#
#sub SetCuttingPlane {
# my ($self, $z, $expolygons) = @_;
#

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

@ -1854,7 +1854,10 @@ sub list_item_deselected {
if ($self->{list}->GetFirstSelected == -1) {
$self->select_object(undef);
$self->{canvas}->Refresh;
$self->{canvas3D}->deselect_volumes if $self->{canvas3D};
#==============================================================================================================================
Slic3r::GUI::_3DScene::deselect_volumes($self->{canvas3D}) if $self->{canvas3D};
# $self->{canvas3D}->deselect_volumes if $self->{canvas3D};
#==============================================================================================================================
$self->{canvas3D}->Render if $self->{canvas3D};
}
undef $self->{_lecursor};

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

@ -195,7 +195,10 @@ sub update_volumes_selection {
foreach my $obj_idx (0..$#{$self->{model}->objects}) {
if ($self->{objects}[$obj_idx]->selected) {
my $volume_idxs = $self->{objects_volumes_idxs}->[$obj_idx];
$self->select_volume($_) for @{$volume_idxs};
#==============================================================================================================================
Slic3r::GUI::_3DScene::select_volume($self, $_) for @{$volume_idxs};
# $self->select_volume($_) for @{$volume_idxs};
#==============================================================================================================================
}
}
}