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`_ diff --git a/.travis.yml b/.travis.yml index f399c1de8..1bfbb3ba7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: perl before_install: - sh package/linux/travis-decrypt-key install: -- export LDLOADLIBS=-lstdc++ - export BOOST_DIR=$HOME/boost_1_63_0 - export SLIC3R_STATIC=1 - export CXX=g++-4.9 diff --git a/README.md b/README.md index 7f3de1b8b..aa5983a9e 100644 --- a/README.md +++ b/README.md @@ -58,8 +58,7 @@ Sure! You can do the following to find things that are available to help with: * Development * [Low Effort tasks](https://github.com/alexrj/Slic3r/labels/Low%20Effort): pick one of them! * [More available tasks](https://github.com/alexrj/Slic3r/milestone/31): let's discuss together before you start working on them - * Please comment in the related github issue that you are working on it so that other people know. - * Please comment in the related GitHub issue that you are working on it so that other people know. + * Please comment in the related GitHub issue that you are working on it so that other people know. * Contribute to the [Manual](http://manual.slic3r.org/)! (see its [GitHub repository](https://github.com/alexrj/Slic3r-Manual)) * You can also find us in #slic3r on [FreeNode](https://webchat.freenode.net): talk to _Sound_, _LoH_ or the other members of the Slic3r community. * Add an [issue](https://github.com/alexrj/Slic3r/issues) to the GitHub tracker if it isn't already present. diff --git a/appveyor.yml b/appveyor.yml index 701f5ca6c..b090aeea0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,6 +7,7 @@ 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 @@ -14,32 +15,37 @@ environment: 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/lib/Slic3r.pm b/lib/Slic3r.pm index f93bfc633..47ed095f3 100644 --- a/lib/Slic3r.pm +++ b/lib/Slic3r.pm @@ -301,6 +301,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); @@ -311,6 +313,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); diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm index 167c733dd..52d67bfee 100644 --- a/lib/Slic3r/Config.pm +++ b/lib/Slic3r/Config.pm @@ -95,7 +95,8 @@ sub load { # legacy syntax of load() my $config = $class->new; - $config->_load(Slic3r::encode_path($file)); + + $config->_load($file); return $config; } @@ -103,7 +104,7 @@ sub save { my $self = shift; my ($file) = @_; - return $self->_save(Slic3r::encode_path($file)); + return $self->_save($file); } # Deserialize a perl hash into the underlying C++ Slic3r::DynamicConfig class, @@ -269,12 +270,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/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm index bdc9de27e..10714f1c7 100644 --- a/lib/Slic3r/GUI.pm +++ b/lib/Slic3r/GUI.pm @@ -5,6 +5,7 @@ use utf8; use Wx 0.9901 qw(:bitmap :dialog :icon :id :misc :systemsettings :toplevelwindow :filedialog :font); +use Wx::Event qw(EVT_MENU); BEGIN { # Wrap the Wx::_load_plugin() function which doesn't work with non-ASCII paths @@ -73,7 +74,6 @@ use constant AMF_MODEL_WILDCARD => join '|', @{&FILE_WILDCARDS}{qw(amf)}; our $datadir; # If set, the "Controller" tab for the control of the printer over serial line and the serial port settings are hidden. -our $no_controller; our $autosave; our $threads; our @cb; @@ -84,23 +84,26 @@ our $Settings = { autocenter => 1, invert_zoom => 0, background_processing => 0, - # If set, the "Controller" tab for the control of the printer over serial line and the serial port settings are hidden. - no_controller => 0, threads => $Slic3r::Config::Options->{threads}{default}, color_toolpaths_by => 'role', + tabbed_preset_editors => 1, }, }; 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); 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; @@ -437,6 +440,30 @@ sub scan_serial_ports { return grep !/Bluetooth|FireFly/, @ports; } +sub append_menu_item { + my ($self, $menu, $string, $description, $cb, $id, $icon, $kind) = @_; + + $id //= &Wx::NewId(); + my $item = Wx::MenuItem->new($menu, $id, $string, $description // '', $kind // 0); + $self->set_menu_item_icon($item, $icon); + $menu->Append($item); + + EVT_MENU($self, $id, $cb); + return $item; +} + +sub append_submenu { + my ($self, $menu, $string, $description, $submenu, $id, $icon) = @_; + + $id //= &Wx::NewId(); + my $item = Wx::MenuItem->new($menu, $id, $string, $description // ''); + $self->set_menu_item_icon($item, $icon); + $item->SetSubMenu($submenu); + $menu->Append($item); + + return $item; +} + sub set_menu_item_icon { my ($self, $menuItem, $icon) = @_; diff --git a/lib/Slic3r/GUI/3DScene.pm b/lib/Slic3r/GUI/3DScene.pm index 09801fe6d..72e7d28ef 100644 --- a/lib/Slic3r/GUI/3DScene.pm +++ b/lib/Slic3r/GUI/3DScene.pm @@ -330,6 +330,19 @@ sub set_viewport_from_scene { $self->_dirty(1); } +sub zoom{ + my ($self, $direction) = @_; + if( $direction eq 'in'){ + $self->_zoom($self->_zoom / (1-0.3)); + } + elsif($direction eq 'out'){ + $self->_zoom($self->_zoom / (1+0.3)); + } + $self->on_viewport_changed->() if $self->on_viewport_changed; + $self->_dirty(1); + $self->Refresh; +} + # Set the camera to a default orientation, # zoom to volumes. sub select_view { @@ -1441,7 +1454,7 @@ sub load_print_object_toolpaths { } } $add->($non_solid, $top_z, $copy, $color); - $color = $self->colors->[ ($layerm->region->config->solid_infill_extruder-1) % @{&COLORS} ]; + $color = $self->colors->[ ($layerm->region->config->solid_infill_extruder-1) % @{$self->colors} ]; $add->($solid, $top_z, $copy, $color); } else { $add->($layerm->fills, $top_z, $copy, $color); diff --git a/lib/Slic3r/GUI/Controller.pm b/lib/Slic3r/GUI/Controller.pm index 87b85fde2..717149d5b 100644 --- a/lib/Slic3r/GUI/Controller.pm +++ b/lib/Slic3r/GUI/Controller.pm @@ -40,20 +40,20 @@ sub new { EVT_LEFT_DOWN($btn, sub { my $menu = Wx::Menu->new; - my %presets = map { $_->name => $_ } wxTheApp->presets('printer'); + my %presets = map { $_->name => $_ } @{wxTheApp->presets->{printer}}; # remove printers that already exist my @panels = $self->print_panels; delete $presets{$_} for map $_->printer_name, @panels; foreach my $preset_name (sort keys %presets) { - my $config = $presets{$preset_name}->dirty_config; - next if !$config->serial_port; + my $preset = $presets{$preset_name}; + next if !$preset->dirty_config->serial_port; my $id = &Wx::NewId(); $menu->Append($id, $preset_name); EVT_MENU($menu, $id, sub { - $self->add_printer($preset_name, $config); + $self->add_printer($preset); }); } $self->PopupMenu($menu, $btn->GetPosition); @@ -100,10 +100,10 @@ sub OnActivate { # get all available presets my %presets = (); - { - my %all = map { $_->name => $_ } @{wxTheApp->presets->{printer}}; - my %configs = map { my $name = $_; $name => $all{$name}->load_config } keys %all; - %presets = map { $_ => $configs{$_} } grep $configs{$_}->serial_port, keys %all; + foreach my $preset (@{wxTheApp->presets->{printer}}) { + $preset->load_config; + next if !$preset->dirty_config->serial_port; + $presets{$preset->name} = $preset; } # decide which ones we want to keep @@ -124,7 +124,7 @@ sub OnActivate { # enable printers whose port is available my %ports = map { $_ => 1 } wxTheApp->scan_serial_ports; $active{$_} = 1 - for grep exists $ports{$presets{$_}->serial_port}, keys %presets; + for grep exists $ports{$presets{$_}->dirty_config->serial_port}, keys %presets; } if (!%active && $self->_selected_printer_preset) { # enable currently selected printer if it is configured @@ -140,7 +140,7 @@ sub OnActivate { $self->{sizer}->DetachWindow($panel); $panel->Destroy; } - $self->add_printer($_, $presets{$_}) for sort keys %active; + $self->add_printer($presets{$_}) for sort keys %active; # show/hide the warning about no printers $self->{text_no_printers}->Show(!%presets); @@ -156,16 +156,16 @@ sub OnActivate { } sub add_printer { - my ($self, $printer_name, $config) = @_; + my ($self, $preset) = @_; # check that printer doesn't exist already foreach my $panel ($self->print_panels) { - if ($panel->printer_name eq $printer_name) { + if ($panel->printer_name eq $preset->name) { return $panel; } } - my $printer_panel = Slic3r::GUI::Controller::PrinterPanel->new($self, $printer_name, $config); + my $printer_panel = Slic3r::GUI::Controller::PrinterPanel->new($self, $preset); $self->{sizer}->Prepend($printer_panel, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 10); $self->Layout; diff --git a/lib/Slic3r/GUI/Controller/PrinterPanel.pm b/lib/Slic3r/GUI/Controller/PrinterPanel.pm index 9e2dc211d..cc0bac03f 100644 --- a/lib/Slic3r/GUI/Controller/PrinterPanel.pm +++ b/lib/Slic3r/GUI/Controller/PrinterPanel.pm @@ -3,6 +3,7 @@ use strict; use warnings; use utf8; +use List::Util qw(first); use Wx qw(wxTheApp :panel :id :misc :sizer :button :bitmap :window :gauge :timer :textctrl :font :systemsettings); use Wx::Event qw(EVT_BUTTON EVT_MOUSEWHEEL EVT_TIMER EVT_SCROLLWIN); @@ -16,11 +17,11 @@ use constant STATUS_TIMER_INTERVAL => 1000; # milliseconds use constant TEMP_TIMER_INTERVAL => 5000; # milliseconds sub new { - my ($class, $parent, $printer_name, $config) = @_; + my ($class, $parent, $preset) = @_; my $self = $class->SUPER::new($parent, -1, wxDefaultPosition, [500, 250]); - $self->printer_name($printer_name || 'Printer'); - $self->config($config); + $self->printer_name($preset->name); + $self->config($preset->dirty_config); $self->manual_control_config({ xy_travel_speed => 130, z_travel_speed => 10, @@ -103,7 +104,7 @@ sub new { } my $serial_port_sizer = Wx::BoxSizer->new(wxHORIZONTAL); { - $self->{serial_port_combobox} = Wx::ComboBox->new($self, -1, $config->serial_port, wxDefaultPosition, wxDefaultSize, []); + $self->{serial_port_combobox} = Wx::ComboBox->new($self, -1, $self->config->serial_port, wxDefaultPosition, wxDefaultSize, []); $self->{serial_port_combobox}->SetFont($Slic3r::GUI::small_font); $self->update_serial_ports; $serial_port_sizer->Add($self->{serial_port_combobox}, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 1); @@ -125,7 +126,7 @@ sub new { } my $serial_speed_sizer = Wx::BoxSizer->new(wxHORIZONTAL); { - $self->{serial_speed_combobox} = Wx::ComboBox->new($self, -1, $config->serial_speed, wxDefaultPosition, wxDefaultSize, + $self->{serial_speed_combobox} = Wx::ComboBox->new($self, -1, $self->config->serial_speed, wxDefaultPosition, wxDefaultSize, ["57600", "115200", "250000"]); $self->{serial_speed_combobox}->SetFont($Slic3r::GUI::small_font); $serial_speed_sizer->Add($self->{serial_speed_combobox}, 0, wxALIGN_CENTER_VERTICAL, 0); @@ -336,6 +337,17 @@ sub connect { # request temperature now, without waiting for the timer $self->sender->send("M105", 1); + + # Update the printer preset with the new connection info + { + my $preset = first { $_->name eq $self->printer_name } @{wxTheApp->presets->{printer}}; + if ($preset) { + $preset->load_config; + $preset->_dirty_config->set('serial_port', $self->{serial_port_combobox}->GetValue); + $preset->_dirty_config->set('serial_speed', $self->{serial_speed_combobox}->GetValue); + $preset->save([ 'serial_port', 'serial_speed' ]); + } + } } else { $self->set_status("Connection failed. Check serial port and speed."); } @@ -543,17 +555,26 @@ use Wx::Event qw(EVT_BUTTON EVT_TIMER EVT_ERASE_BACKGROUND); use base qw(Wx::Panel Class::Accessor); __PACKAGE__->mk_accessors(qw(job on_delete_job on_print_job on_pause_print on_resume_print - on_abort_print blink_timer)); + on_abort_print blink_timer duration queued)); sub new { my ($class, $parent, $job) = @_; my $self = $class->SUPER::new($parent, -1, wxDefaultPosition, wxDefaultSize); + # Estimate print duration + { + my $estimator = Slic3r::GCode::TimeEstimator->new; + $estimator->parse_file($job->gcode_file); + $self->duration($estimator->time); + } + $self->job($job); - $self->SetBackgroundColour(wxWHITE); + $self->queued(scalar localtime); + + $self->SetBackgroundColour(Wx::SystemSettings::GetColour(Wx::wxSYS_COLOUR_LISTBOX)); { - my $white_brush = Wx::Brush->new(wxWHITE, wxSOLID); + my $white_brush = Wx::Brush->new($self->GetBackgroundColour, wxSOLID); my $pen = Wx::Pen->new(Wx::Colour->new(200,200,200), 1, wxSOLID); EVT_ERASE_BACKGROUND($self, sub { my ($self, $event) = @_; @@ -574,13 +595,18 @@ sub new { if ($job->printed) { $text->SetForegroundColour($Slic3r::GUI::grey); } + $text->SetToolTipString("Queued on " . $self->queued) + if $text->can('SetToolTipString'); $left_sizer->Add($text, 0, wxEXPAND, 0); } { - my $filament_stats = join "\n", + my $stats = join "\n", map "$_ (" . sprintf("%.2f", $job->filament_stats->{$_}/1000) . "m)", sort keys %{$job->filament_stats}; - my $text = Wx::StaticText->new($self, -1, $filament_stats, wxDefaultPosition, wxDefaultSize); + $stats .= sprintf "\nEstimated time: %d hours and %d minutes", + int($self->duration/3600), int($self->duration/60) % 60; + + my $text = Wx::StaticText->new($self, -1, $stats, wxDefaultPosition, wxDefaultSize); $text->SetFont($Slic3r::GUI::small_font); if ($job->printed && !$job->printing) { $text->SetForegroundColour($Slic3r::GUI::grey); diff --git a/lib/Slic3r/GUI/MainFrame.pm b/lib/Slic3r/GUI/MainFrame.pm index 1b07d37ef..aac9b85d3 100644 --- a/lib/Slic3r/GUI/MainFrame.pm +++ b/lib/Slic3r/GUI/MainFrame.pm @@ -8,9 +8,10 @@ use utf8; use File::Basename qw(basename dirname); use List::Util qw(min); use Slic3r::Geometry qw(X Y Z); -use Wx qw(:frame :bitmap :id :misc :notebook :panel :sizer :menu :dialog :filedialog - :font :icon wxTheApp); -use Wx::Event qw(EVT_CLOSE EVT_MENU EVT_NOTEBOOK_PAGE_CHANGED); +use Wx qw(:frame :bitmap :id :misc :panel :sizer :menu :dialog :filedialog + :font :icon :aui wxTheApp); +use Wx::AUI; +use Wx::Event qw(EVT_CLOSE EVT_AUINOTEBOOK_PAGE_CHANGED EVT_AUINOTEBOOK_PAGE_CLOSE); use base 'Wx::Frame'; our $qs_last_input_file; @@ -28,6 +29,7 @@ sub new { } $self->{loaded} = 0; + $self->{preset_editor_tabs} = {}; # group => panel # initialize tabpanel and menubar $self->_init_tabpanel; @@ -92,15 +94,28 @@ sub new { sub _init_tabpanel { my ($self) = @_; - $self->{tabpanel} = my $panel = Wx::Notebook->new($self, -1, wxDefaultPosition, wxDefaultSize, wxNB_TOP | wxTAB_TRAVERSAL); - EVT_NOTEBOOK_PAGE_CHANGED($self, $self->{tabpanel}, sub { - my $panel = $self->{tabpanel}->GetCurrentPage; + $self->{tabpanel} = my $panel = Wx::AuiNotebook->new($self, -1, wxDefaultPosition, wxDefaultSize, wxAUI_NB_TOP); + EVT_AUINOTEBOOK_PAGE_CHANGED($self, $self->{tabpanel}, sub { + my $panel = $self->{tabpanel}->GetPage($self->{tabpanel}->GetSelection); $panel->OnActivate if $panel->can('OnActivate'); + if ($self->{tabpanel}->GetSelection > 1) { + $self->{tabpanel}->SetWindowStyle($self->{tabpanel}->GetWindowStyleFlag | wxAUI_NB_CLOSE_ON_ACTIVE_TAB); + } else { + $self->{tabpanel}->SetWindowStyle($self->{tabpanel}->GetWindowStyleFlag & ~wxAUI_NB_CLOSE_ON_ACTIVE_TAB); + } + }); + EVT_AUINOTEBOOK_PAGE_CLOSE($self, $self->{tabpanel}, sub { + my $panel = $self->{tabpanel}->GetPage($self->{tabpanel}->GetSelection); + if ($panel->isa('Slic3r::GUI::PresetEditor')) { + delete $self->{preset_editor_tabs}{$panel->name}; + } + wxTheApp->CallAfter(sub { + $self->{tabpanel}->SetSelection(0); + }); }); $panel->AddPage($self->{plater} = Slic3r::GUI::Plater->new($panel), "Plater"); - $panel->AddPage($self->{controller} = Slic3r::GUI::Controller->new($panel), "Controller") - unless ($Slic3r::GUI::Settings->{_}{no_controller}); + $panel->AddPage($self->{controller} = Slic3r::GUI::Controller->new($panel), "Controller"); } sub _init_menubar { @@ -109,60 +124,60 @@ sub _init_menubar { # File menu my $fileMenu = Wx::Menu->new; { - $self->_append_menu_item($fileMenu, "Open STL/OBJ/AMF…\tCtrl+O", 'Open a model', sub { + wxTheApp->append_menu_item($fileMenu, "Open STL/OBJ/AMF…\tCtrl+O", 'Open a model', sub { $self->{plater}->add if $self->{plater}; }, undef, 'brick_add.png'); - $self->_append_menu_item($fileMenu, "Open 2.5D TIN mesh…", 'Import a 2.5D TIN mesh', sub { + wxTheApp->append_menu_item($fileMenu, "Open 2.5D TIN mesh…", 'Import a 2.5D TIN mesh', sub { $self->{plater}->add_tin if $self->{plater}; }, undef, 'map_add.png'); $fileMenu->AppendSeparator(); - $self->_append_menu_item($fileMenu, "&Load Config…\tCtrl+L", 'Load exported configuration file', sub { + wxTheApp->append_menu_item($fileMenu, "&Load Config…\tCtrl+L", 'Load exported configuration file', sub { $self->load_config_file; }, undef, 'plugin_add.png'); - $self->_append_menu_item($fileMenu, "&Export Config…\tCtrl+E", 'Export current configuration to file', sub { + wxTheApp->append_menu_item($fileMenu, "&Export Config…\tCtrl+E", 'Export current configuration to file', sub { $self->export_config; }, undef, 'plugin_go.png'); - $self->_append_menu_item($fileMenu, "&Load Config Bundle…", 'Load presets from a bundle', sub { + wxTheApp->append_menu_item($fileMenu, "&Load Config Bundle…", 'Load presets from a bundle', sub { $self->load_configbundle; }, undef, 'lorry_add.png'); - $self->_append_menu_item($fileMenu, "&Export Config Bundle…", 'Export all presets to file', sub { + wxTheApp->append_menu_item($fileMenu, "&Export Config Bundle…", 'Export all presets to file', sub { $self->export_configbundle; }, undef, 'lorry_go.png'); $fileMenu->AppendSeparator(); my $repeat; - $self->_append_menu_item($fileMenu, "Q&uick Slice…\tCtrl+U", 'Slice file', sub { + wxTheApp->append_menu_item($fileMenu, "Q&uick Slice…\tCtrl+U", 'Slice file', sub { wxTheApp->CallAfter(sub { $self->quick_slice; $repeat->Enable(defined $Slic3r::GUI::MainFrame::last_input_file); }); }, undef, 'cog_go.png'); - $self->_append_menu_item($fileMenu, "Quick Slice and Save &As…\tCtrl+Alt+U", 'Slice file and save as', sub { + wxTheApp->append_menu_item($fileMenu, "Quick Slice and Save &As…\tCtrl+Alt+U", 'Slice file and save as', sub { wxTheApp->CallAfter(sub { $self->quick_slice(save_as => 1); $repeat->Enable(defined $Slic3r::GUI::MainFrame::last_input_file); }); }, undef, 'cog_go.png'); - $repeat = $self->_append_menu_item($fileMenu, "&Repeat Last Quick Slice\tCtrl+Shift+U", 'Repeat last quick slice', sub { + $repeat = wxTheApp->append_menu_item($fileMenu, "&Repeat Last Quick Slice\tCtrl+Shift+U", 'Repeat last quick slice', sub { wxTheApp->CallAfter(sub { $self->quick_slice(reslice => 1); }); }, undef, 'cog_go.png'); $repeat->Enable(0); $fileMenu->AppendSeparator(); - $self->_append_menu_item($fileMenu, "Slice to SV&G…\tCtrl+G", 'Slice file to SVG', sub { + wxTheApp->append_menu_item($fileMenu, "Slice to SV&G…\tCtrl+G", 'Slice file to SVG', sub { $self->quick_slice(save_as => 1, export_svg => 1); }, undef, 'shape_handles.png'); $fileMenu->AppendSeparator(); - $self->_append_menu_item($fileMenu, "Repair STL file…", 'Automatically repair an STL file', sub { + wxTheApp->append_menu_item($fileMenu, "Repair STL file…", 'Automatically repair an STL file', sub { $self->repair_stl; }, undef, 'wrench.png'); $fileMenu->AppendSeparator(); # Cmd+, is standard on OS X - what about other operating systems? - $self->_append_menu_item($fileMenu, "Preferences…\tCtrl+,", 'Application preferences', sub { + wxTheApp->append_menu_item($fileMenu, "Preferences…\tCtrl+,", 'Application preferences', sub { Slic3r::GUI::Preferences->new($self)->ShowModal; }, wxID_PREFERENCES); $fileMenu->AppendSeparator(); - $self->_append_menu_item($fileMenu, "&Quit", 'Quit Slic3r', sub { + wxTheApp->append_menu_item($fileMenu, "&Quit", 'Quit Slic3r', sub { $self->Close(0); }, wxID_EXIT); } @@ -174,40 +189,43 @@ sub _init_menubar { $self->{plater_menu} = Wx::Menu->new; { my $selectMenu = $self->{plater_select_menu} = Wx::Menu->new; - my $selectMenuItem = $self->{plater_menu}->AppendSubMenu($selectMenu, "Select", 'Select an object in the plater'); - wxTheApp->set_menu_item_icon($selectMenuItem, 'brick.png'); + wxTheApp->append_submenu($self->{plater_menu}, "Select", 'Select an object in the plater', $selectMenu, undef, 'brick.png'); } - $self->_append_menu_item($self->{plater_menu}, "Select Next Object\tCtrl+Right", 'Select Next Object in the plater', sub { + wxTheApp->append_menu_item($self->{plater_menu}, "Select Next Object\tCtrl+Right", 'Select Next Object in the plater', sub { $plater->select_next; }, undef, 'arrow_right.png'); - $self->_append_menu_item($self->{plater_menu}, "Select Prev Object\tCtrl+Left", 'Select Previous Object in the plater', sub { + 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'); + 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(); - $self->_append_menu_item($self->{plater_menu}, "Export G-code...", 'Export current plate as G-code', sub { + wxTheApp->append_menu_item($self->{plater_menu}, "Export G-code...", 'Export current plate as G-code', sub { $plater->export_gcode; }, undef, 'cog_go.png'); - $self->_append_menu_item($self->{plater_menu}, "Export plate as STL...", 'Export current plate as STL', sub { + wxTheApp->append_menu_item($self->{plater_menu}, "Export plate as STL...", 'Export current plate as STL', sub { $plater->export_stl; }, undef, 'brick_go.png'); - $self->_append_menu_item($self->{plater_menu}, "Export plate with modifiers as AMF...", 'Export current plate as AMF, including all modifier meshes', sub { + wxTheApp->append_menu_item($self->{plater_menu}, "Export plate with modifiers as AMF...", 'Export current plate as AMF, including all modifier meshes', sub { $plater->export_amf; }, undef, 'brick_go.png'); - $self->{object_menu} = $self->{plater}->object_menu; + $self->on_plater_object_list_changed(0); $self->on_plater_selection_changed(0); } # Settings menu my $settingsMenu = Wx::Menu->new; { - $self->_append_menu_item($settingsMenu, "P&rint Settings…\tCtrl+1", 'Show the print settings editor', sub { + wxTheApp->append_menu_item($settingsMenu, "P&rint Settings…\tCtrl+1", 'Show the print settings editor', sub { $self->{plater}->show_preset_editor('print'); }, undef, 'cog.png'); - $self->_append_menu_item($settingsMenu, "&Filament Settings…\tCtrl+2", 'Show the filament settings editor', sub { + wxTheApp->append_menu_item($settingsMenu, "&Filament Settings…\tCtrl+2", 'Show the filament settings editor', sub { $self->{plater}->show_preset_editor('filament'); }, undef, 'spool.png'); - $self->_append_menu_item($settingsMenu, "Print&er Settings…\tCtrl+3", 'Show the printer settings editor', sub { + wxTheApp->append_menu_item($settingsMenu, "Print&er Settings…\tCtrl+3", 'Show the printer settings editor', sub { $self->{plater}->show_preset_editor('printer'); }, undef, 'printer_empty.png'); } @@ -215,15 +233,15 @@ sub _init_menubar { # View menu { $self->{viewMenu} = Wx::Menu->new; - $self->_append_menu_item($self->{viewMenu}, "Top\tCtrl+4" , 'Top View' , sub { $self->select_view('top' ); }); - $self->_append_menu_item($self->{viewMenu}, "Bottom\tCtrl+5" , 'Bottom View' , sub { $self->select_view('bottom' ); }); - $self->_append_menu_item($self->{viewMenu}, "Left\tCtrl+6" , 'Left View' , sub { $self->select_view('left' ); }); - $self->_append_menu_item($self->{viewMenu}, "Right\tCtrl+7" , 'Right View' , sub { $self->select_view('right' ); }); - $self->_append_menu_item($self->{viewMenu}, "Front\tCtrl+8" , 'Front View' , sub { $self->select_view('front' ); }); - $self->_append_menu_item($self->{viewMenu}, "Back\tCtrl+9" , 'Back View' , sub { $self->select_view('back' ); }); - $self->_append_menu_item($self->{viewMenu}, "Diagonal\tCtrl+0", 'Diagonal View', sub { $self->select_view('diagonal'); }); + wxTheApp->append_menu_item($self->{viewMenu}, "Top\tCtrl+4" , 'Top View' , sub { $self->select_view('top' ); }); + wxTheApp->append_menu_item($self->{viewMenu}, "Bottom\tCtrl+5" , 'Bottom View' , sub { $self->select_view('bottom' ); }); + wxTheApp->append_menu_item($self->{viewMenu}, "Left\tCtrl+6" , 'Left View' , sub { $self->select_view('left' ); }); + wxTheApp->append_menu_item($self->{viewMenu}, "Right\tCtrl+7" , 'Right View' , sub { $self->select_view('right' ); }); + wxTheApp->append_menu_item($self->{viewMenu}, "Front\tCtrl+8" , 'Front View' , sub { $self->select_view('front' ); }); + wxTheApp->append_menu_item($self->{viewMenu}, "Back\tCtrl+9" , 'Back View' , sub { $self->select_view('back' ); }); + wxTheApp->append_menu_item($self->{viewMenu}, "Diagonal\tCtrl+0", 'Diagonal View', sub { $self->select_view('diagonal'); }); $self->{viewMenu}->AppendSeparator(); - $self->{color_toolpaths_by_role} = $self->_append_menu_item($self->{viewMenu}, + $self->{color_toolpaths_by_role} = wxTheApp->append_menu_item($self->{viewMenu}, "Color Toolpaths by Role", 'Color toolpaths according to perimeter/infill/support material', sub { @@ -233,7 +251,7 @@ sub _init_menubar { }, undef, undef, wxITEM_RADIO ); - $self->{color_toolpaths_by_extruder} = $self->_append_menu_item($self->{viewMenu}, + $self->{color_toolpaths_by_extruder} = wxTheApp->append_menu_item($self->{viewMenu}, "Color Toolpaths by Filament", 'Color toolpaths using the configured extruder/filament color', sub { @@ -253,13 +271,13 @@ sub _init_menubar { # Window menu my $windowMenu = Wx::Menu->new; { - $self->_append_menu_item($windowMenu, "&Plater\tCtrl+T", 'Show the plater', sub { + wxTheApp->append_menu_item($windowMenu, "&Plater\tCtrl+T", 'Show the plater', sub { $self->select_tab(0); }, undef, 'application_view_tile.png'); - $self->_append_menu_item($windowMenu, "&Controller\tCtrl+Y", 'Show the printer controller', sub { + wxTheApp->append_menu_item($windowMenu, "&Controller\tCtrl+Y", 'Show the printer controller', sub { $self->select_tab(1); - }, undef, 'printer_empty.png') unless ($Slic3r::GUI::Settings->{_}{no_controller}); - $self->_append_menu_item($windowMenu, "DLP Projector…\tCtrl+P", 'Open projector window for DLP printing', sub { + }, undef, 'printer_empty.png'); + wxTheApp->append_menu_item($windowMenu, "DLP Projector…\tCtrl+P", 'Open projector window for DLP printing', sub { $self->{plater}->pause_background_process; Slic3r::GUI::SLAPrintOptions->new($self)->ShowModal; $self->{plater}->resume_background_process; @@ -269,22 +287,22 @@ sub _init_menubar { # Help menu my $helpMenu = Wx::Menu->new; { - $self->_append_menu_item($helpMenu, "&Configuration $Slic3r::GUI::ConfigWizard::wizard…", "Run Configuration $Slic3r::GUI::ConfigWizard::wizard", sub { + wxTheApp->append_menu_item($helpMenu, "&Configuration $Slic3r::GUI::ConfigWizard::wizard…", "Run Configuration $Slic3r::GUI::ConfigWizard::wizard", sub { $self->config_wizard; }); $helpMenu->AppendSeparator(); - $self->_append_menu_item($helpMenu, "Slic3r &Website", 'Open the Slic3r website in your browser', sub { + wxTheApp->append_menu_item($helpMenu, "Slic3r &Website", 'Open the Slic3r website in your browser', sub { Wx::LaunchDefaultBrowser('http://slic3r.org/'); }); - my $versioncheck = $self->_append_menu_item($helpMenu, "Check for &Updates...", 'Check for new Slic3r versions', sub { + my $versioncheck = wxTheApp->append_menu_item($helpMenu, "Check for &Updates...", 'Check for new Slic3r versions', sub { wxTheApp->check_version(1); }); $versioncheck->Enable(wxTheApp->have_version_check); - $self->_append_menu_item($helpMenu, "Slic3r &Manual", 'Open the Slic3r manual in your browser', sub { + wxTheApp->append_menu_item($helpMenu, "Slic3r &Manual", 'Open the Slic3r manual in your browser', sub { Wx::LaunchDefaultBrowser('http://manual.slic3r.org/'); }); $helpMenu->AppendSeparator(); - $self->_append_menu_item($helpMenu, "&About Slic3r", 'Show about dialog', sub { + wxTheApp->append_menu_item($helpMenu, "&About Slic3r", 'Show about dialog', sub { wxTheApp->about; }); } @@ -310,6 +328,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) = @_; @@ -458,9 +484,9 @@ sub repair_stl { } my $tmesh = Slic3r::TriangleMesh->new; - $tmesh->ReadSTLFile(Slic3r::encode_path($input_file)); + $tmesh->ReadSTLFile($input_file); $tmesh->repair; - $tmesh->WriteOBJFile(Slic3r::encode_path($output_file)); + $tmesh->WriteOBJFile($output_file); Slic3r::GUI::show_info($self, "Your file was repaired.", "Repair"); } @@ -627,19 +653,8 @@ sub select_tab { # Set a camera direction, zoom to all objects. sub select_view { my ($self, $direction) = @_; - + $self->{plater}->select_view($direction); } -sub _append_menu_item { - my ($self, $menu, $string, $description, $cb, $id, $icon, $kind) = @_; - - $id //= &Wx::NewId(); - my $item = $menu->Append($id, $string, $description, $kind); - wxTheApp->set_menu_item_icon($item, $icon); - - EVT_MENU($self, $id, $cb); - return $item; -} - 1; diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm index 505108a6a..7ecc9923d 100644 --- a/lib/Slic3r/GUI/Plater.pm +++ b/lib/Slic3r/GUI/Plater.pm @@ -50,7 +50,7 @@ sub new { my $self = $class->SUPER::new($parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); $self->{config} = Slic3r::Config->new_from_defaults(qw( bed_shape complete_objects extruder_clearance_radius skirts skirt_distance brim_width - serial_port serial_speed octoprint_host octoprint_apikey overridable filament_colour + serial_port serial_speed host_type print_host octoprint_apikey shortcuts filament_colour )); $self->{model} = Slic3r::Model->new; $self->{print} = Slic3r::Print->new; @@ -92,7 +92,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}); @@ -329,7 +329,6 @@ sub new { if ($self->{preview3D}) { $self->{preview3D}->set_bed_shape($self->{config}->bed_shape); } - $self->on_model_change; { my $presets = $self->{presets_sizer} = Wx::FlexGridSizer->new(3, 3, 1, 2); @@ -373,9 +372,37 @@ sub new { { my $o = $self->{settings_override_panel} = Slic3r::GUI::Plater::OverrideSettingsPanel->new($self, on_change => sub { + my ($opt_key) = @_; + + my ($preset) = $self->selected_presets('print'); + $preset->load_config; + + # If this option is not in the override panel it means it was manually deleted, + # so let's restore the profile value. + if (!$self->{settings_override_config}->has($opt_key)) { + $preset->_dirty_config->set($opt_key, $preset->_config->get($opt_key)); + } else { + # Apply the overrides to the current Print preset, potentially making it dirty + $preset->_dirty_config->apply($self->{settings_override_config}); + + # If this is a configured shortcut (and not just a dirty option), + # save it now. + if (any { $_ eq $opt_key } @{$preset->dirty_config->shortcuts}) { + $preset->save([$opt_key]); + } + } + + $self->load_presets; $self->config_changed; + + # Reload the open tab if any + if (my $print_tab = $self->GetFrame->{preset_editor_tabs}{print}) { + $print_tab->load_presets; + $print_tab->reload_preset; + } }); - $o->set_editable(1); + $o->can_add(0); + $o->can_delete(1); $o->set_opt_keys([ Slic3r::GUI::PresetEditor::Print->options ]); $self->{settings_override_config} = Slic3r::Config->new; $o->set_default_config($self->{settings_override_config}); @@ -541,6 +568,14 @@ sub _on_change_combobox { return 0 if !$self->prompt_unsaved_changes; } wxTheApp->CallAfter(sub { + # Close the preset editor tab if any + if (exists $self->GetFrame->{preset_editor_tabs}{$group}) { + my $tabpanel = $self->GetFrame->{tabpanel}; + $tabpanel->DeletePage($tabpanel->GetPageIndex($self->GetFrame->{preset_editor_tabs}{$group})); + delete $self->GetFrame->{preset_editor_tabs}{$group}; + $tabpanel->SetSelection(0); # without this, a newly created tab will not be selected by wx + } + $self->_on_select_preset($group); # This will remove the "(modified)" mark from any dirty preset handled here. @@ -569,31 +604,19 @@ sub _on_select_preset { my $o_config = $self->{settings_override_config}; my $o_panel = $self->{settings_override_panel}; - if ($changed) { - # Preserve current options if re-selecting the same preset - $o_config->clear; - } + my $shortcuts = $config->get('shortcuts'); - my $overridable = $config->get('overridable'); - - # Add/remove options (we do it this way for preserving current options) - foreach my $opt_key (@$overridable) { - # Populate option with the default value taken from configuration - # (re-set the override always, because if we here it means user - # switched to this preset or opened/closed the editor, so he expects - # the new values set in the editor to be used). + # Re-populate the override panel with the configured shortcuts + # and the dirty options. + $o_config->clear; + foreach my $opt_key (@$shortcuts, $presets[0]->dirty_options) { + # Don't add shortcut for shortcuts! + next if $opt_key eq 'shortcuts'; $o_config->set($opt_key, $config->get($opt_key)); } - foreach my $opt_key (@{$o_config->get_keys}) { - # Keep options listed among overridable and options added on the fly - if ((none { $_ eq $opt_key } @$overridable) - && (any { $_ eq $opt_key } $o_panel->fixed_options)) { - $o_config->erase($opt_key); - } - } $o_panel->set_default_config($config); - $o_panel->set_fixed_options(\@$overridable); + $o_panel->set_fixed_options(\@$shortcuts); $o_panel->update_optgroup; } elsif ($group eq 'printer') { # reload print and filament settings to honor their compatible_printer options @@ -706,7 +729,7 @@ sub load_presets { } } - $self->{print}->placeholder_parser->set("${group}_preset", [ @preset_names ]); + $self->{print}->placeholder_parser->set_multiple("${group}_preset", [ @preset_names ]); } } @@ -749,19 +772,54 @@ sub selected_presets { sub show_preset_editor { my ($self, $group, $i) = @_; - my $class = "Slic3r::GUI::PresetEditorDialog::" . ucfirst($group); - my $dlg = $class->new($self); + wxTheApp->CallAfter(sub { + my @presets = $self->selected_presets($group); - my @presets = $self->selected_presets($group); - $dlg->preset_editor->select_preset_by_name($presets[$i // 0]->name); - $dlg->ShowModal; + my $preset_editor; + my $dlg; + my $mainframe = $self->GetFrame; + my $tabpanel = $mainframe->{tabpanel}; + if (exists $mainframe->{preset_editor_tabs}{$group}) { + # we already have an open editor + $tabpanel->SetSelection($tabpanel->GetPageIndex($mainframe->{preset_editor_tabs}{$group})); + return; + } elsif ($Slic3r::GUI::Settings->{_}{tabbed_preset_editors}) { + my $class = "Slic3r::GUI::PresetEditor::" . ucfirst($group); + $mainframe->{preset_editor_tabs}{$group} = $preset_editor = $class->new($self->GetFrame); + $tabpanel->AddPage($preset_editor, ucfirst($group) . " Settings", 1); + } else { + my $class = "Slic3r::GUI::PresetEditorDialog::" . ucfirst($group); + $dlg = $class->new($self); + $preset_editor = $dlg->preset_editor; + } - # Re-load the presets as they might have changed. - $self->load_presets; + $preset_editor->select_preset_by_name($presets[$i // 0]->name); + $preset_editor->on_value_change(sub { + # Re-load the presets in order to toggle the (modified) suffix + $self->load_presets; + + # Update shortcuts + $self->_on_select_preset($group); + + # Use the new config wherever we actually use its contents + $self->config_changed; + }); + my $cb = sub { + my ($group, $preset) = @_; + + # Re-load the presets as they might have changed. + $self->load_presets; + + # Select the preset in plater too + $self->select_preset_by_name($preset->name, $group, $i, 1); + }; + $preset_editor->on_select_preset($cb); + $preset_editor->on_save_preset($cb); - # Select the preset that was last selected in the editor. - $self->select_preset_by_name - ($dlg->preset_editor->current_preset->name, $group, $i, 1); + if ($dlg) { + $dlg->Show; + } + }); } # Returns the current config by merging the selected presets and the overrides. @@ -772,7 +830,7 @@ sub config { my $config = Slic3r::Config->new_from_defaults; # get defaults also for the values tracked by the Plater's config - # (for example 'overridable') + # (for example 'shortcuts') $config->apply(Slic3r::Config->new_from_defaults(@{$self->{config}->get_keys})); my %classes = map { $_ => "Slic3r::GUI::PresetEditor::".ucfirst($_) } @@ -893,6 +951,11 @@ sub load_file { sub load_model_objects { my ($self, @model_objects) = @_; + # Always restart background process when adding new objects. + # This prevents lack of processing in some circumstances when background process is + # running but adding a new object does not invalidate anything. + $self->stop_background_process; + my $bed_centerf = $self->bed_centerf; my $bed_shape = Slic3r::Polygon->new_scale(@{$self->{config}->bed_shape}); my $bed_size = $bed_shape->bounding_box->size; @@ -1353,8 +1416,8 @@ sub config_changed { $self->{btn_print}->Hide; } $self->Layout; - } elsif ($opt_key eq 'octoprint_host') { - if ($config->get('octoprint_host')) { + } elsif ($opt_key eq 'print_host') { + if ($config->get('print_host')) { $self->{btn_send_gcode}->Show; } else { $self->{btn_send_gcode}->Hide; @@ -1506,7 +1569,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; @@ -1677,7 +1740,7 @@ sub on_export_completed { $message = "File added to print queue"; $do_print = 1; } elsif ($self->{send_gcode_file}) { - $message = "Sending G-code file to the OctoPrint server..."; + $message = "Sending G-code file to the " . $self->{config}->host_type . " server..."; $send_gcode = 1; } else { $message = "G-code file exported to " . $self->{export_gcode_output_file}; @@ -1721,8 +1784,7 @@ sub do_print { my %current_presets = $self->selected_presets; - my $printer_name = $current_presets{printer}->[0]->name; - my $printer_panel = $controller->add_printer($printer_name, $self->config); + my $printer_panel = $controller->add_printer($current_presets{printer}->[0], $self->config); my $filament_stats = $self->{print}->filament_stats; $filament_stats = { map { $current_presets{filament}[$_]->name => $filament_stats->{$_} } keys %$filament_stats }; @@ -1751,23 +1813,33 @@ sub prepare_send { my $ua = LWP::UserAgent->new; $ua->timeout(5); - my $res = $ua->get( - "http://" . $self->{config}->octoprint_host . "/api/files/local", - 'X-Api-Key' => $self->{config}->octoprint_apikey, - ); + my $res; + if ($self->{config}->print_host) { + if($self->{config}->host_type eq 'octoprint'){ + $res = $ua->get( + "http://" . $self->{config}->print_host . "/api/files/local", + 'X-Api-Key' => $self->{config}->octoprint_apikey, + ); + }else { + $res = $ua->get( + "http://" . $self->{config}->print_host . "/rr_files", + ); + } + } $progress->Destroy; if ($res->is_success) { - if ($res->decoded_content =~ /"name":\s*"\Q$filename\E"/) { + my $searchterm = ($self->{config}->host_type eq 'octoprint') ? '/"name":\s*"\Q$filename\E"/' : '"'.$filename.'"'; + if ($res->decoded_content =~ $searchterm) { my $dialog = Wx::MessageDialog->new($self, "It looks like a file with the same name already exists in the server. " . "Shall I overwrite it?", - 'OctoPrint', wxICON_WARNING | wxYES | wxNO); + $self->{config}->host_type, wxICON_WARNING | wxYES | wxNO); if ($dialog->ShowModal() == wxID_NO) { return; } } } else { - my $message = "Error while connecting to the OctoPrint server: " . $res->status_line; + my $message = "Error while connecting to the " . $self->{config}->host_type . " server: " . $res->status_line; Slic3r::GUI::show_error($self, $message); return; } @@ -1786,24 +1858,52 @@ sub send_gcode { $ua->timeout(180); my $path = Slic3r::encode_path($self->{send_gcode_file}); - my $res = $ua->post( - "http://" . $self->{config}->octoprint_host . "/api/files/local", - Content_Type => 'form-data', - 'X-Api-Key' => $self->{config}->octoprint_apikey, - Content => [ - # OctoPrint doesn't like Windows paths so we use basename() - # Also, since we need to read from filesystem we process it through encode_path() - file => [ $path, basename($path) ], - print => $self->{send_gcode_file_print} ? 1 : 0, - ], - ); - + my $filename = basename($self->{print}->output_filepath($main::opt{output} // '')); + my $res; + if($self->{config}->print_host){ + if($self->{config}->host_type eq 'octoprint'){ + $res = $ua->post( + "http://" . $self->{config}->print_host . "/api/files/local", + Content_Type => 'form-data', + 'X-Api-Key' => $self->{config}->octoprint_apikey, + Content => [ + # OctoPrint doesn't like Windows paths so we use basename() + # Also, since we need to read from filesystem we process it through encode_path() + file => [ $path, basename($path) ], + print => $self->{send_gcode_file_print} ? 1 : 0, + ], + ); + }else{ + # slurp the file we would send into a string - should be someplace to reference this but could not find it? + local $/=undef; + open my $gch,$path; + my $gcode=<$gch>; + close($gch); + + # get the time string + my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); + my $t = sprintf("%4d-%02d-%02dT%02d:%02d:%02d",$year+1900,$mon+1,$mday,$hour,$min,$sec); + + my $req = HTTP::Request->new(POST => "http://" . $self->{config}->print_host . "/rr_upload?name=0:/gcodes/" . basename($path) . "&time=$t",); + $req->content( $gcode ); + $res = $ua->request($req); + + if ($res->is_success) { + if ($self->{send_gcode_file_print}) { + $res = $ua->get( + "http://" . $self->{config}->print_host . "/rr_gcode?gcode=M32%20" . basename($path), + ); + } + } + } + } + $self->statusbar->StopBusy; if ($res->is_success) { - $self->statusbar->SetStatusText("G-code file successfully uploaded to the OctoPrint server"); + $self->statusbar->SetStatusText("G-code file successfully uploaded to the " . $self->{config}->host_type . " server"); } else { - my $message = "Error while uploading to the OctoPrint server: " . $res->status_line; + my $message = "Error while uploading to the " . $self->{config}->host_type . " server: " . $res->status_line; Slic3r::GUI::show_error($self, $message); $self->statusbar->SetStatusText($message); } @@ -1971,7 +2071,7 @@ sub on_model_change { if ($count > 1) { $name .= " (${count}x)"; } - my $item = $self->GetFrame->_append_menu_item($menu, $name, 'Select object', sub { + my $item = wxTheApp->append_menu_item($menu, $name, 'Select object', sub { $self->select_object($i); $self->refresh_canvases; }, undef, undef, wxITEM_CHECK); @@ -2187,6 +2287,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 { @@ -2335,108 +2438,112 @@ sub object_menu { my $frame = $self->GetFrame; my $menu = Wx::Menu->new; - $frame->_append_menu_item($menu, "Delete\tCtrl+Del", 'Remove the selected object', sub { + wxTheApp->append_menu_item($menu, "Delete\tCtrl+Del", 'Remove the selected object', sub { $self->remove; }, undef, 'brick_delete.png'); - $frame->_append_menu_item($menu, "Increase copies\tCtrl++", 'Place one more copy of the selected object', sub { + wxTheApp->append_menu_item($menu, "Increase copies\tCtrl++", 'Place one more copy of the selected object', sub { $self->increase; }, undef, 'add.png'); - $frame->_append_menu_item($menu, "Decrease copies\tCtrl+-", 'Remove one copy of the selected object', sub { + wxTheApp->append_menu_item($menu, "Decrease copies\tCtrl+-", 'Remove one copy of the selected object', sub { $self->decrease; }, undef, 'delete.png'); - $frame->_append_menu_item($menu, "Set number of copies…", 'Change the number of copies of the selected object', sub { + wxTheApp->append_menu_item($menu, "Set number of copies…", 'Change the number of copies of the selected object', sub { $self->set_number_of_copies; }, undef, 'textfield.png'); $menu->AppendSeparator(); - $frame->_append_menu_item($menu, "Move to bed center", 'Center object around bed center', sub { + wxTheApp->append_menu_item($menu, "Move to bed center", 'Center object around bed center', sub { $self->center_selected_object_on_bed; }, undef, 'arrow_in.png'); - $frame->_append_menu_item($menu, "Rotate 45° clockwise", 'Rotate the selected object by 45° clockwise', sub { + wxTheApp->append_menu_item($menu, "Rotate 45° clockwise", 'Rotate the selected object by 45° clockwise', sub { $self->rotate(-45); }, undef, 'arrow_rotate_clockwise.png'); - $frame->_append_menu_item($menu, "Rotate 45° counter-clockwise", 'Rotate the selected object by 45° counter-clockwise', sub { + wxTheApp->append_menu_item($menu, "Rotate 45° counter-clockwise", 'Rotate the selected object by 45° counter-clockwise', sub { $self->rotate(+45); }, undef, 'arrow_rotate_anticlockwise.png'); - my $rotateMenu = Wx::Menu->new; - my $rotateMenuItem = $menu->AppendSubMenu($rotateMenu, "Rotate", 'Rotate the selected object by an arbitrary angle'); - wxTheApp->set_menu_item_icon($rotateMenuItem, 'textfield.png'); - $frame->_append_menu_item($rotateMenu, "Around X axis…", 'Rotate the selected object by an arbitrary angle around X axis', sub { - $self->rotate(undef, X); - }, undef, 'bullet_red.png'); - $frame->_append_menu_item($rotateMenu, "Around Y axis…", 'Rotate the selected object by an arbitrary angle around Y axis', sub { - $self->rotate(undef, Y); - }, undef, 'bullet_green.png'); - $frame->_append_menu_item($rotateMenu, "Around Z axis…", 'Rotate the selected object by an arbitrary angle around Z axis', sub { - $self->rotate(undef, Z); - }, undef, 'bullet_blue.png'); + { + my $rotateMenu = Wx::Menu->new; + wxTheApp->append_menu_item($rotateMenu, "Around X axis…", 'Rotate the selected object by an arbitrary angle around X axis', sub { + $self->rotate(undef, X); + }, undef, 'bullet_red.png'); + wxTheApp->append_menu_item($rotateMenu, "Around Y axis…", 'Rotate the selected object by an arbitrary angle around Y axis', sub { + $self->rotate(undef, Y); + }, undef, 'bullet_green.png'); + wxTheApp->append_menu_item($rotateMenu, "Around Z axis…", 'Rotate the selected object by an arbitrary angle around Z axis', sub { + $self->rotate(undef, Z); + }, undef, 'bullet_blue.png'); + wxTheApp->append_submenu($menu, "Rotate", 'Rotate the selected object by an arbitrary angle', $rotateMenu, undef, 'textfield.png'); + } - my $mirrorMenu = Wx::Menu->new; - my $mirrorMenuItem = $menu->AppendSubMenu($mirrorMenu, "Mirror", 'Mirror the selected object'); - wxTheApp->set_menu_item_icon($mirrorMenuItem, 'shape_flip_horizontal.png'); - $frame->_append_menu_item($mirrorMenu, "Along X axis…", 'Mirror the selected object along the X axis', sub { - $self->mirror(X); - }, undef, 'bullet_red.png'); - $frame->_append_menu_item($mirrorMenu, "Along Y axis…", 'Mirror the selected object along the Y axis', sub { - $self->mirror(Y); - }, undef, 'bullet_green.png'); - $frame->_append_menu_item($mirrorMenu, "Along Z axis…", 'Mirror the selected object along the Z axis', sub { - $self->mirror(Z); - }, undef, 'bullet_blue.png'); + { + my $mirrorMenu = Wx::Menu->new; + wxTheApp->append_menu_item($mirrorMenu, "Along X axis…", 'Mirror the selected object along the X axis', sub { + $self->mirror(X); + }, undef, 'bullet_red.png'); + wxTheApp->append_menu_item($mirrorMenu, "Along Y axis…", 'Mirror the selected object along the Y axis', sub { + $self->mirror(Y); + }, undef, 'bullet_green.png'); + wxTheApp->append_menu_item($mirrorMenu, "Along Z axis…", 'Mirror the selected object along the Z axis', sub { + $self->mirror(Z); + }, undef, 'bullet_blue.png'); + wxTheApp->append_submenu($menu, "Mirror", 'Mirror the selected object', $mirrorMenu, undef, 'shape_flip_horizontal.png'); + } - my $scaleMenu = Wx::Menu->new; - my $scaleMenuItem = $menu->AppendSubMenu($scaleMenu, "Scale", 'Scale the selected object along a single axis'); - wxTheApp->set_menu_item_icon($scaleMenuItem, 'arrow_out.png'); - $frame->_append_menu_item($scaleMenu, "Uniformly…", 'Scale the selected object along the XYZ axes', sub { - $self->changescale(undef); - }); - $frame->_append_menu_item($scaleMenu, "Along X axis…", 'Scale the selected object along the X axis', sub { - $self->changescale(X); - }, undef, 'bullet_red.png'); - $frame->_append_menu_item($scaleMenu, "Along Y axis…", 'Scale the selected object along the Y axis', sub { - $self->changescale(Y); - }, undef, 'bullet_green.png'); - $frame->_append_menu_item($scaleMenu, "Along Z axis…", 'Scale the selected object along the Z axis', sub { - $self->changescale(Z); - }, undef, 'bullet_blue.png'); + { + my $scaleMenu = Wx::Menu->new; + wxTheApp->append_menu_item($scaleMenu, "Uniformly…", 'Scale the selected object along the XYZ axes', sub { + $self->changescale(undef); + }); + wxTheApp->append_menu_item($scaleMenu, "Along X axis…", 'Scale the selected object along the X axis', sub { + $self->changescale(X); + }, undef, 'bullet_red.png'); + wxTheApp->append_menu_item($scaleMenu, "Along Y axis…", 'Scale the selected object along the Y axis', sub { + $self->changescale(Y); + }, undef, 'bullet_green.png'); + wxTheApp->append_menu_item($scaleMenu, "Along Z axis…", 'Scale the selected object along the Z axis', sub { + $self->changescale(Z); + }, undef, 'bullet_blue.png'); + wxTheApp->append_submenu($menu, "Scale", 'Scale the selected object by a given factor', $scaleMenu, undef, 'arrow_out.png'); + } - my $scaleToSizeMenu = Wx::Menu->new; - my $scaleToSizeMenuItem = $menu->AppendSubMenu($scaleToSizeMenu, "Scale to size", 'Scale the selected object along a single axis'); - wxTheApp->set_menu_item_icon($scaleToSizeMenuItem, 'arrow_out.png'); - $frame->_append_menu_item($scaleToSizeMenu, "Uniformly…", 'Scale the selected object along the XYZ axes', sub { - $self->changescale(undef, 1); - }); - $frame->_append_menu_item($scaleToSizeMenu, "Along X axis…", 'Scale the selected object along the X axis', sub { - $self->changescale(X, 1); - }, undef, 'bullet_red.png'); - $frame->_append_menu_item($scaleToSizeMenu, "Along Y axis…", 'Scale the selected object along the Y axis', sub { - $self->changescale(Y, 1); - }, undef, 'bullet_green.png'); - $frame->_append_menu_item($scaleToSizeMenu, "Along Z axis…", 'Scale the selected object along the Z axis', sub { - $self->changescale(Z, 1); - }, undef, 'bullet_blue.png'); + { + my $scaleToSizeMenu = Wx::Menu->new; + wxTheApp->append_menu_item($scaleToSizeMenu, "Uniformly…", 'Scale the selected object along the XYZ axes', sub { + $self->changescale(undef, 1); + }); + wxTheApp->append_menu_item($scaleToSizeMenu, "Along X axis…", 'Scale the selected object along the X axis', sub { + $self->changescale(X, 1); + }, undef, 'bullet_red.png'); + wxTheApp->append_menu_item($scaleToSizeMenu, "Along Y axis…", 'Scale the selected object along the Y axis', sub { + $self->changescale(Y, 1); + }, undef, 'bullet_green.png'); + wxTheApp->append_menu_item($scaleToSizeMenu, "Along Z axis…", 'Scale the selected object along the Z axis', sub { + $self->changescale(Z, 1); + }, undef, 'bullet_blue.png'); + wxTheApp->append_submenu($menu, "Scale to size", 'Scale the selected object to match a given size', $scaleToSizeMenu, undef, 'arrow_out.png'); + } - $frame->_append_menu_item($menu, "Split", 'Split the selected object into individual parts', sub { + wxTheApp->append_menu_item($menu, "Split", 'Split the selected object into individual parts', sub { $self->split_object; }, undef, 'shape_ungroup.png'); - $frame->_append_menu_item($menu, "Cut…", 'Open the 3D cutting tool', sub { + wxTheApp->append_menu_item($menu, "Cut…", 'Open the 3D cutting tool', sub { $self->object_cut_dialog; }, undef, 'package.png'); $frame->_append_menu_item($menu, "Layer heights…", 'Open the dynamic layer height control', sub { $self->object_layers_dialog; }, undef, 'cog.png'); $menu->AppendSeparator(); - $frame->_append_menu_item($menu, "Settings…", 'Open the object editor dialog', sub { + wxTheApp->append_menu_item($menu, "Settings…", 'Open the object editor dialog', sub { $self->object_settings_dialog; }, undef, 'cog.png'); $menu->AppendSeparator(); - $frame->_append_menu_item($menu, "Reload from Disk", 'Reload the selected file from Disk', sub { + wxTheApp->append_menu_item($menu, "Reload from Disk", 'Reload the selected file from Disk', sub { $self->reload_from_disk; }, undef, 'arrow_refresh.png'); - $frame->_append_menu_item($menu, "Export object as STL…", 'Export this single object as STL file', sub { + wxTheApp->append_menu_item($menu, "Export object as STL…", 'Export this single object as STL file', sub { $self->export_object_stl; }, undef, 'brick_go.png'); - $frame->_append_menu_item($menu, "Export object and modifiers as AMF…", 'Export this single object and all associated modifiers as AMF file', sub { + wxTheApp->append_menu_item($menu, "Export object and modifiers as AMF…", 'Export this single object and all associated modifiers as AMF file', sub { $self->export_object_amf; }, undef, 'brick_go.png'); @@ -2457,6 +2564,21 @@ sub select_view { } } +sub zoom{ + my ($self, $direction) = @_; + #Apply Zoom to the current active tab + my ($currentSelection) = $self->{preview_notebook}->GetSelection; + if($currentSelection == 0){ + $self->{canvas3D}->zoom($direction) if($self->{canvas3D}); + } + elsif($currentSelection == 2){ #3d Preview tab + $self->{preview3D}->canvas->zoom($direction) if($self->{preview3D}); + } + elsif($currentSelection == 3) { #2D toolpaths tab + $self->{toolpaths2D}->{canvas}->zoom($direction) if($self->{toolpaths2D}); + } +} + package Slic3r::GUI::Plater::DropTarget; use Wx::DND; use base 'Wx::FileDropTarget'; @@ -2546,7 +2668,7 @@ use base 'Wx::Dialog'; sub new { my $class = shift; my ($parent, $filename) = @_; - my $self = $class->SUPER::new($parent, -1, "Send to OctoPrint", wxDefaultPosition, + my $self = $class->SUPER::new($parent, -1, "Send to Server", wxDefaultPosition, [400, -1]); $self->{filename} = $filename; @@ -2555,7 +2677,7 @@ sub new { my $optgroup; $optgroup = Slic3r::GUI::OptionsGroup->new( parent => $self, - title => 'Send to OctoPrint', + title => 'Send to Server', on_change => sub { my ($opt_id) = @_; diff --git a/lib/Slic3r/GUI/Plater/2DToolpaths.pm b/lib/Slic3r/GUI/Plater/2DToolpaths.pm index d39c53179..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; } }); @@ -187,21 +189,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 +219,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/lib/Slic3r/GUI/Plater/3DPreview.pm b/lib/Slic3r/GUI/Plater/3DPreview.pm index 4d6af8287..ce7a5f579 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; } }); diff --git a/lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm b/lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm index 17090438d..e0fe90f6e 100644 --- a/lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm +++ b/lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm @@ -163,35 +163,44 @@ sub new { my $item = $event->GetItem; my $frame = $self->GetFrame; my $menu = Wx::Menu->new; - - my $scaleToSizeMenu = Wx::Menu->new; - my $scaleToSizeMenuItem = $menu->AppendSubMenu($scaleToSizeMenu, "Scale to size", 'Scale the selected object along a single axis'); - wxTheApp->set_menu_item_icon($scaleToSizeMenuItem, 'arrow_out.png'); - $frame->_append_menu_item($scaleToSizeMenu, "Uniformly… ", 'Scale the selected object along the XYZ axes', sub { - $self->changescale(undef, 1); - }); - $frame->_append_menu_item($scaleToSizeMenu, "Along X axis…", 'Scale the selected object along the X axis', sub { - $self->changescale(X, 1); - }, undef, 'bullet_red.png'); - $frame->_append_menu_item($scaleToSizeMenu, "Along Y axis…", 'Scale the selected object along the Y axis', sub { - $self->changescale(Y, 1); - }, undef, 'bullet_green.png'); - $frame->_append_menu_item($scaleToSizeMenu, "Along Z axis…", 'Scale the selected object along the Z axis', sub { - $self->changescale(Z, 1); - }, undef, 'bullet_blue.png'); - my $rotateMenu = Wx::Menu->new; - my $rotateMenuItem = $menu->AppendSubMenu($rotateMenu, "Rotate", 'Rotate the selected object by an arbitrary angle'); - wxTheApp->set_menu_item_icon($rotateMenuItem, 'textfield.png'); - $frame->_append_menu_item($rotateMenu, "Around X axis…", 'Rotate the selected object by an arbitrary angle around X axis', sub { - $self->rotate(undef, X); - }, undef, 'bullet_red.png'); - $frame->_append_menu_item($rotateMenu, "Around Y axis…", 'Rotate the selected object by an arbitrary angle around Y axis', sub { - $self->rotate(undef, Y); - }, undef, 'bullet_green.png'); - $frame->_append_menu_item($rotateMenu, "Around Z axis…", 'Rotate the selected object by an arbitrary angle around Z axis', sub { - $self->rotate(undef, Z); - }, undef, 'bullet_blue.png'); - + + { + my $scaleMenu = Wx::Menu->new; + wxTheApp->append_menu_item($scaleMenu, "Uniformly… ", 'Scale the selected object along the XYZ axes', + sub { $self->changescale(undef, 0) }); + wxTheApp->append_menu_item($scaleMenu, "Along X axis…", 'Scale the selected object along the X axis', + sub { $self->changescale(X, 0) }, undef, 'bullet_red.png'); + wxTheApp->append_menu_item($scaleMenu, "Along Y axis…", 'Scale the selected object along the Y axis', + sub { $self->changescale(Y, 0) }, undef, 'bullet_green.png'); + wxTheApp->append_menu_item($scaleMenu, "Along Z axis…", 'Scale the selected object along the Z axis', + sub { $self->changescale(Z, 0) }, undef, 'bullet_blue.png'); + wxTheApp->append_submenu($menu, "Scale", 'Scale the selected object by a given factor', + $scaleMenu, undef, 'arrow_out.png'); + } + { + my $scaleToSizeMenu = Wx::Menu->new; + wxTheApp->append_menu_item($scaleToSizeMenu, "Uniformly… ", 'Scale the selected object along the XYZ axes', + sub { $self->changescale(undef, 1) }); + wxTheApp->append_menu_item($scaleToSizeMenu, "Along X axis…", 'Scale the selected object along the X axis', + sub { $self->changescale(X, 1) }, undef, 'bullet_red.png'); + wxTheApp->append_menu_item($scaleToSizeMenu, "Along Y axis…", 'Scale the selected object along the Y axis', + sub { $self->changescale(Y, 1) }, undef, 'bullet_green.png'); + wxTheApp->append_menu_item($scaleToSizeMenu, "Along Z axis…", 'Scale the selected object along the Z axis', + sub { $self->changescale(Z, 1) }, undef, 'bullet_blue.png'); + wxTheApp->append_submenu($menu, "Scale to size", 'Scale the selected object to match a given size', + $scaleToSizeMenu, undef, 'arrow_out.png'); + } + { + my $rotateMenu = Wx::Menu->new; + wxTheApp->append_menu_item($rotateMenu, "Around X axis…", 'Rotate the selected object by an arbitrary angle around X axis', + sub { $self->rotate(undef, X) }, undef, 'bullet_red.png'); + wxTheApp->append_menu_item($rotateMenu, "Around Y axis…", 'Rotate the selected object by an arbitrary angle around Y axis', + sub { $self->rotate(undef, Y) }, undef, 'bullet_green.png'); + wxTheApp->append_menu_item($rotateMenu, "Around Z axis…", 'Rotate the selected object by an arbitrary angle around Z axis', + sub { $self->rotate(undef, Z) }, undef, 'bullet_blue.png'); + wxTheApp->append_submenu($menu, "Rotate", 'Rotate the selected object by an arbitrary angle', + $rotateMenu, undef, 'arrow_rotate_anticlockwise.png'); + } $frame->PopupMenu($menu, $event->GetPoint); }); EVT_BUTTON($self, $self->{btn_load_part}, sub { $self->on_btn_load(0) }); @@ -409,7 +418,6 @@ sub on_btn_lambda { # set a default extruder value, since user can't add it manually $new_volume->config->set_ifndef('extruder', 0); - $self->{parts_changed} = 1; $self->_parts_changed($self->{model_object}->volumes_count-1); } @@ -436,6 +444,7 @@ sub on_btn_delete { sub _parts_changed { my ($self, $selected_volume_idx) = @_; + $self->{parts_changed} = 1; $self->reload_tree($selected_volume_idx); if ($self->{canvas}) { $self->{canvas}->reset_objects; diff --git a/lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm b/lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm index 52a0b4d5f..b6d911c93 100644 --- a/lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm +++ b/lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm @@ -35,6 +35,9 @@ sub new { # notify tabs $self->{layers}->Closing; + # save window size + wxTheApp->save_window_pos($self, "object_settings"); + $self->EndModal(wxID_OK); $self->Destroy; }); @@ -46,6 +49,8 @@ sub new { $self->SetSizer($sizer); $self->SetMinSize($self->GetSize); + wxTheApp->restore_window_pos($self, "object_settings"); + return $self; } @@ -58,16 +63,6 @@ sub PartSettingsChanged { my ($self) = @_; return $self->{parts}->PartSettingsChanged || $self->{layers}->LayersChanged; } -sub _append_menu_item { - my ($self, $menu, $string, $description, $cb, $id, $icon, $kind) = @_; - - $id //= &Wx::NewId(); - my $item = $menu->Append($id, $string, $description, $kind); - wxTheApp->set_menu_item_icon($item, $icon); - - EVT_MENU($self, $id, $cb); - return $item; -} package Slic3r::GUI::Plater::ObjectDialog::BaseTab; diff --git a/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm b/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm index 8e5e6b52b..34b9eb6f4 100644 --- a/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm +++ b/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm @@ -34,7 +34,8 @@ sub new { $self->{default_config} = Slic3r::Config->new; $self->{config} = Slic3r::Config->new; $self->{on_change} = $params{on_change}; - $self->{editable} = 1; + $self->{can_add} = 1; + $self->{can_delete} = 1; $self->{fixed_options} = {}; $self->{sizer} = Wx::BoxSizer->new(wxVERTICAL); @@ -52,27 +53,32 @@ 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}}) { - my $id = &Wx::NewId(); - - # 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 $menuItem = $menu->Append($id, $self->{option_labels}{$opt_key}); - wxTheApp->set_menu_item_icon($menuItem, $icon) if $icon; - - EVT_MENU($menu, $id, sub { + my $cb = sub { $self->{config}->set($opt_key, $self->{default_config}->get($opt_key)); $self->update_optgroup; $self->{on_change}->($opt_key) if $self->{on_change}; - }); + }; + + 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; @@ -84,7 +90,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; @@ -109,17 +117,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}} ]; } @@ -143,7 +145,7 @@ sub update_optgroup { $self->{options_sizer}->Clear(1); return if !defined $self->{config}; - $self->{btn_add}->Show($self->{editable}); + $self->{btn_add}->Show($self->{can_add}); my %categories = (); foreach my $opt_key (@{$self->{config}->get_keys}) { @@ -172,7 +174,7 @@ sub update_optgroup { my ($opt_key, $opt_index) = @{ $optgroup->_opt_map->{$opt_id} }; # disallow deleting fixed options - return undef if $self->{fixed_options}{$opt_key} || !$self->{editable}; + return undef if $self->{fixed_options}{$opt_key} || !$self->{can_delete}; my $btn = Wx::BitmapButton->new($self, -1, Wx::Bitmap->new($Slic3r::var->("delete.png"), wxBITMAP_TYPE_PNG), wxDefaultPosition, wxDefaultSize, Wx::wxBORDER_NONE); @@ -209,11 +211,27 @@ sub disable { $self->Disable; } -# Shows or hides the Add button. +# Shows or hides the Add/Delete buttons. sub set_editable { my ($self, $editable) = @_; - $self->{editable} = $editable; + $self->{can_add} = $self->{can_delete} = $editable; +} + +# Shows or hides the Add button. +sub can_add { + my ($self, $can) = @_; + + $self->{can_add} = $can if defined $can; + return $can; +} + +# Shows or hides the Delete button. +sub can_delete { + my ($self, $can) = @_; + + $self->{can_delete} = $can if defined $can; + return $can; } 1; diff --git a/lib/Slic3r/GUI/Preferences.pm b/lib/Slic3r/GUI/Preferences.pm index 9c96efa3a..c7d8a84bb 100644 --- a/lib/Slic3r/GUI/Preferences.pm +++ b/lib/Slic3r/GUI/Preferences.pm @@ -65,11 +65,11 @@ sub new { default => $Slic3r::GUI::Settings->{_}{threads}, )); $optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new( - opt_id => 'no_controller', + opt_id => 'tabbed_preset_editors', type => 'bool', - label => 'Disable USB/serial connection', - tooltip => 'Disable communication with the printer over a serial / USB cable. This simplifies the user interface in case the printer is never attached to the computer.', - default => $Slic3r::GUI::Settings->{_}{no_controller}, + label => 'Display profile editors as tabs', + tooltip => 'When opening a profile editor, it will be shown in a dialog or in a tab according to this option.', + default => $Slic3r::GUI::Settings->{_}{tabbed_preset_editors}, )); my $sizer = Wx::BoxSizer->new(wxVERTICAL); @@ -88,7 +88,7 @@ sub new { sub _accept { my $self = shift; - if ($self->{values}{mode} || defined($self->{values}{no_controller})) { + if ($self->{values}{mode}) { Slic3r::GUI::warning_catcher($self)->("You need to restart Slic3r to make the changes effective."); } diff --git a/lib/Slic3r/GUI/Preset.pm b/lib/Slic3r/GUI/Preset.pm index 5bdd0f20e..f6d3de733 100644 --- a/lib/Slic3r/GUI/Preset.pm +++ b/lib/Slic3r/GUI/Preset.pm @@ -94,7 +94,7 @@ sub prompt_unsaved_changes { if ($res == wxID_CANCEL) { return 0; } elsif ($res == wxID_YES) { - return $self->save($self->default ? undef : $self->name); + return $self->default ? $self->save_prompt($parent) : $self->save; } elsif ($res == wxID_NO) { $self->dismiss_changes; return 1; @@ -104,20 +104,29 @@ sub prompt_unsaved_changes { return 1; } +sub save_prompt { + my ($self, $parent) = @_; + + my $default_name = $self->default ? 'Untitled' : $self->name; + $default_name =~ s/\.ini$//i; + + my $dlg = Slic3r::GUI::SavePresetWindow->new($parent, + default => $default_name, + values => [ map $_->name, grep !$_->default && !$_->external, @{wxTheApp->presets->{$self->name}} ], + ); + return 0 unless $dlg->ShowModal == wxID_OK; + + $self->save_as($dlg->get_name); +} + sub save { - my ($self, $name, $parent) = @_; + my ($self, $opt_keys) = @_; - if (!$name) { - my $default_name = $self->default ? 'Untitled' : $self->name; - $default_name =~ s/\.ini$//i; - - my $dlg = Slic3r::GUI::SavePresetWindow->new($parent, - default => $default_name, - values => [ map $_->name, grep !$_->default && !$_->external, @{wxTheApp->presets->{$self->name}} ], - ); - return 0 unless $dlg->ShowModal == wxID_OK; - $name = $dlg->get_name; - } + return $self->save_as($self->name, $opt_keys); +} + +sub save_as { + my ($self, $name, $opt_keys) = @_; $self->rename($name); @@ -125,8 +134,15 @@ sub save { die "Calling save() without setting filename"; } - $self->_config->clear; - $self->_config->apply($self->_dirty_config); + if ($opt_keys) { + $self->_config->apply_only($self->_dirty_config, $opt_keys); + } else { + $self->_config->clear; + $self->_config->apply($self->_dirty_config); + } + + # unlink the file first to avoid problems on case-insensitive file systems + unlink Slic3r::encode_path($self->file); $self->_config->save($self->file); wxTheApp->load_presets; @@ -167,6 +183,8 @@ sub dirty_config { sub load_config { my ($self) = @_; + return $self->_config if $self->_loaded; + my @keys = $self->_group_class->options; my @extra_keys = $self->_group_class->overriding_options; diff --git a/lib/Slic3r/GUI/PresetEditor.pm b/lib/Slic3r/GUI/PresetEditor.pm index 7bf7e3811..7ca2fbc63 100644 --- a/lib/Slic3r/GUI/PresetEditor.pm +++ b/lib/Slic3r/GUI/PresetEditor.pm @@ -87,7 +87,7 @@ sub new { }); EVT_CHOICE($parent, $self->{presets_choice}, sub { - $self->on_select_preset; + $self->_on_select_preset; }); EVT_BUTTON($self, $self->{btn_save_preset}, sub { $self->save_preset }); @@ -123,13 +123,20 @@ sub save_preset { $self->{treectrl}->SetFocus; my $preset = $self->current_preset; - $preset->save(undef, $self); + $preset->save_prompt($self); $self->load_presets; $self->select_preset_by_name($preset->name); + $self->{on_save_preset}->($self->name, $preset) if $self->{on_save_preset}; + return 1; } +sub on_save_preset { + my ($self, $cb) = @_; + $self->{on_save_preset} = $cb; +} + sub on_value_change { my ($self, $cb) = @_; $self->{on_value_change} = $cb; @@ -141,10 +148,12 @@ sub on_value_change { sub _on_value_change { my ($self, $opt_key) = @_; - $self->current_preset->_dirty_config->apply($self->config); - $self->{on_value_change}->($opt_key) if $self->{on_value_change}; - $self->load_presets; - $self->_update; + wxTheApp->CallAfter(sub { + $self->current_preset->_dirty_config->apply($self->config); + $self->{on_value_change}->($opt_key) if $self->{on_value_change}; + $self->load_presets; + $self->_update; + }); } sub _update {} @@ -155,7 +164,7 @@ sub select_preset { my ($self, $i, $force) = @_; $self->{presets_choice}->SetSelection($i); - $self->on_select_preset($force); + $self->_on_select_preset($force); } sub select_preset_by_name { @@ -163,8 +172,12 @@ sub select_preset_by_name { my $presets = wxTheApp->presets->{$self->name}; my $i = first { $presets->[$_]->name eq $name } 0..$#$presets; + if (!defined $i) { + warn "No preset named $name"; + return 0; + } $self->{presets_choice}->SetSelection($i); - $self->on_select_preset($force); + $self->_on_select_preset($force); } sub prompt_unsaved_changes { @@ -175,6 +188,11 @@ sub prompt_unsaved_changes { } sub on_select_preset { + my ($self, $cb) = @_; + $self->{on_select_preset} = $cb; +} + +sub _on_select_preset { my ($self, $force) = @_; # This method is called: @@ -186,7 +204,12 @@ sub on_select_preset { my $preset = wxTheApp->presets->{$self->name}->[$self->{presets_choice}->GetSelection]; # If selection didn't change, do nothing. - return if defined $self->current_preset && $preset->name eq $self->current_preset->name; + # (But still reset current_preset because it might contain an older object of the + # current preset) + if (defined $self->current_preset && $preset->name eq $self->current_preset->name) { + $self->current_preset($preset); + return; + } # If we have unsaved changes, prompt user. if (!$force && !$self->prompt_unsaved_changes) { @@ -203,9 +226,7 @@ sub on_select_preset { # prompted and chose to discard changes. $self->load_presets; - $preset->load_config if !$preset->_loaded; - $self->config->clear; - $self->config->apply($preset->dirty_config); + $self->reload_preset; eval { local $SIG{__WARN__} = Slic3r::GUI::warning_catcher($self); @@ -215,12 +236,13 @@ sub on_select_preset { $self->_update; $self->on_preset_loaded; - $self->reload_config; }; if ($@) { $@ = "I was unable to load the selected config file: $@"; Slic3r::GUI::catch_error($self); } + + $self->{on_select_preset}->($self->name, $preset) if $self->{on_select_preset}; } sub add_options_page { @@ -240,6 +262,15 @@ sub add_options_page { return $page; } +sub reload_preset { + my ($self) = @_; + + $self->current_preset->load_config if !$self->current_preset->_loaded; + $self->config->clear; + $self->config->apply($self->current_preset->dirty_config); + $self->reload_config; +} + sub reload_config { my $self = shift; @@ -437,12 +468,12 @@ sub options { perimeter_extruder infill_extruder solid_infill_extruder support_material_extruder support_material_interface_extruder ooze_prevention standby_temperature_delta - interface_shells + interface_shells regions_overlap extrusion_width first_layer_extrusion_width perimeter_extrusion_width external_perimeter_extrusion_width infill_extrusion_width solid_infill_extrusion_width top_infill_extrusion_width support_material_extrusion_width infill_overlap bridge_flow_ratio - xy_size_compensation resolution overridable compatible_printers + xy_size_compensation resolution shortcuts compatible_printers print_settings_id ) } @@ -450,7 +481,7 @@ sub options { sub build { my $self = shift; - my $overridable_widget = sub { + my $shortcuts_widget = sub { my ($parent) = @_; my $Options = $Slic3r::Config::Options; @@ -459,15 +490,15 @@ sub build { grep { exists $Options->{$_} && $Options->{$_}{category} } $self->options ); my @opt_keys = sort { $options{$a} cmp $options{$b} } keys %options; - $self->{overridable_opt_keys} = [ @opt_keys ]; + $self->{shortcuts_opt_keys} = [ @opt_keys ]; - my $listbox = $self->{overridable_list} = Wx::CheckListBox->new($parent, -1, + my $listbox = $self->{shortcuts_list} = Wx::CheckListBox->new($parent, -1, wxDefaultPosition, [-1, 320], [ map $options{$_}, @opt_keys ]); EVT_CHECKLISTBOX($self, $listbox, sub { my $value = [ map $opt_keys[$_], grep $listbox->IsChecked($_), 0..$#opt_keys ]; - $self->config->set('overridable', $value); - $self->_on_value_change('overridable'); + $self->config->set('shortcuts', $value); + $self->_on_value_change('shortcuts'); }); my $sizer = Wx::BoxSizer->new(wxVERTICAL); @@ -639,6 +670,7 @@ sub build { } { my $optgroup = $page->new_optgroup('Advanced'); + $optgroup->append_single_option_line('regions_overlap'); $optgroup->append_single_option_line('interface_shells'); } } @@ -720,7 +752,7 @@ sub build { } { - my $page = $self->add_options_page('Overrides', 'wrench.png'); + my $page = $self->add_options_page('Shortcuts', 'wrench.png'); { my $optgroup = $page->new_optgroup('Profile preferences'); { @@ -732,10 +764,10 @@ sub build { } } { - my $optgroup = $page->new_optgroup('Overridable settings (they will be displayed in the plater for quick changes)'); + my $optgroup = $page->new_optgroup('Show shortcuts for the following settings'); { my $line = Slic3r::GUI::OptionsGroup::Line->new( - widget => $overridable_widget, + widget => $shortcuts_widget, full_width => 1, ); $optgroup->append_line($line); @@ -750,9 +782,9 @@ sub reload_config { $self->_reload_compatible_printers_widget; { - my %overridable = map { $_ => 1 } @{ $self->config->get('overridable') }; - for my $i (0..$#{$self->{overridable_opt_keys}}) { - $self->{overridable_list}->Check($i, $overridable{ $self->{overridable_opt_keys}[$i] }); + my %shortcuts = map { $_ => 1 } @{ $self->config->get('shortcuts') }; + for my $i (0..$#{$self->{shortcuts_opt_keys}}) { + $self->{shortcuts_list}->Check($i, $shortcuts{ $self->{shortcuts_opt_keys}[$i] }); } } @@ -1174,11 +1206,10 @@ sub options { bed_shape z_offset z_steps_per_mm has_heatbed gcode_flavor use_relative_e_distances serial_port serial_speed - octoprint_host octoprint_apikey + host_type print_host octoprint_apikey use_firmware_retraction pressure_advance vibration_limit use_volumetric_e start_gcode end_gcode before_layer_gcode layer_gcode toolchange_gcode between_objects_gcode - notes nozzle_diameter extruder_offset retract_length retract_lift retract_speed retract_restart_extra retract_before_travel retract_layer_change wipe retract_length_toolchange retract_restart_extra_toolchange retract_lift_above retract_lift_below @@ -1243,7 +1274,7 @@ sub build { } }); } - unless ($Slic3r::GUI::Settings->{_}{no_controller}) { + { my $optgroup = $page->new_optgroup('USB/Serial connection'); my $line = Slic3r::GUI::OptionsGroup::Line->new( label => 'Serial port', @@ -1277,9 +1308,11 @@ sub build { $optgroup->append_line($line); } { - my $optgroup = $page->new_optgroup('OctoPrint upload'); + my $optgroup = $page->new_optgroup('Print server upload'); + + $optgroup->append_single_option_line('host_type'); - my $host_line = $optgroup->create_single_option_line('octoprint_host'); + my $host_line = $optgroup->create_single_option_line('print_host'); $host_line->append_button("Browse…", "zoom.png", sub { # look for devices my $entries; @@ -1292,19 +1325,19 @@ sub build { my $dlg = Slic3r::GUI::BonjourBrowser->new($self, $entries); if ($dlg->ShowModal == wxID_OK) { my $value = $dlg->GetValue . ":" . $dlg->GetPort; - $self->config->set('octoprint_host', $value); - $self->_on_value_change('octoprint_host'); + $self->config->set('print_host', $value); + $self->_on_value_change('print_host'); } } else { Wx::MessageDialog->new($self, 'No Bonjour device found', 'Device Browser', wxOK | wxICON_INFORMATION)->ShowModal; } - }, undef, !eval "use Net::Bonjour; 1"); + }, \$self->{print_host_browse_btn}, !eval "use Net::Bonjour; 1"); $host_line->append_button("Test", "wrench.png", sub { my $ua = LWP::UserAgent->new; $ua->timeout(10); my $res = $ua->get( - "http://" . $self->config->octoprint_host . "/api/version", + "http://" . $self->config->print_host . "/api/version", 'X-Api-Key' => $self->config->octoprint_apikey, ); if ($res->is_success) { @@ -1314,7 +1347,7 @@ sub build { "I wasn't able to connect to OctoPrint (" . $res->status_line . "). " . "Check hostname and OctoPrint version (at least 1.1.0 is required)."); } - }, \$self->{octoprint_host_test_btn}); + }, \$self->{print_host_test_btn}); $optgroup->append_line($host_line); $optgroup->append_single_option_line('octoprint_apikey'); } @@ -1398,13 +1431,13 @@ sub build { my $optgroup = $page->new_optgroup('Notes', label_width => 0, ); - my $option = $optgroup->get_option('notes'); + my $option = $optgroup->get_option('printer_notes'); $option->full_width(1); $option->height(250); $optgroup->append_single_option_line($option); } } - $self->_update_serial_ports unless $Slic3r::GUI::Settings->{_}{no_controller}; + $self->_update_serial_ports; } sub _update_serial_ports { @@ -1520,12 +1553,17 @@ sub _update { $self->{serial_test_btn}->Disable; } } - if ($config->get('octoprint_host') && eval "use LWP::UserAgent; 1") { - $self->{octoprint_host_test_btn}->Enable; - } else { - $self->{octoprint_host_test_btn}->Disable; + if (($config->get('host_type') eq 'octoprint')) { + $self->{print_host_browse_btn}->Enable; + }else{ + $self->{print_host_browse_btn}->Disable; } - $self->get_field('octoprint_apikey')->toggle($config->get('octoprint_host')); + if (($config->get('host_type') eq 'octoprint') && eval "use LWP::UserAgent; 1") { + $self->{print_host_test_btn}->Enable; + } else { + $self->{print_host_test_btn}->Disable; + } + $self->get_field('octoprint_apikey')->toggle($config->get('print_host')); my $have_multiple_extruders = $self->{extruders_count} > 1; $self->get_field('toolchange_gcode')->toggle($have_multiple_extruders); @@ -1618,11 +1656,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; } diff --git a/lib/Slic3r/GUI/Projector.pm b/lib/Slic3r/GUI/Projector.pm index c41b7e8ad..deb81a43e 100644 --- a/lib/Slic3r/GUI/Projector.pm +++ b/lib/Slic3r/GUI/Projector.pm @@ -9,7 +9,7 @@ use Wx::Event qw(EVT_BUTTON EVT_CLOSE EVT_TEXT_ENTER EVT_SPINCTRL EVT_SLIDER); use base qw(Wx::Dialog Class::Accessor); use utf8; -__PACKAGE__->mk_accessors(qw(config config2 screen controller _optgroups)); +__PACKAGE__->mk_accessors(qw(config config2 manual_control_config screen controller _optgroups)); sub new { my ($class, $parent) = @_; @@ -27,6 +27,12 @@ sub new { z_lift_speed => 8, offset => [0,0], }); + $self->manual_control_config({ + xy_travel_speed => 130, + z_travel_speed => 10, + temperature => '', + bed_temperature => '', + }); my $ini = eval { Slic3r::Config->read_ini("$Slic3r::GUI::datadir/DLP.ini") }; if ($ini) { @@ -286,7 +292,7 @@ sub new { return; } my $dlg = Slic3r::GUI::Controller::ManualControlDialog->new - ($self, $self->config, $sender); + ($self, $self->config, $sender, $self->manual_control_config); $dlg->ShowModal; $sender->disconnect; }); @@ -605,8 +611,12 @@ sub start_print { } Slic3r::debugf "connected to " . $self->config->serial_port . "\n"; + # TODO: this wait should be handled by GCodeSender + sleep 4; + # send custom start G-code $self->sender->send($_, 1) for grep !/^;/, split /\n/, $self->config->start_gcode; + $self->sender->("G90", 1); # set absolute positioning } $self->is_printing(1); 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}; diff --git a/lib/Slic3r/Print/GCode.pm b/lib/Slic3r/Print/GCode.pm index 710125c5e..63ee24282 100644 --- a/lib/Slic3r/Print/GCode.pm +++ b/lib/Slic3r/Print/GCode.pm @@ -72,9 +72,8 @@ sub export { my @lt = localtime; printf $fh "; generated by Slic3r $Slic3r::VERSION on %04d-%02d-%02d at %02d:%02d:%02d\n\n", $lt[5] + 1900, $lt[4]+1, $lt[3], $lt[2], $lt[1], $lt[0]; - # Write notes (content of the Print Settings tab -> Notes) - print $fh "; $_\n" foreach split /\R/, $self->config->notes; - print $fh "\n" if $self->config->notes; + # Write notes (content of all Settings tabs -> Notes) + print $fh $gcodegen->notes; # Write some terse information on the slicing parameters. my $first_object = $self->objects->[0]; my $layer_height = $first_object->config->layer_height; @@ -136,6 +135,10 @@ sub export { # prepare the helper object for replacing placeholders in custom G-code and output filename $self->placeholder_parser->update_timestamp; + # GCode sets this automatically whenever we call change_layer(), + # but we need it for skirt/brim too + $gcodegen->set_first_layer(1); + # disable fan print $fh $gcodegen->writer->set_fan(0, 1) if $self->config->cooling && $self->config->disable_fan_first_layers; @@ -403,8 +406,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 diff --git a/lib/Slic3r/Print/Object.pm b/lib/Slic3r/Print/Object.pm index 43b389b21..6eb9993aa 100644 --- a/lib/Slic3r/Print/Object.pm +++ b/lib/Slic3r/Print/Object.pm @@ -213,7 +213,11 @@ sub generate_support_material { $self->clear_support_layers; - if ((!$self->config->support_material && $self->config->raft_layers == 0) || scalar(@{$self->layers}) < 2) { + if ((!$self->config->support_material + && $self->config->raft_layers == 0 + && $self->config->support_material_enforce_layers == 0) + || scalar(@{$self->layers}) < 2 + ) { $self->set_step_done(STEP_SUPPORTMATERIAL); return; } diff --git a/lib/Slic3r/Print/SupportMaterial.pm b/lib/Slic3r/Print/SupportMaterial.pm index ecb044068..4c25dace2 100644 --- a/lib/Slic3r/Print/SupportMaterial.pm +++ b/lib/Slic3r/Print/SupportMaterial.pm @@ -93,18 +93,21 @@ sub generate { sub contact_area { # $object is Slic3r::Print::Object my ($self, $object) = @_; + my $conf = $self->object_config; # if user specified a custom angle threshold, convert it to radians my $threshold_rad; - if (!($self->object_config->support_material_threshold =~ /%$/)) { - $threshold_rad = deg2rad($self->object_config->support_material_threshold + 1); # +1 makes the threshold inclusive + if (!($conf->support_material_threshold =~ /%$/)) { + $threshold_rad = deg2rad($conf->support_material_threshold + 1); # +1 makes the threshold inclusive Slic3r::debugf "Threshold angle = %d°\n", rad2deg($threshold_rad); } # Build support on a build plate only? If so, then collect top surfaces into $buildplate_only_top_surfaces # and subtract $buildplate_only_top_surfaces from the contact surfaces, so # there is no contact surface supported by a top surface. - my $buildplate_only = $self->object_config->support_material && $self->object_config->support_material_buildplate_only; + my $buildplate_only = + ( $conf->support_material || $conf->support_material_enforce_layers) + && $conf->support_material_buildplate_only; my $buildplate_only_top_surfaces = []; # determine contact areas @@ -115,12 +118,19 @@ sub contact_area { # so $layer_id == 0 means first object layer # and $layer->id == 0 means first print layer (including raft) - if ($self->object_config->raft_layers == 0) { - next if $layer_id == 0; - } elsif (!$self->object_config->support_material) { + # if no raft, and we're at layer 0, skip to layer 1 + if ( $conf->raft_layers == 0 && $layer_id == 0 ) { + next; + } + # with or without raft, if we're above layer 1, we need to quit + # support generation if supports are disabled, or if we're at a high + # enough layer that enforce-supports no longer applies + if ( $layer_id > 0 + && !$conf->support_material + && ($layer_id >= $conf->support_material_enforce_layers) ) { # if we are only going to generate raft just check # the 'overhangs' of the first object layer - last if $layer_id > 0; + last; } my $layer = $object->get_layer($layer_id); @@ -154,12 +164,19 @@ sub contact_area { my $diff; # If a threshold angle was specified, use a different logic for detecting overhangs. - if (defined $threshold_rad - || $layer_id < $self->object_config->support_material_enforce_layers - || ($self->object_config->raft_layers > 0 && $layer_id == 0)) { - my $d = defined $threshold_rad - ? scale $lower_layer->height * ((cos $threshold_rad) / (sin $threshold_rad)) - : 0; + if (($conf->support_material && defined $threshold_rad) + || $layer_id <= $conf->support_material_enforce_layers + || ($conf->raft_layers > 0 && $layer_id == 0)) { + my $d = 0; + my $layer_threshold_rad = $threshold_rad; + if ($layer_id <= $conf->support_material_enforce_layers) { + # Use ~45 deg number for enforced supports if we are in auto + $layer_threshold_rad = deg2rad(89); + } + if (defined $layer_threshold_rad) { + $d = scale $lower_layer->height + * ((cos $layer_threshold_rad) / (sin $layer_threshold_rad)); + } $diff = diff( offset([ map $_->p, @{$layerm->slices} ], -$d), @@ -177,7 +194,7 @@ sub contact_area { } else { $diff = diff( [ map $_->p, @{$layerm->slices} ], - offset([ map @$_, @{$lower_layer->slices} ], +$self->object_config->get_abs_value_over('support_material_threshold', $fw)), + offset([ map @$_, @{$lower_layer->slices} ], +$conf->get_abs_value_over('support_material_threshold', $fw)), ); # collapse very tiny spots @@ -189,22 +206,31 @@ sub contact_area { # outside the lower slice boundary, thus no overhang } - if ($self->object_config->dont_support_bridges) { + 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( @@ -226,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 ]); } @@ -241,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, [ @@ -264,7 +295,7 @@ sub contact_area { 1, ); } - } # if ($self->object_config->dont_support_bridges) + } # if ($conf->dont_support_bridges) if ($buildplate_only) { # Don't support overhangs above the top surfaces. @@ -309,7 +340,7 @@ sub contact_area { my $contact_z = $layer->print_z - $self->contact_distance($layer->height, $nozzle_diameter); # ignore this contact area if it's too low - next if $contact_z < $self->object_config->get_value('first_layer_height') - epsilon; + next if $contact_z < $conf->get_value('first_layer_height') - epsilon; $contact{$contact_z} = [ @contact ]; $overhang{$contact_z} = [ @overhang ]; diff --git a/lib/Slic3r/Test.pm b/lib/Slic3r/Test.pm index e63723c8b..f167e30aa 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/package/deploy/sftp.sh b/package/deploy/sftp.sh index 3fc786fc3..14ffa6aab 100755 --- a/package/deploy/sftp.sh +++ b/package/deploy/sftp.sh @@ -19,8 +19,16 @@ fi if [ -s $KEY ]; then for i in $FILES; do filepath=$(readlink -f "$i") - echo put $filepath | sftp -i$KEY "${UPLOAD_USER}@dl.slic3r.org:$DIR/" + tmpfile=$(mktemp) + echo put $filepath > $tmpfile + sftp -b $tmpfile -i$KEY "${UPLOAD_USER}@dl.slic3r.org:$DIR/" + result=$? + if [ $? -eq 1 ]; then + echo "Error with SFTP" + exit $result; + fi done else echo "$KEY is not available, not deploying." fi +exit $result diff --git a/package/linux/libpaths.txt b/package/linux/libpaths.txt index 798e9103d..17c4f8cb6 100644 --- a/package/linux/libpaths.txt +++ b/package/linux/libpaths.txt @@ -1,28 +1,10 @@ /home/travis/builds/alexrj/Slic3r/local-lib/lib/perl5/x86_64-linux-thread-multi/Alien/wxWidgets/gtk_3_0_2_uni/lib/libwx_baseu-3.0.so.0 /home/travis/builds/alexrj/Slic3r/local-lib/lib/perl5/x86_64-linux-thread-multi/Alien/wxWidgets/gtk_3_0_2_uni/lib/libwx_gtk2u_adv-3.0.so.0 /home/travis/builds/alexrj/Slic3r/local-lib/lib/perl5/x86_64-linux-thread-multi/Alien/wxWidgets/gtk_3_0_2_uni/lib/libwx_gtk2u_core-3.0.so.0 +/home/travis/builds/alexrj/Slic3r/local-lib/lib/perl5/x86_64-linux-thread-multi/Alien/wxWidgets/gtk_3_0_2_uni/lib/libwx_gtk2u_gl-3.0.so.0 +/home/travis/builds/alexrj/Slic3r/local-lib/lib/perl5/x86_64-linux-thread-multi/Alien/wxWidgets/gtk_3_0_2_uni/lib/libwx_gtk2u_html-3.0.so.0 /lib/x86_64-linux-gnu/liblzma.so.5 -/lib/x86_64-linux-gnu/libm.so.6 -/lib/x86_64-linux-gnu/libpcre.so.3 /lib/x86_64-linux-gnu/libpng12.so.0 -/lib/x86_64-linux-gnu/libresolv.so.2 -/lib/x86_64-linux-gnu/libuuid.so.1 -/usr/lib/x86_64-linux-gnu/libSM.so.6 -/usr/lib/x86_64-linux-gnu/libatk-1.0.so.0 -/usr/lib/x86_64-linux-gnu/libdatrie.so.1 -/usr/lib/x86_64-linux-gnu/libfreetype.so.6 -/usr/lib/x86_64-linux-gnu/libgdk-x11-2.0.so.0 -/usr/lib/x86_64-linux-gnu/libgdk_pixbuf-2.0.so.0 -/usr/lib/x86_64-linux-gnu/libgio-2.0.so.0 -/usr/lib/x86_64-linux-gnu/libgmodule-2.0.so.0 -/usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0 -/usr/lib/x86_64-linux-gnu/libgraphite2.so.3 -/usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0 -/usr/lib/x86_64-linux-gnu/libharfbuzz.so.0 -/usr/lib/x86_64-linux-gnu/libjbig.so.0 /usr/lib/x86_64-linux-gnu/libjpeg.so.8 -/usr/lib/x86_64-linux-gnu/libpango-1.0.so.0 -/usr/lib/x86_64-linux-gnu/libpangocairo-1.0.so.0 -/usr/lib/x86_64-linux-gnu/libpangoft2-1.0.so.0 -/usr/lib/x86_64-linux-gnu/libpixman-1.so.0 +/usr/lib/x86_64-linux-gnu/libjbig.so.0 /usr/lib/x86_64-linux-gnu/libtiff.so.5 diff --git a/package/linux/make_archive.sh b/package/linux/make_archive.sh index 422ac19a0..68d7bac00 100755 --- a/package/linux/make_archive.sh +++ b/package/linux/make_archive.sh @@ -96,7 +96,7 @@ cp -f $PERL_BIN $archivefolder/perl-local ${PP_BIN} wxextension .0 \ -M attributes -M base -M bytes -M B -M POSIX \ -M FindBin -M Unicode::Normalize -M Tie::Handle \ - -M Time::Local -M Math::Trig \ + -M Time::Local -M Math::Trig -M IO::Socket -M Errno \ -M lib -M overload \ -M warnings -M local::lib \ -M strict -M utf8 -M parent \ @@ -122,7 +122,7 @@ rm -rf $(pwd)$archivefolder/local-lib/lib/perl5/TAP rm -rf $(pwd)/$archivefolder/local-lib/lib/perl5/Test* find $(pwd)/$archivefolder/local-lib -type d -path '*/Wx/*' \( -name WebView \ -or -name DocView -or -name STC -or -name IPC \ - -or -name AUI -or -name Calendar -or -name DataView \ + -or -name Calendar -or -name DataView \ -or -name DateTime -or -name Media -or -name PerlTest \ -or -name Ribbon \) -exec rm -rf "{}" \; rm -rf $archivefolder/local-lib/lib/perl5/*/Alien/wxWidgets/*/include diff --git a/package/linux/startup_script.sh b/package/linux/startup_script.sh index 53cea63d6..82757118b 100644 --- a/package/linux/startup_script.sh +++ b/package/linux/startup_script.sh @@ -1,5 +1,5 @@ #!/bin/bash DIR=$(dirname "$0") -export LD_LIBRARY_PATH=./shlib/x86_64-linux-thread-multi/ +export LD_LIBRARY_PATH=./bin exec "$DIR/perl-local" -I"$DIR/local-lib/lib/perl5" "$DIR/slic3r.pl" $@ diff --git a/package/osx/make_dmg.sh b/package/osx/make_dmg.sh index 8167e6d06..79721f9d5 100755 --- a/package/osx/make_dmg.sh +++ b/package/osx/make_dmg.sh @@ -101,8 +101,8 @@ echo "Copying perl from $PERL_BIN" cp -f $PERL_BIN $macosfolder/perl-local ${PP_BIN} -M attributes -M base -M bytes -M B -M POSIX \ -M FindBin -M Unicode::Normalize -M Tie::Handle \ - -M Time::Local -M Math::Trig \ - -M lib -M overload \ + -M Time::Local -M Math::Trig -M IO::Socket -M Errno \ + -M Storable -M lib -M overload \ -M warnings -M local::lib \ -M strict -M utf8 -M parent \ -B -p -e "print 123" -o $WD/_tmp/test.par @@ -128,11 +128,10 @@ find -d $macosfolder/local-lib -name '*.h' -delete find -d $macosfolder/local-lib -name wxPerl.app -exec rm -rf "{}" \; find -d $macosfolder/local-lib -type d -path '*/Wx/*' \( -name WebView \ -or -name DocView -or -name STC -or -name IPC \ - -or -name AUI -or -name Calendar -or -name DataView \ + -or -name Calendar -or -name DataView \ -or -name DateTime -or -name Media -or -name PerlTest \ -or -name Ribbon \) -exec rm -rf "{}" \; find -d $macosfolder/local-lib -name libwx_osx_cocoau_ribbon-3.0.0.2.0.dylib -delete -find -d $macosfolder/local-lib -name libwx_osx_cocoau_aui-3.0.0.2.0.dylib -delete find -d $macosfolder/local-lib -name libwx_osx_cocoau_stc-3.0.0.2.0.dylib -delete find -d $macosfolder/local-lib -name libwx_osx_cocoau_webview-3.0.0.2.0.dylib -delete rm -rf $macosfolder/local-lib/lib/perl5/darwin-thread-multi-2level/Alien/wxWidgets/osx_cocoa_3_0_2_uni/include diff --git a/package/win/appveyor_buildscript.ps1 b/package/win/appveyor_buildscript.ps1 index 4f98dcbf4..0377ee997 100644 --- a/package/win/appveyor_buildscript.ps1 +++ b/package/win/appveyor_buildscript.ps1 @@ -1,21 +1,27 @@ -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 +./compile_wrapper.ps1 524 | Write-Output ./package_win32.ps1 524| Write-Output diff --git a/package/win/appveyor_deploy.ps1 b/package/win/appveyor_deploy.ps1 index 28616f02c..3e9f20c26 100644 --- a/package/win/appveyor_deploy.ps1 +++ b/package/win/appveyor_deploy.ps1 @@ -1,8 +1,3 @@ -Add-AppveyorCompilationMessage -Message "Making ZIP package" -cd package/win -./compile_wrapper.ps1 524 | Write-Output -./package_win32.ps1 524| Write-Output -cd ../../ Add-AppveyorCompilationMessage -Message "Uploading to server." & ./package/deploy/winscp.ps1 -DIR win -KEY $env:APPVEYOR_BUILD_FOLDER/package/deploy/slic3r-upload.ppk -FILE *.zip *>> ./sftplog.txt diff --git a/package/win/appveyor_preinstall.ps1 b/package/win/appveyor_preinstall.ps1 index 4ba912e14..e2f6feff2 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 @@ -32,11 +41,15 @@ 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) { - 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 (!(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 { + 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,14 @@ 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 } diff --git a/package/win/compile_wrapper.ps1 b/package/win/compile_wrapper.ps1 index c5d603ef3..44fdfe90b 100644 --- a/package/win/compile_wrapper.ps1 +++ b/package/win/compile_wrapper.ps1 @@ -1,30 +1,38 @@ # Short Powershell script to build a wrapper exec -if ($args[0]) -{ - $perlver = $args[0] -} else -{ - $perlver = 524 -} +Param +( + [string]$perlVersion = "524", + [string]$STRAWBERRY_PATH = "C:\Strawberry", + # Path to C++ compiler, or just name if it is in path + [string]$cxx = "g++" +) -$perllib = "-lperl$perlver" -$shell_loc = "..\common\shell.cpp" +function Get-ScriptDirectory +{ + $Invocation = (Get-Variable MyInvocation -Scope 1).Value + Split-Path $Invocation.MyCommand.Path +} +$scriptDir = Get-ScriptDirectory + +$perllib = "-lperl$perlVersion" +$shell_loc = "${scriptDir}\..\common\shell.cpp" # Build the resource file (used to load icon, etc) -windres slic3r.rc -O coff -o slic3r.res +windres ${scriptDir}\slic3r.rc -O coff -o ${scriptDir}\slic3r.res # Compile an object file that does not have gui forced. -g++ -c -I'C:\strawberry\perl\lib\CORE\' $shell_loc -o slic3r.o +Invoke-Expression "$cxx -c -I'${STRAWBERRY_PATH}\perl\lib\CORE\' $shell_loc -o ${scriptDir}/slic3r.o" + # Compile an object file with --gui automatically passed as an argument -g++ -c -I'C:\strawberry\perl\lib\CORE\' -DFORCE_GUI $shell_loc -o slic3r-gui.o +Invoke-Expression "$cxx -c -I'${STRAWBERRY_PATH}\perl\lib\CORE\' -DFORCE_GUI $shell_loc -o ${scriptDir}/slic3r-gui.o" # Build the EXE for the unforced version as slic3r-console -g++ -static-libgcc -static-libstdc++ -L'C:\strawberry\c\lib' -L'C:\strawberry\perl\bin' -L'C:\strawberry\perl\lib\CORE\' $perllib slic3r.o slic3r.res -o slic3r-console.exe | Write-Host +Invoke-Expression "$cxx -static-libgcc -static-libstdc++ -L'${STRAWBERRY_PATH}\c\lib' -L'${STRAWBERRY_PATH}\perl\bin' -L'${STRAWBERRY_PATH}\perl\lib\CORE\' $perllib ${scriptDir}/slic3r.o ${scriptDir}/slic3r.res -o ${scriptDir}/slic3r-console.exe | Write-Host" # Build the EXE for the forced GUI -g++ -static-libgcc -static-libstdc++ -L'C:\strawberry\c\lib' -mwindows -L'C:\strawberry\perl\bin' -L'C:\strawberry\perl\lib\CORE\' $perllib slic3r-gui.o slic3r.res -o slic3r.exe | Write-Host +Invoke-Expression "$cxx -static-libgcc -static-libstdc++ -L'${STRAWBERRY_PATH}\c\lib' -mwindows -L'${STRAWBERRY_PATH}\perl\bin' -L'${STRAWBERRY_PATH}\perl\lib\CORE\' $perllib ${scriptDir}/slic3r-gui.o ${scriptDir}/slic3r.res -o ${scriptDir}/slic3r.exe | Write-Host" # Build an extra copy of the GUI version that creates a console window -g++ -static-libgcc -static-libstdc++ -L'C:\strawberry\c\lib' -L'C:\strawberry\perl\bin' -L'C:\strawberry\perl\lib\CORE\' $perllib slic3r-gui.o slic3r.res -o slic3r-debug-console.exe | Write-Host +Invoke-Expression "$cxx -static-libgcc -static-libstdc++ -L'${STRAWBERRY_PATH}\c\lib' -L'${STRAWBERRY_PATH}\perl\bin' -L'${STRAWBERRY_PATH}\perl\lib\CORE\' $perllib ${scriptDir}/slic3r-gui.o ${scriptDir}/slic3r.res -o ${scriptDir}/slic3r-debug-console.exe | Write-Host" diff --git a/package/win/package_win32.ps1 b/package/win/package_win32.ps1 index 07396ea37..27af2e270 100644 --- a/package/win/package_win32.ps1 +++ b/package/win/package_win32.ps1 @@ -2,62 +2,119 @@ # Licensed under the same license as the rest of Slic3r. # ------------------------ # You need to have Strawberry Perl 5.24.0.1 (or slic3r-perl) installed for this to work, -param ( - [switch]$exe = $false +Param +( + # Perl version major/minor number. Slic3r perl uses 524 + [string]$perlVersion = "524", + # Override the output file name. + [string]$outputFile = "", + [string]$currentDate = "$(Get-Date -UFormat '%Y.%m.%d')", + # Override the branch name used in the output. Otherwise autodetect based on git. + [string]$branch = "", + #This is "32bit" or "64bit". It will detect based on presence of libglut. + [string]$arch = $env:ARCH, + # Change this to where you have Strawberry Perl installed. + [string]$STRAWBERRY_PATH = "C:\Strawberry", + [switch]$skipInstallPAR ) + +function Get-ScriptDirectory +{ + $Invocation = (Get-Variable MyInvocation -Scope 1).Value + Split-Path $Invocation.MyCommand.Path +} +$scriptDir = Get-ScriptDirectory + echo "Make this is run from the perl command window." echo "Requires PAR." -New-Variable -Name "current_branch" -Value "" -New-Variable -Name "current_date" -Value "$(Get-Date -UFormat '%Y.%m.%d')" -New-Variable -Name "output_file" -Value "" +$perldll = "perl$perlVersion" -if ($args[0]) { - $perlversion = $args[0] +if ($branch -eq "") { + git branch | foreach { + if ($env:APPVEYOR) { + if ($_ -match "` (.*)") { + $branch += $matches[1] + } + } else { + if ($_ -match "\*` (.*)"){ + $branch += $matches[1] + } + } + } +} + +if ($outputFile -eq "") { + $outputFile = $output_zip +} + +if (!($arch -eq "64bit" -Or $arch -eq "32bit")) { + # detect current version through libglut + if (Test-Path "${STRAWBERRY_PATH}\c\bin\libglut-0__.dll") { + $arch = "64bit" + } else { + $arch = "32bit" + } + echo "Arch: $arch" +} + +if ($env:APPVEYOR) { + $output_zip = "${scriptDir}\..\..\Slic3r-${branch}.${currentDate}.${env:APPVEYOR_BUILD_NUMBER}.$(git rev-parse --short HEAD).${arch}.zip" } else { - $perlversion = "524" + $output_zip = "${scriptDir}\..\..\Slic3r-${branch}.${currentDate}.$(git rev-parse --short HEAD).${arch}.zip" } -$perldll = "perl$perlversion" - -git branch | foreach { - if ($env:APPVEYOR) { - if ($_ -match "` (.*)") { - $current_branch += $matches[1] - } - } else { - if ($_ -match "\*` (.*)"){ - $current_branch += $matches[1] - } - } +if ($outputFile -eq "") { + $outputFile = $output_zip } -if ($exe) { - $output_file = "slic3r.exe" + +if (-Not $skipInstallPAR) { + cpanm "PAR::Packer" +} + +# Some file names change based on 64bit/32bit. Set them here. +if ($arch -eq "32bit") { + $perlarch = "sjlj" + $glut = "libglut-0_.dll" + $pthread= "pthreadGC2-w32.dll" } else { - $output_file = "slic3r.par" + $perlarch = "seh" + $glut = "libglut-0__.dll" + $pthread= "pthreadGC2-w64.dll" } -# Change this to where you have Strawberry Perl installed. -New-Variable -Name "STRAWBERRY_PATH" -Value "C:\Strawberry" +if (!( (Test-Path -Path "${scriptDir}\slic3r.exe") -And (Test-Path -Path "${scriptDir}\slic3r-console.exe") -And (Test-Path -Path "${scriptDir}\slic3r-debug-console.exe") ) ) { + echo "Compiling Slic3r binaries" + & ${scriptDir}\compile_wrapper.ps1 -perlVersion=$perlVersion -STRAWBERRY_PATH=$STRAWBERRY_PATH +} -cpanm "PAR::Packer" +# remove all static libraries, they just take up space. +if ($env:APPVEYOR) { + gci ${scriptDir}\..\..\ -recurse | ? {$_.Name -match ".*\.a$"} | ri + gci -recurse ${scriptDir}\..\..\local-lib | ? {$_.PSIsContainer -And $_.Name -match "DocView|IPC|DataView|Media|Ribbon|Calendar|STC|PerlTest|WebView"} | ri + gci -recurse ${scriptDir}\..\..\local-lib| ? {$_.Name -match ".*(webview|ribbon|stc).*\.dll"} | ri + gci -recurse ${scriptDir}\..\..\local-lib| ? {$_.Name -match ".*(webview|ribbon|stc).*\.dll"} | ri + gci -recurse ${scriptDir}\..\..\local-lib| ? {$_.Name -match "^ExtUtils$"} | ri + gci -recurse ${scriptDir}\..\..\local-lib\lib\perl5\Module ? {$_.Name -match "^Build"} | ri + gci -recurse ${scriptDir}\..\..\local-lib ? {$_.Name -match "\.pod$"} | ri + gci -recurse ${scriptDir}\..\..\local-lib ? {$_.Name -match "\.h$"} | ri +} pp ` --a "slic3r.exe;slic3r.exe" ` --a "slic3r-console.exe;slic3r-console.exe" ` --a "slic3r-debug-console.exe;slic3r-debug-console.exe" ` --a "../../lib;lib" ` --a "../../local-lib;local-lib" ` --a "../../slic3r.pl;slic3r.pl" ` --a "../../utils;utils" ` --a "../../var;var" ` --a "../../FreeGLUT/freeglut.dll;freeglut.dll" ` --a "${STRAWBERRY_PATH}\perl\bin\perl${perlversion}.dll;perl${perlversion}.dll" ` +-a "${scriptDir}/slic3r.exe;Slic3r.exe" ` +-a "${scriptDir}/slic3r-console.exe;Slic3r-console.exe" ` +-a "${scriptDir}/slic3r-debug-console.exe;Slic3r-debug-console.exe" ` +-a "${scriptDir}/../../lib;lib" ` +-a "${scriptDir}/../../local-lib;local-lib" ` +-a "${scriptDir}/../../slic3r.pl;slic3r.pl" ` +-a "${scriptDir}/../../var;var" ` +-a "${scriptDir}/../../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\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 ` @@ -93,6 +150,7 @@ pp ` -M IO ` -M IO::Handle ` -M IO::Select ` +-M IO::Socket ` -M LWP ` -M LWP::MediaTypes ` -M LWP::MemberMixin ` @@ -137,23 +195,11 @@ pp ` -M XSLoader ` -B ` -M lib ` --p ..\..\slic3r.pl -o ..\..\${output_file} +-p ${scriptDir}\..\..\slic3r.pl -o ${scriptDir}\..\..\slic3r.par + # switch renaming based on whether or not using packaged exe or zip -if ($exe) { - if ($env:APPVEYOR) { - copy ..\..\slic3r.exe "..\..\slic3r-${current_branch}.${current_date}.${env:APPVEYOR_BUILD_NUMBER}.$(git rev-parse --short HEAD).exe" - del ..\slic3r.exe - } else { - copy ..\..\slic3r.exe "..\..\slic3r-${current_branch}.${current_date}.$(git rev-parse --short HEAD).exe" - del ..\..\slic3r.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" - } else { - copy ..\..\slic3r.par "..\..\slic3r-${current_branch}.${current_date}.$(git rev-parse --short HEAD).zip" - del ..\..\slic3r.par - } -} +copy ${scriptDir}\..\..\slic3r.par ${outputFile} +echo "Package saved as ${outputFile}" +del ${scriptDir}\..\..\slic3r.par diff --git a/slic3r.pl b/slic3r.pl index 9526ab6c2..77b87c3ff 100755 --- a/slic3r.pl +++ b/slic3r.pl @@ -18,6 +18,7 @@ use Slic3r::Geometry qw(epsilon X Y Z deg2rad); use Time::HiRes qw(gettimeofday tv_interval); $|++; binmode STDOUT, ':utf8'; +binmode STDERR, ':utf8'; our %opt = (); my %cli_options = (); @@ -35,7 +36,6 @@ my %cli_options = (); 'load=s@' => \$opt{load}, 'autosave=s' => \$opt{autosave}, 'ignore-nonexistent-config' => \$opt{ignore_nonexistent_config}, - 'no-controller' => \$opt{no_controller}, 'datadir=s' => \$opt{datadir}, 'export-svg' => \$opt{export_svg}, 'merge|m' => \$opt{merge}, @@ -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})); } } @@ -109,7 +109,6 @@ if ((!@ARGV || $opt{gui}) && !$opt{save} && eval "require Slic3r::GUI; 1") { { no warnings 'once'; $Slic3r::GUI::datadir = Slic3r::decode_path($opt{datadir} // ''); - $Slic3r::GUI::no_controller = $opt{no_controller}; $Slic3r::GUI::autosave = Slic3r::decode_path($opt{autosave} // ''); $Slic3r::GUI::threads = $opt{threads}; } @@ -266,7 +265,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); @@ -316,6 +315,9 @@ Usage: slic3r.pl [ OPTIONS ] [ file.stl ] [ file2.stl ] ... --save Save configuration to the specified file --load Load configuration from the specified file. It can be used more than once to load options from multiple files. + --datadir Load and store settings at the given directory. + This is useful for maintaining different profiles or including + configurations from a network storage. -o, --output File to output gcode to (by default, the file will be saved into the same directory as the input file using the --output-filename-format to generate the filename.) If a diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 14f4a657a..1e761a750 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -139,17 +139,29 @@ include_directories(${Boost_INCLUDE_DIRS}) IF(CMAKE_HOST_UNIX) #set(Boost_LIBRARIES bsystem bthread bfilesystem) ENDIF(CMAKE_HOST_UNIX) + +target_link_libraries (slic3r libslic3r admesh clipper expat polypartition poly2tri ${Boost_LIBRARIES}) + IF(wxWidgets_FOUND) MESSAGE("wx found!") INCLUDE("${wxWidgets_USE_FILE}") add_library(slic3r_gui STATIC ${LIBDIR}/slic3r/GUI/3DScene.cpp ${LIBDIR}/slic3r/GUI/GUI.cpp) #only build GUI lib if building with wx - target_link_libraries (slic3r slic3r_gui libslic3r admesh clipper expat polypartition poly2tri ${Boost_LIBRARIES} ${wxWidgets_LIBRARIES}) + target_link_libraries (slic3r slic3r-gui ${wxWidgets_LIBRARIES}) ELSE(wxWidgets_FOUND) # For convenience. When we cannot continue, inform the user MESSAGE("wx not found!") - target_link_libraries (slic3r libslic3r admesh clipper expat polypartition poly2tri ${Boost_LIBRARIES}) #skip gui when no wx included ENDIF(wxWidgets_FOUND) +# Windows needs a compiled component for Boost.nowide +IF (WIN32) + add_library(boost-nowide STATIC + ${LIBDIR}/boost/nowide/iostream.cpp + ) + + target_link_libraries(slic3r boost-nowide) + target_link_libraries(extrude-tin boost-nowide) +ENDIF(WIN32) + target_link_libraries (extrude-tin libslic3r admesh clipper expat polypartition poly2tri ${Boost_LIBRARIES}) diff --git a/src/slic3r.cpp b/src/slic3r.cpp index e194117b3..e245caeea 100644 --- a/src/slic3r.cpp +++ b/src/slic3r.cpp @@ -10,15 +10,22 @@ #include #include #include -#include "boost/filesystem.hpp" +#include +#include +#include + using namespace Slic3r; void confess_at(const char *file, int line, const char *func, const char *pat, ...){} int -main(const int argc, const char **argv) +main(int argc, char **argv) { + // Convert arguments to UTF-8 (needed on Windows). + // argv then points to memory owned by a. + boost::nowide::args a(argc, argv); + // parse all command line options into a DynamicConfig ConfigDef config_def; config_def.merge(cli_config_def); @@ -34,18 +41,17 @@ main(const int argc, const char **argv) DynamicPrintConfig print_config; // load config files supplied via --load - for (std::vector::const_iterator file = cli_config.load.values.begin(); - file != cli_config.load.values.end(); ++file) { - if (!boost::filesystem::exists(*file)) { - std::cout << "No such file: " << *file << std::endl; + for (const std::string &file : cli_config.load.values) { + if (!boost::filesystem::exists(file)) { + boost::nowide::cout << "No such file: " << file << std::endl; exit(1); } DynamicPrintConfig c; try { - c.load(*file); + c.load(file); } catch (std::exception &e) { - std::cout << "Error while reading config file: " << e.what() << std::endl; + boost::nowide::cout << "Error while reading config file: " << e.what() << std::endl; exit(1); } c.normalize(); @@ -62,85 +68,85 @@ main(const int argc, const char **argv) // read input file(s) if any std::vector models; - for (t_config_option_keys::const_iterator it = input_files.begin(); it != input_files.end(); ++it) { - if (!boost::filesystem::exists(*it)) { - std::cout << "No such file: " << *it << std::endl; + for (const t_config_option_key &file : input_files) { + if (!boost::filesystem::exists(file)) { + boost::nowide::cerr << "No such file: " << file << std::endl; exit(1); } Model model; try { - model = Model::read_from_file(*it); + model = Model::read_from_file(file); } catch (std::exception &e) { - std::cout << *it << ": " << e.what() << std::endl; + boost::nowide::cerr << file << ": " << e.what() << std::endl; exit(1); } if (model.objects.empty()) { - printf("Error: file is empty: %s\n", it->c_str()); + boost::nowide::cerr << "Error: file is empty: " << file << std::endl; continue; } model.add_default_instances(); // apply command line transform options - for (ModelObjectPtrs::iterator o = model.objects.begin(); o != model.objects.end(); ++o) { + for (ModelObject* o : model.objects) { if (cli_config.scale_to_fit.is_positive_volume()) - (*o)->scale_to_fit(cli_config.scale_to_fit.value); + o->scale_to_fit(cli_config.scale_to_fit.value); // TODO: honor option order? - (*o)->scale(cli_config.scale.value); - (*o)->rotate(Geometry::deg2rad(cli_config.rotate_x.value), X); - (*o)->rotate(Geometry::deg2rad(cli_config.rotate_y.value), Y); - (*o)->rotate(Geometry::deg2rad(cli_config.rotate.value), Z); + o->scale(cli_config.scale.value); + o->rotate(Geometry::deg2rad(cli_config.rotate_x.value), X); + o->rotate(Geometry::deg2rad(cli_config.rotate_y.value), Y); + o->rotate(Geometry::deg2rad(cli_config.rotate.value), Z); } // TODO: handle --merge models.push_back(model); } - for (std::vector::iterator model = models.begin(); model != models.end(); ++model) { + for (Model &model : models) { if (cli_config.info) { // --info works on unrepaired model - model->print_info(); + model.print_info(); } else if (cli_config.export_obj) { std::string outfile = cli_config.output.value; - if (outfile.empty()) outfile = model->objects.front()->input_file + ".obj"; + if (outfile.empty()) outfile = model.objects.front()->input_file + ".obj"; - TriangleMesh mesh = model->mesh(); + TriangleMesh mesh = model.mesh(); mesh.repair(); IO::OBJ::write(mesh, outfile); - printf("File exported to %s\n", outfile.c_str()); + boost::nowide::cout << "File exported to " << outfile << std::endl; } else if (cli_config.export_pov) { std::string outfile = cli_config.output.value; - if (outfile.empty()) outfile = model->objects.front()->input_file + ".pov"; + if (outfile.empty()) outfile = model.objects.front()->input_file + ".pov"; - TriangleMesh mesh = model->mesh(); + TriangleMesh mesh = model.mesh(); mesh.repair(); IO::POV::write(mesh, outfile); - printf("File exported to %s\n", outfile.c_str()); + boost::nowide::cout << "File exported to " << outfile << std::endl; } else if (cli_config.export_svg) { std::string outfile = cli_config.output.value; - if (outfile.empty()) outfile = model->objects.front()->input_file + ".svg"; + if (outfile.empty()) outfile = model.objects.front()->input_file + ".svg"; - SLAPrint print(&*model); + SLAPrint print(&model); print.config.apply(print_config, true); print.slice(); print.write_svg(outfile); - printf("SVG file exported to %s\n", outfile.c_str()); + boost::nowide::cout << "SVG file exported to " << outfile << std::endl; } else if (cli_config.cut_x > 0 || cli_config.cut_y > 0 || cli_config.cut > 0) { - model->repair(); - model->translate(0, 0, -model->bounding_box().min.z); + model.repair(); + model.translate(0, 0, -model.bounding_box().min.z); - if (!model->objects.empty()) { + if (!model.objects.empty()) { // FIXME: cut all objects Model out; if (cli_config.cut_x > 0) { - model->objects.front()->cut(X, cli_config.cut_x, &out); + model.objects.front()->cut(X, cli_config.cut_x, &out); } else if (cli_config.cut_y > 0) { - model->objects.front()->cut(Y, cli_config.cut_y, &out); + model.objects.front()->cut(Y, cli_config.cut_y, &out); } else { - model->objects.front()->cut(Z, cli_config.cut, &out); + model.objects.front()->cut(Z, cli_config.cut, &out); } ModelObject &upper = *out.objects[0]; @@ -156,18 +162,19 @@ main(const int argc, const char **argv) } } } else if (cli_config.cut_grid.value.x > 0 && cli_config.cut_grid.value.y > 0) { - TriangleMesh mesh = model->mesh(); + TriangleMesh mesh = model.mesh(); mesh.repair(); TriangleMeshPtrs meshes = mesh.cut_by_grid(cli_config.cut_grid.value); - for (TriangleMeshPtrs::iterator m = meshes.begin(); m != meshes.end(); ++m) { + size_t i = 0; + for (TriangleMesh* m : meshes) { std::ostringstream ss; - ss << model->objects.front()->input_file << "_" << (m - meshes.begin()) << ".stl"; - IO::STL::write(**m, ss.str()); - delete *m; + ss << model.objects.front()->input_file << "_" << i++ << ".stl"; + IO::STL::write(*m, ss.str()); + delete m; } } else { - std::cerr << "error: command not supported" << std::endl; + boost::nowide::cerr << "error: command not supported" << std::endl; return 1; } } diff --git a/src/utils/extrude-tin.cpp b/src/utils/extrude-tin.cpp index 0043b42e8..d5ad91625 100644 --- a/src/utils/extrude-tin.cpp +++ b/src/utils/extrude-tin.cpp @@ -3,14 +3,20 @@ #include "IO.hpp" #include "TriangleMesh.hpp" #include "libslic3r.h" +#include +#include using namespace Slic3r; void confess_at(const char *file, int line, const char *func, const char *pat, ...){} int -main(const int argc, const char **argv) +main(int argc, char **argv) { + // Convert arguments to UTF-8 (needed on Windows). + // argv then points to memory owned by a. + boost::nowide::args a(argc, argv); + // read config ConfigDef config_def; { @@ -40,7 +46,7 @@ main(const int argc, const char **argv) if (outfile.empty()) outfile = *it + "_extruded.stl"; Slic3r::IO::STL::write(mesh, outfile); - printf("Extruded mesh written to %s\n", outfile.c_str()); + boost::nowide::cout << "Extruded mesh written to " << outfile << std::endl; } return 0; 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/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/t/multi.t b/t/multi.t index 6ce862818..fb8cad81b 100644 --- a/t/multi.t +++ b/t/multi.t @@ -16,6 +16,8 @@ use Slic3r::Test; { my $config = Slic3r::Config->new_from_defaults; + $config->set('layer_height', 0.3); + $config->set('first_layer_height', 0.35); $config->set('raft_layers', 2); $config->set('infill_extruder', 2); $config->set('solid_infill_extruder', 3); @@ -24,7 +26,9 @@ use Slic3r::Test; $config->set('extruder_offset', [ [0,0], [20,0], [0,20], [20,20] ]); $config->set('temperature', [200, 180, 170, 160]); $config->set('first_layer_temperature', [206, 186, 166, 156]); + $config->set('standby_temperature_delta', -5); $config->set('toolchange_gcode', ';toolchange'); # test that it doesn't crash when this is supplied + $config->set('skirts', 2); # test correct temperatures are applied to skirt as well my $print = Slic3r::Test::init_print('20mm_cube', config => $config); @@ -57,6 +61,18 @@ use Slic3r::Test; } elsif ($cmd eq 'G1' && $info->{extruding} && $info->{dist_XY} > 0) { push @extrusion_points, my $point = Slic3r::Point->new_scale($args->{X}, $args->{Y}); $point->translate(map +scale($_), @{ $config->extruder_offset->[$tool] }); + + # check temperature (we don't do it at M104/M109 because that may be + # issued before layer change) + if ($self->Z == $config->first_layer_height) { + fail 'unexpected temperature in first layer' + unless $tool_temp[$tool] == ($config->first_layer_temperature->[$tool] + $config->standby_temperature_delta) + || $tool_temp[$tool] == $config->first_layer_temperature->[$tool]; + } else { + fail 'unexpected temperature' + unless $tool_temp[$tool] == ($config->temperature->[$tool] + $config->standby_temperature_delta) + || $tool_temp[$tool] == $config->temperature->[$tool]; + } } }); my $convex_hull = convex_hull(\@extrusion_points); diff --git a/t/perimeters.t b/t/perimeters.t index 828504311..513c76ef9 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,37 @@ 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(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; + } + }); + 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/t/retraction.t b/t/retraction.t index 571e9755d..237af3abf 100644 --- a/t/retraction.t +++ b/t/retraction.t @@ -1,4 +1,4 @@ -use Test::More tests => 26; +use Test::More tests => 27; use strict; use warnings; @@ -10,6 +10,7 @@ BEGIN { use List::Util qw(any); use Slic3r; +use Slic3r::Geometry qw(epsilon); use Slic3r::Test qw(_eq); { @@ -209,20 +210,55 @@ use Slic3r::Test qw(_eq); my $config = Slic3r::Config->new_from_defaults; $config->set('start_gcode', ''); $config->set('retract_lift', [3, 4]); + $config->set('only_retract_when_crossing_perimeters', 0); my @lifted_at = (); my $test = sub { my $print = Slic3r::Test::init_print('20mm_cube', config => $config, duplicate => 2); @lifted_at = (); + my $retracted = 0; + my $lifted = 0; + my $tool = 0; Slic3r::GCode::Reader->new->parse(Slic3r::Test::gcode($print), sub { my ($self, $cmd, $args, $info) = @_; - if ($cmd eq 'G1' && $info->{dist_Z} < 0) { - push @lifted_at, $info->{new_Z}; + if ($cmd eq 'G1') { + if ($info->{dist_Z} < 0) { + # going downwards; this is a "restore lift" move + $lifted = 0; + push @lifted_at, $info->{new_Z}; + } elsif (abs($info->{dist_Z} - $config->get_at('retract_lift', $tool)) < &epsilon) { + # going upwards by a large amount; this is a lift move + fail 'always lift after retraction' if !$retracted; + ### It would be useful to prevent the double lift happening at layer change: + ###fail 'no double lift' if $lifted; + $lifted = 1; + } elsif ($info->{retracting}) { + $retracted = 1; + } elsif ($info->{extruding} && $info->{dist_XY} == 0) { + # consider the lift as layer change if they are configured with the same distance + $lifted = 0 if $config->get_at('retract_lift', $tool) == $config->layer_height; + fail 'always unretract after unlifting' if $lifted; + $retracted = 0; + } elsif ($info->{travel} && $info->{dist_XY} >= $config->get_at('retract_before_travel', $tool)) { + #printf "dist_XY = %f, rbt = %f\n", $info->{dist_XY}, $config->get_at('retract_before_travel', 0); + my $below = $config->get_at('retract_lift_below', $tool); + fail 'no retraction for long travel move' if !$retracted; + fail 'no lift for long travel move' + if !$lifted + && $self->Z >= $config->get_at('retract_lift_above', $tool) + && ($below == 0 || $self->Z <= $below); + } + } elsif ($cmd =~ /^T(\d+)/) { + $tool = $1; } }); }; + $config->set('retract_layer_change', [1,1]); + $test->(); + ok !!@lifted_at, 'lift is compatible with retract_layer_change'; + $config->set('retract_lift_above', [0, 0]); $config->set('retract_lift_below', [0, 0]); $test->(); @@ -234,9 +270,13 @@ use Slic3r::Test qw(_eq); ok !!@lifted_at, 'lift takes place when above/below != 0'; ok !(any { $_ < $config->get_at('retract_lift_above', 0) } @lifted_at), 'Z is not lifted below the configured value'; - ok !(any { $_ > $config->get_at('retract_lift_below', 0) } @lifted_at), - 'Z is not lifted above the configured value'; - + { + my $below = $config->get_at('retract_lift_below', 0); + $below += $config->layer_height if $config->get_at('retract_layer_change', 0); + ok !(any { $_ > $below } @lifted_at), + 'Z is not lifted above the configured value'; + } + # check lifting with different values for 2. extruder $config->set('perimeter_extruder', 2); $config->set('infill_extruder', 2); @@ -251,8 +291,20 @@ use Slic3r::Test qw(_eq); ok !!@lifted_at, 'lift takes place when above/below != 0 for 2. extruder'; ok !(any { $_ < $config->get_at('retract_lift_above', 1) } @lifted_at), 'Z is not lifted below the configured value for 2. extruder'; - ok !(any { $_ > $config->get_at('retract_lift_below', 1) } @lifted_at), - 'Z is not lifted above the configured value for 2. extruder'; + { + my $below = $config->get_at('retract_lift_below', 1); + $below += $config->layer_height if $config->get_at('retract_layer_change', 1); + ok !(any { $_ > $below } @lifted_at), + 'Z is not lifted above the configured value for 2. extruder'; + } + + $config->set('retract_lift', [$config->layer_height]); + $config->set('perimeter_extruder', 1); + $config->set('infill_extruder', 1); + $config->set('retract_lift_above', [0, 0]); + $config->set('retract_lift_below', [0, 0]); + $test->(); + } __END__ diff --git a/t/support.t b/t/support.t index 33e5d9cb3..8d4655b3f 100644 --- a/t/support.t +++ b/t/support.t @@ -1,4 +1,4 @@ -use Test::More tests => 27; +use Test::More tests => 28; use strict; use warnings; @@ -258,5 +258,32 @@ use Slic3r::Test; @{ $layer_heights_by_tool{$config->support_material_extruder-1} }), 'no support material layer is as thin as object layers'; } - +{ + my $config = Slic3r::Config->new_from_defaults; + $config->set('support_material_enforce_layers', 100); + $config->set('support_material', 0); + my @contact_z = my @top_z = (); + + my $test = sub { + my $print = Slic3r::Test::init_print('20mm_cube', config => $config); + my $flow = $print->print->objects->[0]->support_material_flow; + my $support = Slic3r::Print::SupportMaterial->new( + object_config => $print->print->objects->[0]->config, + print_config => $print->print->config, + flow => $flow, + interface_flow => $flow, + first_layer_flow => $flow, + ); + my $support_z = $support->support_layers_z(\@contact_z, \@top_z, $config->layer_height); + + is scalar(grep { $support_z->[$_]-$support_z->[$_-1] <= 0 } 1..$#$support_z), 0, + 'forced support is generated'; + + }; + $config->set('layer_height', 0.2); + $config->set('first_layer_height', 0.3); + @contact_z = (1.9); + @top_z = (1.1); + $test->(); +} __END__ diff --git a/var/zoom_in.png b/var/zoom_in.png new file mode 100755 index 000000000..cdf0a52fe Binary files /dev/null and b/var/zoom_in.png differ diff --git a/var/zoom_out.png b/var/zoom_out.png new file mode 100755 index 000000000..07bf98a79 Binary files /dev/null and b/var/zoom_out.png differ diff --git a/xs/Build.PL b/xs/Build.PL index 2fc5b33c1..b59e2fb57 100644 --- a/xs/Build.PL +++ b/xs/Build.PL @@ -10,6 +10,10 @@ use Module::Build::WithXSpp; my $cpp_guess = ExtUtils::CppGuess->new; my $mswin = $^O eq 'MSWin32'; +my $linux = $^O eq 'linux'; + +# prevent an annoying concatenation warning by Devel::CheckLib +$ENV{LD_RUN_PATH} //= ""; # _GLIBCXX_USE_C99 : to get the long long type for g++ # HAS_BOOL : stops Perl/lib/CORE/handy.h from doing "# define bool char" for MSVC @@ -20,14 +24,32 @@ if ($cpp_guess->is_gcc) { # GCC is pedantic with c++11 std, so undefine strict ansi to get M_PI back push @cflags, qw(-U__STRICT_ANSI__); } -if (`$Config{cc} -v` =~ /gcc version 4\.6\./) { - # Compatibility with GCC 4.6 is not a requirement, but as long as code compiles on it we try to support it. - push @cflags, qw(-std=c++0x); -} else { - # std=c++11 Enforce usage of C++11 (required now). Minimum compiler supported: gcc 4.9, clang 3.3, MSVC 14.0 - push @cflags, qw(-std=c++11); -} + +# std=c++11 Enforce usage of C++11 (required now). Minimum compiler supported: gcc 4.9, clang 3.3, MSVC 14.0 +push @cflags, qw(-std=c++11); + my @ldflags = (); + +if ($linux && (defined $ENV{SLIC3R_STATIC} && $ENV{SLIC3R_STATIC})) { + push @ldflags, qw(-static-libgcc -static-libstdc++); + if ($ENV{TRAVIS}) { + # On the build server, link to the actual static libraries to make sure we get them in the list. + push @ldflags, qw(/usr/lib/gcc/x86_64-linux-gnu/4.9/libstdc++.a /usr/lib/gcc/x86_64-linux-gnu/4.9/libgcc.a); + } + # ExtUtils::CppGuess has a hard-coded -lstdc++, so we filter it out + { + no strict 'refs'; + no warnings 'redefine'; + my $func = "ExtUtils::CppGuess::_get_lflags"; + my $orig = *$func{CODE}; + *{$func} = sub { + my $lflags = $orig->(@_); + $lflags =~ s/\s*-lstdc\+\+//; + return $lflags; + }; + } +} + if ($^O eq 'darwin') { push @cflags, qw(-stdlib=libc++); push @ldflags, qw(-framework IOKit -framework CoreFoundation -lc++); @@ -67,15 +89,13 @@ my @boost_include = (); if (defined $ENV{BOOST_INCLUDEDIR}) { push @boost_include, $ENV{BOOST_INCLUDEDIR} } elsif (defined $ENV{BOOST_DIR}) { - my $subdir = $ENV{BOOST_DIR} . (($mswin == 1) ? '\include' : '/include'); - if (-d $subdir) { - push @boost_include, $subdir; - } elsif (-d "../$subdir") { - # User might have provided a path relative to the Build.PL in the main directory - push @boost_include, "../$subdir"; - } else { - push @boost_include, $ENV{BOOST_DIR}; + # User might have provided a path relative to the Build.PL in the main directory + foreach my $subdir ($ENV{BOOST_DIR}, "../$ENV{BOOST_DIR}", "$ENV{BOOST_DIR}/include", "../$ENV{BOOST_DIR}/include") { + if (-d $subdir) { + push @boost_include, $subdir; + } } + die "Invalid BOOST_DIR: no such directory\n" if !@boost_include; } else { # Boost library was not defined by the environment. # Try to guess at some default paths. @@ -99,15 +119,13 @@ my @boost_libs = (); if (defined $ENV{BOOST_LIBRARYPATH}) { push @boost_libs, $ENV{BOOST_LIBRARYPATH} } elsif (defined $ENV{BOOST_DIR}) { - my $subdir = $ENV{BOOST_DIR} . ($mswin ? '\stage\lib' : '/stage/lib'); - if (-d $subdir) { - push @boost_libs, $subdir; - } elsif (-d "../$subdir") { - # User might have provided a path relative to the Build.PL in the main directory - push @boost_libs, "../$subdir"; - } else { - push @boost_libs, $ENV{BOOST_DIR}; + # User might have provided a path relative to the Build.PL in the main directory + foreach my $subdir ("$ENV{BOOST_DIR}/stage/lib", "../$ENV{BOOST_DIR}/stage/lib") { + if (-d $subdir) { + push @boost_libs, $subdir; + } } + die "Invalid BOOST_DIR: no such directory\n" if !@boost_libs; } else { # Boost library was not defined by the environment. # Try to guess at some default paths. @@ -196,13 +214,8 @@ if ($ENV{SLIC3R_DEBUG}) { push @cflags, '-DNDEBUG'; } if ($cpp_guess->is_gcc) { - # check whether we're dealing with a buggy GCC version - # see https://github.com/alexrj/Slic3r/issues/1965 - if (`cc --version` =~ / 4\.7\.[012]/) { - # Workaround suggested by Boost devs: - # https://svn.boost.org/trac/boost/ticket/8695 - push @cflags, qw(-fno-inline-small-functions); - } + # our templated XS bindings cause undefined-var-template warnings + push @cflags, qw(-Wno-undefined-var-template); } my $build = Module::Build::WithXSpp->new( diff --git a/xs/MANIFEST b/xs/MANIFEST index d01b3ead3..c6141c54d 100644 --- a/xs/MANIFEST +++ b/xs/MANIFEST @@ -1,5 +1,6 @@ Build.PL lib/Slic3r/XS.pm +libslic3r.doxygen MANIFEST This list of files src/admesh/connect.c src/admesh/normals.c @@ -8,6 +9,21 @@ src/admesh/stl.h src/admesh/stl_io.c src/admesh/stlinit.c src/admesh/util.c +src/boost/nowide/args.hpp +src/boost/nowide/cenv.hpp +src/boost/nowide/config.hpp +src/boost/nowide/convert.hpp +src/boost/nowide/cstdio.hpp +src/boost/nowide/cstdlib.hpp +src/boost/nowide/filebuf.hpp +src/boost/nowide/fstream.hpp +src/boost/nowide/integration/filesystem.hpp +src/boost/nowide/iostream.cpp +src/boost/nowide/iostream.hpp +src/boost/nowide/stackstring.hpp +src/boost/nowide/system.hpp +src/boost/nowide/utf8_codecvt.hpp +src/boost/nowide/windows.hpp src/clipper.cpp src/clipper.hpp src/expat/ascii.h diff --git a/xs/libslic3r.doxygen b/xs/libslic3r.doxygen new file mode 100644 index 000000000..40b239a56 --- /dev/null +++ b/xs/libslic3r.doxygen @@ -0,0 +1,2478 @@ +# 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 \ + *.inc \ + *.m \ + *.markdown \ + *.md \ + *.mm \ + *.dox \ + *.py \ + *.pyw \ + *.f90 \ + *.f95 \ + *.f03 \ + *.f08 \ + *.f \ + *.for \ + *.tcl \ + *.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 = YES + +# 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 +# , /