From 4961b74c3e4391c3882599f4246cf798ac562b35 Mon Sep 17 00:00:00 2001 From: Samir55 Date: Thu, 6 Apr 2017 23:09:06 +0200 Subject: [PATCH 01/44] Adding Zoom --- lib/Slic3r/GUI/3DScene.pm | 14 ++++++++++++++ lib/Slic3r/GUI/MainFrame.pm | 8 +++++++- lib/Slic3r/GUI/Plater.pm | 5 +++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/lib/Slic3r/GUI/3DScene.pm b/lib/Slic3r/GUI/3DScene.pm index 09801fe6d..7f65f9c30 100644 --- a/lib/Slic3r/GUI/3DScene.pm +++ b/lib/Slic3r/GUI/3DScene.pm @@ -330,6 +330,20 @@ sub set_viewport_from_scene { $self->_dirty(1); } +sub zoom{ + my ($self, $direction) = @_; + print ($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 { diff --git a/lib/Slic3r/GUI/MainFrame.pm b/lib/Slic3r/GUI/MainFrame.pm index 1b07d37ef..275675dae 100644 --- a/lib/Slic3r/GUI/MainFrame.pm +++ b/lib/Slic3r/GUI/MainFrame.pm @@ -193,7 +193,8 @@ sub _init_menubar { $self->_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->_append_menu_item($self->{plater_menu}, "Zoom In\tCtrl+up" , 'Zoom In' , sub { $self->zoom('in' ); }); + $self->_append_menu_item($self->{plater_menu}, "Zoom Out\tCtrl+down" , 'Zoom Out' , sub { $self->zoom('out' ); }); $self->{object_menu} = $self->{plater}->object_menu; $self->on_plater_selection_changed(0); } @@ -631,6 +632,11 @@ sub select_view { $self->{plater}->select_view($direction); } +sub zoom{ + my($self, $direction) = @_; + $self->{plater}->zoom($direction); +} + sub _append_menu_item { my ($self, $menu, $string, $description, $cb, $id, $icon, $kind) = @_; diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm index 364f9c191..62468e814 100644 --- a/lib/Slic3r/GUI/Plater.pm +++ b/lib/Slic3r/GUI/Plater.pm @@ -2432,6 +2432,11 @@ sub select_view { } } +sub zoom{ + my ($self, $direction) = @_; + $self->{canvas3D}->zoom($direction); +} + package Slic3r::GUI::Plater::DropTarget; use Wx::DND; use base 'Wx::FileDropTarget'; From 75291772ce01cce7382ba15a2e5618f71d259ce9 Mon Sep 17 00:00:00 2001 From: Samir55 Date: Wed, 19 Apr 2017 15:33:42 +0200 Subject: [PATCH 02/44] Improving Zoom by keyboardShortcut --- lib/Slic3r/GUI/3DScene.pm | 1 - lib/Slic3r/GUI/MainFrame.pm | 11 +++-------- lib/Slic3r/GUI/Plater.pm | 18 ++++++++++++++++-- lib/Slic3r/GUI/Plater/2DToolpaths.pm | 22 ++++++++++++++++++---- slic3r.pl | 2 +- 5 files changed, 38 insertions(+), 16 deletions(-) diff --git a/lib/Slic3r/GUI/3DScene.pm b/lib/Slic3r/GUI/3DScene.pm index 7f65f9c30..057342879 100644 --- a/lib/Slic3r/GUI/3DScene.pm +++ b/lib/Slic3r/GUI/3DScene.pm @@ -332,7 +332,6 @@ sub set_viewport_from_scene { sub zoom{ my ($self, $direction) = @_; - print ($direction); if( $direction eq 'in'){ $self->_zoom($self->_zoom / (1-0.3)); } diff --git a/lib/Slic3r/GUI/MainFrame.pm b/lib/Slic3r/GUI/MainFrame.pm index 275675dae..7b3d998af 100644 --- a/lib/Slic3r/GUI/MainFrame.pm +++ b/lib/Slic3r/GUI/MainFrame.pm @@ -183,6 +183,8 @@ sub _init_menubar { $self->_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(); $self->_append_menu_item($self->{plater_menu}, "Export G-code...", 'Export current plate as G-code', sub { $plater->export_gcode; @@ -193,8 +195,6 @@ sub _init_menubar { $self->_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->_append_menu_item($self->{plater_menu}, "Zoom In\tCtrl+up" , 'Zoom In' , sub { $self->zoom('in' ); }); - $self->_append_menu_item($self->{plater_menu}, "Zoom Out\tCtrl+down" , 'Zoom Out' , sub { $self->zoom('out' ); }); $self->{object_menu} = $self->{plater}->object_menu; $self->on_plater_selection_changed(0); } @@ -628,13 +628,8 @@ sub select_tab { # Set a camera direction, zoom to all objects. sub select_view { my ($self, $direction) = @_; - - $self->{plater}->select_view($direction); -} -sub zoom{ - my($self, $direction) = @_; - $self->{plater}->zoom($direction); + $self->{plater}->select_view($direction); } sub _append_menu_item { diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm index 62468e814..89341498f 100644 --- a/lib/Slic3r/GUI/Plater.pm +++ b/lib/Slic3r/GUI/Plater.pm @@ -91,7 +91,7 @@ sub new { my $on_instances_moved = sub { $self->on_model_change; }; - + # Initialize 3D plater if ($Slic3r::GUI::have_OpenGL) { $self->{canvas3D} = Slic3r::GUI::Plater::3D->new($self->{preview_notebook}, $self->{objects}, $self->{model}, $self->{config}); @@ -2434,7 +2434,21 @@ sub select_view { sub zoom{ my ($self, $direction) = @_; - $self->{canvas3D}->zoom($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 == 1) { #2D platter should zomobe applied here or not ? +# } + 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}); + } + else {#Do Nothing + } } package Slic3r::GUI::Plater::DropTarget; diff --git a/lib/Slic3r/GUI/Plater/2DToolpaths.pm b/lib/Slic3r/GUI/Plater/2DToolpaths.pm index d39c53179..c7b3765c0 100644 --- a/lib/Slic3r/GUI/Plater/2DToolpaths.pm +++ b/lib/Slic3r/GUI/Plater/2DToolpaths.pm @@ -187,21 +187,21 @@ sub new { $zoom /= 10; $self->_zoom($self->_zoom / (1-$zoom)); $self->_zoom(1) if $self->_zoom > 1; # prevent from zooming out too much - + { # In order to zoom around the mouse point we need to translate # the camera target. This math is almost there but not perfect yet... my $camera_bb_size = $self->_camera_bb->size; my $size = Slic3r::Pointf->new($self->GetSizeWH); my $pos = Slic3r::Pointf->new($e->GetPositionXY); - + # calculate the zooming center in pixel coordinates relative to the viewport center my $vec = Slic3r::Pointf->new($pos->x - $size->x/2, $pos->y - $size->y/2); #- - + # calculate where this point will end up after applying the new zoom my $vec2 = $vec->clone; $vec2->scale($old_zoom / $self->_zoom); - + # move the camera target by the difference of the two positions $self->_camera_target->translate( -($vec->x - $vec2->x) * $camera_bb_size->x / $size->x, @@ -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) = @_; diff --git a/slic3r.pl b/slic3r.pl index 75bf3b961..5f08ba8b0 100755 --- a/slic3r.pl +++ b/slic3r.pl @@ -6,7 +6,7 @@ use warnings; BEGIN { use FindBin; use lib "$FindBin::Bin/lib"; - use local::lib '--no-create', "$FindBin::Bin/local-lib"; + use local::lib "$FindBin::Bin/local-lib"; } use File::Basename qw(basename); From 489059f82749ceaf9fd7e00eef4f4da69591ba9a Mon Sep 17 00:00:00 2001 From: Samir55 Date: Wed, 19 Apr 2017 18:40:32 +0200 Subject: [PATCH 03/44] Improving Zoom by Keyboard Shortcut removing unnecessary lines --- lib/Slic3r/GUI/Plater.pm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm index 89341498f..c7ceb2899 100644 --- a/lib/Slic3r/GUI/Plater.pm +++ b/lib/Slic3r/GUI/Plater.pm @@ -2439,16 +2439,12 @@ sub zoom{ if($currentSelection == 0){ $self->{canvas3D}->zoom($direction) if($self->{canvas3D}); } -# elsif($currentSelection == 1) { #2D platter should zomobe applied here or not ? -# } 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}); } - else {#Do Nothing - } } package Slic3r::GUI::Plater::DropTarget; From 85836ab3804f8156c9d305fb32ae4983675c8414 Mon Sep 17 00:00:00 2001 From: Samir55 Date: Thu, 27 Apr 2017 17:45:04 +0200 Subject: [PATCH 04/44] fix slic3r.pl file --- slic3r.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slic3r.pl b/slic3r.pl index 5f08ba8b0..75bf3b961 100755 --- a/slic3r.pl +++ b/slic3r.pl @@ -6,7 +6,7 @@ use warnings; BEGIN { use FindBin; use lib "$FindBin::Bin/lib"; - use local::lib "$FindBin::Bin/local-lib"; + use local::lib '--no-create', "$FindBin::Bin/local-lib"; } use File::Basename qw(basename); From 9895885ba59f314c61e24c079096ca1dda66148d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xoan=20Sampai=C3=B1o?= Date: Sat, 29 Apr 2017 14:35:27 +0200 Subject: [PATCH 05/44] Disable Plater menu when there are no objects in plater --- lib/Slic3r/GUI/MainFrame.pm | 9 +++++++++ lib/Slic3r/GUI/Plater.pm | 3 +++ 2 files changed, 12 insertions(+) diff --git a/lib/Slic3r/GUI/MainFrame.pm b/lib/Slic3r/GUI/MainFrame.pm index 12ae8abbc..ed9dc7fac 100644 --- a/lib/Slic3r/GUI/MainFrame.pm +++ b/lib/Slic3r/GUI/MainFrame.pm @@ -194,6 +194,7 @@ sub _init_menubar { }, undef, 'brick_go.png'); $self->{object_menu} = $self->{plater}->object_menu; + $self->on_plater_object_list_changed(0); $self->on_plater_selection_changed(0); } @@ -309,6 +310,14 @@ sub is_loaded { return $self->{loaded}; } +sub on_plater_object_list_changed { + my ($self, $have_objects) = @_; + + return if !defined $self->{plater_menu}; + $self->{plater_menu}->Enable($_->GetId, $have_objects) + for $self->{plater_menu}->GetMenuItems; +} + sub on_plater_selection_changed { my ($self, $have_selection) = @_; diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm index 3cbee451b..df4f16680 100644 --- a/lib/Slic3r/GUI/Plater.pm +++ b/lib/Slic3r/GUI/Plater.pm @@ -2169,6 +2169,9 @@ sub object_list_changed { $self->{htoolbar}->EnableTool($_, $have_objects) for (TB_RESET, TB_ARRANGE); } + + # prepagate the event to the frame (a custom Wx event would be cleaner) + $self->GetFrame->on_plater_object_list_changed($have_objects); } sub selection_changed { From 1826517b047755e201eed8ef4f36663fe8cb0424 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Sat, 29 Apr 2017 22:08:33 +0200 Subject: [PATCH 06/44] Adapt the zoom code to the new menu methods --- lib/Slic3r/GUI/MainFrame.pm | 6 ++++-- var/zoom_in.png | Bin 0 -> 725 bytes var/zoom_out.png | Bin 0 -> 708 bytes 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100755 var/zoom_in.png create mode 100755 var/zoom_out.png diff --git a/lib/Slic3r/GUI/MainFrame.pm b/lib/Slic3r/GUI/MainFrame.pm index 6410ae4ec..67b9b354e 100644 --- a/lib/Slic3r/GUI/MainFrame.pm +++ b/lib/Slic3r/GUI/MainFrame.pm @@ -182,8 +182,10 @@ 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' ); }); + wxTheApp->append_menu_item($self->{plater_menu}, "Zoom In\tCtrl+up", 'Zoom In', + sub { $self->{plater}->zoom('in') }, undef, 'zoom_in.png'); + wxTheApp->append_menu_item($self->{plater_menu}, "Zoom Out\tCtrl+down", 'Zoom Out', + sub { $self->{plater}->zoom('out') }, undef, 'zoom_out.png'); $self->{plater_menu}->AppendSeparator(); wxTheApp->append_menu_item($self->{plater_menu}, "Export G-code...", 'Export current plate as G-code', sub { $plater->export_gcode; diff --git a/var/zoom_in.png b/var/zoom_in.png new file mode 100755 index 0000000000000000000000000000000000000000..cdf0a52fe03715dcdf399e59c8071c4572dc51f7 GIT binary patch literal 725 zcmV;`0xJE9P)m%7v+TE=2L@ zAc44q=tejYU5HLZGooZ=NXsV%)bU*sTokj@jZSo^9&w{ke7#VNQ*1zG!rIRk_@ zCqOr;g6B6CM1oPv1(~U4k@Gd+5tN0(j@GA*K*busv3Lb0UyXuowiRkTRZ#85JN!eC z_8ZVW>+upx5C#N|BTv2dK_EW@%(@F6yu1sZv>T3gm&*mIkvej1R4=RyYw#mS zx}c)#2z<)=VQ1|=ux>5PwjVE+J!Q84EQyG-j9SFYV*6AQj$Gb(7!KJE!k5iQ@O3K$ z@0NQZ)>b7&TaFd~Ciolk*Q(7cL+9cB`Y;G@rr`tk5Hdjv+))zSdlF#gI!>6`zB<@i zaKYP!9!Pl&5VMjydlq1x&}37{RQY+SSBXX-w?kCLKK%bXFYU6{?d+nH00000NkvXX Hu0mjfTSP*+ literal 0 HcmV?d00001 diff --git a/var/zoom_out.png b/var/zoom_out.png new file mode 100755 index 0000000000000000000000000000000000000000..07bf98a79cfea526e250703356dbefdb6b80d166 GIT binary patch literal 708 zcmV;#0z3VQP)TNkCP1&*^7LC~A?iZQEu_hKZoQoXI zA7tfTv}|~Fb8b^XuP>qvDk=)P)vYKtT12;}bKn-mwHWl`1Bb)&{XXC4IY$Nnvj5@N zfekg1Y}gcI!)Cq|u?lR+A{2&=d~S$}&0ei1|7pO6jkZ$6%&{R8TNpk>=dV#j&aWqO zgE~4pNU_-giktFkY-J5_XDlv`7+j?n3mXtxgadILp+c<9cr~t!x1LM6m69Z~V#pLL z22Cs~BoIdtZHTjo7Q|_U0a2OmSF=gCGFB$RVZIP(pixmBqE!^15yd!#9Z{Wh)zB%o zikBFa!WJPvMB(noe(U;k1e~Y|r$}@wh*Ymykd6>E3t69z5DT&Jq-fSG-dPdU{SG;i zbSb3<`RfKgJD|lQC`6(Cdut1PbDV&$M=Y?U)x)A(0iQN+gAeOBg2Z6fr$_Is!%M70 z=n*z7{*s%3rO7yazIO)}qa&~o@WZ=R>!b#mOSR zlCR8M*iRy2j7!PmWiiegA>Og~W1?FLk0*NI^}`$RW Date: Sat, 29 Apr 2017 22:12:46 +0200 Subject: [PATCH 07/44] Use submenus for listing options in dropdown menu. #3905 --- .../GUI/Plater/OverrideSettingsPanel.pm | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm b/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm index 9e91a7a56..1ab1c7ffa 100644 --- a/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm +++ b/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm @@ -52,16 +52,23 @@ sub new { EVT_LEFT_DOWN($btn, sub { my $menu = Wx::Menu->new; my $last_cat = ''; + + # create category submenus + my %categories = (); # category => submenu foreach my $opt_key (@{$self->{options}}) { - # add icon, if we have one for this category - my $icon; if (my $cat = $Slic3r::Config::Options->{$opt_key}{category}) { - if ($last_cat && $cat ne $last_cat) { - $menu->AppendSeparator; - } - $last_cat = $cat; - $icon = $icons{$cat}; + $categories{$cat} //= Wx::Menu->new; } + } + + # append submenus to main menu + foreach my $cat (sort keys %categories) { + wxTheApp->append_submenu($menu, $cat, "", $categories{$cat}, undef, $icons{$cat}); + } + + # append options to submenus + foreach my $opt_key (@{$self->{options}}) { + my $cat = $Slic3r::Config::Options->{$opt_key}{category} or next; my $cb = sub { $self->{config}->set($opt_key, $self->{default_config}->get($opt_key)); @@ -69,8 +76,8 @@ sub new { $self->{on_change}->($opt_key) if $self->{on_change}; }; - wxTheApp->append_menu_item($menu, $self->{option_labels}{$opt_key}, - $Slic3r::Config::Options->{$opt_key}{tooltip}, $cb, undef, $icon); + wxTheApp->append_menu_item($categories{$cat}, $self->{option_labels}{$opt_key}, + $Slic3r::Config::Options->{$opt_key}{tooltip}, $cb); } $self->PopupMenu($menu, $btn->GetPosition); $menu->Destroy; @@ -107,17 +114,11 @@ sub set_config { sub set_opt_keys { my ($self, $opt_keys) = @_; - # sort options by category+label + # sort options by label $self->{option_labels} = {}; foreach my $opt_key (@$opt_keys) { my $def = $Slic3r::Config::Options->{$opt_key} or next; - if (!$def->{category}) { - #printf "Skipping %s\n", $opt_key; - next; - } - $self->{option_labels}{$opt_key} = sprintf '%s > %s', - $def->{category}, - $def->{full_label} // $def->{label}; + $self->{option_labels}{$opt_key} = $def->{full_label} // $def->{label}; }; $self->{options} = [ sort { $self->{option_labels}{$a} cmp $self->{option_labels}{$b} } keys %{$self->{option_labels}} ]; } From 90de54f2fce063b4b7456845f1a82ad656db4bed Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Mon, 1 May 2017 17:00:02 +0200 Subject: [PATCH 08/44] Fix for undetected convex points. #3458 --- t/geometry.t | 12 ++++++++++- xs/src/libslic3r/Polygon.cpp | 42 +++++++++++++++++++----------------- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/t/geometry.t b/t/geometry.t index 0f37c0aa3..9c6eef55e 100644 --- a/t/geometry.t +++ b/t/geometry.t @@ -2,7 +2,7 @@ use Test::More; use strict; use warnings; -plan tests => 42; +plan tests => 44; BEGIN { use FindBin; @@ -254,4 +254,14 @@ my $polygons = [ is scalar(@$simplified), 3, 'triangle is never simplified to less than 3 points'; } +{ + # Two concave vertices of this polygon have angle = PI*4/3, so this test fails + # if epsilon is not used. + my $polygon = Slic3r::Polygon->new( + [60246458,14802768],[64477191,12360001],[63727343,11060995],[64086449,10853608],[66393722,14850069],[66034704,15057334],[65284646,13758387],[61053864,16200839],[69200258,30310849],[62172547,42483120],[61137680,41850279],[67799985,30310848],[51399866,1905506],[38092663,1905506],[38092663,692699],[52100125,692699], + ); + is scalar(@{$polygon->concave_points(PI*4/3)}), 6, 'expected number of concave points'; + is scalar(@{$polygon->convex_points(PI*2/3)}), 10, 'expected number of convex points'; +} + __END__ diff --git a/xs/src/libslic3r/Polygon.cpp b/xs/src/libslic3r/Polygon.cpp index 5d12b3062..b14b7d0fa 100644 --- a/xs/src/libslic3r/Polygon.cpp +++ b/xs/src/libslic3r/Polygon.cpp @@ -248,23 +248,24 @@ Polygon::wkt() const Points Polygon::concave_points(double angle) const { - Points points; - angle = 2*PI - angle; + angle = 2*PI - angle + EPSILON; + const Points &pp = this->points; + Points concave; // check whether first point forms a concave angle - if (this->points.front().ccw_angle(this->points.back(), *(this->points.begin()+1)) <= angle) - points.push_back(this->points.front()); + if (pp.front().ccw_angle(pp.back(), *(pp.begin()+1)) <= angle) + concave.push_back(pp.front()); // check whether points 1..(n-1) form concave angles - for (Points::const_iterator p = this->points.begin()+1; p != this->points.end()-1; ++p) { - if (p->ccw_angle(*(p-1), *(p+1)) <= angle) points.push_back(*p); - } + for (Points::const_iterator p = pp.begin()+1; p != pp.end()-1; ++p) + if (p->ccw_angle(*(p-1), *(p+1)) <= angle) + concave.push_back(*p); // check whether last point forms a concave angle - if (this->points.back().ccw_angle(*(this->points.end()-2), this->points.front()) <= angle) - points.push_back(this->points.back()); + if (pp.back().ccw_angle(*(pp.end()-2), pp.front()) <= angle) + concave.push_back(pp.back()); - return points; + return concave; } // find all convex vertices (i.e. having an internal angle smaller than the supplied angle) @@ -272,23 +273,24 @@ Polygon::concave_points(double angle) const Points Polygon::convex_points(double angle) const { - Points points; - angle = 2*PI - angle; + angle = 2*PI - angle - EPSILON; + const Points &pp = this->points; + Points convex; // check whether first point forms a convex angle - if (this->points.front().ccw_angle(this->points.back(), *(this->points.begin()+1)) >= angle) - points.push_back(this->points.front()); + if (pp.front().ccw_angle(pp.back(), *(pp.begin()+1)) >= angle) + convex.push_back(pp.front()); // check whether points 1..(n-1) form convex angles - for (Points::const_iterator p = this->points.begin()+1; p != this->points.end()-1; ++p) { - if (p->ccw_angle(*(p-1), *(p+1)) >= angle) points.push_back(*p); - } + for (Points::const_iterator p = pp.begin()+1; p != pp.end()-1; ++p) + if (p->ccw_angle(*(p-1), *(p+1)) >= angle) + convex.push_back(*p); // check whether last point forms a convex angle - if (this->points.back().ccw_angle(*(this->points.end()-2), this->points.front()) >= angle) - points.push_back(this->points.back()); + if (pp.back().ccw_angle(*(pp.end()-2), pp.front()) >= angle) + convex.push_back(pp.back()); - return points; + return convex; } } From 180666468618517289e032dd3b89e0d65182c1b0 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Mon, 1 May 2017 17:25:48 +0200 Subject: [PATCH 09/44] Bugfix: spAligned didn't always work in multi-island layers. #3458 --- xs/src/libslic3r/GCode.cpp | 38 +++++++++++++++++++------------------- xs/src/libslic3r/Layer.cpp | 12 +++++++----- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/xs/src/libslic3r/GCode.cpp b/xs/src/libslic3r/GCode.cpp index f6ae8f75a..38d36857a 100644 --- a/xs/src/libslic3r/GCode.cpp +++ b/xs/src/libslic3r/GCode.cpp @@ -334,25 +334,19 @@ GCode::extrude(ExtrusionLoop loop, std::string description, double speed) // restore original winding order so that concave and convex detection always happens // on the right/outer side of the polygon - if (was_clockwise) { - for (Polygons::iterator p = simplified.begin(); p != simplified.end(); ++p) - p->reverse(); - } + if (was_clockwise) + for (Polygon &p : simplified) + p.reverse(); // concave vertices have priority Points candidates; - for (Polygons::const_iterator p = simplified.begin(); p != simplified.end(); ++p) { - Points concave = p->concave_points(PI*4/3); - candidates.insert(candidates.end(), concave.begin(), concave.end()); - } + for (const Polygon &p : simplified) + append_to(candidates, p.concave_points(PI*4/3)); // if no concave points were found, look for convex vertices - if (candidates.empty()) { - for (Polygons::const_iterator p = simplified.begin(); p != simplified.end(); ++p) { - Points convex = p->convex_points(PI*2/3); - candidates.insert(candidates.end(), convex.begin(), convex.end()); - } - } + if (candidates.empty()) + for (const Polygon &p : simplified) + append_to(candidates, p.convex_points(PI*2/3)); // retrieve the last start position for this object if (this->layer != NULL) { @@ -375,10 +369,9 @@ GCode::extrude(ExtrusionLoop loop, std::string description, double speed) if (!loop.split_at_vertex(point)) loop.split_at(point); } else if (!candidates.empty()) { Points non_overhang; - for (Points::const_iterator p = candidates.begin(); p != candidates.end(); ++p) { - if (!loop.has_overhang_point(*p)) - non_overhang.push_back(*p); - } + for (const Point &p : candidates) + if (!loop.has_overhang_point(p)) + non_overhang.push_back(p); if (!non_overhang.empty()) candidates = non_overhang; @@ -389,8 +382,15 @@ GCode::extrude(ExtrusionLoop loop, std::string description, double speed) point = last_pos.projection_onto(polygon); loop.split_at(point); } - if (this->layer != NULL) + if (this->layer != NULL) { + /* Keeping a single starting point for each object works best with objects + having a single island. In the other cases, this works when layers are + similar, so the algorithm picks the same chain of points. But when an + island disappears, the others might suffer from a starting point change + even if their shape didn't change. We should probably keep multiple + starting points for each layer and test all of them. */ this->_seam_position[this->layer->object()] = point; + } } else if (seam_position == spRandom) { if (loop.role == elrContourInternalPerimeter) { Polygon polygon = loop.polygon(); diff --git a/xs/src/libslic3r/Layer.cpp b/xs/src/libslic3r/Layer.cpp index 4837af9c0..721df879d 100644 --- a/xs/src/libslic3r/Layer.cpp +++ b/xs/src/libslic3r/Layer.cpp @@ -98,19 +98,21 @@ Layer::make_slices() this->slices.expolygons.reserve(slices.size()); // prepare ordering points + // While it's more computationally expensive, we use centroid() + // instead of first_point() because it's [much more] deterministic + // and preserves ordering across similar layers. Points ordering_points; ordering_points.reserve(slices.size()); - for (ExPolygons::const_iterator ex = slices.begin(); ex != slices.end(); ++ex) - ordering_points.push_back(ex->contour.first_point()); + for (const ExPolygon &ex : slices) + ordering_points.push_back(ex.contour.centroid()); // sort slices std::vector order; Slic3r::Geometry::chained_path(ordering_points, order); // populate slices vector - for (std::vector::const_iterator it = order.begin(); it != order.end(); ++it) { - this->slices.expolygons.push_back(slices[*it]); - } + for (const Points::size_type &o : order) + this->slices.expolygons.push_back(slices[o]); } void From 6382af2b650f8596b6ad51d31a0d2ec9a835678f Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Mon, 1 May 2017 19:09:06 +0200 Subject: [PATCH 10/44] Gracefully transform support_material_threshold = 0 into the default value instead of emitting an error. #3837 --- lib/Slic3r/Config.pm | 6 ------ xs/src/libslic3r/PrintConfig.cpp | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm index 167c733dd..930917dfd 100644 --- a/lib/Slic3r/Config.pm +++ b/lib/Slic3r/Config.pm @@ -269,12 +269,6 @@ sub validate { qw(perimeter infill solid_infill top_infill support_material first_layer); } - # support material - if ($self->support_material) { - die "Value of 0 is illegal. Use some % value instead (e.g. 150%) for auto.\n" - if $self->support_material_threshold =~ /^0+/; - } - # general validation, quick and dirty foreach my $opt_key (@{$self->get_keys}) { diff --git a/xs/src/libslic3r/PrintConfig.cpp b/xs/src/libslic3r/PrintConfig.cpp index 8a63ef268..e0771d596 100644 --- a/xs/src/libslic3r/PrintConfig.cpp +++ b/xs/src/libslic3r/PrintConfig.cpp @@ -1705,6 +1705,10 @@ PrintConfigBase::_handle_legacy(t_config_option_key &opt_key, std::string &value values is a dirty hack and will need to be removed sometime in the future, but it will avoid lots of complaints for now. */ value = "0"; + } else if (opt_key == "support_material_threshold" && value == "0") { + // 0 used to be automatic threshold, but we introduced percent values so let's + // transform it into the default value + value = "60%"; } // cemetery of old config settings From 8e263328677b6de4baca484908a014f020b95e48 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Mon, 1 May 2017 20:02:46 +0200 Subject: [PATCH 11/44] Add a serialize/unserialize roundtrip in test. #3921 --- xs/t/15_config.t | 1 + 1 file changed, 1 insertion(+) diff --git a/xs/t/15_config.t b/xs/t/15_config.t index f6efc8a5d..65854dca1 100644 --- a/xs/t/15_config.t +++ b/xs/t/15_config.t @@ -107,6 +107,7 @@ foreach my $config (Slic3r::Config->new, Slic3r::Config::Static::new_FullPrintCo is_deeply [ map $_->pp, @{$config->get('extruder_offset')} ], [[10,20],[30,45]], 'set/get points'; $config->set('extruder_offset', [Slic3r::Pointf->new(10,20),Slic3r::Pointf->new(30,45)]); is_deeply [ map $_->pp, @{$config->get('extruder_offset')} ], [[10,20],[30,45]], 'set/get points'; + $config->set_deserialize('extruder_offset', $config->serialize('extruder_offset')); is $config->serialize('extruder_offset'), '10x20,30x45', 'serialize points'; $config->set_deserialize('extruder_offset', '20x10'); is_deeply [ map $_->pp, @{$config->get('extruder_offset')} ], [[20,10]], 'deserialize points'; From c82302e284b08b8ba43e7dc641cfd386418f3561 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Tue, 2 May 2017 00:56:39 +0200 Subject: [PATCH 12/44] Fixed regression in dont_support_bridges. #3859 --- lib/Slic3r/Print/SupportMaterial.pm | 40 +++++++++++++++++++---------- xs/src/libslic3r/Polyline.cpp | 10 ++++---- xs/xsp/ExtrusionLoop.xsp | 1 + xs/xsp/ExtrusionPath.xsp | 1 + 4 files changed, 34 insertions(+), 18 deletions(-) diff --git a/lib/Slic3r/Print/SupportMaterial.pm b/lib/Slic3r/Print/SupportMaterial.pm index 1b1edf023..4c25dace2 100644 --- a/lib/Slic3r/Print/SupportMaterial.pm +++ b/lib/Slic3r/Print/SupportMaterial.pm @@ -208,20 +208,29 @@ sub contact_area { if ($conf->dont_support_bridges) { # compute the area of bridging perimeters - # Note: this is duplicate code from GCode.pm, we need to refactor - my $bridged_perimeters; # Polygons { my $bridge_flow = $layerm->flow(FLOW_ROLE_PERIMETER, 1); - my $nozzle_diameter = $self->print_config->get_at('nozzle_diameter', $layerm->region->config->perimeter_extruder-1); - my $lower_grown_slices = offset([ map @$_, @{$lower_layer->slices} ], +scale($nozzle_diameter/2)); + # Get the lower layer's slices and grow them by half the nozzle diameter + # because we will consider the upper perimeters supported even if half nozzle + # falls outside the lower slices. + my $lower_grown_slices; + { + my $nozzle_diameter = $self->print_config->get_at('nozzle_diameter', $layerm->region->config->perimeter_extruder-1); + $lower_grown_slices = offset( + [ map @$_, @{$lower_layer->slices} ], + +scale($nozzle_diameter/2), + ); + } - # TODO: split_at_first_point() could split a bridge mid-way - my @overhang_perimeters = - map { $_->isa('Slic3r::ExtrusionLoop') ? $_->polygon->split_at_first_point : $_->polyline->clone } - map @$_, @{$layerm->perimeters}; + # Get all perimeters as polylines. + # TODO: split_at_first_point() (called by as_polyline() for ExtrusionLoops) + # could split a bridge mid-way + my @overhang_perimeters = map $_->as_polyline, @{$layerm->perimeters->flatten}; + # Only consider the overhang parts of such perimeters, + # overhangs being those parts not supported by # workaround for Clipper bug, see Slic3r::Polygon::clip_as_polyline() $_->[0]->translate(1,0) for @overhang_perimeters; @overhang_perimeters = @{diff_pl( @@ -243,11 +252,16 @@ sub contact_area { # convert bridging polylines into polygons by inflating them with their thickness { - # since we're dealing with bridges, we can't assume width is larger than spacing, - # so we take the largest value and also apply safety offset to be ensure no gaps - # are left in between - my $w = max($bridge_flow->scaled_width, $bridge_flow->scaled_spacing); + # For bridges we can't assume width is larger than spacing because they + # are positioned according to non-bridging perimeters spacing. + my $w = max( + $bridge_flow->scaled_width, + $bridge_flow->scaled_spacing, + $fw, # width of external perimeters + $layerm->flow(FLOW_ROLE_PERIMETER)->scaled_width, + ); $bridged_perimeters = union([ + # Also apply safety offset to ensure no gaps are left in between. map @{$_->grow($w/2 + 10)}, @overhang_perimeters ]); } @@ -258,7 +272,7 @@ sub contact_area { my @bridges = map $_->expolygon, grep $_->bridge_angle != -1, @{$layerm->fill_surfaces->filter_by_type(S_TYPE_BOTTOMBRIDGE)}; - + $diff = diff( $diff, [ diff --git a/xs/src/libslic3r/Polyline.cpp b/xs/src/libslic3r/Polyline.cpp index baa2bbf5d..3c371ae71 100644 --- a/xs/src/libslic3r/Polyline.cpp +++ b/xs/src/libslic3r/Polyline.cpp @@ -198,12 +198,12 @@ Polyline::is_straight() const /* Check that each segment's direction is equal to the line connecting first point and last point. (Checking each line against the previous one would cause the error to accumulate.) */ - double dir = Line(this->first_point(), this->last_point()).direction(); + const double dir = Line(this->first_point(), this->last_point()).direction(); + + for (const Line &line : this->lines()) + if (!line.parallel_to(dir)) + return false; - Lines lines = this->lines(); - for (Lines::const_iterator line = lines.begin(); line != lines.end(); ++line) { - if (!line->parallel_to(dir)) return false; - } return true; } diff --git a/xs/xsp/ExtrusionLoop.xsp b/xs/xsp/ExtrusionLoop.xsp index 290265b19..6544f9bf6 100644 --- a/xs/xsp/ExtrusionLoop.xsp +++ b/xs/xsp/ExtrusionLoop.xsp @@ -31,6 +31,7 @@ bool is_infill(); bool is_solid_infill(); Polygons grow(); + Clone as_polyline(); %{ SV* diff --git a/xs/xsp/ExtrusionPath.xsp b/xs/xsp/ExtrusionPath.xsp index d9892d10c..a3819caef 100644 --- a/xs/xsp/ExtrusionPath.xsp +++ b/xs/xsp/ExtrusionPath.xsp @@ -27,6 +27,7 @@ bool is_solid_infill(); bool is_bridge(); Polygons grow(); + Clone as_polyline(); %{ ExtrusionPath* From 8c77f4763854d33255d61f7a7336c229dad080d7 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Tue, 2 May 2017 17:21:16 +0200 Subject: [PATCH 13/44] Fixed regression: no processing with background processing and auto-center parts enabled. #3862 --- lib/Slic3r/GUI/Plater.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm index a693ad47b..2cd8e52af 100644 --- a/lib/Slic3r/GUI/Plater.pm +++ b/lib/Slic3r/GUI/Plater.pm @@ -1502,7 +1502,7 @@ sub pause_background_process { return 1; } elsif (defined $self->{apply_config_timer} && $self->{apply_config_timer}->IsRunning) { $self->{apply_config_timer}->Stop; - return 1; + return 0; # we didn't actually pause any running thread; need to reschedule } return 0; From 245efea71a46617da9b8d11bf1b6732d364f9ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xoan=20Sampai=C3=B1o?= Date: Tue, 2 May 2017 19:04:04 +0200 Subject: [PATCH 14/44] Remove hardcoded font size for wxGTK When in wxGTK (GNU/Linux), some widgets has a hardcoded point size font that not fit with normal GUI font and therefore this widgets doesn't inherit changes in system font size. This commit only affect this platform, changing `!&Wx::wxMSW` to `&Wx::wxMAC`. --- lib/Slic3r/GUI.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm index def50e167..46e4614a9 100644 --- a/lib/Slic3r/GUI.pm +++ b/lib/Slic3r/GUI.pm @@ -93,9 +93,9 @@ our $Settings = { our $have_button_icons = &Wx::wxVERSION_STRING =~ / (?:2\.9\.[1-9]|3\.)/; our $small_font = Wx::SystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); -$small_font->SetPointSize(11) if !&Wx::wxMSW; +$small_font->SetPointSize(11) if &Wx::wxMAC; our $small_bold_font = Wx::SystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); -$small_bold_font->SetPointSize(11) if !&Wx::wxMSW; +$small_bold_font->SetPointSize(11) if &Wx::wxMAC; $small_bold_font->SetWeight(wxFONTWEIGHT_BOLD); our $medium_font = Wx::SystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); $medium_font->SetPointSize(12); From dfc364af3cb3ad650c99f4a8616b4ddf795843b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xoan=20Sampai=C3=B1o?= Date: Wed, 3 May 2017 21:28:53 +0200 Subject: [PATCH 15/44] Enhance scrolling by using font point size as scroll rate In wxWidgets documentation there are three ways to set the size of the scrolling area. The most automatic (and newest) way is by using SetScrollRate: * http://docs.wxwidgets.org/trunk/classwx_scrolled.html#details --- lib/Slic3r/GUI.pm | 4 ++++ lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm | 4 +++- lib/Slic3r/GUI/PresetEditor.pm | 5 +++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm index def50e167..d02baf868 100644 --- a/lib/Slic3r/GUI.pm +++ b/lib/Slic3r/GUI.pm @@ -101,6 +101,10 @@ our $medium_font = Wx::SystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); $medium_font->SetPointSize(12); our $grey = Wx::Colour->new(200,200,200); +# to use in ScrolledWindow::SetScrollRate(xstep, ystep) +# step related to system font point size +our $scroll_step = Wx::SystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)->GetPointSize; + our $VERSION_CHECK_EVENT : shared = Wx::NewEventType; our $DLP_projection_screen; diff --git a/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm b/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm index 1ab1c7ffa..f803fb8f8 100644 --- a/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm +++ b/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm @@ -89,7 +89,9 @@ sub new { } $self->SetSizer($self->{sizer}); - $self->SetScrollbars(0, 1, 0, 1); + + # http://docs.wxwidgets.org/3.0/classwx_scrolled.html#details + $self->SetScrollRate(0, $Slic3r::GUI::scroll_step); $self->set_opt_keys($params{opt_keys}) if $params{opt_keys}; $self->update_optgroup; diff --git a/lib/Slic3r/GUI/PresetEditor.pm b/lib/Slic3r/GUI/PresetEditor.pm index dbeae5568..aa78bb895 100644 --- a/lib/Slic3r/GUI/PresetEditor.pm +++ b/lib/Slic3r/GUI/PresetEditor.pm @@ -1602,11 +1602,12 @@ sub new { $self->{title} = $title; $self->{iconID} = $iconID; - $self->SetScrollbars(1, 1, 1, 1); - $self->{vsizer} = Wx::BoxSizer->new(wxVERTICAL); $self->SetSizer($self->{vsizer}); + # http://docs.wxwidgets.org/3.0/classwx_scrolled.html#details + $self->SetScrollRate($Slic3r::GUI::scroll_step, $Slic3r::GUI::scroll_step); + return $self; } From b762b38af019007d148dfefd486cf442389c9ece Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Thu, 4 May 2017 23:40:19 +0200 Subject: [PATCH 16/44] Removed bad label --- xs/src/libslic3r/PrintConfig.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/xs/src/libslic3r/PrintConfig.cpp b/xs/src/libslic3r/PrintConfig.cpp index e0771d596..9be29718d 100644 --- a/xs/src/libslic3r/PrintConfig.cpp +++ b/xs/src/libslic3r/PrintConfig.cpp @@ -1383,7 +1383,6 @@ PrintConfigDef::PrintConfigDef() def = this->add("support_material_interface_speed", coFloatOrPercent); def->label = "↳ interface"; - def->label = "Interface Speed"; def->category = "Support material interface speed"; def->gui_type = "f_enum_open"; def->category = "Support material"; From 1d97698270cc9de09cac8d8914e487d607db2d8f Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Fri, 5 May 2017 00:26:08 +0200 Subject: [PATCH 17/44] Ignore too thin extrusions when computing the volumetric speed, otherwise very slow speeds would be generated. #3868 --- lib/Slic3r/Print/GCode.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Slic3r/Print/GCode.pm b/lib/Slic3r/Print/GCode.pm index 710125c5e..3080e1343 100644 --- a/lib/Slic3r/Print/GCode.pm +++ b/lib/Slic3r/Print/GCode.pm @@ -403,8 +403,8 @@ sub process_layer { push @mm3_per_mm, $layer->support_interface_fills->min_mm3_per_mm; } } - # filter out 0-width segments - @mm3_per_mm = grep $_ > 0.000001, @mm3_per_mm; + # ignore too thin segments + @mm3_per_mm = grep $_ > 0.01, @mm3_per_mm; if (@mm3_per_mm) { my $min_mm3_per_mm = min(@mm3_per_mm); # In order to honor max_print_speed we need to find a target volumetric From 788cbebcfc7e83e9b7131525a4d871c73ae47294 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Mon, 8 May 2017 21:09:37 +0200 Subject: [PATCH 18/44] Bugfix: crash when optimizing bridges. #3928 --- xs/src/libslic3r/LayerRegion.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/xs/src/libslic3r/LayerRegion.cpp b/xs/src/libslic3r/LayerRegion.cpp index 5b4a6cc5c..9ba33d236 100644 --- a/xs/src/libslic3r/LayerRegion.cpp +++ b/xs/src/libslic3r/LayerRegion.cpp @@ -74,17 +74,17 @@ LayerRegion::process_external_surfaces() Surfaces &surfaces = this->fill_surfaces.surfaces; for (size_t j = 0; j < surfaces.size(); ++j) { - Surface &surface = surfaces[j]; + // we don't get any reference to surface because it would be invalidated + // by the erase() call below - if (this->layer()->lower_layer != NULL && surface.is_bridge()) { + if (this->layer()->lower_layer != NULL && surfaces[j].is_bridge()) { // If this bridge has one or more holes that are internal surfaces // (thus not visible from the outside), like a slab sustained by // pillars, include them in the bridge in order to have better and // more continuous bridging. - Polygons &holes = surface.expolygon.holes; - for (int i = 0; i < holes.size(); ++i) { + for (int i = 0; i < surfaces[j].expolygon.holes.size(); ++i) { // reverse the hole and consider it a polygon - Polygon h = holes[i]; + Polygon h = surfaces[j].expolygon.holes[i]; h.reverse(); // Is this hole fully contained in the layer slices? @@ -94,10 +94,12 @@ LayerRegion::process_external_surfaces() if (k == j) continue; if (h.contains(surfaces[k].expolygon.contour.first_point())) { surfaces.erase(surfaces.begin() + k); + if (j > k) --j; --k; } } + Polygons &holes = surfaces[j].expolygon.holes; holes.erase(holes.begin() + i); --i; } From 67d42f9e4f41744991c25c9707da317712f1f3f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xoan=20Sampai=C3=B1o?= Date: Mon, 8 May 2017 20:58:11 +0200 Subject: [PATCH 19/44] Skip event handling in 3D/Layer preview tab when no UP or DOWN key is pressed * fixes alexrj/Slic3r#3792 --- lib/Slic3r/GUI/Plater/2DToolpaths.pm | 2 ++ lib/Slic3r/GUI/Plater/3DPreview.pm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lib/Slic3r/GUI/Plater/2DToolpaths.pm b/lib/Slic3r/GUI/Plater/2DToolpaths.pm index c7b3765c0..2c5a4a7d6 100644 --- a/lib/Slic3r/GUI/Plater/2DToolpaths.pm +++ b/lib/Slic3r/GUI/Plater/2DToolpaths.pm @@ -60,6 +60,8 @@ sub new { } elsif ($key == 68 || $key == 317) { $slider->SetValue($slider->GetValue - 1); $self->set_z($self->{layers_z}[$slider->GetValue]); + } else { + $event->Skip; } }); diff --git a/lib/Slic3r/GUI/Plater/3DPreview.pm b/lib/Slic3r/GUI/Plater/3DPreview.pm index dddefee01..8fa9188ef 100644 --- a/lib/Slic3r/GUI/Plater/3DPreview.pm +++ b/lib/Slic3r/GUI/Plater/3DPreview.pm @@ -58,6 +58,8 @@ sub new { } elsif ($key == 68 || $key == 317) { $slider->SetValue($slider->GetValue - 1); $self->set_z($self->{layers_z}[$slider->GetValue]); + } else { + $event->Skip; } }); From a06b11db8e2aa49eedaecc6720b2644a5a8da314 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Tue, 9 May 2017 16:05:02 +0200 Subject: [PATCH 20/44] Bugfix: gap_fill_speed didn't actually support autospeed. #3696 --- xs/src/libslic3r/PrintConfig.cpp | 4 ++-- xs/src/libslic3r/PrintConfig.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xs/src/libslic3r/PrintConfig.cpp b/xs/src/libslic3r/PrintConfig.cpp index 9be29718d..ccf9ccc7e 100644 --- a/xs/src/libslic3r/PrintConfig.cpp +++ b/xs/src/libslic3r/PrintConfig.cpp @@ -578,7 +578,7 @@ PrintConfigDef::PrintConfigDef() def->default_value = opt; } - def = this->add("gap_fill_speed", coFloat); + def = this->add("gap_fill_speed", coFloatOrPercent); def->label = "↳ gaps"; def->full_label = "Gap fill speed"; def->gui_type = "f_enum_open"; @@ -590,7 +590,7 @@ PrintConfigDef::PrintConfigDef() def->min = 0; def->enum_values.push_back("0"); def->enum_labels.push_back("auto"); - def->default_value = new ConfigOptionFloat(20); + def->default_value = new ConfigOptionFloatOrPercent(20); def = this->add("gcode_arcs", coBool); def->label = "Use native G-code arcs"; diff --git a/xs/src/libslic3r/PrintConfig.hpp b/xs/src/libslic3r/PrintConfig.hpp index ce5162ffa..856e5def1 100644 --- a/xs/src/libslic3r/PrintConfig.hpp +++ b/xs/src/libslic3r/PrintConfig.hpp @@ -219,7 +219,7 @@ class PrintRegionConfig : public virtual StaticPrintConfig ConfigOptionPercent fill_density; ConfigOptionBool fill_gaps; ConfigOptionEnum fill_pattern; - ConfigOptionFloat gap_fill_speed; + ConfigOptionFloatOrPercent gap_fill_speed; ConfigOptionInt infill_extruder; ConfigOptionFloatOrPercent infill_extrusion_width; ConfigOptionInt infill_every_layers; From 97cf94c694ad8a68f84160fd9fbee35f14595891 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Tue, 9 May 2017 23:54:05 +0200 Subject: [PATCH 21/44] Fixed error in last commit preventing compilation --- xs/src/libslic3r/PrintConfig.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xs/src/libslic3r/PrintConfig.cpp b/xs/src/libslic3r/PrintConfig.cpp index ccf9ccc7e..ff206b1f5 100644 --- a/xs/src/libslic3r/PrintConfig.cpp +++ b/xs/src/libslic3r/PrintConfig.cpp @@ -590,7 +590,7 @@ PrintConfigDef::PrintConfigDef() def->min = 0; def->enum_values.push_back("0"); def->enum_labels.push_back("auto"); - def->default_value = new ConfigOptionFloatOrPercent(20); + def->default_value = new ConfigOptionFloatOrPercent(20, false); def = this->add("gcode_arcs", coBool); def->label = "Use native G-code arcs"; From b12453cf5956a3edac00d909fb61fdb9129fdd3b Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Wed, 10 May 2017 16:17:28 +0200 Subject: [PATCH 22/44] Remember object settings dialog size and position. #3943 --- lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm b/lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm index 854748765..752b4a32c 100644 --- a/lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm +++ b/lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm @@ -30,6 +30,9 @@ sub new { # notify tabs $self->{layers}->Closing; + # save window size + wxTheApp->save_window_pos($self, "object_settings"); + $self->EndModal(wxID_OK); $self->Destroy; }); @@ -41,6 +44,8 @@ sub new { $self->SetSizer($sizer); $self->SetMinSize($self->GetSize); + wxTheApp->restore_window_pos($self, "object_settings"); + return $self; } From 893cab752362f58f49024e354a40f96dc4eff43e Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Wed, 10 May 2017 17:14:21 +0200 Subject: [PATCH 23/44] Restore path simplification for "Avoid crossing perimeters". Algorithm is now faster as we're simplifying input geometry. #3940 --- xs/src/libslic3r/MotionPlanner.cpp | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/xs/src/libslic3r/MotionPlanner.cpp b/xs/src/libslic3r/MotionPlanner.cpp index 1f604d5fa..7a6efa10c 100644 --- a/xs/src/libslic3r/MotionPlanner.cpp +++ b/xs/src/libslic3r/MotionPlanner.cpp @@ -13,17 +13,17 @@ MotionPlanner::MotionPlanner(const ExPolygons &islands) : initialized(false) { ExPolygons expp; - for (ExPolygons::const_iterator island = islands.begin(); island != islands.end(); ++island) - island->simplify(SCALED_EPSILON, &expp); + for (const ExPolygon &island : islands) + island.simplify(MP_INNER_MARGIN/10, &expp); - for (ExPolygons::const_iterator island = expp.begin(); island != expp.end(); ++island) - this->islands.push_back(MotionPlannerEnv(*island)); + for (const ExPolygon &island : expp) + this->islands.push_back(MotionPlannerEnv(island)); } MotionPlanner::~MotionPlanner() { - for (std::vector::iterator graph = this->graphs.begin(); graph != this->graphs.end(); ++graph) - delete *graph; + for (MotionPlannerGraph* graph : this->graphs) + delete graph; } size_t @@ -40,20 +40,20 @@ MotionPlanner::initialize() // loop through islands in order to create inner expolygons and collect their contours Polygons outer_holes; - for (std::vector::iterator island = this->islands.begin(); island != this->islands.end(); ++island) { + for (MotionPlannerEnv island : this->islands) { // generate the internal env boundaries by shrinking the island // we'll use these inner rings for motion planning (endpoints of the Voronoi-based // graph, visibility check) in order to avoid moving too close to the boundaries - island->env = offset_ex(island->island, -MP_INNER_MARGIN); + island.env = offset_ex(island.island, -MP_INNER_MARGIN); // island contours are holes of our external environment - outer_holes.push_back(island->island.contour); + outer_holes.push_back(island.island.contour); } // generate outer contour as bounding box of everything BoundingBox bb; - for (Polygons::const_iterator contour = outer_holes.begin(); contour != outer_holes.end(); ++contour) - bb.merge(contour->bounding_box()); + for (const Polygon contour : outer_holes) + bb.merge(contour.bounding_box()); // grow outer contour Polygons contour = offset(bb.polygon(), +MP_OUTER_MARGIN*2); @@ -166,12 +166,16 @@ MotionPlanner::shortest_path(const Point &from, const Point &to) } } + // Perform some quick simplification (simplify_by_visibility() would make this + // unnecessary, but this is much faster) + polyline.simplify(MP_INNER_MARGIN/10); + // remove unnecessary vertices // Note: this is computationally intensive and does not look very necessary // now that we prune the endpoints with the logic above, // so we comment it for now until a good test case arises //polyline.simplify_by_visibility(grown_env); - + /* SVG svg("shortest_path.svg"); svg.draw(grown_env.expolygons); From f74a91532dcf0a4f8a2e6bd15b38557f8c80cca4 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Wed, 10 May 2017 23:21:22 +0200 Subject: [PATCH 24/44] Detect bridge direction also when lower slices have narrow gaps. #3929 --- t/bridges.t | 26 +++++++++++++++++++---- xs/src/libslic3r/BridgeDetector.cpp | 33 +++++++++++++++++++++++++---- xs/src/libslic3r/BridgeDetector.hpp | 3 ++- xs/src/libslic3r/Fill/Fill.cpp | 7 ++---- 4 files changed, 55 insertions(+), 14 deletions(-) diff --git a/t/bridges.t b/t/bridges.t index 95db67daf..677115b84 100644 --- a/t/bridges.t +++ b/t/bridges.t @@ -1,4 +1,4 @@ -use Test::More tests => 18; +use Test::More tests => 20; use strict; use warnings; @@ -99,6 +99,24 @@ use Slic3r::Test; 'correct bridge angle for rectangle'; } +{ + # GH #3929: This test case checks that narrow gaps in lower slices don't prevent correct + # direction detection. + my $bridge = Slic3r::ExPolygon->new( + Slic3r::Polygon->new([10099996,45867519],[3762370,45867519],[3762370,2132479],[10099996,2132479]), + ); + my $lower = [ + Slic3r::ExPolygon->new( + Slic3r::Polygon->new([13534103,210089],[13629884,235753],[14249999,401901],[14269611,421510],[14272931,424830],[14287518,439411],[14484206,636101],[15348099,1500000],[15360812,1547449],[15365467,1564815],[15388623,1651235],[15391897,1663454],[15393088,1667906],[15399044,1690134],[15457593,1908648],[15750000,2999999],[15750000,45000000],[15742825,45026783],[15741540,45031580],[15735900,45052628],[15663980,45321047],[15348099,46500000],[15151410,46696691],[14287518,47560587],[14267907,47580196],[14264587,47583515],[14249999,47598100],[14211041,47608539],[14204785,47610215],[14176024,47617916],[14105602,47636784],[14097768,47638884],[14048000,47652220],[13871472,47699515],[12750000,48000000],[10446106,48000000],[10446124,47990347],[10446124,9652],[10446106,0],[12750000,0]), + Slic3r::Polygon->new([10251886,5013],[10251886,47994988],[10251907,48000000],[10100006,48000000],[10100006,0],[10251907,0]), + Slic3r::Polygon->new([3762360,17017],[3762360,47982984],[3762397,48000000],[1249999,48000000],[536029,47808700],[456599,47787419],[73471,47684764],[0,47665076],[0,23124327],[119299,22907322],[159278,22834601],[196290,22690451],[239412,22522516],[303787,22271780],[639274,20965103],[639274,19034896],[616959,18947983],[607651,18911729],[559146,18722807],[494769,18472073],[159278,17165397],[38931,16946491],[0,16875676],[0,334922],[128529,300484],[1250000,0],[3762397,0]), + ), + ]; + + ok check_angle($lower, $bridge, 0, undef, $bridge->area, 500000), + 'correct bridge angle when lower slices have narrow gap'; +} + sub check_angle { my ($lower, $bridge, $expected, $tolerance, $expected_coverage, $extrusion_width) = @_; @@ -121,9 +139,9 @@ sub check_angle { # our epsilon is equal to the steps used by the bridge detection algorithm ###use XXX; YYY [ rad2deg($result), $expected ]; # returned value must be non-negative, check for that too - my $delta=rad2deg($result) - $expected; - $delta-=180 if $delta>=180 - epsilon; - return defined $result && $result>=0 && abs($delta) < $tolerance; + my $delta = rad2deg($result) - $expected; + $delta -= 180 if $delta >= 180 - epsilon; + return defined $result && $result >= 0 && abs($delta) < $tolerance; } { diff --git a/xs/src/libslic3r/BridgeDetector.cpp b/xs/src/libslic3r/BridgeDetector.cpp index 33c239d6f..255b78a2a 100644 --- a/xs/src/libslic3r/BridgeDetector.cpp +++ b/xs/src/libslic3r/BridgeDetector.cpp @@ -7,13 +7,23 @@ namespace Slic3r { BridgeDetector::BridgeDetector(const ExPolygon &_expolygon, const ExPolygonCollection &_lower_slices, coord_t _extrusion_width) - : expolygon(_expolygon), lower_slices(_lower_slices), extrusion_width(_extrusion_width), + : expolygon(_expolygon), extrusion_width(_extrusion_width), resolution(PI/36.0), angle(-1) { /* outset our bridge by an arbitrary amout; we'll use this outer margin for detecting anchors */ Polygons grown = offset(this->expolygon, this->extrusion_width); + // remove narrow gaps from lower slices + // (this is only needed as long as we use clipped test lines for angle detection + // and we check their endpoints: when endpoint fall in the gap we'd get false + // negatives) + this->lower_slices.expolygons = offset2_ex( + _lower_slices, + +this->extrusion_width/2, + -this->extrusion_width/2 + ); + // detect what edges lie on lower slices by turning bridge contour and holes // into polylines and then clipping them with each lower slice's contour this->_edges = intersection_pl(grown, this->lower_slices.contours()); @@ -34,6 +44,10 @@ BridgeDetector::BridgeDetector(const ExPolygon &_expolygon, const ExPolygonColle svg.draw(this->_anchors, "yellow"); svg.draw(this->_edges, "black", scale_(0.2)); svg.Close(); + + std::cout << "expolygon: " << this->expolygon.dump_perl() << std::endl; + for (const ExPolygon &e : this->lower_slices.expolygons) + std::cout << "lower: " << e.dump_perl() << std::endl; } #endif } @@ -133,6 +147,13 @@ BridgeDetector::detect_angle() )); } if (candidate.coverage > 0) have_coverage = true; + + #if 0 + std::cout << "angle = " << Slic3r::Geometry::rad2deg(candidate.angle) + << "; coverage = " << candidate.coverage + << "; max_length = " << candidate.max_length + << std::endl; + #endif } // if no direction produced coverage, then there's no bridge direction @@ -159,12 +180,16 @@ BridgeDetector::detect_angle() return true; } +Polygons +BridgeDetector::coverage() const +{ + if (this->angle == -1) return Polygons(); + return this->coverage(this->angle); +} + Polygons BridgeDetector::coverage(double angle) const { - if (angle == -1) angle = this->angle; - if (angle == -1) return Polygons(); - // Clone our expolygon and rotate it so that we work with vertical lines. ExPolygon expolygon = this->expolygon; expolygon.rotate(PI/2.0 - angle, Point(0,0)); diff --git a/xs/src/libslic3r/BridgeDetector.hpp b/xs/src/libslic3r/BridgeDetector.hpp index 84f9f3848..9abe1162a 100644 --- a/xs/src/libslic3r/BridgeDetector.hpp +++ b/xs/src/libslic3r/BridgeDetector.hpp @@ -23,7 +23,8 @@ public: BridgeDetector(const ExPolygon &_expolygon, const ExPolygonCollection &_lower_slices, coord_t _extrusion_width); bool detect_angle(); - Polygons coverage(double angle = -1) const; + Polygons coverage() const; + Polygons coverage(double angle) const; Polylines unsupported_edges(double angle = -1) const; private: diff --git a/xs/src/libslic3r/Fill/Fill.cpp b/xs/src/libslic3r/Fill/Fill.cpp index 39c9107b9..c07851fb1 100644 --- a/xs/src/libslic3r/Fill/Fill.cpp +++ b/xs/src/libslic3r/Fill/Fill.cpp @@ -1,10 +1,9 @@ -#define DEBUG -#undef NDEBUG #include #include #include #include "../ClipperUtils.hpp" +#include "../Geometry.hpp" #include "../Surface.hpp" #include "../PrintConfig.hpp" @@ -96,10 +95,8 @@ Fill::_infill_direction(const Surface &surface) const if (surface.bridge_angle >= 0) { // use bridge angle - //FIXME Vojtech: Add a debugf? - // Slic3r::debugf "Filling bridge with angle %d\n", rad2deg($surface->bridge_angle); #ifdef SLIC3R_DEBUG - printf("Filling bridge with angle %f\n", surface.bridge_angle); + printf("Filling bridge with angle %f\n", Slic3r::Geometry::rad2deg(surface.bridge_angle)); #endif out_angle = surface.bridge_angle; } else if (this->layer_id != size_t(-1)) { From 9670f2b712c509487235bd97dda859cf2c55ec97 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Fri, 12 May 2017 19:25:58 +0200 Subject: [PATCH 25/44] Fixed typo causing test failure --- xs/src/libslic3r/MotionPlanner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xs/src/libslic3r/MotionPlanner.cpp b/xs/src/libslic3r/MotionPlanner.cpp index 7a6efa10c..c63ea2338 100644 --- a/xs/src/libslic3r/MotionPlanner.cpp +++ b/xs/src/libslic3r/MotionPlanner.cpp @@ -40,7 +40,7 @@ MotionPlanner::initialize() // loop through islands in order to create inner expolygons and collect their contours Polygons outer_holes; - for (MotionPlannerEnv island : this->islands) { + for (MotionPlannerEnv &island : this->islands) { // generate the internal env boundaries by shrinking the island // we'll use these inner rings for motion planning (endpoints of the Voronoi-based // graph, visibility check) in order to avoid moving too close to the boundaries From b52de34304a9691abb1361c12d2489c658521787 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sat, 13 May 2017 13:00:47 -0500 Subject: [PATCH 26/44] Added note about not reporting Prusa3d bugs here. --- .github/ISSUE_TEMPLATE.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 84fb5e570..c890df33c 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,7 +1,9 @@ ### Version _Version of Slic3r used goes here_ -_Use `About->About Slic3r` for release versions_ +_Use `About->About Slic3r` for release versions._ + +_Do not report Prusa3D Slic3r bugs here without confirming it is a problem on a development release of Slic3r, or your issue will be closed. *Only* use normal Slic3r version IDs._ _For -dev versions, use `git describe --tag` or get the hash value for the version you downloaded or `git rev-parse HEAD`_ From b826f8baeabbf094beb4b63fe29fb1e64f0d9136 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sun, 14 May 2017 12:51:12 -0500 Subject: [PATCH 27/44] Windows 32-bit build. (#3954) * Updated appveyor, preinstall, and deploy script to build 32 and 64 bit versions. --- appveyor.yml | 30 ++++++++------ package/win/appveyor_buildscript.ps1 | 18 ++++++--- package/win/appveyor_preinstall.ps1 | 59 +++++++++++++++++----------- package/win/package_win32.ps1 | 11 +++++- 4 files changed, 74 insertions(+), 44 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 701f5ca6c..c3d24925d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,39 +7,45 @@ environment: SLIC3R_STATIC: 1 SLIC3R_VERSION: 1.3.0 BOOST_DIR: C:\dev\boost_1_63_0 + WXDIR: C:\dev\wxwidgets WXSHARED: SHARED=0 - FORCE_WX_BUILD: 0 - FORCE_BOOST_REINSTALL: 0 + FORCE_WX_BUILD: 1 + FORCE_BOOST_REINSTALL: 1 ENC_SECRET: secure: QfeTOSKXz1uFCEACqFKLNw== UPLOAD_USER: secure: fYPwnI3p6HNR+eMRJR3JfmyNolFn+Uc0MUn2bBXp9uU= + matrix: + - ARCH: 64bit + - ARCH: 32bit install: - IF DEFINED ENC_SECRET nuget install secure-file -ExcludeVersion - IF DEFINED ENC_SECRET secure-file\tools\secure-file -decrypt package/deploy/slic3r-upload.ppk.enc -secret %ENC_SECRET% - ps: "& package/win/appveyor_preinstall.ps1" cache: -- C:\Users\appveyor\boost.1.63.0.7z -- C:\Users\appveyor\local-lib.7z -- C:\Strawberry\perl\site -- C:\Users\appveyor\freeglut.7z -- C:\users\appveyor\strawberry.msi +- C:\Users\appveyor\local-lib-64bit.7z +- C:\Users\appveyor\local-lib-32bit.7z +- C:\Users\appveyor\freeglut.64bit.7z +- C:\Users\appveyor\freeglut.32bit.7z +- C:\users\appveyor\strawberry.64bit.msi +- C:\users\appveyor\strawberry.32bit.msi - C:\Users\appveyor\winscp.zip - C:\Users\appveyor\extra_perl.7z -- C:\Users\appveyor\wxwidgets.7z +- C:\Users\appveyor\wxwidgets-64bit.7z +- C:\Users\appveyor\wxwidgets-32bit.7z +- C:\Users\appveyor\boost.1.63.0.32bit.7z +- C:\Users\appveyor\boost.1.63.0.64bit.7z build_script: - ps: "& package/win/appveyor_buildscript.ps1" -test_script: -- ps: "mkdir C:\\Andrés\nwget \"http://www.thingiverse.com/download:73351\" -o\"C:\\Andrés\\5mm.stl\"\necho \"bed_temperature=60\" > C:\\Andrés\\test.ini\n\ncd C:\\projects\\slic3r\nperl slic3r.pl --load \"C:\\Andrés\\test.ini\" \"C:\\Andrés\\5mm.stl\"\n\nif (!(Test-Path \"C:\\Andrés\\5mm.gcode\")) {\necho \"IS IT HERE\"\n}" artifacts: - path: .\slic3r*zip name: slic3r-dev deploy_script: -- ps: "& package/win/appveyor_deploy.ps1" +- ps: "cd C:/projects/slic3r; & package/win/appveyor_deploy.ps1" on_success: - ps: on_failure: -- ps: + - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) on_finish: - ps: diff --git a/package/win/appveyor_buildscript.ps1 b/package/win/appveyor_buildscript.ps1 index 4f98dcbf4..f09fdaadd 100644 --- a/package/win/appveyor_buildscript.ps1 +++ b/package/win/appveyor_buildscript.ps1 @@ -1,20 +1,26 @@ -if (!(Test-Path "C:\users\appveyor\local-lib.7z")) { - wget "http://www.siusgs.com/slic3r/buildserver/win/slic3r-perl-dependencies-5.24.0-win-seh-gcc6.3.0-x64.7z" -o "C:\users\appveyor\local-lib.7z" | Write-Output +if (!(Test-Path "C:\users\appveyor\local-lib-$env:ARCH.7z")) { + wget "https://bintray.com/lordofhyphens/Slic3r/download_file?file_path=local-lib-$env:ARCH.7z" -o "C:\users\appveyor\local-lib-$env:ARCH.7z" | Write-Output } -if (Test-Path "C:\users\appveyor\local-lib.7z") { - cmd /c "7z x C:\Users\appveyor\local-lib.7z -oC:\projects\slic3r" -y | Write-Output +if (Test-Path "C:\users\appveyor\local-lib-$env:ARCH.7z") { + cmd /c "7z x C:\Users\appveyor\local-lib-$env:ARCH.7z -oC:\projects\slic3r" -y | Write-Output rm -r 'C:\projects\slic3r\local-lib\Slic3r*' } $env:Path = "C:\Strawberry\c\bin;C:\Strawberry\perl\bin;" + $env:Path cd C:\projects\slic3r + rm -r 'C:\Program Files (x86)\Microsoft Vis*\bin' -Force + Add-AppveyorCompilationMessage -Message "Building Slic3r XS" -perl Build.pl -if (-NOT ($LASTEXITCODE -eq 0)) { +perl ./Build.pl + +if ($LastExitCode -ne 0) { Add-AppveyorCompilationMessage -Message "XS Failed to Build" -Category Error + $host.SetShouldExit($LastExitCode) + exit } + Add-AppveyorCompilationMessage -Message "Making ZIP package" cd package/win ./compile_wrapper.ps1 524| Write-Output diff --git a/package/win/appveyor_preinstall.ps1 b/package/win/appveyor_preinstall.ps1 index 4ba912e14..90b9be7ec 100644 --- a/package/win/appveyor_preinstall.ps1 +++ b/package/win/appveyor_preinstall.ps1 @@ -1,19 +1,28 @@ mkdir C:\projects\slic3r\FreeGLUT -if (!(Test-Path "C:\users\appveyor\freeglut.7z")) +if (!(Test-Path "C:\users\appveyor\freeglut.$env:ARCH.7z")) { - wget "http://www.siusgs.com/slic3r/buildserver/win/freeglut-mingw-3.0.0.win64.7z" -o C:\users\appveyor\freeglut.7z + wget "https://bintray.com/lordofhyphens/Slic3r/download_file?file_path=freeglut-mingw-3.0.0.$env:ARCH.7z" -o C:\users\appveyor\freeglut.$env:ARCH.7z } -cmd /c "7z x C:\Users\appveyor\freeglut.7z -oC:\projects\slic3r\FreeGLUT" +cmd /c "7z x C:\Users\appveyor\freeglut.$env:ARCH.7z -oC:\projects\slic3r\FreeGLUT" -if (!(Test-Path "C:\users\appveyor\strawberry.msi")) { - wget "https://bintray.com/lordofhyphens/Slic3r/download_file?file_path=slic3r-perl-5.24.1.4-64bit.msi" -o "C:\users\appveyor\strawberry.msi" | Write-Output -} -if (!(Test-Path "C:\users\appveyor\extra_perl.7z")) { - wget "https://bintray.com/lordofhyphens/Slic3r/download_file?file_path=Strawberry-6.3.0-seg-archive.7z" -o "C:\users\appveyor\extra_perl.7z" | Write-Output +if (!(Test-Path "C:\users\appveyor\strawberry.$env:ARCH.msi")) { + if ($env:ARCH -eq "64bit") { + wget "https://bintray.com/lordofhyphens/Slic3r/download_file?file_path=slic3r-perl-5.24.1.4-64bit.msi" -o "C:\users\appveyor\strawberry.$env:ARCH.msi" | Write-Output + } else { + wget "http://strawberryperl.com/download/5.24.1.1/strawberry-perl-5.24.1.1-32bit.msi" -o "C:\users\appveyor\strawberry.$env:ARCH.msi" | Write-Output + } } -msiexec.exe /i "C:\users\appveyor\strawberry.msi" /quiet -cmd /c "7z x -aoa C:\Users\appveyor\extra_perl.7z -oC:\" +if (!($env:ARCH -eq "32bit")) { + if (!(Test-Path "C:\users\appveyor\extra_perl.7z")) { + wget "https://bintray.com/lordofhyphens/Slic3r/download_file?file_path=Strawberry-6.3.0-seg-archive.7z" -o "C:\users\appveyor\extra_perl.7z" | Write-Output + } +} + +msiexec.exe /i "C:\users\appveyor\strawberry.$env:ARCH.msi" /quiet +if (!($env:ARCH -eq "32bit")) { + cmd /c "7z x -aoa C:\Users\appveyor\extra_perl.7z -oC:\" +} if (!(Test-Path "C:\users\appveyor\winscp.zip")) { wget "https://bintray.com/lordofhyphens/Slic3r/download_file?file_path=WinSCP-5.9.4-Portable.zip" -o "C:\users\appveyor\winscp.zip" | Write-Output @@ -33,10 +42,14 @@ if(Test-Path -Path 'C:\Strawberry' ) { cmd /c mklink /D C:\Perl C:\Strawberry\perl mkdir C:\dev if (!(Test-Path "C:\users\appveyor\boost.1.63.0.7z") -Or $env:FORCE_BOOST_REINSTALL -eq 1) { - wget "https://bintray.com/lordofhyphens/Slic3r/download_file?file_path=boost_1_63_0-x64-gcc-6.3.0-seh.7z" -O "C:\users\appveyor\boost.1.63.0.7z" | Write-Output + if ($env:ARCH -eq "64bit") { + wget "http://www.siusgs.com/slic3r/buildserver/win/boost_1_63_0-x64-gcc-6.3.0-seh.7z" -O "C:\users\appveyor\boost.1.63.0.$env:ARCH.7z" | Write-Output + } else { + wget "https://bintray.com/lordofhyphens/Slic3r/download_file?file_path=boost_1_63_0-x32-gcc-4.9.2-sjlj.7z" -O "C:\users\appveyor\boost.1.63.0.$env:ARCH.7z" | Write-Output + } } Add-AppveyorCompilationMessage -Message "Extracting cached archive." - cmd /c "7z x C:\Users\appveyor\boost.1.63.0.7z -oC:\dev" + cmd /c "7z x C:\Users\appveyor\boost.1.63.0.$env:ARCH.7z -oC:\dev" mkdir C:\dev\CitrusPerl cmd /C mklink /D C:\dev\CitrusPerl\mingw32 C:\Strawberry\c @@ -53,19 +66,17 @@ if(Test-Path -Path 'C:\Strawberry' ) { Add-AppveyorCompilationMessage -Message "Installing wxWidgets (xsgui dependency))" if ($env:FORCE_WX_BUILD -eq 1) { - rm "C:\Users\appveyor\wxwidgets.7z" -Force + rm "C:\Users\appveyor\wxwidgets-$env:ARCH.7z" -Force } -if (!(Test-Path "C:\Users\appveyor\wxwidgets.7z")) { - Add-AppveyorCompilationMessage -Message "Compiling wxWidgets" - git clone https://github.com/wxWidgets/wxWidgets -b "v3.1.0" -q C:\dev\wxWidgets - cd C:\dev\wxwidgets - cp .\include\wx\msw\setup0.h include/wx/msw/setup.h - cd build\msw - mingw32-make -f makefile.gcc CXXFLAGS="-std=gnu++11" BUILD=release VENDOR=Slic3r - cd C:\dev - 7z a C:\Users\appveyor\wxwidgets.7z wxwidgets - cd C:\projects\slic3r + +if (!(Test-Path "C:\Users\appveyor\wxwidgets-$env:ARCH.7z")) { + Add-AppveyorCompilationMessage -Message "Extracting wxWidgets for $env:ARCH" + wget "https://bintray.com/lordofhyphens/Slic3r/download_file?file_path=wxwidgets-$env:ARCH.7z" -o C:\users\appveyor\wxwidgets-$env:ARCH.7z + 7z x C:\users\appveyor\wxwidgets-$env:ARCH.7z -oC:\dev } else { Add-AppveyorCompilationMessage -Message "Extracting prebuilt wxWidgets." - 7z x "C:\Users\appveyor\wxwidgets.7z" -oC:\dev + 7z x "C:\Users\appveyor\wxwidgets-$env:ARCH.7z" -oC:\dev } + +cpan App::cpanminus +cpan PAR::Packer diff --git a/package/win/package_win32.ps1 b/package/win/package_win32.ps1 index 8c1cc977a..717b30488 100644 --- a/package/win/package_win32.ps1 +++ b/package/win/package_win32.ps1 @@ -41,6 +41,12 @@ if ($exe) { New-Variable -Name "STRAWBERRY_PATH" -Value "C:\Strawberry" cpanm "PAR::Packer" +if ($env:ARCH -eq "32bit") { + $perlarch = "sjlj" +} else { + $perlarch = "seh" +} + pp ` -a "slic3r.exe;slic3r.exe" ` @@ -54,9 +60,10 @@ pp ` -a "../../FreeGLUT/freeglut.dll;freeglut.dll" ` -a "${STRAWBERRY_PATH}\perl\bin\perl${perlversion}.dll;perl${perlversion}.dll" ` -a "${STRAWBERRY_PATH}\perl\bin\libstdc++-6.dll;libstdc++-6.dll" ` --a "${STRAWBERRY_PATH}\perl\bin\libgcc_s_seh-1.dll;libgcc_s_seh-1.dll" ` +-a "${STRAWBERRY_PATH}\perl\bin\libgcc_s_${perlarch}-1.dll;libgcc_s_${perlarch}-1.dll" ` -a "${STRAWBERRY_PATH}\perl\bin\libwinpthread-1.dll;libwinpthread-1.dll" ` -a "${STRAWBERRY_PATH}\c\bin\pthreadGC2-w64.dll;pthreadGC2-w64.dll" ` +-a "${STRAWBERRY_PATH}\c\bin\pthreadGC2-w32.dll;pthreadGC2-w32.dll" ` -a "${STRAWBERRY_PATH}\c\bin\libglut-0__.dll;libglut-0__.dll" ` -M AutoLoader ` -M B ` @@ -152,7 +159,7 @@ if ($exe) { } else { # make this more useful for not being on the appveyor server if ($env:APPVEYOR) { - copy ..\..\slic3r.par "..\..\slic3r-${current_branch}.${current_date}.${env:APPVEYOR_BUILD_NUMBER}.$(git rev-parse --short HEAD).zip" + copy ..\..\slic3r.par "..\..\slic3r-${current_branch}.${current_date}.${env:APPVEYOR_BUILD_NUMBER}.$(git rev-parse --short HEAD).$env:ARCH.zip" } else { copy ..\..\slic3r.par "..\..\slic3r-${current_branch}.${current_date}.$(git rev-parse --short HEAD).zip" del ..\..\slic3r.par From 69bef2a971fd6d7221bfa367ec4c9095067b6127 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Mon, 15 May 2017 20:08:03 +0200 Subject: [PATCH 28/44] Fixed the "has virtual functions and accessible non-virtual destructor" warning. #3949 --- xs/src/libslic3r/MultiPoint.hpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xs/src/libslic3r/MultiPoint.hpp b/xs/src/libslic3r/MultiPoint.hpp index 99bc79281..acb409b20 100644 --- a/xs/src/libslic3r/MultiPoint.hpp +++ b/xs/src/libslic3r/MultiPoint.hpp @@ -17,8 +17,6 @@ class MultiPoint Points points; operator Points() const; - MultiPoint() {}; - explicit MultiPoint(const Points &_points): points(_points) {}; void scale(double factor); void translate(double x, double y); void translate(const Point &vector); @@ -48,6 +46,11 @@ class MultiPoint std::string dump_perl() const; static Points _douglas_peucker(const Points &points, const double tolerance); + + protected: + MultiPoint() {}; + explicit MultiPoint(const Points &_points): points(_points) {}; + ~MultiPoint() = default; }; } // namespace Slic3r From 60f0ca52e3b3a61539cc5eae521a2b8bd16d4448 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Mon, 15 May 2017 22:54:20 +0200 Subject: [PATCH 29/44] Fix regression with non-ASCII paths on Windows. We'll need to work more on this when porting stuff to C++. #2955 --- lib/Slic3r/GUI/BedShapeDialog.pm | 2 +- lib/Slic3r/GUI/MainFrame.pm | 2 +- lib/Slic3r/GUI/Plater.pm | 4 ++-- lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm | 2 +- slic3r.pl | 18 +++++++++--------- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/Slic3r/GUI/BedShapeDialog.pm b/lib/Slic3r/GUI/BedShapeDialog.pm index 1ef787e70..a336b40e7 100644 --- a/lib/Slic3r/GUI/BedShapeDialog.pm +++ b/lib/Slic3r/GUI/BedShapeDialog.pm @@ -289,7 +289,7 @@ sub _load_stl { my $input_file = Slic3r::decode_path($dialog->GetPaths); $dialog->Destroy; - my $model = Slic3r::Model->read_from_file($input_file); + my $model = Slic3r::Model->read_from_file(Slic3r::encode_path($input_file)); my $mesh = $model->raw_mesh; my $expolygons = $mesh->horizontal_projection; diff --git a/lib/Slic3r/GUI/MainFrame.pm b/lib/Slic3r/GUI/MainFrame.pm index 9eec4d625..dc04b39d5 100644 --- a/lib/Slic3r/GUI/MainFrame.pm +++ b/lib/Slic3r/GUI/MainFrame.pm @@ -384,7 +384,7 @@ sub quick_slice { ); # keep model around - my $model = Slic3r::Model->read_from_file($input_file); + my $model = Slic3r::Model->read_from_file(Slic3r::encode_path($input_file)); $sprint->apply_config($config); $sprint->set_model($model); diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm index 2cd8e52af..4d2ce292d 100644 --- a/lib/Slic3r/GUI/Plater.pm +++ b/lib/Slic3r/GUI/Plater.pm @@ -816,7 +816,7 @@ sub add_tin { return if $offset < 0; foreach my $input_file (@input_files) { - my $model = eval { Slic3r::Model->read_from_file($input_file) }; + my $model = eval { Slic3r::Model->read_from_file(Slic3r::encode_path($input_file)) }; Slic3r::GUI::show_error($self, $@) if $@; next if !$model; @@ -847,7 +847,7 @@ sub load_file { local $SIG{__WARN__} = Slic3r::GUI::warning_catcher($self); - my $model = eval { Slic3r::Model->read_from_file($input_file) }; + my $model = eval { Slic3r::Model->read_from_file(Slic3r::encode_path($input_file)) }; Slic3r::GUI::show_error($self, $@) if $@; my @obj_idx = (); diff --git a/lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm b/lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm index e0fe90f6e..bc3c7d0b8 100644 --- a/lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm +++ b/lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm @@ -350,7 +350,7 @@ sub on_btn_load { my @input_files = wxTheApp->open_model($self); foreach my $input_file (@input_files) { - my $model = eval { Slic3r::Model->read_from_file($input_file) }; + my $model = eval { Slic3r::Model->read_from_file(Slic3r::encode_path($input_file)) }; if ($@) { Slic3r::GUI::show_error($self, $@); next; diff --git a/slic3r.pl b/slic3r.pl index a21509843..a97dcca81 100755 --- a/slic3r.pl +++ b/slic3r.pl @@ -74,9 +74,9 @@ my @external_configs = (); if ($opt{load}) { foreach my $configfile (@{$opt{load}}) { $configfile = Slic3r::decode_path($configfile); - if (-e $configfile) { + if (-e Slic3r::encode_path($configfile)) { push @external_configs, Slic3r::Config->load($configfile); - } elsif (-e "$FindBin::Bin/$configfile") { + } elsif (-e Slic3r::encode_path("$FindBin::Bin/$configfile")) { printf STDERR "Loading $FindBin::Bin/$configfile\n"; push @external_configs, Slic3r::Config->load("$FindBin::Bin/$configfile"); } else { @@ -99,7 +99,7 @@ if ($opt{save}) { if (@{$config->get_keys} > 0) { $config->save($opt{save}); } else { - Slic3r::Config->new_from_defaults->save($opt{save}); + Slic3r::Config->new_from_defaults->save(Slic3r::decode_path($opt{save})); } } @@ -154,7 +154,7 @@ if (@ARGV) { # slicing from command line if ($opt{cut}) { foreach my $file (@ARGV) { $file = Slic3r::decode_path($file); - my $model = Slic3r::Model->read_from_file($file); + my $model = Slic3r::Model->read_from_file(Slic3r::encode_path($file)); $model->add_default_instances; my $mesh = $model->mesh; $mesh->translate(0, 0, -$mesh->bounding_box->z_min); @@ -175,7 +175,7 @@ if (@ARGV) { # slicing from command line my ($grid_x, $grid_y) = split /[,x]/, $opt{cut_grid}, 2; foreach my $file (@ARGV) { $file = Slic3r::decode_path($file); - my $model = Slic3r::Model->read_from_file($file); + my $model = Slic3r::Model->read_from_file(Slic3r::encode_path($file)); $model->add_default_instances; my $mesh = $model->mesh; my $bb = $mesh->bounding_box; @@ -217,7 +217,7 @@ if (@ARGV) { # slicing from command line if ($opt{split}) { foreach my $file (@ARGV) { $file = Slic3r::decode_path($file); - my $model = Slic3r::Model->read_from_file($file); + my $model = Slic3r::Model->read_from_file(Slic3r::encode_path($file)); $model->add_default_instances; my $mesh = $model->mesh; $mesh->repair; @@ -236,10 +236,10 @@ if (@ARGV) { # slicing from command line $input_file = Slic3r::decode_path($input_file); my $model; if ($opt{merge}) { - my @models = map Slic3r::Model->read_from_file($_), $input_file, (splice @ARGV, 0); + my @models = map Slic3r::Model->read_from_file($_), Slic3r::encode_path($input_file), (splice @ARGV, 0); $model = Slic3r::Model->merge(@models); } else { - $model = Slic3r::Model->read_from_file($input_file); + $model = Slic3r::Model->read_from_file(Slic3r::encode_path($input_file)); } $model->repair; @@ -266,7 +266,7 @@ if (@ARGV) { # slicing from command line my ($percent, $message) = @_; printf "=> %s\n", $message; }, - output_file => $opt{output}, + output_file => Slic3r::decode_path($opt{output}), ); $sprint->apply_config($config); From bbbf4e617259f56d5962855a9f2459b304406a9b Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Mon, 15 May 2017 18:41:07 -0500 Subject: [PATCH 30/44] Use caching during builds. Change library name/path depending on arch. --- appveyor.yml | 4 ++-- package/win/package_win32.ps1 | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c3d24925d..b090aeea0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,8 +9,8 @@ environment: BOOST_DIR: C:\dev\boost_1_63_0 WXDIR: C:\dev\wxwidgets WXSHARED: SHARED=0 - FORCE_WX_BUILD: 1 - FORCE_BOOST_REINSTALL: 1 + FORCE_WX_BUILD: 0 + FORCE_BOOST_REINSTALL: 0 ENC_SECRET: secure: QfeTOSKXz1uFCEACqFKLNw== UPLOAD_USER: diff --git a/package/win/package_win32.ps1 b/package/win/package_win32.ps1 index 717b30488..67d120450 100644 --- a/package/win/package_win32.ps1 +++ b/package/win/package_win32.ps1 @@ -43,8 +43,12 @@ New-Variable -Name "STRAWBERRY_PATH" -Value "C:\Strawberry" cpanm "PAR::Packer" if ($env:ARCH -eq "32bit") { $perlarch = "sjlj" + $glut = "libglut-0_.dll" + $pthread= "pthreadGC2-w32.dll" } else { $perlarch = "seh" + $glut = "libglut-0__.dll" + $pthread= "pthreadGC2-w64.dll" } @@ -62,9 +66,8 @@ pp ` -a "${STRAWBERRY_PATH}\perl\bin\libstdc++-6.dll;libstdc++-6.dll" ` -a "${STRAWBERRY_PATH}\perl\bin\libgcc_s_${perlarch}-1.dll;libgcc_s_${perlarch}-1.dll" ` -a "${STRAWBERRY_PATH}\perl\bin\libwinpthread-1.dll;libwinpthread-1.dll" ` --a "${STRAWBERRY_PATH}\c\bin\pthreadGC2-w64.dll;pthreadGC2-w64.dll" ` --a "${STRAWBERRY_PATH}\c\bin\pthreadGC2-w32.dll;pthreadGC2-w32.dll" ` --a "${STRAWBERRY_PATH}\c\bin\libglut-0__.dll;libglut-0__.dll" ` +-a "${STRAWBERRY_PATH}\c\bin\${pthread};${pthread}" ` +-a "${STRAWBERRY_PATH}\c\bin\${glut};${glut}" ` -M AutoLoader ` -M B ` -M Carp ` From 68711c7f2bf17a7806a79bf0a44a19e75c3a543f Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Mon, 15 May 2017 19:18:52 -0500 Subject: [PATCH 31/44] Use right check for download and remove explicit install of app::cpanminus --- package/win/appveyor_preinstall.ps1 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/package/win/appveyor_preinstall.ps1 b/package/win/appveyor_preinstall.ps1 index 90b9be7ec..e2f6feff2 100644 --- a/package/win/appveyor_preinstall.ps1 +++ b/package/win/appveyor_preinstall.ps1 @@ -41,7 +41,7 @@ if(Test-Path -Path 'C:\Strawberry' ) { copy C:\Strawberry\c\bin\gcc.exe C:\Strawberry\c\bin\cc.exe cmd /c mklink /D C:\Perl C:\Strawberry\perl mkdir C:\dev - if (!(Test-Path "C:\users\appveyor\boost.1.63.0.7z") -Or $env:FORCE_BOOST_REINSTALL -eq 1) { + if (!(Test-Path "C:\users\appveyor\boost.1.63.0.$env:ARCH.7z") -Or $env:FORCE_BOOST_REINSTALL -eq 1) { if ($env:ARCH -eq "64bit") { wget "http://www.siusgs.com/slic3r/buildserver/win/boost_1_63_0-x64-gcc-6.3.0-seh.7z" -O "C:\users\appveyor\boost.1.63.0.$env:ARCH.7z" | Write-Output } else { @@ -77,6 +77,3 @@ if (!(Test-Path "C:\Users\appveyor\wxwidgets-$env:ARCH.7z")) { Add-AppveyorCompilationMessage -Message "Extracting prebuilt wxWidgets." 7z x "C:\Users\appveyor\wxwidgets-$env:ARCH.7z" -oC:\dev } - -cpan App::cpanminus -cpan PAR::Packer From 172c324475ffcbaae36c5a8d3153aab6dea72c96 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Tue, 16 May 2017 21:49:00 +0200 Subject: [PATCH 32/44] Ignore small_perimeter_speed when perimeter has overhangs. #3951 --- lib/Slic3r/Test.pm | 7 ++++++ t/perimeters.t | 33 +++++++++++++++++++++++-- xs/src/libslic3r/ExtrusionEntity.hpp | 5 ++++ xs/src/libslic3r/GCode.cpp | 8 +++--- xs/src/libslic3r/PerimeterGenerator.cpp | 14 +++++------ 5 files changed, 54 insertions(+), 13 deletions(-) diff --git a/lib/Slic3r/Test.pm b/lib/Slic3r/Test.pm index dbd2d37f1..8f0b203e1 100644 --- a/lib/Slic3r/Test.pm +++ b/lib/Slic3r/Test.pm @@ -133,6 +133,13 @@ sub mesh { $facets = [ [0,1,2],[1,0,3],[2,1,4],[2,5,0],[0,6,3],[1,3,7],[1,8,4],[4,9,2],[10,5,2],[5,6,0],[6,11,3],[3,12,7],[7,8,1],[4,8,11],[4,11,9],[9,10,2],[10,13,5],[14,6,5],[9,11,6],[11,12,3],[12,8,7],[11,8,15],[13,10,9],[5,13,14],[14,13,6],[6,13,9],[15,12,11],[15,8,12] ]; + } elsif ($name eq 'bridge_with_hole') { + $vertices = [ + [75,69.5,8],[80,76.9091644287109,8],[75,94.5,8],[125,69.5,8],[120,76.9091644287109,8],[120,87.0908355712891,8],[80,87.0908355712891,8],[125,94.5,8],[80,87.0908355712891,5],[120,87.0908355712891,5],[125,94.5,0],[120,69.5,0],[120,94.5,0],[125,69.5,0],[120,94.5,5],[80,94.5,5],[80,94.5,0],[75,94.5,0],[80,69.5,5],[80,69.5,0],[80,76.9091644287109,5],[120,69.5,5],[75,69.5,0],[120,76.9091644287109,5] + ]; + $facets = [ + [0,1,2],[1,0,3],[1,3,4],[4,3,5],[2,6,7],[6,2,1],[7,6,5],[7,5,3],[5,8,9],[8,5,6],[10,11,12],[11,10,13],[14,8,15],[8,14,9],[2,16,17],[16,2,15],[15,2,14],[14,10,12],[10,14,7],[7,14,2],[16,18,19],[18,16,20],[20,16,1],[1,16,8],[8,16,15],[6,1,8],[3,11,13],[11,3,21],[21,3,18],[18,22,19],[22,18,0],[0,18,3],[16,22,17],[22,16,19],[2,22,0],[22,2,17],[5,23,4],[23,11,21],[11,23,12],[12,23,9],[9,23,5],[12,9,14],[23,18,20],[18,23,21],[10,3,13],[3,10,7],[1,23,20],[23,1,4] + ]; } elsif ($name eq 'step') { $vertices = [ [0,20,5],[0,20,0],[0,0,5],[0,0,0],[20,0,0],[20,0,5],[1,19,5],[1,1,5],[19,1,5],[20,20,5],[19,19,5],[20,20,0],[19,19,10],[1,19,10],[1,1,10],[19,1,10] diff --git a/t/perimeters.t b/t/perimeters.t index 828504311..68219782d 100644 --- a/t/perimeters.t +++ b/t/perimeters.t @@ -1,4 +1,4 @@ -use Test::More tests => 59; +use Test::More tests => 63; use strict; use warnings; @@ -393,10 +393,39 @@ use Slic3r::Test; }); return scalar keys %z_with_bridges; }; - ok $test->(Slic3r::Test::init_print('V', config => $config)) == 1, + is $test->(Slic3r::Test::init_print('V', config => $config)), 1, 'no overhangs printed with bridge speed'; # except for the first internal solid layers above void ok $test->(Slic3r::Test::init_print('V', config => $config, scale_xyz => [3,1,1])) > 1, 'overhangs printed with bridge speed'; + + $config->set('bottom_solid_layers', 0); + $config->set('top_solid_layers', 0); + my $test2 = sub { + my ($print) = @_; + my $num_bridges = 0; + Slic3r::GCode::Reader->new->parse(my $gcode = Slic3r::Test::gcode($print), sub { + my ($self, $cmd, $args, $info) = @_; + + if ($info->{extruding} && $info->{dist_XY} > 0) { + $num_bridges++ if ($args->{F} // $self->F) == $config->bridge_speed*60; + } + }); + open my $fh, ">", "bridges.gcode"; + print $fh $gcode; + return $num_bridges; + }; + is $test2->(Slic3r::Test::init_print('overhang', config => $config)), $config->perimeters*3, + 'expected number of segments use bridge speed (overhang)'; + is $test2->(Slic3r::Test::init_print('bridge', config => $config)), $config->perimeters*2, + 'expected number of segments use bridge speed (bridge)'; + is $test2->(Slic3r::Test::init_print('bridge_with_hole', config => $config)), $config->perimeters*4, + 'expected number of segments use bridge speed (bridge with hole)'; + + # scale the test model so that the hole perimeter length is smaller than small perimeter + # threshold (~40mm). check that we still use overhang settings regardless of it being small + is $test2->(Slic3r::Test::init_print('bridge_with_hole', config => $config, scale_xyz => [0.3,0.5,1])), + $config->perimeters*4, + 'expected number of segments use bridge speed (bridge with small hole)'; } { diff --git a/xs/src/libslic3r/ExtrusionEntity.hpp b/xs/src/libslic3r/ExtrusionEntity.hpp index b5bff5ab3..05dc00a58 100644 --- a/xs/src/libslic3r/ExtrusionEntity.hpp +++ b/xs/src/libslic3r/ExtrusionEntity.hpp @@ -167,6 +167,11 @@ class ExtrusionLoop : public ExtrusionEntity void append(const ExtrusionPath &path) { this->paths.push_back(path); }; + bool has(ExtrusionRole role) const { + for (const auto &path : this->paths) + if (path.role == role) return true; + return false; + }; }; } diff --git a/xs/src/libslic3r/GCode.cpp b/xs/src/libslic3r/GCode.cpp index 38d36857a..56100f9f5 100644 --- a/xs/src/libslic3r/GCode.cpp +++ b/xs/src/libslic3r/GCode.cpp @@ -415,9 +415,11 @@ GCode::extrude(ExtrusionLoop loop, std::string description, double speed) if (paths.empty()) return ""; // apply the small perimeter speed - if (paths.front().is_perimeter() && loop.length() <= SMALL_PERIMETER_LENGTH) { - if (speed == -1) speed = this->config.get_abs_value("small_perimeter_speed"); - } + if (paths.front().is_perimeter() + && !loop.has(erOverhangPerimeter) + && loop.length() <= SMALL_PERIMETER_LENGTH + && speed == -1) + speed = this->config.get_abs_value("small_perimeter_speed"); // extrude along the path std::string gcode; diff --git a/xs/src/libslic3r/PerimeterGenerator.cpp b/xs/src/libslic3r/PerimeterGenerator.cpp index b902f5307..02c2488df 100644 --- a/xs/src/libslic3r/PerimeterGenerator.cpp +++ b/xs/src/libslic3r/PerimeterGenerator.cpp @@ -349,11 +349,10 @@ PerimeterGenerator::_traverse_loops(const PerimeterGeneratorLoops &loops, && !(this->object_config->support_material && this->object_config->support_material_contact_distance.value == 0)) { // get non-overhang paths by intersecting this loop with the grown lower slices { - Polylines polylines = intersection_pl(loop->polygon, this->_lower_slices_p); - - for (Polylines::const_iterator polyline = polylines.begin(); polyline != polylines.end(); ++polyline) { + const Polylines polylines = intersection_pl(loop->polygon, this->_lower_slices_p); + for (const Polyline &polyline : polylines) { ExtrusionPath path(role); - path.polyline = *polyline; + path.polyline = polyline; path.mm3_per_mm = is_external ? this->_ext_mm3_per_mm : this->_mm3_per_mm; path.width = is_external ? this->ext_perimeter_flow.width : this->perimeter_flow.width; path.height = this->layer_height; @@ -365,11 +364,10 @@ PerimeterGenerator::_traverse_loops(const PerimeterGeneratorLoops &loops, // outside the grown lower slices (thus where the distance between // the loop centerline and original lower slices is >= half nozzle diameter { - Polylines polylines = diff_pl(loop->polygon, this->_lower_slices_p); - - for (Polylines::const_iterator polyline = polylines.begin(); polyline != polylines.end(); ++polyline) { + const Polylines polylines = diff_pl(loop->polygon, this->_lower_slices_p); + for (const Polyline &polyline : polylines) { ExtrusionPath path(erOverhangPerimeter); - path.polyline = *polyline; + path.polyline = polyline; path.mm3_per_mm = this->_mm3_per_mm_overhang; path.width = this->overhang_flow.width; path.height = this->overhang_flow.height; From 9b7755497599bbd8a09750a6c31a7b8cd9ec31f5 Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Tue, 16 May 2017 22:30:17 +0200 Subject: [PATCH 33/44] Prevent double perimeter processing while we have this idempotency workaround in place. #3850 --- lib/Slic3r/Print.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/Slic3r/Print.pm b/lib/Slic3r/Print.pm index 372a0c35c..586bd8a8d 100644 --- a/lib/Slic3r/Print.pm +++ b/lib/Slic3r/Print.pm @@ -42,8 +42,10 @@ sub size { sub process { my ($self) = @_; - $self->status_cb->(20, "Generating perimeters"); - $_->make_perimeters for @{$self->objects}; + ### No need to call this as we call it as part of prepare_infill() + ### until we fix the idempotency issue. + ###$self->status_cb->(20, "Generating perimeters"); + ###$_->make_perimeters for @{$self->objects}; $self->status_cb->(70, "Infilling layers"); $_->infill for @{$self->objects}; From a7ffe54fb6229bd885f97f0a5cf1190abf1a715c Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Tue, 16 May 2017 22:31:04 +0200 Subject: [PATCH 34/44] Remove warning --- lib/Slic3r.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/Slic3r.pm b/lib/Slic3r.pm index d759d1b34..8b1f2a7a2 100644 --- a/lib/Slic3r.pm +++ b/lib/Slic3r.pm @@ -300,6 +300,8 @@ sub resume_all_threads { sub encode_path { my ($path) = @_; + return undef if !defined $path; + $path = Unicode::Normalize::NFC($path); $path = Encode::encode(locale_fs => $path); @@ -310,6 +312,8 @@ sub encode_path { sub decode_path { my ($path) = @_; + return undef if !defined $path; + $path = Encode::decode(locale_fs => $path) unless utf8::is_utf8($path); From 3912c3a083f5de69213f4768d03044f3973f3a90 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Tue, 16 May 2017 14:22:52 -0700 Subject: [PATCH 35/44] Add initial doxygen configuration for libslic3r, run from xs dir --- xs/libslic3r.doxygen | 2484 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2484 insertions(+) create mode 100644 xs/libslic3r.doxygen diff --git a/xs/libslic3r.doxygen b/xs/libslic3r.doxygen new file mode 100644 index 000000000..8ff5a1e35 --- /dev/null +++ b/xs/libslic3r.doxygen @@ -0,0 +1,2484 @@ +# Doxyfile 1.8.14 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project. +# +# All text after a double hash (##) is considered a comment and is placed in +# front of the TAG it is preceding. +# +# All text after a single hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists, items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (\" \"). + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all text +# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv +# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv +# for the list of possible encodings. +# The default value is: UTF-8. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by +# double-quotes, unless you are using Doxywizard) that should identify the +# project for which the documentation is generated. This name is used in the +# title of most generated pages and in a few other places. +# The default value is: My Project. + +PROJECT_NAME = "libslic3r" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. This +# could be handy for archiving the generated documentation or if some version +# control system is used. + +PROJECT_NUMBER = + +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer a +# quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = "Library for generating gcode from 3d models" + +# With the PROJECT_LOGO tag one can specify a logo or an icon that is included +# in the documentation. The maximum height of the logo should not exceed 55 +# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy +# the logo to the output directory. + +PROJECT_LOGO = "../var/Slic3r_192px_transparent.png" + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path +# into which the generated documentation will be written. If a relative path is +# entered, it will be relative to the location where doxygen was started. If +# left blank the current directory will be used. + +OUTPUT_DIRECTORY = "./doc.libslic3r" + +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- +# directories (in 2 levels) under the output directory of each output format and +# will distribute the generated files over these directories. Enabling this +# option can be useful when feeding doxygen a huge amount of source files, where +# putting all generated files in the same directory would otherwise causes +# performance problems for the file system. +# The default value is: NO. + +CREATE_SUBDIRS = NO + +# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII +# characters to appear in the names of generated files. If set to NO, non-ASCII +# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode +# U+3044. +# The default value is: NO. + +ALLOW_UNICODE_NAMES = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, +# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), +# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, +# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, +# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, +# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, +# Ukrainian and Vietnamese. +# The default value is: English. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member +# descriptions after the members that are listed in the file and class +# documentation (similar to Javadoc). Set to NO to disable this. +# The default value is: YES. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief +# description of a member or function before the detailed description +# +# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. +# The default value is: YES. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator that is +# used to form the text in various listings. Each string in this list, if found +# as the leading text of the brief description, will be stripped from the text +# and the result, after processing the whole list, is used as the annotated +# text. Otherwise, the brief description is used as-is. If left blank, the +# following values are used ($name is automatically replaced with the name of +# the entity):The $name class, The $name widget, The $name file, is, provides, +# specifies, contains, represents, a, an and the. + +ABBREVIATE_BRIEF = "The $name class" \ + "The $name widget" \ + "The $name file" \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# doxygen will generate a detailed section even if there is only a brief +# description. +# The default value is: NO. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. +# The default value is: NO. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path +# before files name in the file list and in the header files. If set to NO the +# shortest path that makes the file name unique will be used +# The default value is: YES. + +FULL_PATH_NAMES = YES + +# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. +# Stripping is only done if one of the specified strings matches the left-hand +# part of the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the path to +# strip. +# +# Note that you can specify absolute paths here, but also relative paths, which +# will be relative from the directory where doxygen is started. +# This tag requires that the tag FULL_PATH_NAMES is set to YES. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the +# path mentioned in the documentation of a class, which tells the reader which +# header file to include in order to use a class. If left blank only the name of +# the header file containing the class definition is used. Otherwise one should +# specify the list of include paths that are normally passed to the compiler +# using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but +# less readable) file names. This can be useful is your file systems doesn't +# support long names like on DOS, Mac, or CD-ROM. +# The default value is: NO. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the +# first line (until the first dot) of a Javadoc-style comment as the brief +# description. If set to NO, the Javadoc-style will behave just like regular Qt- +# style comments (thus requiring an explicit @brief command for a brief +# description.) +# The default value is: NO. + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first +# line (until the first dot) of a Qt-style comment as the brief description. If +# set to NO, the Qt-style will behave just like regular Qt-style comments (thus +# requiring an explicit \brief command for a brief description.) +# The default value is: NO. + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a +# multi-line C++ special comment block (i.e. a block of //! or /// comments) as +# a brief description. This used to be the default behavior. The new default is +# to treat a multi-line C++ comment block as a detailed description. Set this +# tag to YES if you prefer the old behavior instead. +# +# Note that setting this tag to YES also means that rational rose comments are +# not recognized any more. +# The default value is: NO. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the +# documentation from any documented member that it re-implements. +# The default value is: YES. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new +# page for each member. If set to NO, the documentation of a member will be part +# of the file/class/namespace that contains it. +# The default value is: NO. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen +# uses this value to replace tabs by spaces in code fragments. +# Minimum value: 1, maximum value: 16, default value: 4. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that act as commands in +# the documentation. An alias has the form: +# name=value +# For example adding +# "sideeffect=@par Side Effects:\n" +# will allow you to put the command \sideeffect (or @sideeffect) in the +# documentation, which will result in a user-defined paragraph with heading +# "Side Effects:". You can put \n's in the value part of an alias to insert +# newlines. + +ALIASES = + +# This tag can be used to specify a number of word-keyword mappings (TCL only). +# A mapping has the form "name=value". For example adding "class=itcl::class" +# will allow you to use the command class in the itcl::class meaning. + +TCL_SUBST = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources +# only. Doxygen will then generate output that is more tailored for C. For +# instance, some of the names that are used will be different. The list of all +# members will be omitted, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or +# Python sources only. Doxygen will then generate output that is more tailored +# for that language. For instance, namespaces will be presented as packages, +# qualified scopes will look different, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources. Doxygen will then generate output that is tailored for Fortran. +# The default value is: NO. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for VHDL. +# The default value is: NO. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, and +# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: +# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: +# Fortran. In the later case the parser tries to guess whether the code is fixed +# or free formatted code, this is the default for Fortran type files), VHDL. For +# instance to make doxygen treat .inc files as Fortran files (default is PHP), +# and .f files as C (default is Fortran), use: inc=Fortran f=C. +# +# Note: For files without extension you can use no_extension as a placeholder. +# +# Note that for custom extensions you also need to set FILE_PATTERNS otherwise +# the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments +# according to the Markdown format, which allows for more readable +# documentation. See http://daringfireball.net/projects/markdown/ for details. +# The output of markdown processing is further processed by doxygen, so you can +# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in +# case of backward compatibilities issues. +# The default value is: YES. + +MARKDOWN_SUPPORT = YES + +# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up +# to that level are automatically included in the table of contents, even if +# they do not have an id attribute. +# Note: This feature currently applies only to Markdown headings. +# Minimum value: 0, maximum value: 99, default value: 0. +# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. + +TOC_INCLUDE_HEADINGS = 0 + +# When enabled doxygen tries to link words that correspond to documented +# classes, or namespaces to their corresponding documentation. Such a link can +# be prevented in individual cases by putting a % sign in front of the word or +# globally by setting AUTOLINK_SUPPORT to NO. +# The default value is: YES. + +AUTOLINK_SUPPORT = YES + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should set this +# tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); +# versus func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. +# The default value is: NO. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. +# The default value is: NO. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: +# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# will parse them like normal C++ but will assume all classes use public instead +# of private inheritance when no explicit protection keyword is present. +# The default value is: NO. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate +# getter and setter methods for a property. Setting this option to YES will make +# doxygen to replace the get and set methods by a property in the documentation. +# This will only work if the methods are indeed getting or setting a simple +# type. If this is not the case, or you want to show the methods anyway, you +# should set this option to NO. +# The default value is: YES. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. +# The default value is: NO. + +DISTRIBUTE_GROUP_DOC = NO + +# If one adds a struct or class to a group and this option is enabled, then also +# any nested class or struct is added to the same group. By default this option +# is disabled and one has to add nested compounds explicitly via \ingroup. +# The default value is: NO. + +GROUP_NESTED_COMPOUNDS = NO + +# Set the SUBGROUPING tag to YES to allow class member groups of the same type +# (for instance a group of public functions) to be put as a subgroup of that +# type (e.g. under the Public Functions section). Set it to NO to prevent +# subgrouping. Alternatively, this can be done per class using the +# \nosubgrouping command. +# The default value is: YES. + +SUBGROUPING = YES + +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions +# are shown inside the group in which they are included (e.g. using \ingroup) +# instead of on a separate page (for HTML and Man pages) or section (for LaTeX +# and RTF). +# +# Note that this feature does not work in combination with +# SEPARATE_MEMBER_PAGES. +# The default value is: NO. + +INLINE_GROUPED_CLASSES = NO + +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions +# with only public data fields or simple typedef fields will be shown inline in +# the documentation of the scope in which they are defined (i.e. file, +# namespace, or group documentation), provided this scope is documented. If set +# to NO, structs, classes, and unions are shown on a separate page (for HTML and +# Man pages) or section (for LaTeX and RTF). +# The default value is: NO. + +INLINE_SIMPLE_STRUCTS = NO + +# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or +# enum is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically be +# useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. +# The default value is: NO. + +TYPEDEF_HIDES_STRUCT = NO + +# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This +# cache is used to resolve symbols given their name and scope. Since this can be +# an expensive process and often the same symbol appears multiple times in the +# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small +# doxygen will become slower. If the cache is too large, memory is wasted. The +# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range +# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 +# symbols. At the end of a run doxygen will report the cache usage and suggest +# the optimal cache size from a speed point of view. +# Minimum value: 0, maximum value: 9, default value: 0. + +LOOKUP_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in +# documentation are documented, even if no documentation was available. Private +# class members and static file members will be hidden unless the +# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. +# Note: This will also disable the warnings about undocumented members that are +# normally produced when WARNINGS is set to YES. +# The default value is: NO. + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will +# be included in the documentation. +# The default value is: NO. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal +# scope will be included in the documentation. +# The default value is: NO. + +EXTRACT_PACKAGE = NO + +# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be +# included in the documentation. +# The default value is: NO. + +EXTRACT_STATIC = YES + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO, +# only classes defined in header files are included. Does not have any effect +# for Java sources. +# The default value is: YES. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. If set to YES, local methods, +# which are defined in the implementation section but not in the interface are +# included in the documentation. If set to NO, only methods in the interface are +# included. +# The default value is: NO. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base name of +# the file that contains the anonymous namespace. By default anonymous namespace +# are hidden. +# The default value is: NO. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all +# undocumented members inside documented classes or files. If set to NO these +# members will be included in the various overviews, but no documentation +# section is generated. This option has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. If set +# to NO, these classes will be included in the various overviews. This option +# has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend +# (class|struct|union) declarations. If set to NO, these declarations will be +# included in the documentation. +# The default value is: NO. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any +# documentation blocks found inside the body of a function. If set to NO, these +# blocks will be appended to the function's detailed documentation block. +# The default value is: NO. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation that is typed after a +# \internal command is included. If the tag is set to NO then the documentation +# will be excluded. Set it to YES to include the internal documentation. +# The default value is: NO. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file +# names in lower-case letters. If set to YES, upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. +# The default value is: system dependent. + +CASE_SENSE_NAMES = NO + +# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with +# their full class and namespace scopes in the documentation. If set to YES, the +# scope will be hidden. +# The default value is: NO. + +HIDE_SCOPE_NAMES = NO + +# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will +# append additional text to a page's title, such as Class Reference. If set to +# YES the compound reference will be hidden. +# The default value is: NO. + +HIDE_COMPOUND_REFERENCE= NO + +# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of +# the files that are included by a file in the documentation of that file. +# The default value is: YES. + +SHOW_INCLUDE_FILES = YES + +# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each +# grouped member an include statement to the documentation, telling the reader +# which file to include in order to use the member. +# The default value is: NO. + +SHOW_GROUPED_MEMB_INC = NO + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include +# files with double quotes in the documentation rather than with sharp brackets. +# The default value is: NO. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the +# documentation for inline members. +# The default value is: YES. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the +# (detailed) documentation of file and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. +# The default value is: YES. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief +# descriptions of file, namespace and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. Note that +# this will also influence the order of the classes in the class list. +# The default value is: NO. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the +# (brief and detailed) documentation of class members so that constructors and +# destructors are listed first. If set to NO the constructors will appear in the +# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. +# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief +# member documentation. +# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting +# detailed member documentation. +# The default value is: NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy +# of group names into alphabetical order. If set to NO the group names will +# appear in their defined order. +# The default value is: NO. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by +# fully-qualified names, including namespaces. If set to NO, the class list will +# be sorted only by class name, not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the alphabetical +# list. +# The default value is: NO. + +SORT_BY_SCOPE_NAME = NO + +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper +# type resolution of all parameters of a function it will reject a match between +# the prototype and the implementation of a member function even if there is +# only one candidate or it is obvious which candidate to choose by doing a +# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still +# accept a match between prototype and implementation in such cases. +# The default value is: NO. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo +# list. This list is created by putting \todo commands in the documentation. +# The default value is: YES. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test +# list. This list is created by putting \test commands in the documentation. +# The default value is: YES. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug +# list. This list is created by putting \bug commands in the documentation. +# The default value is: YES. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) +# the deprecated list. This list is created by putting \deprecated commands in +# the documentation. +# The default value is: YES. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional documentation +# sections, marked by \if ... \endif and \cond +# ... \endcond blocks. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the +# initial value of a variable or macro / define can have for it to appear in the +# documentation. If the initializer consists of more lines than specified here +# it will be hidden. Use a value of 0 to hide initializers completely. The +# appearance of the value of individual variables and macros / defines can be +# controlled using \showinitializer or \hideinitializer command in the +# documentation regardless of this setting. +# Minimum value: 0, maximum value: 10000, default value: 30. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at +# the bottom of the documentation of classes and structs. If set to YES, the +# list will mention the files that were used to generate the documentation. +# The default value is: YES. + +SHOW_USED_FILES = YES + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This +# will remove the Files entry from the Quick Index and from the Folder Tree View +# (if specified). +# The default value is: YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces +# page. This will remove the Namespaces entry from the Quick Index and from the +# Folder Tree View (if specified). +# The default value is: YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command command input-file, where command is the value of the +# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided +# by doxygen. Whatever the program writes to standard output is used as the file +# version. For an example see the documentation. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. You can +# optionally specify a file name after the option, if omitted DoxygenLayout.xml +# will be used as the name of the layout file. +# +# Note that if you run doxygen from a directory containing a file called +# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE +# tag is left empty. + +LAYOUT_FILE = + +# The CITE_BIB_FILES tag can be used to specify one or more bib files containing +# the reference definitions. This must be a list of .bib files. The .bib +# extension is automatically appended if omitted. This requires the bibtex tool +# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# For LaTeX the style of the bibliography can be controlled using +# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the +# search path. See also \cite for info how to create references. + +CITE_BIB_FILES = + +#--------------------------------------------------------------------------- +# Configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated to +# standard output by doxygen. If QUIET is set to YES this implies that the +# messages are off. +# The default value is: NO. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES +# this implies that the warnings are on. +# +# Tip: Turn warnings on while writing the documentation. +# The default value is: YES. + +WARNINGS = YES + +# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate +# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: YES. + +WARN_IF_UNDOCUMENTED = YES + +# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some parameters +# in a documented function, or documenting parameters that don't exist or using +# markup commands wrongly. +# The default value is: YES. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that +# are documented, but have no documentation for their parameters or return +# value. If set to NO, doxygen will only warn about wrong or incomplete +# parameter documentation, but not about the absence of documentation. +# The default value is: NO. + +WARN_NO_PARAMDOC = NO + +# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when +# a warning is encountered. +# The default value is: NO. + +WARN_AS_ERROR = NO + +# The WARN_FORMAT tag determines the format of the warning messages that doxygen +# can produce. The string should contain the $file, $line, and $text tags, which +# will be replaced by the file and line number from which the warning originated +# and the warning text. Optionally the format may contain $version, which will +# be replaced by the version of the file (if it could be obtained via +# FILE_VERSION_FILTER) +# The default value is: $file:$line: $text. + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning and error +# messages should be written. If left blank the output is written to standard +# error (stderr). + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# Configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag is used to specify the files and/or directories that contain +# documented source files. You may enter file names like myfile.cpp or +# directories like /usr/src/myproject. Separate the files or directories with +# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING +# Note: If this tag is empty the current directory is searched. + +INPUT = src/libslic3r + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +# libiconv (or the iconv built into libc) for the transcoding. See the libiconv +# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# possible encodings. +# The default value is: UTF-8. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and +# *.h) to filter out the source-files in the directories. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# read by doxygen. +# +# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, +# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, +# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, +# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, +# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf. + +FILE_PATTERNS = *.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.java \ + *.ii \ + *.ixx \ + *.ipp \ + *.i++ \ + *.inl \ + *.idl \ + *.ddl \ + *.odl \ + *.h \ + *.hh \ + *.hxx \ + *.hpp \ + *.h++ \ + *.cs \ + *.d \ + *.php \ + *.php4 \ + *.php5 \ + *.phtml \ + *.inc \ + *.m \ + *.markdown \ + *.md \ + *.mm \ + *.dox \ + *.py \ + *.pyw \ + *.f90 \ + *.f95 \ + *.f03 \ + *.f08 \ + *.f \ + *.for \ + *.tcl \ + *.vhd \ + *.vhdl \ + *.ucf \ + *.qsf + +# The RECURSIVE tag can be used to specify whether or not subdirectories should +# be searched for input files as well. +# The default value is: NO. + +RECURSIVE = NO + +# The EXCLUDE tag can be used to specify files and/or directories that should be +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. +# +# Note that relative paths are relative to the directory from which doxygen is +# run. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded +# from the input. +# The default value is: NO. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories use the pattern */test/* + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or directories +# that contain example code fragments that are included (see the \include +# command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank all +# files are included. + +EXAMPLE_PATTERNS = * + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude commands +# irrespective of the value of the RECURSIVE tag. +# The default value is: NO. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or directories +# that contain images that are to be included in the documentation (see the +# \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command: +# +# +# +# where is the value of the INPUT_FILTER tag, and is the +# name of an input file. Doxygen will then use the output that the filter +# program writes to standard output. If FILTER_PATTERNS is specified, this tag +# will be ignored. +# +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: pattern=filter +# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how +# filters are used. If the FILTER_PATTERNS tag is empty or if none of the +# patterns match the file name, INPUT_FILTER is applied. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will also be used to filter the input files that are used for +# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). +# The default value is: NO. + +FILTER_SOURCE_FILES = NO + +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and +# it is also possible to disable source filtering for a specific pattern using +# *.ext= (so without naming a filter). +# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. + +FILTER_SOURCE_PATTERNS = + +# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that +# is part of the input, its contents will be placed on the main page +# (index.html). This can be useful if you have a project on for instance GitHub +# and want to reuse the introduction page also for the doxygen output. + +USE_MDFILE_AS_MAINPAGE = + +#--------------------------------------------------------------------------- +# Configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will be +# generated. Documented entities will be cross-referenced with these sources. +# +# Note: To get rid of all source code in the generated output, make sure that +# also VERBATIM_HEADERS is set to NO. +# The default value is: NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body of functions, +# classes and enums directly into the documentation. +# The default value is: NO. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any +# special comment blocks from generated source code fragments. Normal C, C++ and +# Fortran comments will always remain visible. +# The default value is: YES. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES then for each documented +# function all documented functions referencing it will be listed. +# The default value is: NO. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES then for each documented function +# all documented entities called/used by that function will be listed. +# The default value is: NO. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set +# to YES then the hyperlinks from functions in REFERENCES_RELATION and +# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will +# link to the documentation. +# The default value is: YES. + +REFERENCES_LINK_SOURCE = YES + +# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the +# source code will show a tooltip with additional information such as prototype, +# brief description and links to the definition and documentation. Since this +# will make the HTML file larger and loading of large files a bit slower, you +# can opt to disable this feature. +# The default value is: YES. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +SOURCE_TOOLTIPS = YES + +# If the USE_HTAGS tag is set to YES then the references to source code will +# point to the HTML generated by the htags(1) tool instead of doxygen built-in +# source browser. The htags tool is part of GNU's global source tagging system +# (see http://www.gnu.org/software/global/global.html). You will need version +# 4.8.6 or higher. +# +# To use it do the following: +# - Install the latest version of global +# - Enable SOURCE_BROWSER and USE_HTAGS in the config file +# - Make sure the INPUT points to the root of the source tree +# - Run doxygen as normal +# +# Doxygen will invoke htags (and that will in turn invoke gtags), so these +# tools must be available from the command line (i.e. in the search path). +# +# The result: instead of the source browser generated by doxygen, the links to +# source code will now point to the output of htags. +# The default value is: NO. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a +# verbatim copy of the header file for each class for which an include is +# specified. Set to NO to disable this. +# See also: Section \class. +# The default value is: YES. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# Configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all +# compounds will be generated. Enable this if the project contains a lot of +# classes, structs, unions or interfaces. +# The default value is: YES. + +ALPHABETICAL_INDEX = YES + +# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in +# which the alphabetical index list will be split. +# Minimum value: 1, maximum value: 20, default value: 5. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all classes will +# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag +# can be used to specify a prefix (or a list of prefixes) that should be ignored +# while generating the index headers. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output +# The default value is: YES. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each +# generated HTML page (for example: .htm, .php, .asp). +# The default value is: .html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a user-defined HTML header file for +# each generated HTML page. If the tag is left blank doxygen will generate a +# standard header. +# +# To get valid HTML the header file that includes any scripts and style sheets +# that doxygen needs, which is dependent on the configuration options used (e.g. +# the setting GENERATE_TREEVIEW). It is highly recommended to start with a +# default header using +# doxygen -w html new_header.html new_footer.html new_stylesheet.css +# YourConfigFile +# and then modify the file new_header.html. See also section "Doxygen usage" +# for information on how to generate the default header that doxygen normally +# uses. +# Note: The header is subject to change so you typically have to regenerate the +# default header when upgrading to a newer version of doxygen. For a description +# of the possible markers and block names see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each +# generated HTML page. If the tag is left blank doxygen will generate a standard +# footer. See HTML_HEADER for more information on how to generate a default +# footer and what special commands can be used inside the footer. See also +# section "Doxygen usage" for information on how to generate the default footer +# that doxygen normally uses. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style +# sheet that is used by each HTML page. It can be used to fine-tune the look of +# the HTML output. If left blank doxygen will generate a default style sheet. +# See also section "Doxygen usage" for information on how to generate the style +# sheet that doxygen normally uses. +# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as +# it is more robust and this tag (HTML_STYLESHEET) will in the future become +# obsolete. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_STYLESHEET = + +# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# cascading style sheets that are included after the standard style sheets +# created by doxygen. Using this option one can overrule certain style aspects. +# This is preferred over using HTML_STYLESHEET since it does not replace the +# standard style sheet and is therefore more robust against future updates. +# Doxygen will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). For an example see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_STYLESHEET = + +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that the +# files will be copied as-is; there are no commands or markers available. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_FILES = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen +# will adjust the colors in the style sheet and background images according to +# this color. Hue is specified as an angle on a colorwheel, see +# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 +# purple, and 360 is red again. +# Minimum value: 0, maximum value: 359, default value: 220. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors +# in the HTML output. For a value of 0 the output will use grayscales only. A +# value of 255 will produce the most vivid colors. +# Minimum value: 0, maximum value: 255, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the +# luminance component of the colors in the HTML output. Values below 100 +# gradually make the output lighter, whereas values above 100 make the output +# darker. The value divided by 100 is the actual gamma applied, so 80 represents +# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not +# change the gamma. +# Minimum value: 40, maximum value: 240, default value: 80. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting this +# to YES can help to show when doxygen was last run and thus if the +# documentation is up to date. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_TIMESTAMP = NO + +# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML +# documentation will contain a main index with vertical navigation menus that +# are dynamically created via Javascript. If disabled, the navigation index will +# consists of multiple levels of tabs that are statically embedded in every HTML +# page. Disable this option to support browsers that do not have Javascript, +# like the Qt help browser. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_MENUS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_SECTIONS = NO + +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries +# shown in the various tree structured indices initially; the user can expand +# and collapse entries dynamically later on. Doxygen will expand the tree to +# such a level that at most the specified number of entries are visible (unless +# a fully collapsed tree already exceeds this amount). So setting the number of +# entries 1 will produce a full collapsed tree by default. 0 is a special value +# representing an infinite number of entries and will result in a full expanded +# tree by default. +# Minimum value: 0, maximum value: 9999, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_INDEX_NUM_ENTRIES = 100 + +# If the GENERATE_DOCSET tag is set to YES, additional index files will be +# generated that can be used as input for Apple's Xcode 3 integrated development +# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a +# Makefile in the HTML output directory. Running make will produce the docset in +# that directory and running make install will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at +# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_DOCSET = NO + +# This tag determines the name of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# The default value is: Doxygen generated docs. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# This tag specifies a string that should uniquely identify the documentation +# set bundle. This should be a reverse domain-name style string, e.g. +# com.mycompany.MyDocSet. Doxygen will append .docset to the name. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. +# The default value is: org.doxygen.Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. +# The default value is: Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three +# additional HTML index files: index.hhp, index.hhc, and index.hhk. The +# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop +# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on +# Windows. +# +# The HTML Help Workshop contains a compiler that can convert all HTML output +# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML +# files are now used as the Windows 98 help format, and will replace the old +# Windows help format (.hlp) on all Windows platforms in the future. Compressed +# HTML files also contain an index, a table of contents, and you can search for +# words in the documentation. The HTML workshop also contains a viewer for +# compressed HTML files. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_HTMLHELP = NO + +# The CHM_FILE tag can be used to specify the file name of the resulting .chm +# file. You can add a path in front of the file if the result should not be +# written to the html output directory. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_FILE = + +# The HHC_LOCATION tag can be used to specify the location (absolute path +# including file name) of the HTML help compiler (hhc.exe). If non-empty, +# doxygen will try to run the HTML help compiler on the generated index.hhp. +# The file has to be specified with full path. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +HHC_LOCATION = + +# The GENERATE_CHI flag controls if a separate .chi index file is generated +# (YES) or that it should be included in the master .chm file (NO). +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +GENERATE_CHI = NO + +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) +# and project file content. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_INDEX_ENCODING = + +# The BINARY_TOC flag controls whether a binary table of contents is generated +# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it +# enables the Previous and Next buttons. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members to +# the table of contents of the HTML help documentation and to the tree view. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that +# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help +# (.qch) of the generated HTML documentation. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify +# the file name of the resulting .qch file. The path specified is relative to +# the HTML output folder. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help +# Project output. For more information please see Qt Help Project / Namespace +# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt +# Help Project output. For more information please see Qt Help Project / Virtual +# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- +# folders). +# The default value is: doc. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_VIRTUAL_FOLDER = doc + +# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom +# filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's filter section matches. Qt Help Project / Filter Attributes (see: +# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_SECT_FILTER_ATTRS = + +# The QHG_LOCATION tag can be used to specify the location of Qt's +# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the +# generated .qhp file. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be +# generated, together with the HTML files, they form an Eclipse help plugin. To +# install this plugin and make it available under the help contents menu in +# Eclipse, the contents of the directory containing the HTML and XML files needs +# to be copied into the plugins directory of eclipse. The name of the directory +# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. +# After copying Eclipse needs to be restarted before the help appears. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the Eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have this +# name. Each documentation set should have its own identifier. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# If you want full control over the layout of the generated HTML pages it might +# be necessary to disable the index and replace it with your own. The +# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top +# of each HTML page. A value of NO enables the index and the value YES disables +# it. Since the tabs in the index contain the same information as the navigation +# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +DISABLE_INDEX = NO + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. If the tag +# value is set to YES, a side panel will be generated containing a tree-like +# index structure (just like the one that is generated for HTML Help). For this +# to work a browser that supports JavaScript, DHTML, CSS and frames is required +# (i.e. any modern browser). Windows users are probably better off using the +# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can +# further fine-tune the look of the index. As an example, the default style +# sheet generated by doxygen has an example that shows how to put an image at +# the root of the tree instead of the PROJECT_NAME. Since the tree basically has +# the same information as the tab index, you could consider setting +# DISABLE_INDEX to YES when enabling this option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_TREEVIEW = NO + +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that +# doxygen will group on one line in the generated HTML documentation. +# +# Note that a value of 0 will completely suppress the enum values from appearing +# in the overview section. +# Minimum value: 0, maximum value: 20, default value: 4. +# This tag requires that the tag GENERATE_HTML is set to YES. + +ENUM_VALUES_PER_LINE = 4 + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used +# to set the initial width (in pixels) of the frame in which the tree is shown. +# Minimum value: 0, maximum value: 1500, default value: 250. +# This tag requires that the tag GENERATE_HTML is set to YES. + +TREEVIEW_WIDTH = 250 + +# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to +# external symbols imported via tag files in a separate window. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of LaTeX formulas included as images in +# the HTML documentation. When you change the font size after a successful +# doxygen run you need to manually remove any form_*.png images from the HTML +# output directory to force them to be regenerated. +# Minimum value: 8, maximum value: 50, default value: 10. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are not +# supported properly for IE 6.0, but are supported on all modern browsers. +# +# Note that when changing this option you need to delete any form_*.png files in +# the HTML output directory before the changes have effect. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see +# http://www.mathjax.org) which uses client side Javascript for the rendering +# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX +# installed or if you want to formulas look prettier in the HTML output. When +# enabled you may also need to install MathJax separately and configure the path +# to it using the MATHJAX_RELPATH option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +USE_MATHJAX = NO + +# When MathJax is enabled you can set the default output format to be used for +# the MathJax output. See the MathJax site (see: +# http://docs.mathjax.org/en/latest/output.html) for more details. +# Possible values are: HTML-CSS (which is slower, but has the best +# compatibility), NativeMML (i.e. MathML) and SVG. +# The default value is: HTML-CSS. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_FORMAT = HTML-CSS + +# When MathJax is enabled you need to specify the location relative to the HTML +# output directory using the MATHJAX_RELPATH option. The destination directory +# should contain the MathJax.js script. For instance, if the mathjax directory +# is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax +# Content Delivery Network so you can quickly see the result without installing +# MathJax. However, it is strongly recommended to install a local copy of +# MathJax from http://www.mathjax.org before deployment. +# The default value is: http://cdn.mathjax.org/mathjax/latest. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest + +# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax +# extension names that should be enabled during MathJax rendering. For example +# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_EXTENSIONS = + +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces +# of code that will be used on startup of the MathJax code. See the MathJax site +# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an +# example see the documentation. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_CODEFILE = + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box for +# the HTML output. The underlying search engine uses javascript and DHTML and +# should work on any modern browser. Note that when using HTML help +# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) +# there is already a search function so this one should typically be disabled. +# For large projects the javascript based search engine can be slow, then +# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to +# search using the keyboard; to jump to the search box use + S +# (what the is depends on the OS and browser, but it is typically +# , /