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

New command for setting the number of copies of the selected object. #2540

Browse Source
This commit is contained in:
Alessandro Ranellucci 2015-01-14 23:19:13 +01:00
parent bf02062a67
commit b518d5d32f
1 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -576,17 +576,20 @@ sub reset {
} }
sub increase { sub increase {
my $self = shift; my ($self, $copies) = @_;
$copies //= 1;
my ($obj_idx, $object) = $self->selected_object; my ($obj_idx, $object) = $self->selected_object;
my $model_object = $self->{model}->objects->[$obj_idx]; my $model_object = $self->{model}->objects->[$obj_idx];
my $last_instance = $model_object->instances->[-1]; my $instance = $model_object->instances->[-1];
my $i = $model_object->add_instance( for my $i (1..$copies) {
offset => Slic3r::Pointf->new(map 10+$_, @{$last_instance->offset}), $instance = $model_object->add_instance(
scaling_factor => $last_instance->scaling_factor, offset => Slic3r::Pointf->new(map 10+$_, @{$instance->offset}),
rotation => $last_instance->rotation, scaling_factor => $instance->scaling_factor,
rotation => $instance->rotation,
); );
$self->{print}->objects->[$obj_idx]->add_copy($i->offset); $self->{print}->objects->[$obj_idx]->add_copy($instance->offset);
}
$self->{list}->SetItem($obj_idx, 1, $model_object->instances_count); $self->{list}->SetItem($obj_idx, 1, $model_object->instances_count);
# only autoarrange if user has autocentering enabled # only autoarrange if user has autocentering enabled
@ -600,15 +603,18 @@ sub increase {
} }
sub decrease { sub decrease {
my $self = shift; my ($self, $copies) = @_;
$copies //= 1;
$self->stop_background_process; $self->stop_background_process;
my ($obj_idx, $object) = $self->selected_object; my ($obj_idx, $object) = $self->selected_object;
my $model_object = $self->{model}->objects->[$obj_idx]; my $model_object = $self->{model}->objects->[$obj_idx];
if ($model_object->instances_count >= 2) { if ($model_object->instances_count > $copies) {
for my $i (1..$copies) {
$model_object->delete_last_instance; $model_object->delete_last_instance;
$self->{print}->objects->[$obj_idx]->delete_last_copy; $self->{print}->objects->[$obj_idx]->delete_last_copy;
}
$self->{list}->SetItem($obj_idx, 1, $model_object->instances_count); $self->{list}->SetItem($obj_idx, 1, $model_object->instances_count);
} else { } else {
$self->remove; $self->remove;
@ -622,6 +628,28 @@ sub decrease {
$self->schedule_background_process; $self->schedule_background_process;
} }
sub set_number_of_copies {
my ($self) = @_;
$self->pause_background_process;
# get current number of copies
my ($obj_idx, $object) = $self->selected_object;
my $model_object = $self->{model}->objects->[$obj_idx];
# prompt user
my $copies = Wx::GetNumberFromUser("", "Enter the number of copies of the selected object:", "Copies", $model_object->instances_count, 0, 1000, $self);
my $diff = $copies - $model_object->instances_count;
if ($diff == 0) {
# no variation
$self->resume_background_process;
} elsif ($diff > 0) {
$self->increase($diff);
} elsif ($diff < 0) {
$self->decrease(-$diff);
}
}
sub rotate { sub rotate {
my $self = shift; my $self = shift;
my ($angle, $axis) = @_; my ($angle, $axis) = @_;
@ -1516,6 +1544,9 @@ sub object_menu {
$frame->_append_menu_item($menu, "Decrease copies\tCtrl+-", 'Remove one copy of the selected object', sub { $frame->_append_menu_item($menu, "Decrease copies\tCtrl+-", 'Remove one copy of the selected object', sub {
$self->decrease; $self->decrease;
}); });
$frame->_append_menu_item($menu, "Set number of copies…", 'Change the number of copies of the selected object', sub {
$self->set_number_of_copies;
});
$menu->AppendSeparator(); $menu->AppendSeparator();
$frame->_append_menu_item($menu, "Rotate 45° clockwise", 'Rotate the selected object by 45° clockwise', sub { $frame->_append_menu_item($menu, "Rotate 45° clockwise", 'Rotate the selected object by 45° clockwise', sub {
$self->rotate(-45); $self->rotate(-45);