GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 05:15:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3864 from Samir55/gsoc

Browse Source 
Adding Zoom
This commit is contained in:
Alessandro Ranellucci 2017-04-29 19:26:56 +02:00 committed by GitHub
commit 9499122d58
4 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Slic3r/GUI/3DScene.pm
View File

@ -330,6 +330,19 @@ sub set_viewport_from_scene {
$self->_dirty(1);
}
sub zoom{
my ($self, $direction) = @_;
if( $direction eq 'in'){
$self->_zoom($self->_zoom / (1-0.3));
}
elsif($direction eq 'out'){
$self->_zoom($self->_zoom / (1+0.3));
}
$self->on_viewport_changed->() if $self->on_viewport_changed;
$self->_dirty(1);
$self->Refresh;
}
# Set the camera to a default orientation,
# zoom to volumes.
sub select_view {

3
lib/Slic3r/GUI/MainFrame.pm
View File

@ -182,6 +182,8 @@ sub _init_menubar {
wxTheApp->append_menu_item($self->{plater_menu}, "Select Prev Object\tCtrl+Left", 'Select Previous Object in the plater', sub {
$plater->select_prev;
}, undef, 'arrow_left.png');
$self->_append_menu_item($self->{plater_menu}, "Zoom In\tCtrl+up" , 'Zoom In' , sub { $self->{plater}->zoom('in' ); });
$self->_append_menu_item($self->{plater_menu}, "Zoom Out\tCtrl+down" , 'Zoom Out' , sub { $self->{plater}->zoom('out' ); });
$self->{plater_menu}->AppendSeparator();
wxTheApp->append_menu_item($self->{plater_menu}, "Export G-code...", 'Export current plate as G-code', sub {
$plater->export_gcode;
@ -192,7 +194,6 @@ sub _init_menubar {
wxTheApp->append_menu_item($self->{plater_menu}, "Export plate with modifiers as AMF...", 'Export current plate as AMF, including all modifier meshes', sub {
$plater->export_amf;
}, undef, 'brick_go.png');
$self->{object_menu} = $self->{plater}->object_menu;
$self->on_plater_selection_changed(0);
}

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

@ -2440,6 +2440,21 @@ sub select_view {
}
}
sub zoom{
my ($self, $direction) = @_;
#Apply Zoom to the current active tab
my ($currentSelection) = $self->{preview_notebook}->GetSelection;
if($currentSelection == 0){
$self->{canvas3D}->zoom($direction) if($self->{canvas3D});
}
elsif($currentSelection == 2){ #3d Preview tab
$self->{preview3D}->canvas->zoom($direction) if($self->{preview3D});
}
elsif($currentSelection == 3) { #2D toolpaths tab
$self->{toolpaths2D}->{canvas}->zoom($direction) if($self->{toolpaths2D});
}
}
package Slic3r::GUI::Plater::DropTarget;
use Wx::DND;
use base 'Wx::FileDropTarget';

14
lib/Slic3r/GUI/Plater/2DToolpaths.pm
View File

@ -217,6 +217,20 @@ sub new {
return $self;
}
sub zoom{
my($self, $direction) = @_;
if( $direction eq 'in'){
$self->_zoom($self->_zoom / (1+0.3));
}
elsif($direction eq 'out'){
$self->_zoom($self->_zoom / (1-0.3));
$self->_zoom(1) if $self->_zoom > 1; # prevent from zooming out too much
}
#apply changes
$self->_dirty(1);
$self->Refresh;
}
sub mouse_event {
my ($self, $e) = @_;