diff --git a/.travis.yml b/.travis.yml
index 2d84fd28d..a34433a9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ perl:
branches:
only:
- master
- - stable
+ - xsgui
sudo: false
cache:
apt: true
@@ -26,3 +26,10 @@ addons:
- liblocal-lib-perl
- g++-4.9
env: CC=g++-4.9
+notifications:
+ irc:
+ channels:
+ - "chat.freenode.net#slic3r"
+ on_success: change
+ on_failure: always
+ use_notice: true
diff --git a/README.md b/README.md
index 57010dd4c..2a96554fc 100644
--- a/README.md
+++ b/README.md
@@ -1,63 +1,50 @@
-_Q: Oh cool, a new RepRap slicer?_
-
-A: Yes.
-
-Slic3r [](https://travis-ci.org/alexrj/Slic3r) [](https://ci.appveyor.com/project/lordofhyphens/slic3r) [](http://osx-build.slic3r.org:8080/job/Slic3r)
+ Slic3r [](https://travis-ci.org/alexrj/Slic3r) [](https://ci.appveyor.com/project/lordofhyphens/slic3r) [](http://osx-build.slic3r.org:8080/job/Slic3r)
======
-Prebuilt Windows (64-bit) and OSX (>10.7) builds:
-* http://dl.slic3r.org/dev/
-
+We have automated builds for Windows (64-bit) and OSX (>= 10.7). [Get a fresh build now](http://dl.slic3r.org/dev/) and stay up-to-date with the development!
-Slic3r takes 3D models (STL, OBJ, AMF) and converts them into G-code instructions for
-3D printers. It's compatible with any modern printer based on the RepRap toolchain,
-including all those based on the Marlin, Sprinter and Repetier firmware. It also works
-with Mach3, LinuxCNC and Machinekit controllers.
+The MacOS X build server is kindly sponsored by:
-See the [project homepage](http://slic3r.org/) at slic3r.org and the
-[manual](http://manual.slic3r.org/) for more information.
+### So, what's this Slic3r?
+
+Slic3r is mainly a **toolpath generator** for 3D printers: it reads 3D models (STL, OBJ, AMF) and it converts them into **G-code** instructions for 3D printers. But it does much more than that, see the [features list](#features) below.
+
+Slic3r was born in **2011** within the RepRap community and thanks to its high configurability became the swiss-army knife for 3D printing. It served as a platform for experimenting several **new ideas that later became technology standards**, such as multiple extruders, brim, variable-height layers, per-object settings, modifiers, post-processing scripts, G-code macros and more. Despite being based on volunteer efforts, Slic3r is still pushing the boundaries of 3D printing.
+
+Slic3r is:
+
+* **Open:** it is totally **open source** and it's **independent from any commercial company** or printer manufacturer. We want to keep 3D printing open and free.
+* **Compatible:** it supports all the known G-code dialects (Marlin, Repetier, Mach3, LinuxCNC, Machinekit, Smoothie, Makerware, Sailfish).
+* **Advanced:** many configuration options allow for fine-tuning and full control. While novice users often need just few options, Slic3r is mostly used by advanced users.
+* **Community-driven:** new features or issues are discussed in the [GitHub repository](https://github.com/alexrj/Slic3r/issues). Join our collaborative effort and help improve it!
+* **Robust:** the codebase includes more than 1,000 unit and regression tests, collected in 6 years of development.
+* **Modular:** the core of Slic3r is libslic3r, a C++ library that provides a granular API and reusable components.
+* **Embeddable:** a complete and powerful command line interface allows to use Slic3r from the shell or to integrate it in server-side applications.
+* **Powerful:** see the list below!
+
+See the [project homepage](http://slic3r.org/) at slic3r.org for more information.
+
+### Features
+
+(Most of these are also available in the command line interface.)
+
+* **G-code generation** for FFF/FDM printers;
+* **conversion** between STL, OBJ, AMF and POV formats;
+* **auto-repair** of non-manifold meshes (and ability to re-export them);
+* **SVG export** of slices;
+* built-in **USB/serial** host controller, supporting **multiple simultaneous printers** each one with a spool queue;
+* **OctoPrint integration** (send to printer);
+* built-in **projector and host for DLP printers**;
+* tool for **cutting meshes** in multiple solid parts with visual preview (also in batch using a grid);
+* tool for **extruding 2.5D TIN meshes**.
### What language is it written in?
-The core geometric algorithms and data structures are written in C++,
-and Perl is used for high-level flow abstraction, GUI and testing.
-If you're wondering why Perl, see https://xkcd.com/224/
-
-The C++ API is public and its use in other projects is encouraged.
-The goal is to make Slic3r fully modular so that any part of its logic
-can be used separately.
-
-### What are Slic3r's main features?
-
-Key features are:
-
-* **multi-platform** (Linux/Mac/Win) and packaged as standalone-app with no dependencies required
-* complete **command-line interface** to use it with no GUI
-* multi-material **(multiple extruders)** object printing
-* multiple G-code flavors supported (RepRap, Makerbot, Mach3, Machinekit etc.)
-* ability to plate **multiple objects having distinct print settings**
-* **multithread** processing
-* **STL auto-repair** (tolerance for broken models)
-* wide automated unit testing
-
-Other major features are:
-
-* combine infill every 'n' perimeters layer to speed up printing
-* **3D preview** (including multi-material files)
-* **multiple layer heights** in a single print
-* **spiral vase** mode for bumpless vases
-* fine-grained configuration of speed, acceleration, extrusion width
-* several infill patterns including honeycomb, spirals, Hilbert curves
-* support material, raft, brim, skirt
-* **standby temperature** and automatic wiping for multi-extruder printing
-* customizable **G-code macros** and output filename with variable placeholders
-* support for **post-processing scripts**
-* **cooling logic** controlling fan speed and dynamic print speed
+The core parts of Slic3r are written in C++11, with multithreading. The graphical interface is still mostly written in Perl, but we're gradually porting it to C++ (want to help?). The goal is to port everything to C++.
### How to install?
-You can download a precompiled package from [slic3r.org](http://slic3r.org/);
-it will run without the need for any dependency.
+You can download a precompiled package from [slic3r.org](http://slic3r.org/) (releases) or from [dl.slicr3r.org](http://dl.slic3r.org/dev/) (automated builds).
If you want to compile the source yourself follow the instructions on one of these wiki pages:
* [Linux](https://github.com/alexrj/Slic3r/wiki/Running-Slic3r-from-git-on-GNU-Linux)
@@ -67,28 +54,40 @@ If you want to compile the source yourself follow the instructions on one of the
### Can I help?
Sure! You can do the following to find things that are available to help with:
-* [Pull Request Milestone](https://github.com/alexrj/Slic3r/milestone/31)
- * Please comment in the related github issue that you are working on it so that other people know.
-* Items in the [TODO](https://github.com/alexrj/Slic3r/wiki/TODO) wiki page.
- * Please comment in the related github issue that you are working on it so that other people know.
-* Drop me a line at aar@cpan.org.
-* You can also find me (rarely) in #reprap and in #slic3r on [FreeNode](https://webchat.freenode.net) with the nickname _Sound_. Another contributor, _LoH_, is also in both channels.
-* Add an [issue](https://github.com/alexrj/Slic3r/issues) to the github tracker if it isn't already present.
-Before sending patches and pull requests contact me (preferably through opening a github issue or commenting on an existing, related, issue) to discuss your proposed
-changes: this way we'll ensure nobody wastes their time and no conflicts arise
-in development.
+* 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.
+* 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.
+* Drop Alessandro a line at aar@cpan.org.
-### What's Slic3r license?
+### Directory structure
-Slic3r is licensed under the _GNU Affero General Public License, version 3_.
-The author is Alessandro Ranellucci.
+* `Build.PL`: this script installs dependencies into `local-lib/`, compiles the C++ part and runs tests
+* `lib/`: the Perl code
+* `package/`: the scripts used for packaging the executables
+* `slic3r.pl`: the main executable script, launching the GUI and providing the CLI
+* `src/`: the C++ source of the `slic3r` executable the and CMake definition file for compiling it (note that this C++ `slic3r` executable can do many things but can't generate G-code yet because the porting isn't finished yet - the main executable is `slic3r.pl`)
+* `t/`: the test suite
+* `utils/`: various useful scripts
+* `xs/src/libslic3r/`: C++ sources for libslic3r
+* `xs/src/slic3r/`: C++ sources for the Slic3r GUI application
+* `xs/t/`: test suite for libslic3r
+* `xs/xsp/`: bindings for calling libslic3r from Perl (XS)
-The [Silk icon set](http://www.famfamfam.com/lab/icons/silk/) used in Slic3r is
-licensed under the _Creative Commons Attribution 3.0 License_.
-The author of the Silk icon set is Mark James.
+### Acknowledgements
-### How can I invoke slic3r.pl using the command line?
+The main author of Slic3r is Alessandro Ranellucci (@alexrj, *Sound* in IRC, [@alranel](http://twitter.com/alranel) on Twitter), who started the project in 2011 and still leads development.
+
+Joseph Lenox (@lordofhyphens, *Loh* in IRC) is the current co-maintainer.
+
+Contributions by Henrik Brix Andersen, Nicolas Dandrimont, Mark Hindess, Petr Ledvina, Y. Sapir, Mike Sheldrake, Vojtech Bubnik and numerous others. Original manual by Gary Hodgson. Slic3r logo designed by Corey Daniels, Silk Icon Set designed by Mark James.
+
+### How can I invoke Slic3r using the command line?
Usage: slic3r.pl [ OPTIONS ] [ file.stl ] [ file2.stl ] ...
@@ -116,8 +115,6 @@ The author of the Silk icon set is Mark James.
GUI options:
--gui Forces the GUI launch instead of command line slicing (if you
supply a model file, it will be loaded into the plater)
- --no-plater Disable the plater tab
- --gui-mode Overrides the configured mode (simple/expert)
--autosave Automatically export current configuration to the specified file
Output options:
@@ -384,11 +381,4 @@ The author of the Silk icon set is Mark James.
Temperature difference to be applied when an extruder is not active and
--ooze-prevention is enabled (default: -5)
-
-If you want to change a preset file, just do
-
- slic3r.pl --load config.ini --layer-height 0.25 --save config.ini
-
-If you want to slice a file overriding an option contained in your preset file:
-
- slic3r.pl --load config.ini --layer-height 0.25 file.stl
+For more information about command line usage see the relevant [manual page](http://manual.slic3r.org/advanced/command-line).
diff --git a/lib/Slic3r.pm b/lib/Slic3r.pm
index abffe3c03..a52378502 100644
--- a/lib/Slic3r.pm
+++ b/lib/Slic3r.pm
@@ -42,7 +42,11 @@ warn "Running Slic3r under Perl 5.16 is neither supported nor recommended\n"
use FindBin;
# Path to the images.
-our $var = sub { decode_path($FindBin::Bin) . "/var/" . $_[0] };
+my $varpath = decode_path($FindBin::Bin) . "/var";
+if ($^O eq 'darwin' && !-d $varpath) {
+ $varpath = decode_path($FindBin::Bin) . "/../Resources/var";
+}
+our $var = sub { "$varpath/$_[0]" };
use Moo 1.003001;
diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm
index 2763a8fd0..b68ef2a3e 100644
--- a/lib/Slic3r/Config.pm
+++ b/lib/Slic3r/Config.pm
@@ -30,12 +30,11 @@ sub new_from_defaults {
my (@opt_keys) = @_;
my $self = $class->new;
- my $defaults = Slic3r::Config::Full->new;
if (@opt_keys) {
- $self->set($_, $defaults->get($_))
- for grep $defaults->has($_), @opt_keys;
+ $self->set($_, $Options->{$_}{default})
+ for grep exists $Options->{$_}{default}, @opt_keys;
} else {
- $self->apply_static($defaults);
+ $self->apply_static(Slic3r::Config::Full->new);
}
return $self;
}
@@ -190,8 +189,11 @@ sub validate {
die "Invalid value for --gcode-flavor\n"
if !first { $_ eq $self->gcode_flavor } @{$Options->{gcode_flavor}{values}};
- die "--use-firmware-retraction is only supported by Marlin and Machinekit firmware\n"
- if $self->use_firmware_retraction && $self->gcode_flavor ne 'smoothie' && $self->gcode_flavor ne 'reprap' && $self->gcode_flavor ne 'machinekit';
+ die "--use-firmware-retraction is only supported by Marlin, Smoothie, Repetier and Machinekit firmware\n"
+ if $self->use_firmware_retraction && $self->gcode_flavor ne 'smoothie'
+ && $self->gcode_flavor ne 'reprap'
+ && $self->gcode_flavor ne 'machinekit'
+ && $self->gcode_flavor ne 'repetier';
die "--use-firmware-retraction is not compatible with --wipe\n"
if $self->use_firmware_retraction && first {$_} @{$self->wipe};
diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm
index e8ec92b71..6df7343c2 100644
--- a/lib/Slic3r/GUI.pm
+++ b/lib/Slic3r/GUI.pm
@@ -5,7 +5,9 @@ use utf8;
use File::Basename qw(basename);
use FindBin;
-use List::Util qw(first);
+use List::Util qw(first any);
+use Slic3r::Geometry qw(X Y);
+
use Slic3r::GUI::2DBed;
use Slic3r::GUI::AboutDialog;
use Slic3r::GUI::BedShapeDialog;
@@ -33,9 +35,10 @@ use Slic3r::GUI::ProgressStatusBar;
use Slic3r::GUI::Projector;
use Slic3r::GUI::OptionsGroup;
use Slic3r::GUI::OptionsGroup::Field;
-use Slic3r::GUI::SimpleTab;
+use Slic3r::GUI::Preset;
+use Slic3r::GUI::PresetEditor;
+use Slic3r::GUI::PresetEditorDialog;
use Slic3r::GUI::SLAPrintOptions;
-use Slic3r::GUI::Tab;
our $have_OpenGL = eval "use Slic3r::GUI::3DScene; 1";
our $have_LWP = eval "use LWP::UserAgent; 1";
@@ -61,15 +64,12 @@ 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 $no_plater;
-our $mode;
our $autosave;
our $threads;
our @cb;
our $Settings = {
_ => {
- mode => 'simple',
version_check => 1,
autocenter => 1,
invert_zoom => 0,
@@ -102,6 +102,7 @@ sub OnInit {
Slic3r::debugf "wxWidgets version %s, Wx version %s\n", &Wx::wxVERSION_STRING, $Wx::VERSION;
$self->{notifier} = Slic3r::GUI::Notifier->new;
+ $self->{presets} = { print => [], filament => [], printer => [] };
# locate or create data directory
# Unix: ~/.Slic3r
@@ -133,19 +134,23 @@ sub OnInit {
for grep !exists $ini->{_}{$_}, keys %{$Settings->{_}};
$Settings = $ini;
}
+ delete $Settings->{_}{mode}; # handle legacy
}
$Settings->{_}{version} = $Slic3r::VERSION;
$Settings->{_}{threads} = $threads if $threads;
$self->save_settings;
+ if (-f "$enc_datadir/simple.ini") {
+ # The Simple Mode settings were already automatically duplicated to presets
+ # named "Simple Mode" in each group, so we already support retrocompatibility.
+ unlink "$enc_datadir/simple.ini";
+ }
+
+ $self->load_presets;
+
# application frame
Wx::Image::AddHandler(Wx::PNGHandler->new);
- $self->{mainframe} = my $frame = Slic3r::GUI::MainFrame->new(
- mode => $mode // $Settings->{_}{mode},
- # If set, the "Controller" tab for the control of the printer over serial line and the serial port settings are hidden.
- no_controller => $no_controller // $Settings->{_}{no_controller},
- no_plater => $no_plater,
- );
+ $self->{mainframe} = my $frame = Slic3r::GUI::MainFrame->new;
$self->SetTopWindow($frame);
# load init bundle
@@ -281,21 +286,64 @@ sub save_settings {
Slic3r::Config->write_ini("$datadir/slic3r.ini", $Settings);
}
-sub presets {
- my ($self, $section) = @_;
+sub presets { return $_[0]->{presets}; }
+
+sub load_presets {
+ my ($self) = @_;
- my %presets = ();
- opendir my $dh, Slic3r::encode_path("$Slic3r::GUI::datadir/$section")
- or die "Failed to read directory $Slic3r::GUI::datadir/$section (errno: $!)\n";
- foreach my $file (grep /\.ini$/i, readdir $dh) {
- $file = Slic3r::decode_path($file);
- my $name = basename($file);
- $name =~ s/\.ini$//;
- $presets{$name} = "$Slic3r::GUI::datadir/$section/$file";
+ for my $group (qw(printer filament print)) {
+ my $presets = $self->{presets}{$group};
+
+ # keep external or dirty presets
+ @$presets = grep { ($_->external && $_->file_exists) || $_->dirty } @$presets;
+
+ my $dir = "$Slic3r::GUI::datadir/$group";
+ opendir my $dh, Slic3r::encode_path($dir)
+ or die "Failed to read directory $dir (errno: $!)\n";
+ foreach my $file (grep /\.ini$/i, readdir $dh) {
+ $file = Slic3r::decode_path($file);
+ my $name = basename($file);
+ $name =~ s/\.ini$//i;
+
+ # skip if we already have it
+ next if any { $_->name eq $name } @$presets;
+
+ push @$presets, Slic3r::GUI::Preset->new(
+ group => $group,
+ name => $name,
+ file => "$dir/$file",
+ );
+ }
+ closedir $dh;
+
+ @$presets = sort { $a->name cmp $b->name } @$presets;
+
+ unshift @$presets, Slic3r::GUI::Preset->new(
+ group => $group,
+ default => 1,
+ name => '- default -',
+ );
}
- closedir $dh;
+}
+
+sub add_external_preset {
+ my ($self, $file) = @_;
- return %presets;
+ my $name = basename($file); # keep .ini suffix
+ for my $group (qw(printer filament print)) {
+ my $presets = $self->{presets}{$group};
+
+ # remove any existing preset with the same name
+ @$presets = grep { $_->name ne $name } @$presets;
+
+ push @$presets, Slic3r::GUI::Preset->new(
+ group => $group,
+ name => $name,
+ file => $file,
+ external => 1,
+ );
+ }
+ return $name;
}
sub have_version_check {
@@ -379,4 +427,38 @@ sub scan_serial_ports {
return grep !/Bluetooth|FireFly/, @ports;
}
+sub set_menu_item_icon {
+ my ($self, $menuItem, $icon) = @_;
+
+ # SetBitmap was not available on OS X before Wx 0.9927
+ if ($icon && $menuItem->can('SetBitmap')) {
+ $menuItem->SetBitmap(Wx::Bitmap->new($Slic3r::var->($icon), wxBITMAP_TYPE_PNG));
+ }
+}
+
+sub save_window_pos {
+ my ($self, $window, $name) = @_;
+
+ $Settings->{_}{"${name}_pos"} = join ',', $window->GetScreenPositionXY;
+ $Settings->{_}{"${name}_size"} = join ',', $window->GetSizeWH;
+ $Settings->{_}{"${name}_maximized"} = $window->IsMaximized;
+ $self->save_settings;
+}
+
+sub restore_window_pos {
+ my ($self, $window, $name) = @_;
+
+ if (defined $Settings->{_}{"${name}_pos"}) {
+ my $size = [ split ',', $Settings->{_}{"${name}_size"}, 2 ];
+ $window->SetSize($size);
+
+ my $display = Wx::Display->new->GetClientArea();
+ my $pos = [ split ',', $Settings->{_}{"${name}_pos"}, 2 ];
+ if (($pos->[X] + $size->[X]/2) < $display->GetRight && ($pos->[Y] + $size->[Y]/2) < $display->GetBottom) {
+ $window->Move($pos);
+ }
+ $window->Maximize(1) if $Settings->{_}{"${name}_maximized"};
+ }
+}
+
1;
diff --git a/lib/Slic3r/GUI/3DScene.pm b/lib/Slic3r/GUI/3DScene.pm
index 7c9ae2dee..09801fe6d 100644
--- a/lib/Slic3r/GUI/3DScene.pm
+++ b/lib/Slic3r/GUI/3DScene.pm
@@ -54,13 +54,13 @@ use constant HAS_VBO => eval { glGenBuffersARB_p(0); 1 };
# phi / theta angles to orient the camera.
-use constant VIEW_ISO => [45.0,45.0];
-use constant VIEW_LEFT => [90.0,90.0];
-use constant VIEW_RIGHT => [-90.0,90.0];
use constant VIEW_TOP => [0.0,0.0];
use constant VIEW_BOTTOM => [0.0,180.0];
+use constant VIEW_LEFT => [90.0,90.0];
+use constant VIEW_RIGHT => [-90.0,90.0];
use constant VIEW_FRONT => [0.0,90.0];
-use constant VIEW_REAR => [180.0,90.0];
+use constant VIEW_BACK => [180.0,90.0];
+use constant VIEW_DIAGONAL => [45.0,45.0];
use constant GIMBAL_LOCK_THETA_MAX => 170;
@@ -338,20 +338,20 @@ sub select_view {
if (ref($direction)) {
$dirvec = $direction;
} else {
- if ($direction eq 'iso') {
- $dirvec = VIEW_ISO;
+ if ($direction eq 'top') {
+ $dirvec = VIEW_TOP;
+ } elsif ($direction eq 'bottom') {
+ $dirvec = VIEW_BOTTOM;
} elsif ($direction eq 'left') {
$dirvec = VIEW_LEFT;
} elsif ($direction eq 'right') {
$dirvec = VIEW_RIGHT;
- } elsif ($direction eq 'top') {
- $dirvec = VIEW_TOP;
- } elsif ($direction eq 'bottom') {
- $dirvec = VIEW_BOTTOM;
} elsif ($direction eq 'front') {
$dirvec = VIEW_FRONT;
- } elsif ($direction eq 'rear') {
- $dirvec = VIEW_REAR;
+ } elsif ($direction eq 'back') {
+ $dirvec = VIEW_BACK;
+ } elsif ($direction eq 'diagonal') {
+ $dirvec = VIEW_DIAGONAL;
}
}
$self->_sphi($dirvec->[0]);
diff --git a/lib/Slic3r/GUI/Controller.pm b/lib/Slic3r/GUI/Controller.pm
index c6a568f82..87b85fde2 100644
--- a/lib/Slic3r/GUI/Controller.pm
+++ b/lib/Slic3r/GUI/Controller.pm
@@ -7,6 +7,7 @@ use strict;
use warnings;
use utf8;
+use List::Util qw(any);
use Wx qw(wxTheApp :frame :id :misc :sizer :bitmap :button :icon :dialog);
use Wx::Event qw(EVT_CLOSE EVT_LEFT_DOWN EVT_MENU);
use base qw(Wx::ScrolledWindow Class::Accessor);
@@ -39,14 +40,14 @@ sub new {
EVT_LEFT_DOWN($btn, sub {
my $menu = Wx::Menu->new;
- my %presets = 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 = Slic3r::Config->load($presets{$preset_name});
+ my $config = $presets{$preset_name}->dirty_config;
next if !$config->serial_port;
my $id = &Wx::NewId();
@@ -100,8 +101,8 @@ sub OnActivate {
# get all available presets
my %presets = ();
{
- my %all = wxTheApp->presets('printer');
- my %configs = map { my $name = $_; $name => Slic3r::Config->load($all{$name}) } keys %all;
+ 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;
}
@@ -177,6 +178,12 @@ sub print_panels {
map $_->GetWindow, $self->{sizer}->GetChildren;
}
+sub printing {
+ my ($self) = @_;
+
+ return any { $_->printing } $self->print_panels;
+}
+
sub update_presets {
my $self = shift;
my ($group, $presets, $selected, $is_dirty) = @_;
diff --git a/lib/Slic3r/GUI/Controller/ManualControlDialog.pm b/lib/Slic3r/GUI/Controller/ManualControlDialog.pm
index 37dec1634..424ca3d73 100644
--- a/lib/Slic3r/GUI/Controller/ManualControlDialog.pm
+++ b/lib/Slic3r/GUI/Controller/ManualControlDialog.pm
@@ -1,5 +1,3 @@
-# A printer "Controller" -> "ManualControlDialog" subtab, opened per 3D printer connected?
-
package Slic3r::GUI::Controller::ManualControlDialog;
use strict;
use warnings;
@@ -9,7 +7,7 @@ use Scalar::Util qw(looks_like_number);
use Slic3r::Geometry qw(PI X Y unscale);
use Wx qw(:dialog :id :misc :sizer :choicebook :button :bitmap :textctrl
wxBORDER_NONE wxTAB_TRAVERSAL);
-use Wx::Event qw(EVT_CLOSE EVT_BUTTON);
+use Wx::Event qw(EVT_CLOSE EVT_BUTTON EVT_TEXT_ENTER);
use base qw(Wx::Dialog Class::Accessor);
__PACKAGE__->mk_accessors(qw(sender writer config2 x_homed y_homed));
@@ -163,6 +161,7 @@ sub new {
return;
}
my $cmd = $self->writer->set_temperature($self->config2->{temperature});
+ $self->GetParent->append_to_log(">> $cmd\n");
$self->sender->send($cmd, 1);
});
$optgroup->append_line($line);
@@ -182,6 +181,7 @@ sub new {
return;
}
my $cmd = $self->writer->set_bed_temperature($self->config2->{bed_temperature});
+ $self->GetParent->append_to_log(">> $cmd\n");
$self->sender->send($cmd, 1);
});
$optgroup->append_line($line);
@@ -189,19 +189,12 @@ sub new {
}
{
- my $box = Wx::StaticBox->new($self, -1, "Console");
+ my $box = Wx::StaticBox->new($self, -1, "Send manual command");
my $sbsizer = Wx::StaticBoxSizer->new($box, wxVERTICAL);
- $right_sizer->Add($sbsizer, 1, wxEXPAND, 0);
-
- my $log = $self->{log_textctrl} = Wx::TextCtrl->new($self, -1, "", wxDefaultPosition, wxDefaultSize,
- wxTE_MULTILINE | wxBORDER_NONE);
- $log->SetBackgroundColour($self->GetBackgroundColour);
- $log->SetFont($Slic3r::GUI::small_font);
- $log->SetEditable(0);
- $sbsizer->Add($self->{log_textctrl}, 1, wxEXPAND, 0);
+ $right_sizer->Add($sbsizer, 1, wxEXPAND | wxALL, 10);
my $cmd_sizer = Wx::BoxSizer->new(wxHORIZONTAL);
- my $cmd_textctrl = Wx::TextCtrl->new($self, -1, '');
+ my $cmd_textctrl = Wx::TextCtrl->new($self, -1, '', wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
$cmd_sizer->Add($cmd_textctrl, 1, wxEXPAND, 0);
my $btn = Wx::Button->new($self, -1,
@@ -212,13 +205,17 @@ sub new {
}
$cmd_sizer->Add($btn, 0, wxEXPAND | wxLEFT, 5);
- EVT_BUTTON($self, $btn, sub {
- return if $cmd_textctrl->GetValue eq '';
- $self->sender->send($cmd_textctrl->GetValue, 1);
+ my $do_send = sub {
+ my $cmd = $cmd_textctrl->GetValue;
+ return if $cmd eq '';
+ $self->GetParent->append_to_log(">> $cmd\n");
+ $self->sender->send($cmd, 1);
$cmd_textctrl->SetValue('');
- });
+ };
+ EVT_BUTTON($self, $btn, $do_send);
+ EVT_TEXT_ENTER($self, $cmd_textctrl, $do_send);
- $sbsizer->Add($cmd_sizer, 0, wxEXPAND | wxTOP, 2);
+ $sbsizer->Add($cmd_sizer, 0, wxEXPAND | wxTOP, 5);
}
my $main_sizer = Wx::BoxSizer->new(wxHORIZONTAL);
@@ -239,12 +236,6 @@ sub new {
return $self;
}
-sub update_log {
- my ($self, $log) = @_;
-
- $self->{log_textctrl}->SetValue($log);
-}
-
sub abs_xy_move {
my ($self, $pos) = @_;
diff --git a/lib/Slic3r/GUI/Controller/PrinterPanel.pm b/lib/Slic3r/GUI/Controller/PrinterPanel.pm
index 53850a69e..9e2dc211d 100644
--- a/lib/Slic3r/GUI/Controller/PrinterPanel.pm
+++ b/lib/Slic3r/GUI/Controller/PrinterPanel.pm
@@ -43,9 +43,7 @@ sub new {
$self->print_completed;
}
}
- $self->{log_textctrl}->AppendText("$_\n") for @{$self->sender->purge_log};
- $self->{manual_control_dialog}->update_log($self->{log_textctrl}->GetValue)
- if $self->{manual_control_dialog};
+ $self->append_to_log("$_\n") for @{$self->sender->purge_log};
{
my $temp = $self->sender->getT;
if ($temp eq '') {
@@ -128,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,
- ["115200", "250000"]);
+ ["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);
}
@@ -272,6 +270,12 @@ sub new {
return $self;
}
+sub append_to_log {
+ my ($self, $text) = @_;
+
+ $self->{log_textctrl}->AppendText($text);
+}
+
sub is_connected {
my ($self) = @_;
return $self->sender && $self->sender->is_connected;
@@ -409,9 +413,9 @@ sub print_job {
$self->Layout;
$self->set_status('Printing...');
- $self->{log_textctrl}->AppendText(sprintf "=====\n");
- $self->{log_textctrl}->AppendText(sprintf "Printing %s\n", $job->name);
- $self->{log_textctrl}->AppendText(sprintf "Print started at %s\n", $self->_timestamp);
+ $self->append_to_log(sprintf "=====\n");
+ $self->append_to_log(sprintf "Printing %s\n", $job->name);
+ $self->append_to_log(sprintf "Print started at %s\n", $self->_timestamp);
}
sub print_completed {
@@ -426,7 +430,7 @@ sub print_completed {
$self->Layout;
$self->set_status('Print completed.');
- $self->{log_textctrl}->AppendText(sprintf "Print completed at %s\n", $self->_timestamp);
+ $self->append_to_log(sprintf "Print completed at %s\n", $self->_timestamp);
$self->reload_jobs;
}
@@ -479,7 +483,7 @@ sub reload_jobs {
$self->{gauge}->Disable;
$self->{gauge}->Hide;
$self->set_status('Print was aborted.');
- $self->{log_textctrl}->AppendText(sprintf "Print aborted at %s\n", $self->_timestamp);
+ $self->append_to_log(sprintf "Print aborted at %s\n", $self->_timestamp);
});
$panel->on_resume_print(sub {
my ($job) = @_;
diff --git a/lib/Slic3r/GUI/MainFrame.pm b/lib/Slic3r/GUI/MainFrame.pm
index 92ee27954..c4ceb7780 100644
--- a/lib/Slic3r/GUI/MainFrame.pm
+++ b/lib/Slic3r/GUI/MainFrame.pm
@@ -18,7 +18,7 @@ our $qs_last_output_file;
our $last_config;
sub new {
- my ($class, %params) = @_;
+ my ($class) = @_;
my $self = $class->SUPER::new(undef, -1, 'Slic3r', wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE);
if ($^O eq 'MSWin32') {
@@ -27,12 +27,6 @@ sub new {
$self->SetIcon(Wx::Icon->new($Slic3r::var->("Slic3r_128px.png"), wxBITMAP_TYPE_PNG));
}
- # store input params
- $self->{mode} = $params{mode};
- $self->{mode} = 'expert' if $self->{mode} !~ /^(?:simple|expert)$/;
- # If set, the "Controller" tab for the control of the printer over serial line and the serial port settings are hidden.
- $self->{no_controller} = $params{no_controller};
- $self->{no_plater} = $params{no_plater};
$self->{loaded} = 0;
# initialize tabpanel and menubar
@@ -59,19 +53,8 @@ sub new {
$self->SetSizer($sizer);
$self->Fit;
$self->SetMinSize([760, 490]);
- if (defined $Slic3r::GUI::Settings->{_}{main_frame_size}) {
- my $size = [ split ',', $Slic3r::GUI::Settings->{_}{main_frame_size}, 2 ];
- $self->SetSize($size);
-
- my $display = Wx::Display->new->GetClientArea();
- my $pos = [ split ',', $Slic3r::GUI::Settings->{_}{main_frame_pos}, 2 ];
- if (($pos->[X] + $size->[X]/2) < $display->GetRight && ($pos->[Y] + $size->[Y]/2) < $display->GetBottom) {
- $self->Move($pos);
- }
- $self->Maximize(1) if $Slic3r::GUI::Settings->{_}{main_frame_maximized};
- } else {
- $self->SetSize($self->GetMinSize);
- }
+ $self->SetSize($self->GetMinSize);
+ wxTheApp->restore_window_pos($self, "main_frame");
$self->Show;
$self->Layout;
}
@@ -80,16 +63,24 @@ sub new {
EVT_CLOSE($self, sub {
my (undef, $event) = @_;
- if ($event->CanVeto && !$self->check_unsaved_changes) {
- $event->Veto;
- return;
+ if ($event->CanVeto) {
+ if (!$self->{plater}->prompt_unsaved_changes) {
+ $event->Veto;
+ return;
+ }
+
+ if ($self->{controller} && $self->{controller}->printing) {
+ my $confirm = Wx::MessageDialog->new($self, "You are currently printing. Do you want to stop printing and continue anyway?",
+ 'Unfinished Print', wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT);
+ if ($confirm->ShowModal == wxID_NO) {
+ $event->Veto;
+ return;
+ }
+ }
}
# save window size
- $Slic3r::GUI::Settings->{_}{main_frame_pos} = join ',', $self->GetScreenPositionXY;
- $Slic3r::GUI::Settings->{_}{main_frame_size} = join ',', $self->GetSizeWH;
- $Slic3r::GUI::Settings->{_}{main_frame_maximized} = $self->IsMaximized;
- wxTheApp->save_settings;
+ wxTheApp->save_window_pos($self, "main_frame");
# propagate event
$event->Skip;
@@ -107,71 +98,10 @@ sub _init_tabpanel {
$panel->OnActivate if $panel->can('OnActivate');
});
- if (!$self->{no_plater}) {
- $panel->AddPage($self->{plater} = Slic3r::GUI::Plater->new($panel), "Plater");
- }
+ $panel->AddPage($self->{plater} = Slic3r::GUI::Plater->new($panel), "Plater");
if (!$self->{no_controller}) {
$panel->AddPage($self->{controller} = Slic3r::GUI::Controller->new($panel), "Controller");
}
- $self->{options_tabs} = {};
-
- my $simple_config;
- if ($self->{mode} eq 'simple') {
- $simple_config = Slic3r::Config->load("$Slic3r::GUI::datadir/simple.ini")
- if -e Slic3r::encode_path("$Slic3r::GUI::datadir/simple.ini");
- }
-
- my $class_prefix = $self->{mode} eq 'simple' ? "Slic3r::GUI::SimpleTab::" : "Slic3r::GUI::Tab::";
- for my $tab_name (qw(print filament printer)) {
- my $tab;
- $tab = $self->{options_tabs}{$tab_name} = ($class_prefix . ucfirst $tab_name)->new(
- $panel,
- no_controller => $self->{no_controller});
- $tab->on_value_change(sub {
- my ($opt_key, $value) = @_;
-
- my $config = $tab->config;
- if ($self->{plater}) {
- $self->{plater}->on_config_change($config); # propagate config change events to the plater
- $self->{plater}->on_extruders_change($value) if $opt_key eq 'extruders_count';
- }
- if ($self->{loaded}) { # don't save while loading for the first time
- if ($self->{mode} eq 'simple') {
- # save config
- $self->config->save("$Slic3r::GUI::datadir/simple.ini");
-
- # save a copy into each preset section
- # so that user gets the config when switching to expert mode
- $config->save(sprintf "$Slic3r::GUI::datadir/%s/%s.ini", $tab->name, 'Simple Mode');
- $Slic3r::GUI::Settings->{presets}{$tab->name} = 'Simple Mode.ini';
- wxTheApp->save_settings;
- }
- $self->config->save($Slic3r::GUI::autosave) if $Slic3r::GUI::autosave;
- }
- });
- $tab->on_presets_changed(sub {
- if ($self->{plater}) {
- $self->{plater}->update_presets($tab_name, @_);
- $self->{plater}->on_config_change($tab->config);
- if ($self->{controller}) {
- $self->{controller}->update_presets($tab_name, @_);
- }
- }
- });
- $tab->load_presets;
- $panel->AddPage($tab, $tab->title);
- $tab->load_config($simple_config) if $simple_config;
- }
-
- if ($self->{plater}) {
- $self->{plater}->on_select_preset(sub {
- my ($group, $i) = @_;
- $self->{options_tabs}{$group}->select_preset($i);
- });
-
- # load initial config
- $self->{plater}->on_config_change($self->config);
- }
}
sub _init_menubar {
@@ -239,10 +169,22 @@ sub _init_menubar {
}
# Plater menu
- unless ($self->{no_plater}) {
+ {
my $plater = $self->{plater};
$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');
+ }
+ $self->_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 {
+ $plater->select_prev;
+ }, undef, 'arrow_left.png');
+ $self->{plater_menu}->AppendSeparator();
$self->_append_menu_item($self->{plater_menu}, "Export G-code...", 'Export current plate as G-code', sub {
$plater->export_gcode;
}, undef, 'cog_go.png');
@@ -252,57 +194,35 @@ sub _init_menubar {
$self->_append_menu_item($self->{plater_menu}, "Export plate with modifiers as AMF...", 'Export current plate as AMF, including all modifier meshes', sub {
$plater->export_amf;
}, undef, 'brick_go.png');
- $self->_append_menu_item($self->{plater_menu}, "Open DLP Projector…\tCtrl+L", 'Open projector window for DLP printing', sub {
- $plater->pause_background_process;
- Slic3r::GUI::SLAPrintOptions->new($self)->ShowModal;
- $plater->resume_background_process;
- }, undef, 'film.png');
$self->{object_menu} = $self->{plater}->object_menu;
$self->on_plater_selection_changed(0);
}
- # Window menu
- my $windowMenu = Wx::Menu->new;
+ # Settings menu
+ my $settingsMenu = Wx::Menu->new;
{
- my $tab_offset = 0;
- if (!$self->{no_plater}) {
- $self->_append_menu_item($windowMenu, "Select &Plater Tab\tCtrl+1", 'Show the plater', sub {
- $self->select_tab(0);
- }, undef, 'application_view_tile.png');
- $tab_offset += 1;
- }
- if (!$self->{no_controller}) {
- $self->_append_menu_item($windowMenu, "Select &Controller Tab\tCtrl+T", 'Show the printer controller', sub {
- $self->select_tab(1);
- }, undef, 'printer_empty.png');
- $tab_offset += 1;
- }
- if ($tab_offset > 0) {
- $windowMenu->AppendSeparator();
- }
-
- $self->_append_menu_item($windowMenu, "Select P&rint Settings Tab\tCtrl+2", 'Show the print settings', sub {
- $self->select_tab($tab_offset+0);
+ $self->_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($windowMenu, "Select &Filament Settings Tab\tCtrl+3", 'Show the filament settings', sub {
- $self->select_tab($tab_offset+1);
+ $self->_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($windowMenu, "Select Print&er Settings Tab\tCtrl+4", 'Show the printer settings', sub {
- $self->select_tab($tab_offset+2);
+ $self->_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');
}
# View menu
- if (!$self->{no_plater}) {
+ {
$self->{viewMenu} = Wx::Menu->new;
- $self->_append_menu_item($self->{viewMenu}, "Iso" , 'Iso View' , sub { $self->select_view('iso' ); });
- $self->_append_menu_item($self->{viewMenu}, "Top" , 'Top View' , sub { $self->select_view('top' ); });
- $self->_append_menu_item($self->{viewMenu}, "Bottom" , 'Bottom View' , sub { $self->select_view('bottom' ); });
- $self->_append_menu_item($self->{viewMenu}, "Front" , 'Front View' , sub { $self->select_view('front' ); });
- $self->_append_menu_item($self->{viewMenu}, "Rear" , 'Rear View' , sub { $self->select_view('rear' ); });
- $self->_append_menu_item($self->{viewMenu}, "Left" , 'Left View' , sub { $self->select_view('left' ); });
- $self->_append_menu_item($self->{viewMenu}, "Right" , 'Right View' , sub { $self->select_view('right' ); });
+ $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'); });
$self->{viewMenu}->AppendSeparator();
$self->{color_toolpaths_by_role} = $self->_append_menu_item($self->{viewMenu},
"Color Toolpaths by Role",
@@ -331,6 +251,22 @@ sub _init_menubar {
}
}
+ # Window menu
+ my $windowMenu = Wx::Menu->new;
+ {
+ $self->_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 {
+ $self->select_tab(1);
+ }, undef, 'printer_empty.png') if !$self->{no_controller};
+ $self->_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;
+ }, undef, 'film.png');
+ }
+
# Help menu
my $helpMenu = Wx::Menu->new;
{
@@ -362,8 +298,9 @@ sub _init_menubar {
$menubar->Append($fileMenu, "&File");
$menubar->Append($self->{plater_menu}, "&Plater") if $self->{plater_menu};
$menubar->Append($self->{object_menu}, "&Object") if $self->{object_menu};
- $menubar->Append($windowMenu, "&Window");
+ $menubar->Append($settingsMenu, "&Settings");
$menubar->Append($self->{viewMenu}, "&View") if $self->{viewMenu};
+ $menubar->Append($windowMenu, "&Window");
$menubar->Append($helpMenu, "&Help");
$self->SetMenuBar($menubar);
}
@@ -389,7 +326,7 @@ sub quick_slice {
my $progress_dialog;
eval {
# validate configuration
- my $config = $self->config;
+ my $config = $self->{plater}->config;
$config->validate;
# select input file
@@ -531,7 +468,7 @@ sub repair_stl {
sub export_config {
my $self = shift;
- my $config = $self->config;
+ my $config = $self->{plater}->config;
eval {
# validate configuration
$config->validate;
@@ -557,7 +494,6 @@ sub load_config_file {
my ($file) = @_;
if (!$file) {
- return unless $self->check_unsaved_changes;
my $dir = $last_config ? dirname($last_config) : $Slic3r::GUI::Settings->{recent}{config_directory} || $Slic3r::GUI::Settings->{recent}{skein_directory} || '';
my $dlg = Wx::FileDialog->new($self, 'Select configuration to load:', $dir, "config.ini",
&Slic3r::GUI::FILE_WILDCARDS->{ini}, wxFD_OPEN | wxFD_FILE_MUST_EXIST);
@@ -568,9 +504,10 @@ sub load_config_file {
$Slic3r::GUI::Settings->{recent}{config_directory} = dirname($file);
wxTheApp->save_settings;
$last_config = $file;
- for my $tab (values %{$self->{options_tabs}}) {
- $tab->load_config_file($file);
- }
+
+ my $name = wxTheApp->add_external_preset($file);
+ $self->{plater}->load_presets;
+ $self->{plater}->select_preset_by_name($name, $_) for qw(print filament printer);
}
sub export_configbundle {
@@ -578,7 +515,7 @@ sub export_configbundle {
eval {
# validate current configuration in case it's dirty
- $self->config->validate;
+ $self->{plater}->config->validate;
};
Slic3r::GUI::catch_error($self) and return;
@@ -593,18 +530,14 @@ sub export_configbundle {
# leave default category empty to prevent the bundle from being parsed as a normal config file
my $ini = { _ => {} };
- $ini->{settings}{$_} = $Slic3r::GUI::Settings->{_}{$_} for qw(autocenter mode);
+ $ini->{settings}{$_} = $Slic3r::GUI::Settings->{_}{$_} for qw(autocenter);
$ini->{presets} = $Slic3r::GUI::Settings->{presets};
- if (-e "$Slic3r::GUI::datadir/simple.ini") {
- my $config = Slic3r::Config->load("$Slic3r::GUI::datadir/simple.ini");
- $ini->{simple} = $config->as_ini->{_};
- }
foreach my $section (qw(print filament printer)) {
- my %presets = wxTheApp->presets($section);
- foreach my $preset_name (keys %presets) {
- my $config = Slic3r::Config->load($presets{$preset_name});
- $ini->{"$section:$preset_name"} = $config->as_ini->{_};
+ my @presets = @{wxTheApp->presets->{$section}};
+ foreach my $preset (@presets) {
+ next if $preset->default || $preset->external;
+ $ini->{"$section:" . $preset->name} = $preset->load_config->as_ini->{_};
}
}
@@ -639,15 +572,6 @@ sub load_configbundle {
$Slic3r::GUI::Settings->{presets} = $ini->{presets};
wxTheApp->save_settings;
}
- if ($ini->{simple}) {
- my $config = Slic3r::Config->load_ini_hash($ini->{simple});
- $config->save("$Slic3r::GUI::datadir/simple.ini");
- if ($self->{mode} eq 'simple') {
- foreach my $tab (values %{$self->{options_tabs}}) {
- $tab->load_config($config) for values %{$self->{options_tabs}};
- }
- }
- }
my $imported = 0;
INI_BLOCK: foreach my $ini_category (sort keys %$ini) {
next unless $ini_category =~ /^(print|filament|printer):(.+)$/;
@@ -656,11 +580,11 @@ sub load_configbundle {
next if $skip_no_id && !$config->get($section . "_settings_id");
{
- my %current_presets = Slic3r::GUI->presets($section);
+ my @current_presets = @{wxTheApp->presets->{$section}};
my %current_ids = map { $_ => 1 }
grep $_,
- map Slic3r::Config->load($_)->get($section . "_settings_id"),
- values %current_presets;
+ map $_->dirty_config->get($section . "_settings_id"),
+ @current_presets;
next INI_BLOCK if exists $current_ids{$config->get($section . "_settings_id")};
}
@@ -668,150 +592,34 @@ sub load_configbundle {
Slic3r::debugf "Imported %s preset %s\n", $section, $preset_name;
$imported++;
}
- if ($self->{mode} eq 'expert') {
- foreach my $tab (values %{$self->{options_tabs}}) {
- $tab->load_presets;
- }
- }
+ $self->{plater}->load_presets;
return if !$imported;
my $message = sprintf "%d presets successfully imported.", $imported;
- if ($self->{mode} eq 'simple' && $Slic3r::GUI::Settings->{_}{mode} eq 'expert') {
- Slic3r::GUI::show_info($self, "$message You need to restart Slic3r to make the changes effective.");
- } else {
- Slic3r::GUI::show_info($self, $message);
- }
+ Slic3r::GUI::show_info($self, $message);
}
sub load_config {
- my $self = shift;
- my ($config) = @_;
+ my ($self, $config) = @_;
- foreach my $tab (values %{$self->{options_tabs}}) {
- $tab->load_config($config);
- }
- if ($self->{plater}) {
- $self->{plater}->on_config_change($config);
- }
+ $self->{plater}->load_config($config);
}
sub config_wizard {
my $self = shift;
- return unless $self->check_unsaved_changes;
if (my $config = Slic3r::GUI::ConfigWizard->new($self)->run) {
- if ($self->{mode} eq 'expert') {
- for my $tab (values %{$self->{options_tabs}}) {
- $tab->select_default_preset;
- }
- } else {
- # TODO: select default settings in simple mode
- }
- $self->load_config($config);
- if ($self->{mode} eq 'expert') {
- for my $tab (values %{$self->{options_tabs}}) {
- $tab->save_preset('My Settings');
- }
+ foreach my $group (qw(print filament printer)) {
+ my $name = 'My Settings';
+ $config->save(sprintf "$Slic3r::GUI::datadir/%s/%s.ini", $group, $name);
+ $Slic3r::GUI::Settings->{presets}{$group} = "$name.ini";
+ $self->{plater}->load_presets;
+ $self->{plater}->select_preset_by_name($name, $group);
}
}
}
-=head2 config
-
-This method collects all config values from the tabs and merges them into a single config object.
-
-=cut
-
-sub config {
- my $self = shift;
-
- return Slic3r::Config->new_from_defaults
- if !exists $self->{options_tabs}{print}
- || !exists $self->{options_tabs}{filament}
- || !exists $self->{options_tabs}{printer};
-
- # retrieve filament presets and build a single config object for them
- my $filament_config;
- if (!$self->{plater} || $self->{plater}->filament_presets == 1 || $self->{mode} eq 'simple') {
- $filament_config = $self->{options_tabs}{filament}->config;
- } else {
- my $i = -1;
- foreach my $preset_idx ($self->{plater}->filament_presets) {
- $i++;
- my $config;
- if ($preset_idx == $self->{options_tabs}{filament}->current_preset) {
- # the selected preset for this extruder is the one in the tab
- # use the tab's config instead of the preset in case it is dirty
- # perhaps plater shouldn't expose dirty presets at all in multi-extruder environments.
- $config = $self->{options_tabs}{filament}->config;
- } else {
- my $preset = $self->{options_tabs}{filament}->get_preset($preset_idx);
- $config = $self->{options_tabs}{filament}->get_preset_config($preset);
- }
- if (!$filament_config) {
- $filament_config = $config->clone;
- next;
- }
- foreach my $opt_key (@{$config->get_keys}) {
- my $value = $filament_config->get($opt_key);
- next unless ref $value eq 'ARRAY';
- $value->[$i] = $config->get($opt_key)->[0];
- $filament_config->set($opt_key, $value);
- }
- }
- }
-
- my $config = Slic3r::Config->merge(
- Slic3r::Config->new_from_defaults,
- $self->{options_tabs}{print}->config,
- $self->{options_tabs}{printer}->config,
- $filament_config,
- );
-
- if ($self->{mode} eq 'simple') {
- # set some sensible defaults
- $config->set('first_layer_height', $config->nozzle_diameter->[0]);
- $config->set('avoid_crossing_perimeters', 1);
- $config->set('infill_every_layers', 10);
- } else {
- my $extruders_count = $self->{options_tabs}{printer}{extruders_count};
- $config->set("${_}_extruder", min($config->get("${_}_extruder"), $extruders_count))
- for qw(perimeter infill solid_infill support_material support_material_interface);
- }
-
- return $config;
-}
-
-sub filament_preset_names {
- my ($self) = @_;
-
- if ($self->{mode} eq 'simple') {
- return '';
- }
-
- return map $self->{options_tabs}{filament}->get_preset($_)->name,
- $self->{plater}->filament_presets;
-}
-
-sub check_unsaved_changes {
- my $self = shift;
-
- my @dirty = ();
- foreach my $tab (values %{$self->{options_tabs}}) {
- push @dirty, $tab->title if $tab->is_dirty;
- }
-
- if (@dirty) {
- my $titles = join ', ', @dirty;
- my $confirm = Wx::MessageDialog->new($self, "You have unsaved changes ($titles). Discard changes and continue anyway?",
- 'Unsaved Presets', wxICON_QUESTION | wxYES_NO | wxNO_DEFAULT);
- return ($confirm->ShowModal == wxID_YES);
- }
-
- return 1;
-}
-
sub select_tab {
my ($self, $tab) = @_;
$self->{tabpanel}->SetSelection($tab);
@@ -820,9 +628,8 @@ sub select_tab {
# Set a camera direction, zoom to all objects.
sub select_view {
my ($self, $direction) = @_;
- if (! $self->{no_plater}) {
- $self->{plater}->select_view($direction);
- }
+
+ $self->{plater}->select_view($direction);
}
sub _append_menu_item {
@@ -830,19 +637,10 @@ sub _append_menu_item {
$id //= &Wx::NewId();
my $item = $menu->Append($id, $string, $description, $kind);
- $self->_set_menu_item_icon($item, $icon);
+ wxTheApp->set_menu_item_icon($item, $icon);
EVT_MENU($self, $id, $cb);
return $item;
}
-sub _set_menu_item_icon {
- my ($self, $menuItem, $icon) = @_;
-
- # SetBitmap was not available on OS X before Wx 0.9927
- if ($icon && $menuItem->can('SetBitmap')) {
- $menuItem->SetBitmap(Wx::Bitmap->new($Slic3r::var->($icon), wxBITMAP_TYPE_PNG));
- }
-}
-
1;
diff --git a/lib/Slic3r/GUI/OptionsGroup.pm b/lib/Slic3r/GUI/OptionsGroup.pm
index 2a00b1a0c..776f80ec3 100644
--- a/lib/Slic3r/GUI/OptionsGroup.pm
+++ b/lib/Slic3r/GUI/OptionsGroup.pm
@@ -1,4 +1,4 @@
-# A dialog group object. Used by the Tab, SimpleTab, Preferences dialog, ManualControlDialog etc.
+# A dialog group object. Used by the PresetEditor, Preferences dialog, ManualControlDialog etc.
package Slic3r::GUI::OptionsGroup;
use Moo;
diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm
index 9f1563d4b..ef1409938 100644
--- a/lib/Slic3r/GUI/Plater.pm
+++ b/lib/Slic3r/GUI/Plater.pm
@@ -6,16 +6,17 @@ use warnings;
use utf8;
use File::Basename qw(basename dirname);
-use List::Util qw(sum first max);
+use List::Util qw(sum first max none any);
use Slic3r::Geometry qw(X Y Z MIN MAX scale unscale deg2rad rad2deg);
use LWP::UserAgent;
use threads::shared qw(shared_clone);
-use Wx qw(:button :cursor :dialog :filedialog :keycode :icon :font :id :listctrl :misc
+use Wx qw(:button :cursor :dialog :filedialog :keycode :icon :font :id :misc
:panel :sizer :toolbar :window wxTheApp :notebook :combobox);
-use Wx::Event qw(EVT_BUTTON EVT_COMMAND EVT_KEY_DOWN EVT_LIST_ITEM_ACTIVATED
- EVT_LIST_ITEM_DESELECTED EVT_LIST_ITEM_SELECTED EVT_MOUSE_EVENTS EVT_PAINT EVT_TOOL
+use Wx::Event qw(EVT_BUTTON EVT_COMMAND EVT_KEY_DOWN EVT_MOUSE_EVENTS EVT_PAINT EVT_TOOL
EVT_CHOICE EVT_COMBOBOX EVT_TIMER EVT_NOTEBOOK_PAGE_CHANGED EVT_LEFT_UP EVT_CLOSE);
-use base 'Wx::Panel';
+use base qw(Wx::Panel Class::Accessor);
+
+__PACKAGE__->mk_accessors(qw(presets));
use constant TB_ADD => &Wx::NewId;
use constant TB_REMOVE => &Wx::NewId;
@@ -43,15 +44,13 @@ our $PROCESS_COMPLETED_EVENT : shared = Wx::NewEventType;
use constant FILAMENT_CHOOSERS_SPACING => 0;
use constant PROCESS_DELAY => 0.5 * 1000; # milliseconds
-my $PreventListEvents = 0;
-
sub new {
my $class = shift;
my ($parent) = @_;
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 filament_colour
+ serial_port serial_speed octoprint_host octoprint_apikey overridable filament_colour
));
$self->{model} = Slic3r::Model->new;
$self->{print} = Slic3r::Print->new;
@@ -197,23 +196,6 @@ sub new {
}
}
- $self->{list} = Wx::ListView->new($self, -1, wxDefaultPosition, wxDefaultSize,
- wxLC_SINGLE_SEL | wxLC_REPORT | wxBORDER_SUNKEN | wxTAB_TRAVERSAL | wxWANTS_CHARS );
- $self->{list}->InsertColumn(0, "Name", wxLIST_FORMAT_LEFT, 145);
- $self->{list}->InsertColumn(1, "Copies", wxLIST_FORMAT_CENTER, 45);
- $self->{list}->InsertColumn(2, "Scale", wxLIST_FORMAT_CENTER, wxLIST_AUTOSIZE_USEHEADER);
- EVT_LIST_ITEM_SELECTED($self, $self->{list}, \&list_item_selected);
- EVT_LIST_ITEM_DESELECTED($self, $self->{list}, \&list_item_deselected);
- EVT_LIST_ITEM_ACTIVATED($self, $self->{list}, \&list_item_activated);
- EVT_KEY_DOWN($self->{list}, sub {
- my ($list, $event) = @_;
- if ($event->GetKeyCode == WXK_TAB) {
- $list->Navigate($event->ShiftDown ? &Wx::wxNavigateBackward : &Wx::wxNavigateForward);
- } else {
- $event->Skip;
- }
- });
-
# right pane buttons
$self->{btn_export_gcode} = Wx::Button->new($self, -1, "Export G-code…", wxDefaultPosition, [-1, 30], wxBU_LEFT);
$self->{btn_print} = Wx::Button->new($self, -1, "Print…", wxDefaultPosition, [-1, 30], wxBU_LEFT);
@@ -260,7 +242,7 @@ sub new {
EVT_LEFT_UP($self->{btn_send_gcode}, sub {
my (undef, $e) = @_;
- my $alt = $e->AltDown;
+ my $alt = $e->ShiftDown;
wxTheApp->CallAfter(sub {
$self->prepare_send($alt);
});
@@ -299,7 +281,7 @@ sub new {
$_->SetDropTarget(Slic3r::GUI::Plater::DropTarget->new($self))
for grep defined($_),
- $self, $self->{canvas}, $self->{canvas3D}, $self->{preview3D}, $self->{list};
+ $self, $self->{canvas}, $self->{canvas3D}, $self->{preview3D};
EVT_COMMAND($self, -1, $THUMBNAIL_DONE_EVENT, sub {
my ($self, $event) = @_;
@@ -350,32 +332,54 @@ sub new {
$self->on_model_change;
{
- my $presets;
- if ($self->GetFrame->{mode} eq 'expert') {
- $presets = $self->{presets_sizer} = Wx::FlexGridSizer->new(3, 2, 1, 2);
- $presets->AddGrowableCol(1, 1);
- $presets->SetFlexibleDirection(wxHORIZONTAL);
- my %group_labels = (
- print => 'Print settings',
- filament => 'Filament',
- printer => 'Printer',
- );
- $self->{preset_choosers} = {};
- for my $group (qw(print filament printer)) {
- my $text = Wx::StaticText->new($self, -1, "$group_labels{$group}:", wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT);
- $text->SetFont($Slic3r::GUI::small_font);
- my $choice = Wx::BitmapComboBox->new($self, -1, "", wxDefaultPosition, wxDefaultSize, [], wxCB_READONLY);
- $self->{preset_choosers}{$group} = [$choice];
- # setup the listener
- EVT_COMBOBOX($choice, $choice, sub {
- my ($choice) = @_;
- wxTheApp->CallAfter(sub {
- $self->_on_select_preset($group, $choice);
- });
+ my $presets = $self->{presets_sizer} = Wx::FlexGridSizer->new(3, 3, 1, 2);
+ $presets->AddGrowableCol(1, 1);
+ $presets->SetFlexibleDirection(wxHORIZONTAL);
+ my %group_labels = (
+ print => 'Print settings',
+ filament => 'Filament',
+ printer => 'Printer',
+ );
+ $self->{preset_choosers} = {};
+ $self->{preset_choosers_names} = {}; # wxChoice* => []
+ for my $group (qw(print filament printer)) {
+ # label
+ my $text = Wx::StaticText->new($self, -1, "$group_labels{$group}:", wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT);
+ $text->SetFont($Slic3r::GUI::small_font);
+
+ # dropdown control
+ my $choice = Wx::BitmapComboBox->new($self, -1, "", wxDefaultPosition, wxDefaultSize, [], wxCB_READONLY);
+ $self->{preset_choosers}{$group} = [$choice];
+ # setup the listener
+ EVT_COMBOBOX($choice, $choice, sub {
+ my ($choice) = @_;
+ wxTheApp->CallAfter(sub {
+ $self->_on_change_combobox($group, $choice);
});
- $presets->Add($text, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxRIGHT, 4);
- $presets->Add($choice, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND | wxBOTTOM, 0);
- }
+ });
+
+ # settings button
+ my $settings_btn = Wx::BitmapButton->new($self, -1, Wx::Bitmap->new($Slic3r::var->("cog.png"), wxBITMAP_TYPE_PNG),
+ wxDefaultPosition, wxDefaultSize, wxBORDER_NONE);
+ EVT_BUTTON($self, $settings_btn, sub {
+ $self->show_preset_editor($group, 0);
+ });
+
+ $presets->Add($text, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxRIGHT, 4);
+ $presets->Add($choice, 1, wxALIGN_CENTER_VERTICAL | wxEXPAND | wxBOTTOM, 0);
+ $presets->Add($settings_btn, 0, wxALIGN_CENTER_VERTICAL | wxEXPAND | wxLEFT, 3);
+ }
+
+ {
+ my $o = $self->{settings_override_panel} = Slic3r::GUI::Plater::OverrideSettingsPanel->new($self,
+ on_change => sub {
+ $self->config_changed;
+ });
+ $o->set_editable(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});
+ $o->set_config($self->{settings_override_config});
}
my $object_info_sizer;
@@ -383,6 +387,27 @@ sub new {
my $box = Wx::StaticBox->new($self, -1, "Info");
$object_info_sizer = Wx::StaticBoxSizer->new($box, wxVERTICAL);
$object_info_sizer->SetMinSize([350,-1]);
+
+ {
+ my $sizer = Wx::BoxSizer->new(wxHORIZONTAL);
+ $object_info_sizer->Add($sizer, 0, wxEXPAND | wxBOTTOM, 5);
+ my $text = Wx::StaticText->new($self, -1, "Object:", wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
+ $text->SetFont($Slic3r::GUI::small_font);
+ $sizer->Add($text, 0, wxALIGN_CENTER_VERTICAL);
+
+ # We supply a bogus width to wxChoice (sizer will override it and stretch
+ # the control anyway), because if we leave the default (-1) it will stretch
+ # too much according to the contents, and this is bad with long file names.
+ $self->{object_info_choice} = Wx::Choice->new($self, -1, wxDefaultPosition, [100,-1], []);
+ $self->{object_info_choice}->SetFont($Slic3r::GUI::small_font);
+ $sizer->Add($self->{object_info_choice}, 1, wxALIGN_CENTER_VERTICAL);
+
+ EVT_CHOICE($self, $self->{object_info_choice}, sub {
+ $self->select_object($self->{object_info_choice}->GetSelection);
+ $self->refresh_canvases;
+ });
+ }
+
my $grid_sizer = Wx::FlexGridSizer->new(3, 4, 5, 5);
$grid_sizer->SetFlexibleDirection(wxHORIZONTAL);
$grid_sizer->AddGrowableCol(1, 1);
@@ -390,6 +415,7 @@ sub new {
$object_info_sizer->Add($grid_sizer, 0, wxEXPAND);
my @info = (
+ copies => "Copies",
size => "Size",
volume => "Volume",
facets => "Facets",
@@ -442,7 +468,7 @@ sub new {
$self->{"print_info_$field"}->SetFont($Slic3r::GUI::small_font);
$grid_sizer->Add($self->{"print_info_$field"}, 0);
}
- $self->{"sliced_info_box"} = $print_info_sizer;
+ $self->{sliced_info_box} = $print_info_sizer;
}
@@ -453,14 +479,13 @@ sub new {
$buttons_sizer->Add($self->{btn_send_gcode}, 0, wxALIGN_RIGHT, 0);
$buttons_sizer->Add($self->{btn_export_gcode}, 0, wxALIGN_RIGHT, 0);
- my $right_sizer = Wx::BoxSizer->new(wxVERTICAL);
+ $self->{right_sizer} = my $right_sizer = Wx::BoxSizer->new(wxVERTICAL);
$right_sizer->Add($presets, 0, wxEXPAND | wxTOP, 10) if defined $presets;
$right_sizer->Add($buttons_sizer, 0, wxEXPAND | wxBOTTOM, 5);
- $right_sizer->Add($self->{list}, 1, wxEXPAND, 5);
+ $right_sizer->Add($self->{settings_override_panel}, 1, wxEXPAND, 5);
$right_sizer->Add($object_info_sizer, 0, wxEXPAND, 0);
$right_sizer->Add($print_info_sizer, 0, wxEXPAND, 0);
$right_sizer->Hide($print_info_sizer);
- $self->{"right_sizer"} = $right_sizer;
my $hsizer = Wx::BoxSizer->new(wxHORIZONTAL);
$hsizer->Add($self->{preview_notebook}, 1, wxEXPAND | wxTOP, 1);
@@ -475,34 +500,118 @@ sub new {
$self->SetSizer($sizer);
}
+ $self->load_presets;
+ $self->_on_select_preset($_) for qw(printer filament print);
+
return $self;
}
-# sets the callback
-sub on_select_preset {
- my ($self, $cb) = @_;
- $self->{on_select_preset} = $cb;
+sub prompt_unsaved_changes {
+ my ($self) = @_;
+
+ foreach my $group (qw(printer filament print)) {
+ foreach my $choice (@{$self->{preset_choosers}{$group}}) {
+ my $pp = $self->{preset_choosers_names}{$choice};
+ for my $i (0..$#$pp) {
+ my $preset = first { $_->name eq $pp->[$i] } @{wxTheApp->presets->{$group}};
+ if (!$preset->prompt_unsaved_changes($self)) {
+ # Restore the previous one
+ $choice->SetSelection($i);
+ return 0;
+ }
+ }
+ }
+ }
+ return 1;
+}
+
+sub _on_change_combobox {
+ my ($self, $group, $choice) = @_;
+
+ if (0) {
+ # This code is disabled because wxPerl doesn't provide GetCurrentSelection
+ my $current_name = $self->{preset_choosers_names}{$choice}[$choice->GetCurrentSelection];
+ my $current = first { $_->name eq $current_name } @{wxTheApp->presets->{$group}};
+ if (!$current->prompt_unsaved_changes($self)) {
+ # Restore the previous one
+ $choice->SetSelection($choice->GetCurrentSelection);
+ return;
+ }
+ } else {
+ return 0 if !$self->prompt_unsaved_changes;
+ }
+ wxTheApp->CallAfter(sub {
+ $self->_on_select_preset($group);
+
+ # This will remove the "(modified)" mark from any dirty preset handled here.
+ $self->load_presets;
+ });
}
sub _on_select_preset {
- my $self = shift;
- my ($group, $choice) = @_;
+ my ($self, $group) = @_;
- # if user changed filament preset, don't propagate this to the tabs
- if ($group eq 'filament' && @{$self->{preset_choosers}{filament}} > 1) {
- my @filament_presets = $self->filament_presets;
- $Slic3r::GUI::Settings->{presets}{filament} = $choice->GetString($filament_presets[0]) . ".ini";
- $Slic3r::GUI::Settings->{presets}{"filament_${_}"} = $choice->GetString($filament_presets[$_])
- for 1 .. $#filament_presets;
- wxTheApp->save_settings;
- } else {
- # call GetSelection() in scalar context as it's context-aware
- $self->{on_select_preset}->($group, scalar $choice->GetSelection)
- if $self->{on_select_preset};
- }
+ my @presets = $self->selected_presets($group);
- # generate on_config_change() event for updating plater and other things
- $self->on_config_change();
+ my $s_presets = $Slic3r::GUI::Settings->{presets};
+ my $changed = !$s_presets->{$group} || $s_presets->{$group} ne $presets[0]->name;
+ $s_presets->{$group} = $presets[0]->name;
+ $s_presets->{"${group}_${_}"} = $presets[$_]->name for 1..$#presets;
+
+ wxTheApp->save_settings;
+
+ # Ignore overrides in the plater, we only care about the preset configs.
+ my $config = $self->config(1);
+
+ $self->on_extruders_change(scalar @{$config->get('nozzle_diameter')});
+
+ if ($group eq 'print') {
+ 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 $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).
+ $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->update_optgroup;
+ } elsif ($group eq 'printer') {
+ # reload print and filament settings to honor their compatible_printer options
+ $self->load_presets;
+ }
+
+ $self->config_changed;
+}
+
+sub load_config {
+ my ($self, $config) = @_;
+
+ # This method is called with the CLI options.
+ # We add them to the visible overrides.
+ $self->{settings_override_config}->apply($config);
+ $self->{settings_override_panel}->update_optgroup;
+
+ $self->config_changed;
}
sub GetFrame {
@@ -510,60 +619,190 @@ sub GetFrame {
return &Wx::GetTopLevelParent($self);
}
-sub update_presets {
- my $self = shift;
- my ($group, $presets, $selected, $is_dirty) = @_;
+sub load_presets {
+ my ($self) = @_;
- my @choosers = @{ $self->{preset_choosers}{$group} };
- foreach my $choice (@choosers) {
- if ($group eq 'filament' && @choosers > 1) {
- # if we have more than one filament chooser, keep our selection
- # instead of importing the one from the tab
- $selected = $choice->GetSelection;
- $is_dirty = 0;
- }
- $choice->Clear;
- foreach my $preset (@$presets) {
- my $bitmap;
- if ($group eq 'filament') {
- my $config = $preset->config(['filament_colour']);
- my $rgb_hex = $config->filament_colour->[0];
- if ($preset->default) {
- $bitmap = Wx::Bitmap->new($Slic3r::var->("spool.png"), wxBITMAP_TYPE_PNG);
- } else {
- $rgb_hex =~ s/^#//;
- my @rgb = unpack 'C*', pack 'H*', $rgb_hex;
- my $image = Wx::Image->new(16,16);
- $image->SetRGB(Wx::Rect->new(0,0,16,16), @rgb);
- $bitmap = Wx::Bitmap->new($image);
+ my $selected_printer_name;
+ foreach my $group (qw(printer filament print)) {
+ my @presets = @{wxTheApp->presets->{$group}};
+
+ # Skip presets not compatible with the selected printer, if they
+ # have other compatible printers configured (and at least one of them exists).
+ if ($group eq 'filament' || $group eq 'print') {
+ my %printer_names = map { $_->name => 1 } @{ wxTheApp->presets->{printer} };
+ for (my $i = 0; $i <= $#presets; ++$i) {
+ my $config = $presets[$i]->dirty_config;
+ next if !$config->has('compatible_printers');
+ my @compat = @{$config->compatible_printers};
+ if (@compat
+ && (none { $_ eq $selected_printer_name } @compat)
+ && (any { $printer_names{$_} } @compat)) {
+ splice @presets, $i, 1;
+ --$i;
}
- } elsif ($group eq 'print') {
- $bitmap = Wx::Bitmap->new($Slic3r::var->("cog.png"), wxBITMAP_TYPE_PNG);
- } elsif ($group eq 'printer') {
- $bitmap = Wx::Bitmap->new($Slic3r::var->("printer_empty.png"), wxBITMAP_TYPE_PNG);
}
- $choice->AppendString($preset->name, $bitmap);
}
- if ($selected <= $#$presets) {
- my $preset_name = $choice->GetString($selected);
- if ($is_dirty) {
- $choice->SetString($selected, "$preset_name (modified)");
- }
- # call SetSelection() only after SetString() otherwise the new string
- # won't be picked up as the visible string
- $choice->SetSelection($selected);
-
- $self->{print}->placeholder_parser->set("${group}_preset", $preset_name);
+ # Only show the default presets if we have no other presets.
+ if (@presets > 1) {
+ @presets = grep { !$_->default } @presets;
}
+
+ # get the wxChoice objects for this group
+ my @choosers = @{ $self->{preset_choosers}{$group} };
+
+ # find the currently selected one(s) according to the saved file
+ my @sel = ();
+ if (my $current = $Slic3r::GUI::Settings->{presets}{$group}) {
+ push @sel, grep defined, first { $presets[$_]->name eq $current } 0..$#presets;
+ }
+ for my $i (1..(@choosers-1)) {
+ if (my $current = $Slic3r::GUI::Settings->{presets}{"${group}_$i"}) {
+ push @sel, grep defined, first { $presets[$_]->name eq $current } 0..$#presets;
+ }
+ }
+ @sel = (0) if !@sel;
+
+ # populate the wxChoice objects
+ my @preset_names = ();
+ foreach my $choice (@choosers) {
+ $choice->Clear;
+ $self->{preset_choosers_names}{$choice} = [];
+ foreach my $preset (@presets) {
+ # load/generate the proper icon
+ my $bitmap;
+ if ($group eq 'filament') {
+ my $config = $preset->dirty_config;
+ if ($preset->default || !$config->has('filament_colour')) {
+ $bitmap = Wx::Bitmap->new($Slic3r::var->("spool.png"), wxBITMAP_TYPE_PNG);
+ } else {
+ my $rgb_hex = $config->filament_colour->[0];
+
+ $rgb_hex =~ s/^#//;
+ my @rgb = unpack 'C*', pack 'H*', $rgb_hex;
+ my $image = Wx::Image->new(16,16);
+ $image->SetRGB(Wx::Rect->new(0,0,16,16), @rgb);
+ $bitmap = Wx::Bitmap->new($image);
+ }
+ } elsif ($group eq 'print') {
+ $bitmap = Wx::Bitmap->new($Slic3r::var->("cog.png"), wxBITMAP_TYPE_PNG);
+ } elsif ($group eq 'printer') {
+ $bitmap = Wx::Bitmap->new($Slic3r::var->("printer_empty.png"), wxBITMAP_TYPE_PNG);
+ }
+ $choice->AppendString($preset->dropdown_name, $bitmap);
+ push @{$self->{preset_choosers_names}{$choice}}, $preset->name;
+ }
+
+ my $selected = shift @sel;
+ if (defined $selected && $selected <= $#presets) {
+ # call SetSelection() only after SetString() otherwise the new string
+ # won't be picked up as the visible string
+ $choice->SetSelection($selected);
+
+ my $preset_name = $self->{preset_choosers_names}{$choice}[$selected];
+ push @preset_names, $preset_name;
+ # TODO: populate other filament preset placeholders
+ $selected_printer_name = $preset_name if $group eq 'printer';
+ }
+ }
+
+ $self->{print}->placeholder_parser->set("${group}_preset", [ @preset_names ]);
}
}
-sub filament_presets {
- my $self = shift;
+sub select_preset_by_name {
+ my ($self, $name, $group, $n) = @_;
- # force scalar context for GetSelection() as it's context-aware
- return map scalar($_->GetSelection), @{ $self->{preset_choosers}{filament} };
+ # $n is optional
+
+ my $presets = wxTheApp->presets->{$group};
+ my $choosers = $self->{preset_choosers}{$group};
+ my $names = $self->{preset_choosers_names}{$choosers->[0]};
+ my $i = first { $names->[$_] eq $name } 0..$#$names;
+ return if !defined $i;
+
+ if (defined $n && $n <= $#$choosers) {
+ $choosers->[$n]->SetSelection($i);
+ } else {
+ $_->SetSelection($i) for @$choosers;
+ }
+ $self->_on_select_preset($group);
+}
+
+sub selected_presets {
+ my ($self, $group) = @_;
+
+ my %presets = ();
+ foreach my $group (qw(printer filament print)) {
+ $presets{$group} = [];
+ foreach my $choice (@{$self->{preset_choosers}{$group}}) {
+ my $sel = $choice->GetSelection;
+ $sel = 0 if $sel == -1;
+ push @{ $presets{$group} },
+ grep { $_->name eq $self->{preset_choosers_names}{$choice}[$sel] }
+ @{wxTheApp->presets->{$group}};
+ }
+ }
+ return $group ? @{$presets{$group}} : %presets;
+}
+
+sub show_preset_editor {
+ my ($self, $group, $i) = @_;
+
+ my $class = "Slic3r::GUI::PresetEditorDialog::" . ucfirst($group);
+ my $dlg = $class->new($self);
+
+ my @presets = $self->selected_presets($group);
+ $dlg->preset_editor->select_preset_by_name($presets[$i // 0]->name);
+ $dlg->ShowModal;
+
+ # Re-load the presets as they might have changed.
+ $self->load_presets;
+
+ # Select the preset that was last selected in the editor.
+ $self->select_preset_by_name
+ ($dlg->preset_editor->current_preset->name, $group, $i, 1);
+}
+
+# Returns the current config by merging the selected presets and the overrides.
+sub config {
+ my ($self, $ignore_overrides) = @_;
+
+ # use a DynamicConfig because FullPrintConfig is not enough
+ my $config = Slic3r::Config->new_from_defaults;
+
+ # get defaults also for the values tracked by the Plater's config
+ # (for example 'overridable')
+ $config->apply(Slic3r::Config->new_from_defaults(@{$self->{config}->get_keys}));
+
+ my %classes = map { $_ => "Slic3r::GUI::PresetEditor::".ucfirst($_) }
+ qw(print filament printer);
+
+ my %presets = $self->selected_presets;
+ $config->apply($_->dirty_config) for @{ $presets{printer} };
+ if (@{ $presets{filament} }) {
+ my $filament_config = $presets{filament}[0]->dirty_config;
+
+ for my $i (1..$#{ $presets{filament} }) {
+ my $preset = $presets{filament}[$i];
+ my $config = $preset->dirty_config;
+ foreach my $opt_key (@{$config->get_keys}) {
+ if ($filament_config->has($opt_key)) {
+ my $value = $filament_config->get($opt_key);
+ next unless ref $value eq 'ARRAY';
+ $value->[$i] = $config->get($opt_key)->[0];
+ $filament_config->set($opt_key, $value);
+ }
+ }
+ }
+
+ $config->apply($filament_config);
+ }
+ $config->apply($_->dirty_config) for @{ $presets{print} };
+ $config->apply($self->{settings_override_config})
+ unless $ignore_overrides;
+
+ return $config;
}
sub add {
@@ -709,18 +948,7 @@ sub load_model_objects {
);
}
- foreach my $obj_idx (@obj_idx) {
- my $object = $self->{objects}[$obj_idx];
- my $model_object = $self->{model}->objects->[$obj_idx];
- $self->{list}->InsertStringItem($obj_idx, $object->name);
- $self->{list}->SetItemFont($obj_idx, Wx::Font->new(10, wxDEFAULT, wxNORMAL, wxNORMAL))
- if $self->{list}->can('SetItemFont'); # legacy code for wxPerl < 0.9918 not supporting SetItemFont()
-
- $self->{list}->SetItem($obj_idx, 1, $model_object->instances_count);
- $self->{list}->SetItem($obj_idx, 2, ($model_object->instances->[0]->scaling_factor * 100) . "%");
-
- $self->make_thumbnail($obj_idx);
- }
+ $self->make_thumbnail($_) for @obj_idx;
$self->arrange if $need_arrange;
$self->on_model_change;
@@ -728,8 +956,6 @@ sub load_model_objects {
$self->{canvas3D}->zoom_to_volumes
if $self->{canvas3D};
- $self->{list}->Update;
- $self->{list}->Select($obj_idx[-1], 1);
$self->object_list_changed;
return @obj_idx;
@@ -761,7 +987,6 @@ sub remove {
splice @{$self->{objects}}, $obj_idx, 1;
$self->{model}->delete_object($obj_idx);
$self->{print}->delete_object($obj_idx);
- $self->{list}->DeleteItem($obj_idx);
$self->object_list_changed;
$self->select_object(undef);
@@ -780,7 +1005,6 @@ sub reset {
@{$self->{objects}} = ();
$self->{model}->clear_objects;
$self->{print}->clear_objects;
- $self->{list}->DeleteAllItems;
$self->object_list_changed;
$self->select_object(undef);
@@ -802,7 +1026,6 @@ sub increase {
);
$self->{print}->objects->[$obj_idx]->add_copy($instance->offset);
}
- $self->{list}->SetItem($obj_idx, 1, $model_object->instances_count);
# only autoarrange if user has autocentering enabled
$self->stop_background_process;
@@ -826,15 +1049,10 @@ sub decrease {
$model_object->delete_last_instance;
$self->{print}->objects->[$obj_idx]->delete_last_copy;
}
- $self->{list}->SetItem($obj_idx, 1, $model_object->instances_count);
} else {
$self->remove;
}
- if ($self->{objects}[$obj_idx]) {
- $self->{list}->Select($obj_idx, 0);
- $self->{list}->Select($obj_idx, 1);
- }
$self->on_model_change;
}
@@ -997,8 +1215,8 @@ sub changescale {
$model_instance->scaling_factor*100, $self);
return if !$scale || $scale !~ /^\d*(?:\.\d*)?$/ || $scale < 0;
}
-
- $self->{list}->SetItem($obj_idx, 2, "$scale%");
+ return if !$scale || $scale < 0;
+
$scale /= 100; # turn percent into factor
my $variation = $scale / $model_instance->scaling_factor;
@@ -1025,7 +1243,7 @@ sub arrange {
$self->pause_background_process;
my $bb = Slic3r::Geometry::BoundingBoxf->new_from_points($self->{config}->bed_shape);
- my $success = $self->{model}->arrange_objects($self->GetFrame->config->min_object_distance, $bb);
+ my $success = $self->{model}->arrange_objects($self->config->min_object_distance, $bb);
# ignore arrange failures on purpose: user has visual feedback and we don't need to warn him
# when parts don't fit in print bed
@@ -1076,6 +1294,70 @@ sub split_object {
$self->load_model_objects(@model_objects);
}
+sub toggle_print_stats {
+ my ($self, $show) = @_;
+
+ return if !$self->GetFrame->is_loaded;
+
+ if ($show) {
+ $self->{right_sizer}->Show($self->{sliced_info_box});
+ } else {
+ $self->{right_sizer}->Hide($self->{sliced_info_box});
+ }
+ $self->{right_sizer}->Layout;
+}
+
+sub config_changed {
+ my $self = shift;
+
+ my $config = $self->config;
+
+ if ($Slic3r::GUI::autosave) {
+ $config->save($Slic3r::GUI::autosave);
+ }
+
+ # Apply changes to the plater-specific config options.
+ foreach my $opt_key (@{$self->{config}->diff($config)}) {
+ # Ignore overrides. No need to set them in our config; we'll use them directly below.
+ next if $opt_key eq 'overrides';
+
+ $self->{config}->set($opt_key, $config->get($opt_key));
+
+ if ($opt_key eq 'bed_shape') {
+ $self->{canvas}->update_bed_size;
+ $self->{canvas3D}->update_bed_size if $self->{canvas3D};
+ $self->{preview3D}->set_bed_shape($self->{config}->bed_shape)
+ if $self->{preview3D};
+ $self->on_model_change;
+ } elsif ($opt_key eq 'serial_port') {
+ if ($config->get('serial_port')) {
+ $self->{btn_print}->Show;
+ } else {
+ $self->{btn_print}->Hide;
+ }
+ $self->Layout;
+ } elsif ($opt_key eq 'octoprint_host') {
+ if ($config->get('octoprint_host')) {
+ $self->{btn_send_gcode}->Show;
+ } else {
+ $self->{btn_send_gcode}->Hide;
+ }
+ $self->Layout;
+ }
+ }
+
+ return if !$self->GetFrame->is_loaded;
+
+ $self->toggle_print_stats(0);
+
+ if ($Slic3r::GUI::Settings->{_}{background_processing}) {
+ # (re)start timer
+ $self->schedule_background_process;
+ } else {
+ $self->async_apply_config;
+ }
+}
+
sub schedule_background_process {
my ($self) = @_;
@@ -1099,7 +1381,7 @@ sub async_apply_config {
$self->pause_background_process;
# apply new config
- my $invalidated = $self->{print}->apply_config($self->GetFrame->config);
+ my $invalidated = $self->{print}->apply_config($self->config);
# reset preview canvases (invalidated contents will be hidden)
$self->{toolpaths2D}->reload_print if $self->{toolpaths2D};
@@ -1115,10 +1397,7 @@ sub async_apply_config {
# kill current thread if any
$self->stop_background_process;
# remove the sliced statistics box because something changed.
- if ($self->{"right_sizer"}) {
- $self->{"right_sizer"}->Hide($self->{"sliced_info_box"});
- $self->{"right_sizer"}->Layout;
- }
+ $self->toggle_print_stats(0);
} else {
$self->resume_background_process;
}
@@ -1131,9 +1410,13 @@ sub start_background_process {
my ($self) = @_;
return if !$Slic3r::have_threads;
- return if !@{$self->{objects}};
return if $self->{process_thread};
+ if (!@{$self->{objects}}) {
+ $self->on_process_completed;
+ return;
+ }
+
# It looks like declaring a local $SIG{__WARN__} prevents the ugly
# "Attempt to free unreferenced scalar" warning...
local $SIG{__WARN__} = Slic3r::GUI::warning_catcher($self);
@@ -1141,7 +1424,7 @@ sub start_background_process {
# don't start process thread if config is not valid
eval {
# this will throw errors if config is not valid
- $self->GetFrame->config->validate;
+ $self->config->validate;
$self->{print}->validate;
};
if ($@) {
@@ -1234,14 +1517,14 @@ sub export_gcode {
# (we assume that if it is running, config is valid)
eval {
# this will throw errors if config is not valid
- $self->GetFrame->config->validate;
+ $self->config->validate;
$self->{print}->validate;
};
Slic3r::GUI::catch_error($self) and return;
# apply config and validate print
- my $config = $self->GetFrame->config;
+ my $config = $self->config;
eval {
# this will throw errors if config is not valid
$config->validate;
@@ -1284,9 +1567,6 @@ sub export_gcode {
});
# Supress re-initialization of spline based layer heights
- #foreach my $object @{$self->{print}->objects} {
- # $object->layer_height_spline->suppressUpdate;
- # }
$_->layer_height_spline->suppressUpdate for @{$self->{print}->objects};
# start background process, whose completion event handler
@@ -1303,8 +1583,7 @@ sub export_gcode {
# this updates buttons status
$self->object_list_changed;
- $self->{"right_sizer"}->Show($self->{"sliced_info_box"});
- $self->{"right_sizer"}->Layout;
+ $self->toggle_print_stats(1);
return $self->{export_gcode_output_file};
}
@@ -1424,15 +1703,15 @@ sub on_export_completed {
sub do_print {
my ($self) = @_;
- my $printer_tab = $self->GetFrame->{options_tabs}{printer};
- my $printer_name = $printer_tab->get_current_preset->name;
+ my $controller = $self->GetFrame->{controller} or return;
- my $controller = $self->GetFrame->{controller};
- my $printer_panel = $controller->add_printer($printer_name, $printer_tab->config);
+ 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 $filament_stats = $self->{print}->filament_stats;
- my @filament_names = $self->GetFrame->filament_preset_names;
- $filament_stats = { map { $filament_names[$_] => $filament_stats->{$_} } keys %$filament_stats };
+ $filament_stats = { map { $current_presets{filament}[$_]->name => $filament_stats->{$_} } keys %$filament_stats };
$printer_panel->load_print_job($self->{print_file}, $filament_stats);
$self->GetFrame->select_tab(1);
@@ -1669,6 +1948,38 @@ sub on_thumbnail_made {
sub on_model_change {
my ($self, $force_autocenter) = @_;
+ # reload the select submenu (if already initialized)
+ if (my $menu = $self->GetFrame->{plater_select_menu}) {
+ $menu->DeleteItem($_) for $menu->GetMenuItems;
+ for my $i (0..$#{$self->{objects}}) {
+ my $name = $self->{objects}->[$i]->name;
+ my $count = $self->{model}->get_object($i)->instances_count;
+ if ($count > 1) {
+ $name .= " (${count}x)";
+ }
+ my $item = $self->GetFrame->_append_menu_item($menu, $name, 'Select object', sub {
+ $self->select_object($i);
+ $self->refresh_canvases;
+ }, undef, undef, wxITEM_CHECK);
+ $item->Check(1) if $self->{objects}->[$i]->selected;
+ }
+ }
+
+ # reload the objects info choice
+ if (my $choice = $self->{object_info_choice}) {
+ $choice->Clear;
+ for my $i (0..$#{$self->{objects}}) {
+ my $name = $self->{objects}->[$i]->name;
+ my $count = $self->{model}->get_object($i)->instances_count;
+ if ($count > 1) {
+ $name .= " (${count}x)";
+ }
+ $choice->Append($name);
+ }
+ my ($obj_idx, $object) = $self->selected_object;
+ $choice->SetSelection($obj_idx // -1);
+ }
+
my $running = $self->pause_background_process;
if ($Slic3r::GUI::Settings->{_}{autocenter} || $force_autocenter) {
@@ -1685,10 +1996,7 @@ sub on_model_change {
# failed upon previous instance move, so we have no running thread and no steps
# are invalidated on this move, thus we need to schedule a new run.
$self->schedule_background_process;
- if ($self->{"right_sizer"}) {
- $self->{"right_sizer"}->Hide($self->{"sliced_info_box"});
- $self->{"right_sizer"}->Layout;
- }
+ $self->toggle_print_stats(0);
} else {
$self->resume_background_process;
}
@@ -1722,18 +2030,27 @@ sub on_extruders_change {
# copy icons from first choice
$choice->SetItemBitmap($_, $choices->[0]->GetItemBitmap($_)) for 0..$#presets;
- # insert new choice into sizer
- $self->{presets_sizer}->Insert(4 + ($#$choices-1)*2, 0, 0);
- $self->{presets_sizer}->Insert(5 + ($#$choices-1)*2, $choice, 0, wxEXPAND | wxBOTTOM, FILAMENT_CHOOSERS_SPACING);
+ # settings button
+ my $settings_btn = Wx::BitmapButton->new($self, -1, Wx::Bitmap->new($Slic3r::var->("cog.png"), wxBITMAP_TYPE_PNG),
+ wxDefaultPosition, wxDefaultSize, wxBORDER_NONE);
- # setup the listener
+ # insert new row into sizer
+ $self->{presets_sizer}->Insert(6 + ($#$choices-1)*3, 0, 0);
+ $self->{presets_sizer}->Insert(7 + ($#$choices-1)*3, $choice, 0, wxEXPAND | wxBOTTOM, FILAMENT_CHOOSERS_SPACING);
+ $self->{presets_sizer}->Insert(8 + ($#$choices-1)*3, $settings_btn, 0, wxEXPAND | wxLEFT, 4);
+
+ # setup the listeners
EVT_COMBOBOX($choice, $choice, sub {
my ($choice) = @_;
wxTheApp->CallAfter(sub {
- $self->_on_select_preset('filament', $choice);
+ $self->_on_change_combobox('filament', $choice);
});
});
+ EVT_BUTTON($self, $settings_btn, sub {
+ $self->show_preset_editor('filament', $#$choices);
+ });
+
# initialize selection
my $i = first { $choice->GetString($_) eq ($Slic3r::GUI::Settings->{presets}{"filament_" . $#$choices} || '') } 0 .. $#presets;
$choice->SetSelection($i || 0);
@@ -1741,90 +2058,21 @@ sub on_extruders_change {
# remove unused choices if any
while (@$choices > $num_extruders) {
- $self->{presets_sizer}->Remove(4 + ($#$choices-1)*2); # label
- $self->{presets_sizer}->Remove(4 + ($#$choices-1)*2); # wxChoice
+ my $i = 6 + ($#$choices-1)*3;
+
+ $self->{presets_sizer}->Remove($i); # label
+ $self->{presets_sizer}->Remove($i); # wxChoice
+
+ my $settings_btn = $self->{presets_sizer}->GetItem($i)->GetWindow;
+ $self->{presets_sizer}->Remove($i); # settings btn
+ $settings_btn->Destroy;
+
$choices->[-1]->Destroy;
pop @$choices;
}
$self->Layout;
}
-sub on_config_change {
- my $self = shift;
-
- my $config = $self->GetFrame->config;
-
- if ($Slic3r::GUI::autosave) {
- $config->save($Slic3r::GUI::autosave);
- }
-
- # Apply changes to the plater-specific config options.
- foreach my $opt_key (@{$self->{config}->diff($config)}) {
- $self->{config}->set($opt_key, $config->get($opt_key));
- if ($opt_key eq 'bed_shape') {
- $self->{canvas}->update_bed_size;
- $self->{canvas3D}->update_bed_size if $self->{canvas3D};
- $self->{preview3D}->set_bed_shape($self->{config}->bed_shape)
- if $self->{preview3D};
- $self->on_model_change;
- } elsif ($opt_key eq 'serial_port') {
- if ($config->get('serial_port')) {
- $self->{btn_print}->Show;
- } else {
- $self->{btn_print}->Hide;
- }
- $self->Layout;
- } elsif ($opt_key eq 'octoprint_host') {
- if ($config->get('octoprint_host')) {
- $self->{btn_send_gcode}->Show;
- } else {
- $self->{btn_send_gcode}->Hide;
- }
- $self->Layout;
- }
- }
-
- if ($self->{"right_sizer"}) {
- $self->{"right_sizer"}->Hide($self->{"sliced_info_box"});
- $self->{"right_sizer"}->Layout;
- }
-
- return if !$self->GetFrame->is_loaded;
-
- if ($Slic3r::GUI::Settings->{_}{background_processing}) {
- # (re)start timer
- $self->schedule_background_process;
- } else {
- $self->async_apply_config;
- }
-}
-
-sub list_item_deselected {
- my ($self, $event) = @_;
- return if $PreventListEvents;
-
- if ($self->{list}->GetFirstSelected == -1) {
- $self->select_object(undef);
- $self->refresh_canvases;
- }
-}
-
-sub list_item_selected {
- my ($self, $event) = @_;
- return if $PreventListEvents;
-
- my $obj_idx = $event->GetIndex;
- $self->select_object($obj_idx);
- $self->refresh_canvases;
-}
-
-sub list_item_activated {
- my ($self, $event, $obj_idx) = @_;
-
- $obj_idx //= $event->GetIndex;
- $self->object_settings_dialog($obj_idx);
-}
-
sub object_cut_dialog {
my $self = shift;
my ($obj_idx) = @_;
@@ -1947,6 +2195,13 @@ sub selection_changed {
my ($obj_idx, $object) = $self->selected_object;
my $have_sel = defined $obj_idx;
+ if (my $menu = $self->GetFrame->{plater_select_menu}) {
+ $_->Check(0) for $menu->GetMenuItems;
+ if ($have_sel) {
+ $menu->FindItemByPosition($obj_idx)->Check(1);
+ }
+ }
+
my $method = $have_sel ? 'Enable' : 'Disable';
$self->{"btn_$_"}->$method
for grep $self->{"btn_$_"}, qw(remove increase decrease rotate45cw rotate45ccw changescale split cut layers settings);
@@ -1957,10 +2212,19 @@ sub selection_changed {
}
if ($self->{object_info_size}) { # have we already loaded the info pane?
+
if ($have_sel) {
my $model_object = $self->{model}->objects->[$obj_idx];
+ $self->{object_info_choice}->SetSelection($obj_idx);
+ $self->{object_info_copies}->SetLabel($model_object->instances_count);
my $model_instance = $model_object->instances->[0];
- $self->{object_info_size}->SetLabel(sprintf("%.2f x %.2f x %.2f", @{$model_object->instance_bounding_box(0)->size}));
+ {
+ my $size_string = sprintf "%.2f x %.2f x %.2f", @{$model_object->instance_bounding_box(0)->size};
+ if ($model_instance->scaling_factor != 1) {
+ $size_string .= sprintf " (%s%%)", $model_instance->scaling_factor * 100;
+ }
+ $self->{object_info_size}->SetLabel($size_string);
+ }
$self->{object_info_materials}->SetLabel($model_object->materials_count);
my $raw_mesh = $model_object->raw_mesh;
@@ -1985,7 +2249,8 @@ sub selection_changed {
$self->{object_info_facets}->SetLabel($object->facets);
}
} else {
- $self->{"object_info_$_"}->SetLabel("") for qw(size volume facets materials manifold);
+ $self->{object_info_choice}->SetSelection(-1);
+ $self->{"object_info_$_"}->SetLabel("") for qw(copies size volume facets materials manifold);
$self->{object_info_manifold_warning_icon}->Hide;
$self->{object_info_manifold}->SetToolTipString("");
}
@@ -2002,19 +2267,38 @@ sub select_object {
$_->selected(0) for @{ $self->{objects} };
if (defined $obj_idx) {
$self->{objects}->[$obj_idx]->selected(1);
-
- # We use this flag to avoid circular event handling
- # Select() happens to fire a wxEVT_LIST_ITEM_SELECTED on Windows,
- # whose event handler calls this method again and again and again
- $PreventListEvents = 1;
- $self->{list}->Select($obj_idx, 1);
- $PreventListEvents = 0;
- } else {
- # TODO: deselect all in list
}
$self->selection_changed(1);
}
+sub select_next {
+ my ($self) = @_;
+
+ return if !@{$self->{objects}};
+ my ($obj_idx, $object) = $self->selected_object;
+ if (!defined $obj_idx || $obj_idx == $#{$self->{objects}}) {
+ $obj_idx = 0;
+ } else {
+ $obj_idx++;
+ }
+ $self->select_object($obj_idx);
+ $self->refresh_canvases;
+}
+
+sub select_prev {
+ my ($self) = @_;
+
+ return if !@{$self->{objects}};
+ my ($obj_idx, $object) = $self->selected_object;
+ if (!defined $obj_idx || $obj_idx == 0) {
+ $obj_idx = $#{$self->{objects}};
+ } else {
+ $obj_idx--;
+ }
+ $self->select_object($obj_idx);
+ $self->refresh_canvases;
+}
+
sub selected_object {
my $self = shift;
@@ -2035,7 +2319,7 @@ sub validate_config {
my $self = shift;
eval {
- $self->GetFrame->config->validate;
+ $self->config->validate;
};
return 0 if Slic3r::GUI::catch_error($self);
return 1;
@@ -2073,7 +2357,7 @@ sub object_menu {
my $rotateMenu = Wx::Menu->new;
my $rotateMenuItem = $menu->AppendSubMenu($rotateMenu, "Rotate", 'Rotate the selected object by an arbitrary angle');
- $frame->_set_menu_item_icon($rotateMenuItem, 'textfield.png');
+ 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');
@@ -2086,7 +2370,7 @@ sub object_menu {
my $mirrorMenu = Wx::Menu->new;
my $mirrorMenuItem = $menu->AppendSubMenu($mirrorMenu, "Mirror", 'Mirror the selected object');
- $frame->_set_menu_item_icon($mirrorMenuItem, 'shape_flip_horizontal.png');
+ 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');
@@ -2099,7 +2383,7 @@ sub object_menu {
my $scaleMenu = Wx::Menu->new;
my $scaleMenuItem = $menu->AppendSubMenu($scaleMenu, "Scale", 'Scale the selected object along a single axis');
- $frame->_set_menu_item_icon($scaleMenuItem, 'arrow_out.png');
+ 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);
});
@@ -2115,7 +2399,7 @@ sub object_menu {
my $scaleToSizeMenu = Wx::Menu->new;
my $scaleToSizeMenuItem = $menu->AppendSubMenu($scaleToSizeMenu, "Scale to size", 'Scale the selected object along a single axis');
- $frame->_set_menu_item_icon($scaleToSizeMenuItem, 'arrow_out.png');
+ 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);
});
diff --git a/lib/Slic3r/GUI/Plater/ObjectLayersDialog.pm b/lib/Slic3r/GUI/Plater/ObjectLayersDialog.pm
index 7c3a28e67..e091d46fc 100644
--- a/lib/Slic3r/GUI/Plater/ObjectLayersDialog.pm
+++ b/lib/Slic3r/GUI/Plater/ObjectLayersDialog.pm
@@ -15,8 +15,8 @@ sub new {
my ($parent, %params) = @_;
my $self = $class->SUPER::new($parent, -1, $params{object}->name, wxDefaultPosition, [500,500], wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER);
$self->{model_object} = $params{model_object};
- my $model_object = $self->{model_object} = $params{model_object};
- my $obj_idx = $self->{obj_idx} = $params{obj_idx};
+ my $model_object = $self->{model_object} = $params{model_object};
+ my $obj_idx = $self->{obj_idx} = $params{obj_idx};
my $plater = $self->{plater} = $parent;
my $object = $self->{object} = $self->{plater}->{print}->get_object($self->{obj_idx});
@@ -32,9 +32,9 @@ sub new {
$self->{preview3D}->canvas->zoom_to_volumes;
}
- $self->{splineControl} = Slic3r::GUI::Plater::SplineControl->new($self, Wx::Size->new(150, 200), $object);
+ $self->{splineControl} = Slic3r::GUI::Plater::SplineControl->new($self, Wx::Size->new(150, 200), $model_object);
- my $quality_slider = $self->{quality_slider} = Wx::Slider->new(
+ my $quality_slider = $self->{quality_slider} = Wx::Slider->new(
$self, -1,
0, # default
0, # min
@@ -55,34 +55,34 @@ sub new {
$quality_label->SetFont($Slic3r::GUI::small_font);
$value_label->SetFont($Slic3r::GUI::small_font);
$speed_label->SetFont($Slic3r::GUI::small_font);
-
- my $quality_label_sizer = Wx::BoxSizer->new(wxHORIZONTAL);
- $quality_label_sizer->Add($quality_label, 1, wxEXPAND | wxALL, 0);
+
+ my $quality_label_sizer = Wx::BoxSizer->new(wxHORIZONTAL);
+ $quality_label_sizer->Add($quality_label, 1, wxEXPAND | wxALL, 0);
$quality_label_sizer->Add($value_label, 1, wxEXPAND | wxALL, 0);
$quality_label_sizer->Add($speed_label, 1, wxEXPAND | wxALL, 0);
-
- my $right_sizer = Wx::BoxSizer->new(wxVERTICAL);
- $right_sizer->Add($self->{splineControl}, 1, wxEXPAND | wxALL, 0);
- $right_sizer->Add($quality_slider, 0, wxEXPAND | wxALL, 0);
- $right_sizer->Add($quality_label_sizer, 0, wxEXPAND | wxALL, 0);
-
-
- $self->{sizer} = Wx::BoxSizer->new(wxHORIZONTAL);
- $self->{sizer}->Add($self->{preview3D}, 3, wxEXPAND | wxTOP | wxBOTTOM, 0) if $self->{preview3D};
- $self->{sizer}->Add($right_sizer, 1, wxEXPAND | wxTOP | wxBOTTOM, 10);
+
+ my $right_sizer = Wx::BoxSizer->new(wxVERTICAL);
+ $right_sizer->Add($self->{splineControl}, 1, wxEXPAND | wxALL, 0);
+ $right_sizer->Add($quality_slider, 0, wxEXPAND | wxALL, 0);
+ $right_sizer->Add($quality_label_sizer, 0, wxEXPAND | wxALL, 0);
+
+
+ $self->{sizer} = Wx::BoxSizer->new(wxHORIZONTAL);
+ $self->{sizer}->Add($self->{preview3D}, 3, wxEXPAND | wxTOP | wxBOTTOM, 0) if $self->{preview3D};
+ $self->{sizer}->Add($right_sizer, 1, wxEXPAND | wxTOP | wxBOTTOM, 10);
$self->SetSizerAndFit($self->{sizer});
$self->SetSize([800, 600]);
$self->SetMinSize($self->GetSize);
-
+
# init spline control values
# determine min and max layer height from perimeter extruder capabilities.
my %extruders;
for my $region_id (0 .. ($object->region_count - 1)) {
- foreach (qw(perimeter_extruder infill_extruder solid_infill_extruder)) {
- my $extruder_id = $self->{plater}->{print}->get_region($region_id)->config->get($_)-1;
- $extruders{$extruder_id} = $extruder_id;
- }
+ foreach (qw(perimeter_extruder infill_extruder solid_infill_extruder)) {
+ my $extruder_id = $self->{plater}->{print}->get_region($region_id)->config->get($_)-1;
+ $extruders{$extruder_id} = $extruder_id;
+ }
}
my $min_height = max(map {$self->{plater}->{print}->config->get_at('min_layer_height', $_)} (values %extruders));
my $max_height = min(map {$self->{plater}->{print}->config->get_at('max_layer_height', $_)} (values %extruders));
@@ -92,9 +92,10 @@ sub new {
$self->{splineControl}->on_layer_update(sub {
# trigger re-slicing
- $self->{plater}->stop_background_process;
- $self->{object}->invalidate_step(STEP_SLICE);
- $self->{plater}->start_background_process;
+ $self->_trigger_slicing;
+ #$self->{plater}->stop_background_process;
+ #$self->{object}->invalidate_step(STEP_SLICE);
+ #$self->{plater}->start_background_process;
});
$self->{splineControl}->on_z_indicator(sub {
@@ -117,28 +118,44 @@ sub new {
}
EVT_SLIDER($self, $quality_slider, sub {
- $self->{plater}->pause_background_process;
my $quality_value = $quality_slider->GetValue/100;
$value_label->SetLabel(sprintf '%.2f', $quality_value);
$self->{model_object}->config->set('adaptive_slicing_quality', $quality_value);
# trigger re-slicing
- $self->{plater}->stop_background_process;
- $self->{object}->invalidate_step(STEP_SLICE);
- $self->{plater}->schedule_background_process;
+ $self->_trigger_slicing;
});
return $self;
}
+sub _trigger_slicing {
+ my ($self) = @_;
+ $self->{plater}->stop_background_process;
+ $self->{object}->invalidate_step(STEP_SLICE);
+ if (!$Slic3r::GUI::Settings->{_}{background_processing}) {
+ $self->{plater}->statusbar->SetCancelCallback(sub {
+ $self->{plater}->stop_background_process;
+ $self->{plater}->statusbar->SetStatusText("Slicing cancelled");
+ $self->{plater}->preview_notebook->SetSelection(0);
+ });
+ $self->{plater}->{print}->reload_object($self->{obj_idx});
+ $self->{plater}->on_model_change;
+ $self->{plater}->start_background_process;
+ }else{
+ $self->{plater}->schedule_background_process;
+ }
+}
+
sub reload_preview {
- my ($self) = @_;
+ my ($self) = @_;
$self->{splineControl}->update;
- $self->{preview3D}->reload_print;
- if($self->{object}->layer_count-1 > 0) {
- my $top_layer = $self->{object}->get_layer($self->{object}->layer_count-1);
- $self->{preview3D}->set_z($top_layer->print_z);
- }
+ $self->{preview3D}->reload_print;
+ if($self->{object}->layer_count-1 > 0) {
+ # causes segfault...
+ #my $top_layer = $self->{object}->get_layer($self->{object}->layer_count-1);
+ #$self->{preview3D}->set_z($top_layer->print_z);
+ }
}
1;
diff --git a/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm b/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm
index e848b7638..8e5e6b52b 100644
--- a/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm
+++ b/lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm
@@ -1,5 +1,4 @@
-# Included in ObjectSettingsDialog -> ObjectPartsPanel.
-# Maintains, displays, adds and removes overrides of slicing parameters for an object and its modifier mesh.
+# Maintains, displays, adds and removes overrides of slicing parameters.
package Slic3r::GUI::Plater::OverrideSettingsPanel;
use strict;
@@ -16,13 +15,26 @@ use constant ICON_MATERIAL => 0;
use constant ICON_SOLIDMESH => 1;
use constant ICON_MODIFIERMESH => 2;
+my %icons = (
+ 'Advanced' => 'wand.png',
+ 'Extruders' => 'funnel.png',
+ 'Extrusion Width' => 'funnel.png',
+ 'Infill' => 'infill.png',
+ 'Layers and Perimeters' => 'layers.png',
+ 'Skirt and brim' => 'box.png',
+ 'Speed' => 'time.png',
+ 'Speed > Acceleration' => 'time.png',
+ 'Support material' => 'building.png',
+);
+
sub new {
my $class = shift;
my ($parent, %params) = @_;
- my $self = $class->SUPER::new($parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+ my $self = $class->SUPER::new($parent, -1, wxDefaultPosition, $params{size} // wxDefaultSize, wxTAB_TRAVERSAL);
$self->{default_config} = Slic3r::Config->new;
$self->{config} = Slic3r::Config->new;
$self->{on_change} = $params{on_change};
+ $self->{editable} = 1;
$self->{fixed_options} = {};
$self->{sizer} = Wx::BoxSizer->new(wxVERTICAL);
@@ -35,15 +47,31 @@ sub new {
# create the button
my $btn = $self->{btn_add} = Wx::BitmapButton->new($self, -1, Wx::Bitmap->new($Slic3r::var->("add.png"), wxBITMAP_TYPE_PNG),
wxDefaultPosition, wxDefaultSize, Wx::wxBORDER_NONE);
+ $btn->SetToolTipString("Override one more option")
+ if $btn->can('SetToolTipString');
EVT_LEFT_DOWN($btn, sub {
my $menu = Wx::Menu->new;
+ my $last_cat = '';
foreach my $opt_key (@{$self->{options}}) {
my $id = &Wx::NewId();
- $menu->Append($id, $self->{option_labels}{$opt_key});
+
+ # 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};
+ }
+
+ my $menuItem = $menu->Append($id, $self->{option_labels}{$opt_key});
+ wxTheApp->set_menu_item_icon($menuItem, $icon) if $icon;
+
EVT_MENU($menu, $id, sub {
$self->{config}->set($opt_key, $self->{default_config}->get($opt_key));
$self->update_optgroup;
- $self->{on_change}->() if $self->{on_change};
+ $self->{on_change}->($opt_key) if $self->{on_change};
});
}
$self->PopupMenu($menu, $btn->GetPosition);
@@ -64,39 +92,59 @@ sub new {
return $self;
}
+# Sets the config used to get the default values for user-added options.
sub set_default_config {
my ($self, $config) = @_;
$self->{default_config} = $config;
}
+# Sets the target config, whose options will be displayed in the OptionsGroup.
sub set_config {
my ($self, $config) = @_;
$self->{config} = $config;
$self->update_optgroup;
}
+# Sets the options listed in the Add button.
sub set_opt_keys {
my ($self, $opt_keys) = @_;
# sort options by category+label
- $self->{option_labels} = {
- map { $_ => sprintf('%s > %s', $Slic3r::Config::Options->{$_}{category}, $Slic3r::Config::Options->{$_}{full_label} // $Slic3r::Config::Options->{$_}{label}) } @$opt_keys
+ $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->{options} = [ sort { $self->{option_labels}{$a} cmp $self->{option_labels}{$b} } @$opt_keys ];
+ $self->{options} = [ sort { $self->{option_labels}{$a} cmp $self->{option_labels}{$b} } keys %{$self->{option_labels}} ];
}
+# Sets the options that user can't remove.
sub set_fixed_options {
my ($self, $opt_keys) = @_;
$self->{fixed_options} = { map {$_ => 1} @$opt_keys };
$self->update_optgroup;
}
+sub fixed_options {
+ my ($self) = @_;
+
+ return keys %{$self->{fixed_options}};
+}
+
sub update_optgroup {
my $self = shift;
$self->{options_sizer}->Clear(1);
return if !defined $self->{config};
+ $self->{btn_add}->Show($self->{editable});
+
my %categories = ();
foreach my $opt_key (@{$self->{config}->get_keys}) {
my $category = $Slic3r::Config::Options->{$opt_key}{category};
@@ -104,7 +152,8 @@ sub update_optgroup {
push @{$categories{$category}}, $opt_key;
}
foreach my $category (sort keys %categories) {
- my $optgroup = Slic3r::GUI::ConfigOptionsGroup->new(
+ my $optgroup;
+ $optgroup = Slic3r::GUI::ConfigOptionsGroup->new(
parent => $self,
title => $category,
config => $self->{config},
@@ -112,27 +161,33 @@ sub update_optgroup {
label_font => $Slic3r::GUI::small_font,
sidetext_font => $Slic3r::GUI::small_font,
label_width => 120,
- on_change => sub { $self->{on_change}->() if $self->{on_change} },
+ on_change => sub {
+ my ($opt_key) = @_;
+ $self->{on_change}->($opt_key) if $self->{on_change};
+ },
extra_column => sub {
my ($line) = @_;
- my $opt_key = $line->get_options->[0]->opt_id; # we assume that we have one option per line
+ my $opt_id = $line->get_options->[0]->opt_id; # we assume that we have one option per line
+ my ($opt_key, $opt_index) = @{ $optgroup->_opt_map->{$opt_id} };
# disallow deleting fixed options
- return undef if $self->{fixed_options}{$opt_key};
+ return undef if $self->{fixed_options}{$opt_key} || !$self->{editable};
my $btn = Wx::BitmapButton->new($self, -1, Wx::Bitmap->new($Slic3r::var->("delete.png"), wxBITMAP_TYPE_PNG),
wxDefaultPosition, wxDefaultSize, Wx::wxBORDER_NONE);
EVT_BUTTON($self, $btn, sub {
$self->{config}->erase($opt_key);
- $self->{on_change}->() if $self->{on_change};
+ $self->{on_change}->($opt_key) if $self->{on_change};
wxTheApp->CallAfter(sub { $self->update_optgroup });
});
return $btn;
},
);
foreach my $opt_key (sort @{$categories{$category}}) {
- $optgroup->append_single_option_line($opt_key);
+ # For array options we override the first value.
+ my $opt_index = (ref($self->{config}->get($opt_key)) eq 'ARRAY') ? 0 : -1;
+ $optgroup->append_single_option_line($opt_key, $opt_index);
}
$self->{options_sizer}->Add($optgroup->sizer, 0, wxEXPAND | wxBOTTOM, 0);
}
@@ -154,4 +209,11 @@ sub disable {
$self->Disable;
}
+# Shows or hides the Add button.
+sub set_editable {
+ my ($self, $editable) = @_;
+
+ $self->{editable} = $editable;
+}
+
1;
diff --git a/lib/Slic3r/GUI/Preferences.pm b/lib/Slic3r/GUI/Preferences.pm
index 231eb5cc9..9c96efa3a 100644
--- a/lib/Slic3r/GUI/Preferences.pm
+++ b/lib/Slic3r/GUI/Preferences.pm
@@ -20,16 +20,6 @@ sub new {
},
label_width => 200,
);
- $optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new(
- opt_id => 'mode',
- type => 'select',
- label => 'Mode',
- tooltip => 'Choose between a simpler, basic mode and an expert mode with more options and more complicated interface.',
- labels => ['Simple','Expert'],
- values => ['simple','expert'],
- default => $Slic3r::GUI::Settings->{_}{mode},
- width => 100,
- ));
$optgroup->append_single_option_line(Slic3r::GUI::OptionsGroup::Option->new(
opt_id => 'version_check',
type => 'bool',
diff --git a/lib/Slic3r/GUI/Preset.pm b/lib/Slic3r/GUI/Preset.pm
new file mode 100644
index 000000000..5bdd0f20e
--- /dev/null
+++ b/lib/Slic3r/GUI/Preset.pm
@@ -0,0 +1,210 @@
+package Slic3r::GUI::Preset;
+use Moo;
+
+use Unicode::Normalize;
+use Wx qw(:dialog :icon :id wxTheApp);
+
+has 'group' => (is => 'ro', required => 1);
+has 'default' => (is => 'ro', default => sub { 0 });
+has 'external' => (is => 'ro', default => sub { 0 });
+has 'name' => (is => 'rw', required => 1);
+has 'file' => (is => 'rw');
+has '_config' => (is => 'rw', default => sub { Slic3r::Config->new });
+has '_dirty_config' => (is => 'ro', default => sub { Slic3r::Config->new });
+
+sub BUILD {
+ my ($self) = @_;
+
+ $self->name(Unicode::Normalize::NFC($self->name));
+}
+
+sub _loaded {
+ my ($self) = @_;
+
+ return !$self->_config->empty;
+}
+
+sub dirty_options {
+ my ($self) = @_;
+
+ my @dirty = ();
+
+ # Options present in both configs with different values:
+ push @dirty, @{$self->_config->diff($self->_dirty_config)};
+
+ # Overrides added to the dirty config:
+ my @extra = $self->_group_class->overriding_options;
+ push @dirty, grep { !$self->_config->has($_) && $self->_dirty_config->has($_) } @extra;
+ # Overrides removed from the dirty config:
+ push @dirty, grep { $self->_config->has($_) && !$self->_dirty_config->has($_) } @extra;
+
+ return @dirty;
+}
+
+sub dirty {
+ my ($self) = @_;
+
+ return !!$self->dirty_options;
+}
+
+sub dropdown_name {
+ my ($self) = @_;
+
+ my $name = $self->name;
+ $name .= " (modified)" if $self->dirty;
+ return $name;
+}
+
+sub file_exists {
+ my ($self) = @_;
+
+ die "Can't call file_exists() on a non-file preset" if !$self->file;
+ return -e Slic3r::encode_path($self->file);
+}
+
+sub rename {
+ my ($self, $name) = @_;
+
+ $self->name($name);
+ $self->file(sprintf "$Slic3r::GUI::datadir/%s/%s.ini", $self->group, $name);
+}
+
+sub prompt_unsaved_changes {
+ my ($self, $parent) = @_;
+
+ if ($self->dirty) {
+ my $name = $self->default ? 'Default preset' : "Preset \"" . $self->name . "\"";
+
+ my $opts = '';
+ foreach my $opt_key ($self->dirty_options) {
+ my $opt = $Slic3r::Config::Options->{$opt_key};
+ my $name = $opt->{full_label} // $opt->{label};
+ if ($opt->{category}) {
+ $name = $opt->{category} . " > $name";
+ }
+ $opts .= "- $name\n";
+ }
+
+ my $msg = sprintf "%s has unsaved changes:\n%s\nDo you want to save them?", $name, $opts;
+ my $confirm = Wx::MessageDialog->new($parent, $msg,
+ 'Unsaved Changes', wxYES_NO | wxCANCEL | wxYES_DEFAULT | wxICON_QUESTION);
+ $confirm->SetYesNoCancelLabels('Save', 'Discard', 'Cancel');
+ my $res = $confirm->ShowModal;
+
+ if ($res == wxID_CANCEL) {
+ return 0;
+ } elsif ($res == wxID_YES) {
+ return $self->save($self->default ? undef : $self->name);
+ } elsif ($res == wxID_NO) {
+ $self->dismiss_changes;
+ return 1;
+ }
+ }
+
+ return 1;
+}
+
+sub save {
+ my ($self, $name, $parent) = @_;
+
+ 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;
+ }
+
+ $self->rename($name);
+
+ if (!$self->file) {
+ die "Calling save() without setting filename";
+ }
+
+ $self->_config->clear;
+ $self->_config->apply($self->_dirty_config);
+ $self->_config->save($self->file);
+ wxTheApp->load_presets;
+
+ return 1;
+}
+
+sub dismiss_changes {
+ my ($self) = @_;
+
+ $self->_dirty_config->clear;
+ $self->_dirty_config->apply($self->_config);
+}
+
+sub delete {
+ my ($self) = @_;
+
+ die "Default config can't be deleted" if $self->default;
+ die "External configs can't be deleted" if $self->external;
+
+ # Otherwise wxTheApp->load_presets() will keep it
+ $self->dismiss_changes;
+
+ if ($self->file) {
+ unlink Slic3r::encode_path($self->file) if $self->file_exists;
+ $self->file(undef);
+ }
+}
+
+# This returns the loaded config with the dirty options applied.
+sub dirty_config {
+ my ($self) = @_;
+
+ $self->load_config if !$self->_loaded;
+
+ return $self->_dirty_config->clone;
+}
+
+sub load_config {
+ my ($self) = @_;
+
+ my @keys = $self->_group_class->options;
+ my @extra_keys = $self->_group_class->overriding_options;
+
+ if ($self->default) {
+ $self->_config(Slic3r::Config->new_from_defaults(@keys));
+ } elsif ($self->file) {
+ if (!$self->file_exists) {
+ Slic3r::GUI::show_error(undef, "The selected preset does not exist anymore (" . $self->file . ").");
+ return undef;
+ }
+ my $external_config = Slic3r::Config->load($self->file);
+ if (!@keys) {
+ $self->_config($external_config);
+ } else {
+ # apply preset values on top of defaults
+ my $config = Slic3r::Config->new_from_defaults(@keys);
+ $config->set($_, $external_config->get($_))
+ for grep $external_config->has($_), @keys;
+
+ # For extra_keys we don't populate defaults.
+ if (@extra_keys && !$self->external) {
+ $config->set($_, $external_config->get($_))
+ for grep $external_config->has($_), @extra_keys;
+ }
+
+ $self->_config($config);
+ }
+ }
+
+ $self->_dirty_config->apply($self->_config);
+
+ return $self->_config;
+}
+
+sub _group_class {
+ my ($self) = @_;
+
+ return "Slic3r::GUI::PresetEditor::".ucfirst $self->group;
+}
+
+1;
diff --git a/lib/Slic3r/GUI/Tab.pm b/lib/Slic3r/GUI/PresetEditor.pm
similarity index 80%
rename from lib/Slic3r/GUI/Tab.pm
rename to lib/Slic3r/GUI/PresetEditor.pm
index e55458ded..85ba51c61 100644
--- a/lib/Slic3r/GUI/Tab.pm
+++ b/lib/Slic3r/GUI/PresetEditor.pm
@@ -1,7 +1,4 @@
-# The "Expert" tab at the right of the main tabbed window.
-# The "Expert" is enabled by File->Preferences dialog.
-
-package Slic3r::GUI::Tab;
+package Slic3r::GUI::PresetEditor;
use strict;
use warnings;
use utf8;
@@ -10,19 +7,21 @@ use File::Basename qw(basename);
use List::Util qw(first);
use Wx qw(:bookctrl :dialog :keycode :icon :id :misc :panel :sizer :treectrl :window
:button wxTheApp);
-use Wx::Event qw(EVT_BUTTON EVT_CHOICE EVT_KEY_DOWN EVT_TREE_SEL_CHANGED);
+use Wx::Event qw(EVT_BUTTON EVT_CHOICE EVT_KEY_DOWN EVT_TREE_SEL_CHANGED EVT_CHECKBOX);
use base qw(Wx::Panel Class::Accessor);
-__PACKAGE__->mk_accessors(qw(current_preset));
+__PACKAGE__->mk_accessors(qw(current_preset config));
sub new {
my $class = shift;
my ($parent, %params) = @_;
my $self = $class->SUPER::new($parent, -1, wxDefaultPosition, wxDefaultSize, wxBK_LEFT | wxTAB_TRAVERSAL);
+ $self->{presets} = wxTheApp->presets->{$self->name};
+
# horizontal sizer
$self->{sizer} = Wx::BoxSizer->new(wxHORIZONTAL);
- $self->{sizer}->SetSizeHints($self);
+ #$self->{sizer}->SetSizeHints($self);
$self->SetSizer($self->{sizer});
# left vertical sizer
@@ -89,76 +88,46 @@ sub new {
EVT_CHOICE($parent, $self->{presets_choice}, sub {
$self->on_select_preset;
- $self->_on_presets_changed;
});
EVT_BUTTON($self, $self->{btn_save_preset}, sub { $self->save_preset });
EVT_BUTTON($self, $self->{btn_delete_preset}, sub {
- my $i = $self->current_preset;
- return if $i == 0; # this shouldn't happen but let's trap it anyway
my $res = Wx::MessageDialog->new($self, "Are you sure you want to delete the selected preset?", 'Delete Preset', wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION)->ShowModal;
return unless $res == wxID_YES;
- if (-e $self->{presets}[$i]->file) {
- unlink $self->{presets}[$i]->file;
- }
- splice @{$self->{presets}}, $i, 1;
- $self->{presets_choice}->Delete($i);
+
+ $self->current_preset->delete;
$self->current_preset(undef);
- $self->select_preset(0);
- $self->_on_presets_changed;
+ wxTheApp->load_presets;
+ $self->load_presets;
+ $self->select_preset(0, 1);
});
- # C++ instance DynamicPrintConfig
- $self->{config} = Slic3r::Config->new;
- # Initialize the DynamicPrintConfig by default keys/values.
- # Possible %params keys: no_controller
- $self->build(%params);
+ $self->config(Slic3r::Config->new_from_defaults($self->options));
+
+ $self->build;
$self->update_tree;
+ $self->load_presets;
$self->_update;
- if ($self->hidden_options) {
- $self->{config}->apply(Slic3r::Config->new_from_defaults($self->hidden_options));
- }
return $self;
}
-sub get_current_preset {
- my $self = shift;
- return $self->get_preset($self->current_preset);
-}
-
-sub get_preset {
- my ($self, $i) = @_;
- return $self->{presets}[$i];
-}
-
+# This is called by the save button.
sub save_preset {
- my ($self, $name) = @_;
+ my ($self) = @_;
# since buttons (and choices too) don't get focus on Mac, we set focus manually
# to the treectrl so that the EVT_* events are fired for the input field having
# focus currently. is there anything better than this?
$self->{treectrl}->SetFocus;
- if (!defined $name) {
- my $preset = $self->get_current_preset;
- my $default_name = $preset->default ? 'Untitled' : $preset->name;
- $default_name =~ s/\.ini$//i;
-
- my $dlg = Slic3r::GUI::SavePresetWindow->new($self,
- title => lc($self->title),
- default => $default_name,
- values => [ map $_->name, grep !$_->default && !$_->external, @{$self->{presets}} ],
- );
- return unless $dlg->ShowModal == wxID_OK;
- $name = $dlg->get_name;
- }
-
- $self->config->save(sprintf "$Slic3r::GUI::datadir/%s/%s.ini", $self->name, $name);
+ my $preset = $self->current_preset;
+ $preset->save(undef, $self);
$self->load_presets;
- $self->select_preset_by_name($name);
- $self->_on_presets_changed;
+ $self->select_preset_by_name($preset->name);
+
+ return 1;
}
sub on_value_change {
@@ -166,94 +135,80 @@ sub on_value_change {
$self->{on_value_change} = $cb;
}
-sub on_presets_changed {
- my ($self, $cb) = @_;
- $self->{on_presets_changed} = $cb;
-}
-
# This method is supposed to be called whenever new values are loaded
# or changed by user (so also when a preset is loaded).
# propagate event to the parent
sub _on_value_change {
- my $self = shift;
+ my ($self, $opt_key) = @_;
- $self->{on_value_change}->(@_) if $self->{on_value_change};
+ $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 {}
-sub _on_presets_changed {
- my $self = shift;
-
- $self->{on_presets_changed}->(
- $self->{presets},
- scalar($self->{presets_choice}->GetSelection),
- $self->is_dirty,
- ) if $self->{on_presets_changed};
-}
-
sub on_preset_loaded {}
-sub hidden_options {}
-sub config { $_[0]->{config}->clone }
-
-sub select_default_preset {
- my $self = shift;
- $self->select_preset(0);
-}
sub select_preset {
- my $self = shift;
- $self->{presets_choice}->SetSelection($_[0]);
- $self->on_select_preset;
+ my ($self, $i, $force) = @_;
+
+ $self->{presets_choice}->SetSelection($i);
+ $self->on_select_preset($force);
}
sub select_preset_by_name {
- my ($self, $name) = @_;
+ my ($self, $name, $force) = @_;
- $name = Unicode::Normalize::NFC($name);
- $self->select_preset(first { $self->{presets}[$_]->name eq $name } 0 .. $#{$self->{presets}});
+ my $presets = wxTheApp->presets->{$self->name};
+ my $i = first { $presets->[$_]->name eq $name } 0..$#$presets;
+ $self->{presets_choice}->SetSelection($i);
+ $self->on_select_preset($force);
+}
+
+sub prompt_unsaved_changes {
+ my ($self) = @_;
+
+ return 1 if !$self->current_preset;
+ return $self->current_preset->prompt_unsaved_changes($self);
}
sub on_select_preset {
- my $self = shift;
+ my ($self, $force) = @_;
- if ($self->is_dirty) {
- my $old_preset = $self->get_current_preset;
- my $name = $old_preset->default ? 'Default preset' : "Preset \"" . $old_preset->name . "\"";
-
- my @option_names = ();
- foreach my $opt_key (@{$self->dirty_options}) {
- my $opt = $Slic3r::Config::Options->{$opt_key};
- my $name = $opt->{full_label} // $opt->{label};
- if ($opt->{category}) {
- $name = $opt->{category} . " > $name";
- }
- push @option_names, $name;
- }
-
- my $changes = join "\n", map "- $_", @option_names;
- my $confirm = Wx::MessageDialog->new($self, "$name has unsaved changes:\n$changes\n\nDiscard changes and continue anyway?",
- 'Unsaved Changes', wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION);
- if ($confirm->ShowModal == wxID_NO) {
- $self->{presets_choice}->SetSelection($self->current_preset);
-
- # trigger the on_presets_changed event so that we also restore the previous value
- # in the plater selector
- $self->_on_presets_changed;
- return;
- }
+ # This method is called:
+ # - upon first initialization;
+ # - whenever user selects a preset from the dropdown;
+ # - whenever select_preset() or select_preset_by_name() are called.
+
+ # Get the selected name.
+ 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;
+
+ # If we have unsaved changes, prompt user.
+ if (!$force && !$self->prompt_unsaved_changes) {
+ # User decided not to save the current changes, so we restore the previous selection.
+ my $presets = wxTheApp->presets->{$self->name};
+ my $i = first { $presets->[$_]->name eq $self->current_preset->name } 0..$#$presets;
+ $self->{presets_choice}->SetSelection($i);
+ return;
}
- $self->current_preset($self->{presets_choice}->GetSelection);
- my $preset = $self->get_current_preset;
- my $preset_config = $self->get_preset_config($preset);
+ $self->current_preset($preset);
+
+ # We reload presets in order to remove the "(modified)" suffix in case user was
+ # prompted and chose to discard changes.
+ $self->load_presets;
+
+ $preset->load_config if !$preset->_loaded;
+ $self->config->clear;
+ $self->config->apply($preset->dirty_config);
+
eval {
local $SIG{__WARN__} = Slic3r::GUI::warning_catcher($self);
- foreach my $opt_key (@{$self->{config}->get_keys}) {
- $self->{config}->set($opt_key, $preset_config->get($opt_key))
- if $preset_config->has($opt_key);
- }
($preset->default || $preset->external)
? $self->{btn_delete_preset}->Disable
: $self->{btn_delete_preset}->Enable;
@@ -261,29 +216,11 @@ sub on_select_preset {
$self->_update;
$self->on_preset_loaded;
$self->reload_config;
- $Slic3r::GUI::Settings->{presets}{$self->name} = $preset->file ? basename($preset->file) : '';
};
if ($@) {
$@ = "I was unable to load the selected config file: $@";
Slic3r::GUI::catch_error($self);
- $self->select_default_preset;
}
-
- # use CallAfter because some field triggers schedule on_change calls using CallAfter,
- # and we don't want them to be called after this update_dirty() as they would mark the
- # preset dirty again
- # (not sure this is true anymore now that update_dirty is idempotent)
- wxTheApp->CallAfter(sub {
- $self->_on_presets_changed;
- $self->update_dirty;
- });
-
- wxTheApp->save_settings;
-}
-
-sub init_config_options {
- my ($self, @opt_keys) = @_;
- $self->{config}->apply(Slic3r::Config->new_from_defaults(@opt_keys));
}
sub add_options_page {
@@ -296,7 +233,7 @@ sub add_options_page {
$self->{iconcount}++;
}
- my $page = Slic3r::GUI::Tab::Page->new($self, $title, $self->{iconcount});
+ my $page = Slic3r::GUI::PresetEditor::Page->new($self, $title, $self->{iconcount});
$page->Hide;
$self->{sizer}->Add($page, 1, wxEXPAND | wxLEFT, 5);
push @{$self->{pages}}, $page;
@@ -305,6 +242,7 @@ sub add_options_page {
sub reload_config {
my $self = shift;
+
$_->reload_config for @{$self->{pages}};
}
@@ -333,100 +271,35 @@ sub update_tree {
}
}
-sub update_dirty {
- my $self = shift;
-
- foreach my $i (0..$#{$self->{presets}}) {
- my $preset = $self->get_preset($i);
- if ($i == $self->current_preset && $self->is_dirty) {
- $self->{presets_choice}->SetString($i, $preset->name . " (modified)");
- } else {
- $self->{presets_choice}->SetString($i, $preset->name);
- }
- }
- $self->{presets_choice}->SetSelection($self->current_preset); # http://trac.wxwidgets.org/ticket/13769
- $self->_on_presets_changed;
-}
-
-sub is_dirty {
- my $self = shift;
- return @{$self->dirty_options} > 0;
-}
-
-sub dirty_options {
- my $self = shift;
-
- return [] if !defined $self->current_preset; # happens during initialization
- return $self->get_preset_config($self->get_current_preset)->diff($self->{config});
-}
-
sub load_presets {
my $self = shift;
- $self->{presets} = [
- Slic3r::GUI::Tab::Preset->new(
- default => 1,
- name => '- default -',
- ),
- ];
-
- my %presets = wxTheApp->presets($self->name);
- foreach my $preset_name (sort keys %presets) {
- push @{$self->{presets}}, Slic3r::GUI::Tab::Preset->new(
- name => $preset_name,
- file => $presets{$preset_name},
- );
- }
-
- $self->current_preset(undef);
+ my $presets = wxTheApp->presets->{$self->name};
$self->{presets_choice}->Clear;
- $self->{presets_choice}->Append($_->name) for @{$self->{presets}};
- {
- # load last used preset
- my $i = first { basename($self->{presets}[$_]->file) eq ($Slic3r::GUI::Settings->{presets}{$self->name} || '') } 1 .. $#{$self->{presets}};
- $self->select_preset($i || 0);
+ foreach my $preset (@$presets) {
+ $self->{presets_choice}->Append($preset->dropdown_name);
+
+ # Preserve selection.
+ if ($self->current_preset && $self->current_preset->name eq $preset->name) {
+ $self->{presets_choice}->SetSelection($self->{presets_choice}->GetCount-1);
+ }
}
- $self->_on_presets_changed;
}
-sub load_config_file {
- my $self = shift;
- my ($file) = @_;
-
- # look for the loaded config among the existing menu items
- my $i = first { $self->{presets}[$_]{file} eq $file && $self->{presets}[$_]{external} } 1..$#{$self->{presets}};
- if (!$i) {
- my $preset_name = basename($file); # keep the .ini suffix
- push @{$self->{presets}}, Slic3r::GUI::Tab::Preset->new(
- file => $file,
- name => $preset_name,
- external => 1,
- );
- $self->{presets_choice}->Append($preset_name);
- $i = $#{$self->{presets}};
- }
- $self->{presets_choice}->SetSelection($i);
- $self->on_select_preset;
- $self->_on_presets_changed;
-}
-
-sub load_config {
+# This is called internally whenever we make automatic adjustments to configuration
+# based on user actions.
+sub _load_config {
my $self = shift;
my ($config) = @_;
- foreach my $opt_key (@{$self->{config}->diff($config)}) {
- $self->{config}->set($opt_key, $config->get($opt_key));
- $self->update_dirty;
- }
+ my $diff = $self->config->diff($config);
+ $self->config->set($_, $config->get($_)) for @$diff;
+ # First apply all changes, then call all the _on_value_change triggers.
+ $self->_on_value_change($_) for @$diff;
$self->reload_config;
$self->_update;
}
-sub get_preset_config {
- my ($self, $preset) = @_;
- return $preset->config($self->{config}->get_keys);
-}
-
sub get_field {
my ($self, $opt_key, $opt_index) = @_;
@@ -448,21 +321,92 @@ sub set_value {
return $changed;
}
-package Slic3r::GUI::Tab::Print;
-use base 'Slic3r::GUI::Tab';
+sub _compatible_printers_widget {
+ my ($self) = @_;
+
+ return sub {
+ my ($parent) = @_;
+
+ my $checkbox = $self->{compatible_printers_checkbox} = Wx::CheckBox->new($parent, -1, "All");
+
+ my $btn = $self->{compatible_printers_btn} = Wx::Button->new($parent, -1, "Set…", wxDefaultPosition, wxDefaultSize,
+ wxBU_LEFT | wxBU_EXACTFIT);
+ $btn->SetFont($Slic3r::GUI::small_font);
+ if ($Slic3r::GUI::have_button_icons) {
+ $btn->SetBitmap(Wx::Bitmap->new($Slic3r::var->("printer_empty.png"), wxBITMAP_TYPE_PNG));
+ }
+
+ my $sizer = Wx::BoxSizer->new(wxHORIZONTAL);
+ $sizer->Add($checkbox, 0, wxALIGN_CENTER_VERTICAL);
+ $sizer->Add($btn, 0, wxALIGN_CENTER_VERTICAL);
+
+ EVT_CHECKBOX($self, $checkbox, sub {
+ if ($checkbox->GetValue) {
+ $btn->Disable;
+ } else {
+ $btn->Enable;
+ }
+ });
+
+ EVT_BUTTON($self, $btn, sub {
+ my @presets = map $_->name, grep !$_->default && !$_->external,
+ @{wxTheApp->presets->{printer}};
+
+ my $dlg = Wx::MultiChoiceDialog->new($self,
+ "Select the printers this profile is compatible with.",
+ "Compatible printers", \@presets);
+
+ my @selections = ();
+ foreach my $preset_name (@{ $self->config->get('compatible_printers') }) {
+ push @selections, first { $presets[$_] eq $preset_name } 0..$#presets;
+ }
+ $dlg->SetSelections(@selections);
+
+ if ($dlg->ShowModal == wxID_OK) {
+ my $value = [ @presets[$dlg->GetSelections] ];
+ if (!@$value) {
+ $checkbox->SetValue(1);
+ $btn->Disable;
+ }
+ $self->config->set('compatible_printers', $value);
+ $self->_on_value_change('compatible_printers');
+ }
+ });
+
+ return $sizer;
+ };
+}
+
+sub _reload_compatible_printers_widget {
+ my ($self) = @_;
+
+ if (@{ $self->config->get('compatible_printers') }) {
+ $self->{compatible_printers_checkbox}->SetValue(0);
+ $self->{compatible_printers_btn}->Enable;
+ } else {
+ $self->{compatible_printers_checkbox}->SetValue(1);
+ $self->{compatible_printers_btn}->Disable;
+ }
+}
+
+sub options { die "Unimplemented options()"; }
+sub overridable_options { () }
+sub overriding_options { () }
+
+package Slic3r::GUI::PresetEditor::Print;
+use base 'Slic3r::GUI::PresetEditor';
use List::Util qw(first any);
-use Wx qw(:icon :dialog :id);
+use Wx qw(:icon :dialog :id :misc :button :sizer);
+use Wx::Event qw(EVT_BUTTON EVT_CHECKLISTBOX);
sub name { 'print' }
sub title { 'Print Settings' }
-sub build {
- my $self = shift;
-
- $self->init_config_options(qw(
- adaptive_slicing adaptive_slicing_quality match_horizontal_surfaces
+sub options {
+ return qw(
layer_height first_layer_height
+ adaptive_slicing adaptive_slicing_quality match_horizontal_surfaces
perimeters spiral_vase
top_solid_layers bottom_solid_layers
extra_perimeters avoid_crossing_perimeters thin_walls overhangs
@@ -485,7 +429,7 @@ sub build {
raft_layers
support_material_pattern support_material_spacing support_material_angle
support_material_interface_layers support_material_interface_spacing
- support_material_contact_distance dont_support_bridges
+ support_material_contact_distance support_material_buildplate_only dont_support_bridges
notes
complete_objects extruder_clearance_radius extruder_clearance_height
gcode_comments output_filename_format
@@ -498,9 +442,39 @@ sub build {
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
- ));
- $self->{config}->set('print_settings_id', '');
+ xy_size_compensation resolution overridable compatible_printers
+ print_settings_id
+ )
+}
+
+sub build {
+ my $self = shift;
+
+ my $overridable_widget = sub {
+ my ($parent) = @_;
+
+ my $Options = $Slic3r::Config::Options;
+ my %options = (
+ map { $_ => sprintf('%s > %s', $Options->{$_}{category}, $Options->{$_}{full_label} // $Options->{$_}{label}) }
+ grep { exists $Options->{$_} && $Options->{$_}{category} } $self->options
+ );
+ my @opt_keys = sort { $options{$a} cmp $options{$b} } keys %options;
+ $self->{overridable_opt_keys} = [ @opt_keys ];
+
+ my $listbox = $self->{overridable_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');
+ });
+
+ my $sizer = Wx::BoxSizer->new(wxVERTICAL);
+ $sizer->Add($listbox, 0, wxEXPAND);
+
+ return $sizer;
+ };
{
my $page = $self->add_options_page('Layers and perimeters', 'layers.png');
@@ -608,6 +582,7 @@ sub build {
$optgroup->append_single_option_line('support_material_angle');
$optgroup->append_single_option_line('support_material_interface_layers');
$optgroup->append_single_option_line('support_material_interface_spacing');
+ $optgroup->append_single_option_line('support_material_buildplate_only');
$optgroup->append_single_option_line('dont_support_bridges');
}
}
@@ -647,7 +622,7 @@ sub build {
}
{
- my $page = $self->add_options_page('Multiple Extruders', 'funnel.png');
+ my $page = $self->add_options_page('Multiple extruders', 'funnel.png');
{
my $optgroup = $page->new_optgroup('Extruders');
$optgroup->append_single_option_line('perimeter_extruder');
@@ -668,7 +643,7 @@ sub build {
}
{
- my $page = $self->add_options_page('Advanced', 'wrench.png');
+ my $page = $self->add_options_page('Advanced', 'wand.png');
{
my $optgroup = $page->new_optgroup('Extrusion width',
label_width => 180,
@@ -742,6 +717,45 @@ sub build {
$optgroup->append_single_option_line($option);
}
}
+
+ {
+ my $page = $self->add_options_page('Overrides', 'wrench.png');
+ {
+ my $optgroup = $page->new_optgroup('Profile preferences');
+ {
+ my $line = Slic3r::GUI::OptionsGroup::Line->new(
+ label => 'Compatible printers',
+ widget => $self->_compatible_printers_widget,
+ );
+ $optgroup->append_line($line);
+ }
+ }
+ {
+ my $optgroup = $page->new_optgroup('Overridable settings (they will be displayed in the plater for quick changes)');
+ {
+ my $line = Slic3r::GUI::OptionsGroup::Line->new(
+ widget => $overridable_widget,
+ full_width => 1,
+ );
+ $optgroup->append_line($line);
+ }
+ }
+ }
+}
+
+sub reload_config {
+ my ($self) = @_;
+
+ $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] });
+ }
+ }
+
+ $self->SUPER::reload_config;
}
sub _update {
@@ -764,11 +778,11 @@ sub _update {
$new_conf->set("top_solid_layers", 0);
$new_conf->set("fill_density", 0);
$new_conf->set("support_material", 0);
- $self->load_config($new_conf);
+ $self->_load_config($new_conf);
} else {
my $new_conf = Slic3r::Config->new;
$new_conf->set("spiral_vase", 0);
- $self->load_config($new_conf);
+ $self->_load_config($new_conf);
}
}
@@ -794,7 +808,7 @@ sub _update {
$new_conf->set("support_material", 0);
$self->{support_material_overhangs_queried} = 0;
}
- $self->load_config($new_conf);
+ $self->_load_config($new_conf);
}
}
} else {
@@ -814,7 +828,7 @@ sub _update {
} else {
$new_conf->set("fill_density", 40);
}
- $self->load_config($new_conf);
+ $self->_load_config($new_conf);
}
my $have_perimeters = $config->perimeters > 0;
@@ -895,26 +909,34 @@ sub _update {
for qw(standby_temperature_delta);
}
-sub hidden_options { !$Slic3r::have_threads ? qw(threads) : () }
+package Slic3r::GUI::PresetEditor::Filament;
+use base 'Slic3r::GUI::PresetEditor';
-package Slic3r::GUI::Tab::Filament;
-use base 'Slic3r::GUI::Tab';
+use Wx qw(wxTheApp);
sub name { 'filament' }
sub title { 'Filament Settings' }
-sub build {
- my $self = shift;
-
- $self->init_config_options(qw(
+sub options {
+ return qw(
filament_colour filament_diameter filament_notes filament_max_volumetric_speed extrusion_multiplier filament_density filament_cost
temperature first_layer_temperature bed_temperature first_layer_bed_temperature
- fan_always_on cooling
+ fan_always_on cooling compatible_printers
min_fan_speed max_fan_speed bridge_fan_speed disable_fan_first_layers
fan_below_layer_time slowdown_below_layer_time min_print_speed
start_filament_gcode end_filament_gcode
- ));
- $self->{config}->set('filament_settings_id', '');
+ filament_settings_id
+ );
+}
+
+sub overriding_options {
+ return (
+ Slic3r::GUI::PresetEditor::Printer->overridable_options,
+ );
+}
+
+sub build {
+ my $self = shift;
{
my $page = $self->add_options_page('Filament', 'spool.png');
@@ -993,27 +1015,6 @@ sub build {
$optgroup->append_single_option_line('min_print_speed');
}
}
-
- {
- my $page = $self->add_options_page('Advanced', 'wrench.png');
- {
- my $optgroup = $page->new_optgroup('Print speed override');
- $optgroup->append_single_option_line('filament_max_volumetric_speed', 0);
- }
- }
-
- {
- my $page = $self->add_options_page('Notes', 'note.png');
- {
- my $optgroup = $page->new_optgroup('Notes',
- label_width => 0,
- );
- my $option = $optgroup->get_option('filament_notes', 0);
- $option->full_width(1);
- $option->height(250);
- $optgroup->append_single_option_line($option);
- }
- }
{
my $page = $self->add_options_page('Custom G-code', 'script.png');
{
@@ -1035,6 +1036,87 @@ sub build {
$optgroup->append_single_option_line($option);
}
}
+
+ {
+ my $page = $self->add_options_page('Notes', 'note.png');
+ {
+ my $optgroup = $page->new_optgroup('Notes',
+ label_width => 0,
+ );
+ my $option = $optgroup->get_option('filament_notes', 0);
+ $option->full_width(1);
+ $option->height(250);
+ $optgroup->append_single_option_line($option);
+ }
+ }
+
+ {
+ my $page = $self->add_options_page('Overrides', 'wrench.png');
+ {
+ my $optgroup = $page->new_optgroup('Profile preferences');
+ my $line = Slic3r::GUI::OptionsGroup::Line->new(
+ label => 'Compatible printers',
+ widget => $self->_compatible_printers_widget,
+ );
+ $optgroup->append_line($line);
+ }
+ {
+ my $optgroup = $page->new_optgroup('Overrides');
+ $optgroup->append_single_option_line('filament_max_volumetric_speed', 0);
+
+ # Populate the overrides config.
+ my @overridable = $self->overriding_options;
+ $self->{overrides_config} = Slic3r::Config->new;
+
+ # Populate the defaults with the current preset.
+ $self->{overrides_default_config} = Slic3r::Config->new;
+ $self->{overrides_default_config}->apply_only
+ (wxTheApp->{mainframe}->{plater}->config, \@overridable);
+
+ my $line = Slic3r::GUI::OptionsGroup::Line->new(
+ label => '',
+ full_width => 1,
+ widget => sub {
+ my ($parent) = @_;
+
+ $self->{overrides_panel} = my $panel = Slic3r::GUI::Plater::OverrideSettingsPanel->new($parent,
+ size => [-1, 300],
+ on_change => sub {
+ my ($opt_key) = @_;
+ $self->config->erase($_) for @overridable;
+ $self->current_preset->_dirty_config->erase($_) for @overridable;
+ $self->config->apply($self->{overrides_config});
+ $self->_on_value_change($opt_key);
+ });
+ $panel->set_editable(1);
+ $panel->set_default_config($self->{overrides_default_config});
+ $panel->set_config($self->{overrides_config});
+ $panel->set_opt_keys([@overridable]);
+
+ return $panel;
+ },
+ );
+ $optgroup->append_line($line);
+ }
+ }
+}
+
+sub reload_config {
+ my ($self) = @_;
+
+ $self->_reload_compatible_printers_widget;
+
+ {
+ $self->{overrides_config}->clear;
+ foreach my $opt_key (@{$self->{overrides_default_config}->get_keys}) {
+ if ($self->config->has($opt_key)) {
+ $self->{overrides_config}->set($opt_key, $self->config->get($opt_key));
+ }
+ }
+ $self->{overrides_panel}->update_optgroup;
+ }
+
+ $self->SUPER::reload_config;
}
sub _update {
@@ -1078,19 +1160,16 @@ sub _update_description {
$self->{description_line}->SetText($msg);
}
-package Slic3r::GUI::Tab::Printer;
-use base 'Slic3r::GUI::Tab';
+package Slic3r::GUI::PresetEditor::Printer;
+use base 'Slic3r::GUI::PresetEditor';
use Wx qw(wxTheApp :sizer :button :bitmap :misc :id :icon :dialog);
use Wx::Event qw(EVT_BUTTON);
sub name { 'printer' }
sub title { 'Printer Settings' }
-sub build {
- my $self = shift;
- my (%params) = @_;
-
- $self->init_config_options(qw(
+sub options {
+ return qw(
bed_shape z_offset z_steps_per_mm has_heatbed
gcode_flavor use_relative_e_distances
serial_port serial_speed
@@ -1100,9 +1179,21 @@ sub build {
start_gcode end_gcode before_layer_gcode layer_gcode toolchange_gcode
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
- ));
- $self->{config}->set('printer_settings_id', '');
+ retract_length_toolchange retract_restart_extra_toolchange retract_lift_above retract_lift_below
+ printer_settings_id
+ );
+}
+
+sub overridable_options {
+ return qw(
+ pressure_advance
+ retract_length retract_lift retract_speed retract_restart_extra
+ retract_before_travel retract_layer_change wipe
+ );
+}
+
+sub build {
+ my $self = shift;
$self->{extruders_count} = 1;
@@ -1115,12 +1206,11 @@ sub build {
label => 'Bed shape',
);
$line->append_button("Set…", "cog.png", sub {
- my $dlg = Slic3r::GUI::BedShapeDialog->new($self, $self->{config}->bed_shape);
+ my $dlg = Slic3r::GUI::BedShapeDialog->new($self, $self->config->bed_shape);
if ($dlg->ShowModal == wxID_OK) {
my $value = $dlg->GetValue;
- $self->{config}->set('bed_shape', $value);
- $self->update_dirty;
- $self->_on_value_change('bed_shape', $value);
+ $self->config->set('bed_shape', $value);
+ $self->_on_value_change('bed_shape');
}
});
$optgroup->append_line($line);
@@ -1147,12 +1237,10 @@ sub build {
wxTheApp->CallAfter(sub {
$self->_extruders_count_changed($optgroup->get_value('extruders_count'));
});
- $self->update_dirty;
}
});
}
- if (!$params{no_controller})
- {
+ unless ($Slic3r::GUI::Settings->{_}{no_controller}) {
my $optgroup = $page->new_optgroup('USB/Serial connection');
my $line = Slic3r::GUI::OptionsGroup::Line->new(
label => 'Serial port',
@@ -1174,8 +1262,8 @@ sub build {
$line->append_button("Test", "wrench.png", sub {
my $sender = Slic3r::GCode::Sender->new;
my $res = $sender->connect(
- $self->{config}->serial_port,
- $self->{config}->serial_speed,
+ $self->config->serial_port,
+ $self->config->serial_speed,
);
if ($res && $sender->wait_connected) {
Slic3r::GUI::show_info($self, "Connection to printer works correctly.", "Success!");
@@ -1201,10 +1289,8 @@ 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->update_dirty;
- $self->_on_value_change('octoprint_host', $value);
- $self->reload_config;
+ $self->config->set('octoprint_host', $value);
+ $self->_on_value_change('octoprint_host');
}
} else {
Wx::MessageDialog->new($self, 'No Bonjour device found', 'Device Browser', wxOK | wxICON_INFORMATION)->ShowModal;
@@ -1215,8 +1301,8 @@ sub build {
$ua->timeout(10);
my $res = $ua->get(
- "http://" . $self->{config}->octoprint_host . "/api/version",
- 'X-Api-Key' => $self->{config}->octoprint_apikey,
+ "http://" . $self->config->octoprint_host . "/api/version",
+ 'X-Api-Key' => $self->config->octoprint_apikey,
);
if ($res->is_success) {
Slic3r::GUI::show_info($self, "Connection to OctoPrint works correctly.", "Success!");
@@ -1294,7 +1380,7 @@ sub build {
$self->{extruder_pages} = [];
$self->_build_extruder_pages;
- $self->_update_serial_ports if (!$params{no_controller});
+ $self->_update_serial_ports unless $Slic3r::GUI::Settings->{_}{no_controller};
}
sub _update_serial_ports {
@@ -1308,7 +1394,7 @@ sub _extruders_count_changed {
$self->{extruders_count} = $extruders_count;
$self->_build_extruder_pages;
- $self->_on_value_change('extruders_count', $extruders_count);
+ $self->_on_value_change('extruders_count');
$self->_update;
}
@@ -1323,7 +1409,7 @@ sub _build_extruder_pages {
foreach my $extruder_idx (@{$self->{extruder_pages}} .. $self->{extruders_count}-1) {
# extend options
foreach my $opt_key ($self->_extruder_options) {
- my $values = $self->{config}->get($opt_key);
+ my $values = $self->config->get($opt_key);
if (!defined $values) {
$values = [ $default_config->get_at($opt_key, 0) ];
} else {
@@ -1331,7 +1417,7 @@ sub _build_extruder_pages {
my $last_value = $values->[-1];
$values->[$extruder_idx] //= $last_value;
}
- $self->{config}->set($opt_key, $values)
+ $self->config->set($opt_key, $values)
or die "Unable to extend $opt_key";
}
@@ -1344,7 +1430,7 @@ sub _build_extruder_pages {
{
my $optgroup = $page->new_optgroup('Limits');
$optgroup->append_single_option_line($_, $extruder_idx)
- for qw(min_layer_height max_layer_height);
+ for qw(min_layer_height max_layer_height);
}
{
my $optgroup = $page->new_optgroup('Position (for multi-extruder printers)');
@@ -1382,9 +1468,9 @@ sub _build_extruder_pages {
# remove extra config values
foreach my $opt_key ($self->_extruder_options) {
- my $values = $self->{config}->get($opt_key);
+ my $values = $self->config->get($opt_key);
splice @$values, $self->{extruders_count} if $self->{extruders_count} <= $#$values;
- $self->{config}->set($opt_key, $values)
+ $self->config->set($opt_key, $values)
or die "Unable to truncate $opt_key";
}
@@ -1461,7 +1547,7 @@ sub _update {
} else {
$new_conf->set("use_firmware_retraction", 0);
}
- $self->load_config($new_conf);
+ $self->_load_config($new_conf);
}
$self->get_field('retract_length_toolchange', $i)->toggle($have_multiple_extruders);
@@ -1479,7 +1565,7 @@ sub on_preset_loaded {
# update the extruders count field
{
# update the GUI field according to the number of nozzle diameters supplied
- my $extruders_count = scalar @{ $self->{config}->nozzle_diameter };
+ my $extruders_count = scalar @{ $self->config->nozzle_diameter };
$self->set_value('extruders_count', $extruders_count);
$self->_extruders_count_changed($extruders_count);
}
@@ -1493,10 +1579,10 @@ sub load_config_file {
"Your configuration was imported. However, Slic3r is currently only able to import settings "
. "for the first defined filament. We recommend you don't use exported configuration files "
. "for multi-extruder setups and rely on the built-in preset management system instead.")
- if @{ $self->{config}->nozzle_diameter } > 1;
+ if @{ $self->config->nozzle_diameter } > 1;
}
-package Slic3r::GUI::Tab::Page;
+package Slic3r::GUI::PresetEditor::Page;
use Wx qw(wxTheApp :misc :panel :sizer);
use base 'Wx::ScrolledWindow';
@@ -1527,8 +1613,7 @@ sub new_optgroup {
on_change => sub {
my ($opt_key, $value) = @_;
wxTheApp->CallAfter(sub {
- $self->GetParent->update_dirty;
- $self->GetParent->_on_value_change($opt_key, $value);
+ $self->GetParent->_on_value_change($opt_key);
});
},
);
@@ -1577,7 +1662,7 @@ sub new {
my @values = @{$params{values}};
- my $text = Wx::StaticText->new($self, -1, "Save " . lc($params{title}) . " as:", wxDefaultPosition, wxDefaultSize);
+ my $text = Wx::StaticText->new($self, -1, "Save profile as:", wxDefaultPosition, wxDefaultSize);
$self->{combo} = Wx::ComboBox->new($self, -1, $params{default}, wxDefaultPosition, wxDefaultSize, \@values,
wxTE_PROCESS_ENTER);
my $buttons = $self->CreateStdDialogButtonSizer(wxOK | wxCANCEL);
@@ -1615,33 +1700,4 @@ sub get_name {
return $self->{chosen_name};
}
-package Slic3r::GUI::Tab::Preset;
-use Moo;
-
-has 'default' => (is => 'ro', default => sub { 0 });
-has 'external' => (is => 'ro', default => sub { 0 });
-has 'name' => (is => 'rw', required => 1);
-has 'file' => (is => 'rw');
-
-sub config {
- my ($self, $keys) = @_;
-
- if ($self->default) {
- return Slic3r::Config->new_from_defaults(@$keys);
- } else {
- if (!-e Slic3r::encode_path($self->file)) {
- Slic3r::GUI::show_error(undef, "The selected preset does not exist anymore (" . $self->file . ").");
- return undef;
- }
-
- # apply preset values on top of defaults
- my $config = Slic3r::Config->new_from_defaults(@$keys);
- my $external_config = Slic3r::Config->load($self->file);
- $config->set($_, $external_config->get($_))
- for grep $external_config->has($_), @$keys;
-
- return $config;
- }
-}
-
1;
diff --git a/lib/Slic3r/GUI/PresetEditorDialog.pm b/lib/Slic3r/GUI/PresetEditorDialog.pm
new file mode 100644
index 000000000..6385844c5
--- /dev/null
+++ b/lib/Slic3r/GUI/PresetEditorDialog.pm
@@ -0,0 +1,73 @@
+package Slic3r::GUI::PresetEditorDialog;
+use strict;
+use warnings;
+use Wx qw(:dialog :id :misc :sizer :button :icon wxTheApp WXK_ESCAPE);
+use Wx::Event qw(EVT_CLOSE EVT_CHAR_HOOK);
+use base qw(Wx::Dialog Class::Accessor);
+use utf8;
+
+__PACKAGE__->mk_accessors(qw(preset_editor));
+
+sub new {
+ my ($class, $parent) = @_;
+ my $self = $class->SUPER::new($parent, -1, "Settings", wxDefaultPosition, [900,500],
+ wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxDIALOG_EX_METAL);
+
+ $self->preset_editor($self->preset_editor_class->new($self));
+ $self->SetTitle($self->preset_editor->title);
+
+ my $sizer = Wx::BoxSizer->new(wxVERTICAL);
+ $sizer->Add($self->preset_editor, 1, wxEXPAND);
+
+ $self->SetSizer($sizer);
+ #$sizer->SetSizeHints($self);
+
+ if (0) {
+ my $buttons = $self->CreateStdDialogButtonSizer(wxCLOSE);
+ $sizer->Add($buttons, 0, wxEXPAND | wxBOTTOM | wxLEFT | wxRIGHT, 10);
+ }
+
+ wxTheApp->restore_window_pos($self, "preset_editor");
+
+ EVT_CLOSE($self, sub {
+ my (undef, $event) = @_;
+
+ # save window size
+ wxTheApp->save_window_pos($self, "preset_editor");
+
+ # propagate event
+ $event->Skip;
+ });
+
+ EVT_CHAR_HOOK($self, sub {
+ my (undef, $event) = @_;
+
+ if ($event->GetKeyCode == WXK_ESCAPE) {
+ $self->Close;
+ } else {
+ $event->Skip;
+ }
+ });
+
+ return $self;
+}
+
+
+package Slic3r::GUI::PresetEditorDialog::Printer;
+use base qw(Slic3r::GUI::PresetEditorDialog);
+
+sub preset_editor_class { "Slic3r::GUI::PresetEditor::Printer" }
+
+
+package Slic3r::GUI::PresetEditorDialog::Filament;
+use base qw(Slic3r::GUI::PresetEditorDialog);
+
+sub preset_editor_class { "Slic3r::GUI::PresetEditor::Filament" }
+
+
+package Slic3r::GUI::PresetEditorDialog::Print;
+use base qw(Slic3r::GUI::PresetEditorDialog);
+
+sub preset_editor_class { "Slic3r::GUI::PresetEditor::Print" }
+
+1;
diff --git a/lib/Slic3r/GUI/Projector.pm b/lib/Slic3r/GUI/Projector.pm
index 9023cb0c7..c41b7e8ad 100644
--- a/lib/Slic3r/GUI/Projector.pm
+++ b/lib/Slic3r/GUI/Projector.pm
@@ -44,7 +44,7 @@ sub new {
$self->config(Slic3r::Config->new_from_defaults(
qw(serial_port serial_speed bed_shape start_gcode end_gcode z_offset)
));
- $self->config->apply(wxTheApp->{mainframe}->config);
+ $self->config->apply(wxTheApp->{mainframe}->{plater}->config);
my @optgroups = ();
{
@@ -520,9 +520,6 @@ sub _close {
}
wxTheApp->{mainframe}->Show;
- my $printer_tab = wxTheApp->{mainframe}{options_tabs}{printer};
- $printer_tab->load_config($self->config);
-
$self->EndModal(wxID_OK);
}
@@ -555,7 +552,7 @@ sub BUILD {
# init print
{
my $print = Slic3r::SLAPrint->new(wxTheApp->{mainframe}->{plater}->{model});
- $print->apply_config(wxTheApp->{mainframe}->config);
+ $print->apply_config(wxTheApp->{mainframe}->{plater}->config);
$self->_print($print);
$self->screen->print($print);
diff --git a/lib/Slic3r/GUI/SLAPrintOptions.pm b/lib/Slic3r/GUI/SLAPrintOptions.pm
index 7b3348823..042ddc288 100644
--- a/lib/Slic3r/GUI/SLAPrintOptions.pm
+++ b/lib/Slic3r/GUI/SLAPrintOptions.pm
@@ -10,7 +10,7 @@ sub new {
my $self = $class->SUPER::new($parent, -1, "SLA/DLP Print", wxDefaultPosition, wxDefaultSize);
$self->config(Slic3r::Config::SLAPrint->new);
- $self->config->apply_dynamic(wxTheApp->{mainframe}->config);
+ $self->config->apply_dynamic(wxTheApp->{mainframe}->{plater}->config);
my $sizer = Wx::BoxSizer->new(wxVERTICAL);
my $new_optgroup = sub {
@@ -103,8 +103,6 @@ sub _accept {
return;
}
- wxTheApp->{mainframe}->load_config($self->config->dynamic);
-
$self->EndModal(wxID_OK);
$self->Close; # needed on Linux
@@ -113,6 +111,9 @@ sub _accept {
# this double invocation is needed for properly hiding the MainFrame
$projector->Show;
$projector->ShowModal;
+
+ # TODO: diff the new config with the selected presets and prompt the user for
+ # applying the changes to them.
}
1;
diff --git a/lib/Slic3r/GUI/SimpleTab.pm b/lib/Slic3r/GUI/SimpleTab.pm
deleted file mode 100644
index 6e7d00d09..000000000
--- a/lib/Slic3r/GUI/SimpleTab.pm
+++ /dev/null
@@ -1,351 +0,0 @@
-# The "Simple" Print Settings tab.
-# The "Simple" mode is enabled by File->Preferences dialog.
-
-package Slic3r::GUI::SimpleTab;
-use strict;
-use warnings;
-use utf8;
-
-use File::Basename qw(basename);
-use List::Util qw(first);
-use Wx qw(:bookctrl :dialog :keycode :icon :id :misc :panel :sizer :window :systemsettings);
-use Wx::Event qw(EVT_BUTTON EVT_CHOICE EVT_KEY_DOWN);
-use base 'Wx::ScrolledWindow';
-
-sub new {
- my $class = shift;
- my ($parent, %params) = @_;
- my $self = $class->SUPER::new($parent, -1, wxDefaultPosition, wxDefaultSize, wxBK_LEFT | wxTAB_TRAVERSAL);
-
- $self->SetScrollbars(1, 1, 1, 1);
-
- $self->{config} = Slic3r::Config->new;
- $self->{optgroups} = [];
-
- $self->{vsizer} = Wx::BoxSizer->new(wxVERTICAL);
- $self->SetSizer($self->{vsizer});
- $self->build;
- $self->_update;
-
- {
- my $label = Wx::StaticText->new($self, -1, "Want more options? Switch to the Expert Mode.", wxDefaultPosition, wxDefaultSize);
- $label->SetFont(Wx::SystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
- $self->{vsizer}->Add($label, 0, wxEXPAND | wxALL, 10);
- }
-
- return $self;
-}
-
-sub init_config_options {
- my ($self, @opt_keys) = @_;
- $self->{config}->apply(Slic3r::Config->new_from_defaults(@opt_keys));
-}
-
-sub new_optgroup {
- my ($self, $title, %params) = @_;
-
- my $optgroup = Slic3r::GUI::ConfigOptionsGroup->new(
- parent => $self,
- title => $title,
- config => $self->{config},
- label_width => $params{label_width} // 200,
- on_change => sub { $self->_on_value_change(@_) },
- );
-
- push @{$self->{optgroups}}, $optgroup;
- $self->{vsizer}->Add($optgroup->sizer, 0, wxEXPAND | wxALL, 10);
-
- return $optgroup;
-}
-
-sub load_config_file {
- my $self = shift;
- my ($file) = @_;
-
- my $config = Slic3r::Config->load($file);
- $self->load_config($config);
-}
-
-sub load_config {
- my $self = shift;
- my ($config) = @_;
-
- foreach my $opt_key (@{$self->{config}->get_keys}) {
- next unless $config->has($opt_key);
- $self->{config}->set($opt_key, $config->get($opt_key));
- }
- $_->reload_config for @{$self->{optgroups}};
- $self->_update;
-}
-
-sub load_presets {}
-
-sub is_dirty { 0 }
-sub config { $_[0]->{config}->clone }
-sub _update {}
-
-sub on_value_change {
- my ($self, $cb) = @_;
- $self->{on_value_change} = $cb;
-}
-
-sub on_presets_changed {}
-
-# propagate event to the parent
-sub _on_value_change {
- my $self = shift;
-
- $self->{on_value_change}->(@_) if $self->{on_value_change};
- $self->_update;
-}
-
-sub get_field {
- my ($self, $opt_key, $opt_index) = @_;
-
- foreach my $optgroup (@{ $self->{optgroups} }) {
- my $field = $optgroup->get_fieldc($opt_key, $opt_index);
- return $field if defined $field;
- }
- return undef;
-}
-
-package Slic3r::GUI::SimpleTab::Print;
-use base 'Slic3r::GUI::SimpleTab';
-
-use Wx qw(:sizer);
-
-sub name { 'print' }
-sub title { 'Print Settings' }
-
-sub build {
- my $self = shift;
-
- $self->init_config_options(qw(
- layer_height perimeters top_solid_layers bottom_solid_layers
- fill_density fill_pattern top_infill_pattern bottom_infill_pattern
- support_material support_material_spacing raft_layers
- support_material_contact_distance dont_support_bridges
- perimeter_speed infill_speed travel_speed
- brim_width
- xy_size_compensation
- ));
-
- {
- my $optgroup = $self->new_optgroup('General');
- $optgroup->append_single_option_line('layer_height');
- $optgroup->append_single_option_line('perimeters');
-
- my $line = Slic3r::GUI::OptionsGroup::Line->new(
- label => 'Solid layers',
- );
- $line->append_option($optgroup->get_option('top_solid_layers'));
- $line->append_option($optgroup->get_option('bottom_solid_layers'));
- $optgroup->append_line($line);
- }
-
- {
- my $optgroup = $self->new_optgroup('Infill');
- $optgroup->append_single_option_line('fill_density');
- $optgroup->append_single_option_line('fill_pattern');
- $optgroup->append_single_option_line('top_infill_pattern');
- $optgroup->append_single_option_line('bottom_infill_pattern');
- }
-
- {
- my $optgroup = $self->new_optgroup('Support material');
- $optgroup->append_single_option_line('support_material');
- $optgroup->append_single_option_line('support_material_spacing');
- $optgroup->append_single_option_line('support_material_contact_distance');
- $optgroup->append_single_option_line('dont_support_bridges');
- $optgroup->append_single_option_line('raft_layers');
- }
-
- {
- my $optgroup = $self->new_optgroup('Speed');
- $optgroup->append_single_option_line('perimeter_speed');
- $optgroup->append_single_option_line('infill_speed');
- $optgroup->append_single_option_line('travel_speed');
- }
-
- {
- my $optgroup = $self->new_optgroup('Brim');
- $optgroup->append_single_option_line('brim_width');
- }
-
- {
- my $optgroup = $self->new_optgroup('Other');
- $optgroup->append_single_option_line('xy_size_compensation');
- }
-}
-
-sub _update {
- my ($self) = @_;
-
- my $config = $self->{config};
-
- my $have_perimeters = $config->perimeters > 0;
- $self->get_field($_)->toggle($have_perimeters)
- for qw(perimeter_speed);
-
- my $have_infill = $config->fill_density > 0;
- my $have_solid_infill = $config->top_solid_layers > 0 || $config->bottom_solid_layers > 0;
- $self->get_field($_)->toggle($have_infill)
- for qw(fill_pattern);
- $self->get_field($_)->toggle($have_solid_infill)
- for qw(top_infill_pattern bottom_infill_pattern);
- $self->get_field($_)->toggle($have_infill || $have_solid_infill)
- for qw(infill_speed);
-
- my $have_support_material = $config->support_material || $config->raft_layers > 0;
- $self->get_field($_)->toggle($have_support_material)
- for qw(support_material_spacing dont_support_bridges
- support_material_contact_distance);
-}
-
-package Slic3r::GUI::SimpleTab::Filament;
-use base 'Slic3r::GUI::SimpleTab';
-
-sub name { 'filament' }
-sub title { 'Filament Settings' }
-
-sub build {
- my $self = shift;
-
- $self->init_config_options(qw(
- filament_diameter extrusion_multiplier
- temperature first_layer_temperature bed_temperature first_layer_bed_temperature
- ));
-
- {
- my $optgroup = $self->new_optgroup('Filament');
- $optgroup->append_single_option_line('filament_diameter', 0);
- $optgroup->append_single_option_line('extrusion_multiplier', 0);
- }
-
- {
- my $optgroup = $self->new_optgroup('Temperature (°C)');
-
- {
- my $line = Slic3r::GUI::OptionsGroup::Line->new(
- label => 'Extruder',
- );
- $line->append_option($optgroup->get_option('first_layer_temperature', 0));
- $line->append_option($optgroup->get_option('temperature', 0));
- $optgroup->append_line($line);
- }
-
- {
- my $line = Slic3r::GUI::OptionsGroup::Line->new(
- label => 'Bed',
- );
- $line->append_option($optgroup->get_option('first_layer_bed_temperature'));
- $line->append_option($optgroup->get_option('bed_temperature'));
- $optgroup->append_line($line);
- }
- }
-}
-
-package Slic3r::GUI::SimpleTab::Printer;
-use base 'Slic3r::GUI::SimpleTab';
-use Wx qw(:sizer :button :bitmap :misc :id);
-use Wx::Event qw(EVT_BUTTON);
-
-sub name { 'printer' }
-sub title { 'Printer Settings' }
-
-sub build {
- my $self = shift;
-
- $self->init_config_options(qw(
- bed_shape
- z_offset
- gcode_flavor
- nozzle_diameter
- retract_length retract_lift wipe
- start_gcode
- end_gcode
- ));
-
- {
- my $bed_shape_widget = sub {
- my ($parent) = @_;
-
- my $btn = Wx::Button->new($parent, -1, "Set…", wxDefaultPosition, wxDefaultSize, wxBU_LEFT);
- $btn->SetFont($Slic3r::GUI::small_font);
- if ($Slic3r::GUI::have_button_icons) {
- $btn->SetBitmap(Wx::Bitmap->new($Slic3r::var->("cog.png"), wxBITMAP_TYPE_PNG));
- }
-
- my $sizer = Wx::BoxSizer->new(wxHORIZONTAL);
- $sizer->Add($btn);
-
- EVT_BUTTON($self, $btn, sub {
- my $dlg = Slic3r::GUI::BedShapeDialog->new($self, $self->{config}->bed_shape);
- if ($dlg->ShowModal == wxID_OK) {
- my $value = $dlg->GetValue;
- $self->{config}->set('bed_shape', $value);
- $self->_on_value_change('bed_shape', $value);
- }
- });
-
- return $sizer;
- };
-
- my $optgroup = $self->new_optgroup('Size and coordinates');
- my $line = Slic3r::GUI::OptionsGroup::Line->new(
- label => 'Bed shape',
- widget => $bed_shape_widget,
- );
- $optgroup->append_line($line);
- $optgroup->append_single_option_line('z_offset');
- }
-
- {
- my $optgroup = $self->new_optgroup('Firmware');
- $optgroup->append_single_option_line('gcode_flavor');
- }
-
- {
- my $optgroup = $self->new_optgroup('Extruder');
- $optgroup->append_single_option_line('nozzle_diameter', 0);
- }
-
- {
- my $optgroup = $self->new_optgroup('Retraction');
- $optgroup->append_single_option_line('retract_length', 0);
- $optgroup->append_single_option_line('retract_lift', 0);
- $optgroup->append_single_option_line('wipe', 0);
- }
-
- {
- my $optgroup = $self->new_optgroup('Start G-code',
- label_width => 0,
- );
- my $option = $optgroup->get_option('start_gcode');
- $option->full_width(1);
- $option->height(150);
- $optgroup->append_single_option_line($option);
- }
-
- {
- my $optgroup = $self->new_optgroup('End G-code',
- label_width => 0,
- );
- my $option = $optgroup->get_option('end_gcode');
- $option->full_width(1);
- $option->height(150);
- $optgroup->append_single_option_line($option);
- }
-}
-
-sub _update {
- my ($self) = @_;
-
- my $config = $self->{config};
-
- my $have_retraction = $config->retract_length->[0] > 0;
- $self->get_field($_, 0)->toggle($have_retraction)
- for qw(retract_lift wipe);
-}
-
-1;
diff --git a/lib/Slic3r/Print/Object.pm b/lib/Slic3r/Print/Object.pm
index 0df6f094a..38698e47a 100644
--- a/lib/Slic3r/Print/Object.pm
+++ b/lib/Slic3r/Print/Object.pm
@@ -125,28 +125,44 @@ sub slice {
sub make_perimeters {
my ($self) = @_;
+ return if $self->step_done(STEP_PERIMETERS);
+
+ # Temporary workaround for detect_surfaces_type() not being idempotent (see #3764).
+ # We can remove this when idempotence is restored. This make_perimeters() method
+ # will just call merge_slices() to undo the typed slices and invalidate posDetectSurfaces.
+ if ($self->typed_slices) {
+ $self->invalidate_step(STEP_SLICE);
+ }
+
# prerequisites
$self->slice;
$self->_make_perimeters;
}
+# This will assign a type (top/bottom/internal) to $layerm->slices
+# and transform $layerm->fill_surfaces from expolygon
+# to typed top/bottom/internal surfaces;
+sub detect_surfaces_type {
+ my ($self) = @_;
+
+ # prerequisites
+ $self->slice;
+
+ $self->_detect_surfaces_type;
+}
+
sub prepare_infill {
my ($self) = @_;
# prerequisites
- $self->make_perimeters;
+ $self->make_perimeters; # do we need them? TODO: check
+ $self->detect_surfaces_type;
return if $self->step_done(STEP_PREPARE_INFILL);
$self->set_step_started(STEP_PREPARE_INFILL);
$self->print->status_cb->(30, "Preparing infill");
- # this will assign a type (top/bottom/internal) to $layerm->slices
- # and transform $layerm->fill_surfaces from expolygon
- # to typed top/bottom/internal surfaces;
- $self->detect_surfaces_type;
- $self->set_typed_slices(1);
-
# decide what surfaces are to be filled
$_->prepare_fill_surfaces for map @{$_->regions}, @{$self->layers};
diff --git a/lib/Slic3r/Print/SupportMaterial.pm b/lib/Slic3r/Print/SupportMaterial.pm
index 02b2e5375..4314e4fa6 100644
--- a/lib/Slic3r/Print/SupportMaterial.pm
+++ b/lib/Slic3r/Print/SupportMaterial.pm
@@ -1,3 +1,5 @@
+# Instantiated by Slic3r::Print::Object->_support_material()
+# only generate() and contact_distance() are called from the outside of this module.
package Slic3r::Print::SupportMaterial;
use Moo;
@@ -25,6 +27,7 @@ use constant PILLAR_SIZE => 2.5;
use constant PILLAR_SPACING => 10;
sub generate {
+ # $object is Slic3r::Print::Object
my ($self, $object) = @_;
# Determine the top surfaces of the support, defined as:
@@ -38,7 +41,7 @@ sub generate {
# the layer heights of support material and to clip support to the object
# silhouette.
my ($top) = $self->object_top($object, $contact);
-
+
# We now know the upper and lower boundaries for our support material object
# (@$contact_z and @$top_z), so we can generate intermediate layers.
my $support_z = $self->support_layers_z(
@@ -88,6 +91,7 @@ sub generate {
}
sub contact_area {
+ # $object is Slic3r::Print::Object
my ($self, $object) = @_;
# if user specified a custom angle threshold, convert it to radians
@@ -97,6 +101,12 @@ sub contact_area {
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_top_surfaces = [];
+
# determine contact areas
my %contact = (); # contact_z => [ polygons ]
my %overhang = (); # contact_z => [ polygons ] - this stores the actual overhang supported by each contact layer
@@ -113,7 +123,22 @@ sub contact_area {
last if $layer_id > 0;
}
my $layer = $object->get_layer($layer_id);
-
+
+ if ($buildplate_only) {
+ # Collect the top surfaces up to this layer and merge them.
+ my $projection_new = [];
+ push @$projection_new, ( map $_->p, map @{$_->slices->filter_by_type(S_TYPE_TOP)}, @{$layer->regions} );
+ if (@$projection_new) {
+ # Merge the new top surfaces with the preceding top surfaces.
+ # Apply the safety offset to the newly added polygons, so they will connect
+ # with the polygons collected before,
+ # but don't apply the safety offset during the union operation as it would
+ # inflate the polygons over and over.
+ push @$buildplate_only_top_surfaces, @{ offset($projection_new, scale(0.01)) };
+ $buildplate_only_top_surfaces = union($buildplate_only_top_surfaces, 0);
+ }
+ }
+
# detect overhangs and contact areas needed to support them
my (@overhang, @contact) = ();
if ($layer_id == 0) {
@@ -239,8 +264,14 @@ sub contact_area {
1,
);
}
+ } # if ($self->object_config->dont_support_bridges)
+
+ if ($buildplate_only) {
+ # Don't support overhangs above the top surfaces.
+ # This step is done before the contact surface is calcuated by growing the overhang region.
+ $diff = diff($diff, $buildplate_only_top_surfaces);
}
-
+
next if !@$diff;
push @overhang, @$diff; # NOTE: this is not the full overhang as it misses the outermost half of the perimeter width!
@@ -249,11 +280,16 @@ sub contact_area {
# We increment the area in steps because we don't want our support to overflow
# on the other side of the object (if it's very thin).
{
- my @slices_margin = @{offset([ map @$_, @{$lower_layer->slices} ], +$fw/2)};
+ my $slices_margin = offset([ map @$_, @{$lower_layer->slices} ], +$fw/2);
+ if ($buildplate_only) {
+ # Trim the inflated contact surfaces by the top surfaces as well.
+ push @$slices_margin, map $_->clone, @{$buildplate_only_top_surfaces};
+ $slices_margin = union($slices_margin);
+ }
for ($fw/2, map {scale MARGIN_STEP} 1..(MARGIN / MARGIN_STEP)) {
$diff = diff(
offset($diff, $_),
- \@slices_margin,
+ $slices_margin,
);
}
}
@@ -280,14 +316,15 @@ sub contact_area {
if (0) {
require "Slic3r/SVG.pm";
- Slic3r::SVG::output("contact_" . $contact_z . ".svg",
- expolygons => union_ex(\@contact),
- red_expolygons => union_ex(\@overhang),
+ Slic3r::SVG::output("out\\contact_" . $contact_z . ".svg",
+ green_expolygons => union_ex($buildplate_only_top_surfaces),
+ blue_expolygons => union_ex(\@contact),
+ red_expolygons => union_ex(\@overhang),
);
}
}
}
-
+
return (\%contact, \%overhang);
}
@@ -297,6 +334,8 @@ sub object_top {
# find object top surfaces
# we'll use them to clip our support and detect where does it stick
my %top = (); # print_z => [ expolygons ]
+ return \%top if ($self->object_config->support_material_buildplate_only);
+
my $projection = [];
foreach my $layer (reverse @{$object->layers}) {
if (my @top = map @{$_->slices->filter_by_type(S_TYPE_TOP)}, @{$layer->regions}) {
@@ -429,6 +468,9 @@ sub generate_interface_layers {
sub generate_bottom_interface_layers {
my ($self, $support_z, $base, $top, $interface) = @_;
+
+ # If no interface layers are allowed, don't generate bottom interface layers.
+ return if $self->object_config->support_material_interface_layers == 0;
my $area_threshold = $self->interface_flow->scaled_spacing ** 2;
@@ -722,7 +764,7 @@ sub generate_toolpaths {
width => $_interface_flow->width,
height => $layer->height,
), @$p;
- }
+ }
$layer->support_interface_fills->append(@paths);
}
diff --git a/package/osx/make_dmg.sh b/package/osx/make_dmg.sh
index d62fe991b..f82464daa 100755
--- a/package/osx/make_dmg.sh
+++ b/package/osx/make_dmg.sh
@@ -62,31 +62,28 @@ PP_BIN=$(which pp)
SLIC3R_DIR=$(perl -MCwd=realpath -e "print realpath '${WD}/../../'")
if [[ -d "${appfolder}" ]]; then
- echo "Deleting old working folder."
+ echo "Deleting old working folder: ${appfolder}"
rm -rf ${appfolder}
fi
if [[ -e "${dmgfile}" ]]; then
- echo "Deleting old dmg ${dmgfile}."
+ echo "Deleting old dmg: ${dmgfile}"
rm -rf ${dmgfile}
fi
-echo "Creating new app folder at $appfolder."
+echo "Creating new app folder: $appfolder"
mkdir -p $appfolder
mkdir -p $macosfolder
mkdir -p $resourcefolder
echo "Copying resources..."
-cp -r $SLIC3R_DIR/var $macosfolder/
-mv $macosfolder/var/Slic3r.icns $resourcefolder
+cp -rf $SLIC3R_DIR/var $resourcefolder/
+mv $resourcefolder/var/Slic3r.icns $resourcefolder
echo "Copying Slic3r..."
cp $SLIC3R_DIR/slic3r.pl $macosfolder/slic3r.pl
-cp -RP $SLIC3R_DIR/local-lib $macosfolder/local-lib
-cp -RP $SLIC3R_DIR/lib/* $macosfolder/local-lib/lib/perl5/
-find $macosfolder/local-lib -name man -type d -delete
-find $macosfolder/local-lib -name .packlist -delete
-rm -rf $macosfolder/local-lib/lib/perl5/darwin-thread-multi-2level/Alien/wxWidgets/osx_cocoa_3_0_2_uni/include
+cp -fRP $SLIC3R_DIR/local-lib $macosfolder/local-lib
+cp -fRP $SLIC3R_DIR/lib/* $macosfolder/local-lib/lib/perl5/
echo "Relocating dylib paths..."
for bundle in $(find $macosfolder/local-lib/lib/perl5/darwin-thread-multi-2level/auto/Wx -name '*.bundle') $(find $macosfolder/local-lib/lib/perl5/darwin-thread-multi-2level/Alien/wxWidgets -name '*.dylib' -type f); do
@@ -97,11 +94,11 @@ for bundle in $(find $macosfolder/local-lib/lib/perl5/darwin-thread-multi-2level
done
echo "Copying startup script..."
-cp $WD/startup_script.sh $macosfolder/$appname
+cp -f $WD/startup_script.sh $macosfolder/$appname
chmod +x $macosfolder/$appname
echo "Copying perl from $PERL_BIN"
-cp $PERL_BIN $macosfolder/perl-local
+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 \
@@ -109,13 +106,51 @@ ${PP_BIN} -M attributes -M base -M bytes -M B -M POSIX \
-M warnings -M local::lib \
-M strict -M utf8 -M parent \
-B -p -e "print 123" -o $WD/_tmp/test.par
-unzip $WD/_tmp/test.par -d $WD/_tmp/
-cp -r $WD/_tmp/lib/* $macosfolder/local-lib/lib/perl5/
+unzip -o $WD/_tmp/test.par -d $WD/_tmp/
+cp -rf $WD/_tmp/lib/* $macosfolder/local-lib/lib/perl5/
rm -rf $WD/_tmp
+echo "Cleaning bundle"
+rm -rf $macosfolder/local-lib/bin
+rm -rf $macosfolder/local-lib/man
+rm -f $macosfolder/local-lib/lib/perl5/Algorithm/*.pl
+rm -rf $macosfolder/local-lib/lib/perl5/unicore
+rm -rf $macosfolder/local-lib/lib/perl5/App
+rm -rf $macosfolder/local-lib/lib/perl5/Devel/CheckLib.pm
+rm -rf $macosfolder/local-lib/lib/perl5/ExtUtils
+rm -rf $macosfolder/local-lib/lib/perl5/Module/Build*
+rm -rf $macosfolder/local-lib/lib/perl5/TAP
+rm -rf $macosfolder/local-lib/lib/perl5/Test*
+find -d $macosfolder/local-lib -name '*.pod' -delete
+find -d $macosfolder/local-lib -name .packlist -delete
+find -d $macosfolder/local-lib -name .meta -exec rm -rf "{}" \;
+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 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_media-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
+find -d $macosfolder/local-lib -type d -empty -delete
+
make_plist
echo $PkgInfoContents >$appfolder/Contents/PkgInfo
+if [[ -e "${KEYCHAIN_FILE}" ]]; then
+ echo "Signing app..."
+ chmod -R +w $macosfolder/*
+ security list-keychains -s "${KEYCHAIN_FILE}"
+ security default-keychain -s "${KEYCHAIN_FILE}"
+ security unlock-keychain -p "${KEYCHAIN_PASSWORD}" "${KEYCHAIN_FILE}"
+ codesign --sign "${KEYCHAIN_IDENTITY}" --deep "$appfolder"
+fi
+
echo "Creating dmg file...."
hdiutil create -fs HFS+ -srcfolder "$appfolder" -volname "$appname" "$dmgfile"
diff --git a/package/osx/startup_script.sh b/package/osx/startup_script.sh
index 4f665ac64..c7fd92d2b 100644
--- a/package/osx/startup_script.sh
+++ b/package/osx/startup_script.sh
@@ -1,4 +1,4 @@
#!/bin/bash
DIR=$(dirname "$0")
-"$DIR/perl-local" -I"$DIR/local-lib/lib/perl5" "$DIR/slic3r.pl" $@
+exec "$DIR/perl-local" -I"$DIR/local-lib/lib/perl5" "$DIR/slic3r.pl" $@
diff --git a/package/win/compile_wrapper.ps1 b/package/win/compile_wrapper.ps1
index fc6f15b97..5704788ff 100644
--- a/package/win/compile_wrapper.ps1
+++ b/package/win/compile_wrapper.ps1
@@ -11,5 +11,7 @@ $perllib = "-lperl$perlver"
windres slic3r.rc -O coff -o slic3r.res
g++ -c -I'C:\strawberry\perl\lib\CORE\' shell.cpp -o slic3r.o
-g++ -v -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.exe | Write-Host
+g++ -c -I'C:\strawberry\perl\lib\CORE\' -DFORCE_GUI shell.cpp -o slic3r-gui.o
+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
+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.exe | Write-Host
diff --git a/package/win/package_win32.ps1 b/package/win/package_win32.ps1
index 70127d76b..302eded3d 100644
--- a/package/win/package_win32.ps1
+++ b/package/win/package_win32.ps1
@@ -44,6 +44,7 @@ cpanm "PAR::Packer"
pp `
-a "slic3r.exe;slic3r.exe" `
+-a "slic3r.exe;slic3r-console.exe" `
-a "../../lib;lib" `
-a "../../local-lib;local-lib" `
-a "../../slic3r.pl;slic3r.pl" `
@@ -52,7 +53,8 @@ pp `
-a "../../FreeGLUT/freeglut.dll;freeglut.dll" `
-a "${STRAWBERRY_PATH}\perl\bin\perl${perlversion}.dll;perl${perlversion}.dll" `
-a "${STRAWBERRY_PATH}\perl\bin\libstdc++-6.dll;libstdc++-6.dll" `
--a "${STRAWBERRY_PATH}\perl\bin\libgcc_s_sjlj-1.dll;libgcc_s_sjlj-1.dll" `
+-a "${STRAWBERRY_PATH}\perl\bin\libgcc_s_seh-1.dll;libgcc_s_seh-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" `
-M AutoLoader `
@@ -110,10 +112,8 @@ pp `
-M Socket `
-M Socket6 `
-M Storable `
--M Sub::Defer `
-M Sub::Exporter `
-M Sub::Exporter::Progressive `
--M Sub::Name `
-M Symbol `
-M Term::Cap `
-M Text::ParseWords `
diff --git a/package/win/shell.cpp b/package/win/shell.cpp
index b0904e9e6..e4fe45d20 100644
--- a/package/win/shell.cpp
+++ b/package/win/shell.cpp
@@ -23,7 +23,12 @@ int main(int argc, char **argv, char **env)
char exe_path[MAX_PATH] = {0};
char script_path[MAX_PATH];
+ char gui_flag[6] = {"--gui"};
+#ifdef FORCE_GUI
+ char** command_line = (char**)malloc(sizeof(char*) * ((++ argc) + 2));
+#else
char** command_line = (char**)malloc(sizeof(char*) * ((++ argc) + 1));
+#endif
{
// Unicode path. This will not be used directly, but to test, whether
// there are any non-ISO characters, in which case the path is converted to a
@@ -68,7 +73,12 @@ int main(int argc, char **argv, char **env)
command_line[0] = exe_path;
command_line[1] = script_path;
memcpy(command_line + 2, argv + 1, sizeof(char*) * (argc - 2));
+#ifdef FORCE_GUI
+ command_line[argc] = gui_flag;
+ command_line[argc+1] = NULL;
+#else
command_line[argc] = NULL;
+#endif
// Unset the PERL5LIB and PERLLIB environment variables.
SetEnvironmentVariable("PERL5LIB", NULL);
SetEnvironmentVariable("PERLLIB", NULL);
@@ -78,7 +88,11 @@ int main(int argc, char **argv, char **env)
printf(" %d: %s\r\n", i, command_line[i]);
#endif
}
+#ifdef FORCE_GUI
+ RunPerl(argc+1, command_line, NULL);
+#else
RunPerl(argc, command_line, NULL);
+#endif
free(command_line);
}
diff --git a/package/win/slic3r.rc b/package/win/slic3r.rc
index 20cfa265e..290d51939 100644
--- a/package/win/slic3r.rc
+++ b/package/win/slic3r.rc
@@ -2,6 +2,8 @@ id ICON "../../var/Slic3r.ico"
1 VERSIONINFO
FILEVERSION 1,3,0,0
PRODUCTVERSION 1,3,0,0
+FILEOS 0x4
+FILETYPE 0x1
BEGIN
BLOCK "StringFileInfo"
BEGIN
@@ -10,7 +12,7 @@ BEGIN
VALUE "CompanyName", "Slic3r.org"
VALUE "FileDescription", "3D Printer Slicer application"
VALUE "FileVersion", "1.3.0"
- VALUE "InternalName", "slic3r"
+ VALUE "InternalName", "slic3r.exe"
VALUE "LegalCopyright", "Alessandro Ranellucci"
VALUE "OriginalFilename", "slic3r.exe"
VALUE "ProductName", "Slic3r"
@@ -22,4 +24,4 @@ BEGIN
VALUE "Translation", 0x409, 1252
END
END
-1 Manifest slic3r.exe.manifest
+1 24 "slic3r.exe.manifest"
diff --git a/slic3r.pl b/slic3r.pl
index c881f9560..75bf3b961 100755
--- a/slic3r.pl
+++ b/slic3r.pl
@@ -6,7 +6,7 @@ use warnings;
BEGIN {
use FindBin;
use lib "$FindBin::Bin/lib";
- use local::lib "$FindBin::Bin/local-lib";
+ use local::lib '--no-create', "$FindBin::Bin/local-lib";
}
use File::Basename qw(basename);
@@ -36,8 +36,6 @@ my %cli_options = ();
'autosave=s' => \$opt{autosave},
'ignore-nonexistent-config' => \$opt{ignore_nonexistent_config},
'no-controller' => \$opt{no_controller},
- 'no-plater' => \$opt{no_plater},
- 'gui-mode=s' => \$opt{gui_mode},
'datadir=s' => \$opt{datadir},
'export-svg' => \$opt{export_svg},
'merge|m' => \$opt{merge},
@@ -78,28 +76,26 @@ if ($opt{load}) {
$opt{ignore_nonexistent_config} or die "Cannot find specified configuration file ($configfile).\n";
}
}
+
+ # expand shortcuts before applying, otherwise destination values would be already filled with defaults
+ $_->normalize for @external_configs;
}
# process command line options
-my $cli_config = Slic3r::Config->new;
-foreach my $c (@external_configs, Slic3r::Config->new_from_cli(%cli_options)) {
- $c->normalize; # expand shortcuts before applying, otherwise destination values would be already filled with defaults
- $cli_config->apply($c);
-}
+my $cli_config = Slic3r::Config->new_from_cli(%cli_options);
+$cli_config->normalize; # expand shortcuts
# save configuration
if ($opt{save}) {
- if (@{$cli_config->get_keys} > 0) {
- $cli_config->save($opt{save});
+ my $config = $cli_config->clone;
+ $config->apply($_) for @external_configs;
+ if (@{$config->get_keys} > 0) {
+ $config->save($opt{save});
} else {
Slic3r::Config->new_from_defaults->save($opt{save});
}
}
-# apply command line config on top of default config
-my $config = Slic3r::Config->new_from_defaults;
-$config->apply($cli_config);
-
# launch GUI
my $gui;
if ((!@ARGV || $opt{gui}) && !$opt{save} && eval "require Slic3r::GUI; 1") {
@@ -107,9 +103,7 @@ 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::no_plater = $opt{no_plater};
- $Slic3r::GUI::mode = $opt{gui_mode};
- $Slic3r::GUI::autosave = $opt{autosave};
+ $Slic3r::GUI::autosave = Slic3r::decode_path($opt{autosave} // '');
$Slic3r::GUI::threads = $opt{threads};
}
$gui = Slic3r::GUI->new;
@@ -119,7 +113,7 @@ if ((!@ARGV || $opt{gui}) && !$opt{save} && eval "require Slic3r::GUI; 1") {
$gui->{mainframe}->load_config($cli_config);
foreach my $input_file (@ARGV) {
$input_file = Slic3r::decode_path($input_file);
- $gui->{mainframe}{plater}->load_file($input_file) unless $opt{no_plater};
+ $gui->{mainframe}{plater}->load_file($input_file);
}
});
$gui->MainLoop;
@@ -128,6 +122,10 @@ if ((!@ARGV || $opt{gui}) && !$opt{save} && eval "require Slic3r::GUI; 1") {
die $@ if $@ && $opt{gui};
if (@ARGV) { # slicing from command line
+ # apply command line config on top of default config
+ my $config = Slic3r::Config->new_from_defaults;
+ $config->apply($_) for @external_configs;
+ $config->apply($cli_config);
$config->validate;
if ($opt{repair}) {
@@ -329,8 +327,6 @@ $j
GUI options:
--gui Forces the GUI launch instead of command line slicing (if you
supply a model file, it will be loaded into the plater)
- --no-plater Disable the plater tab
- --gui-mode Overrides the configured mode (simple/expert)
--autosave Automatically export current configuration to the specified file
Output options:
@@ -490,6 +486,8 @@ $j
--support-material-enforce-layers
Enforce support material on the specified number of layers from bottom,
regardless of --support-material and threshold (0+, default: $config->{support_material_enforce_layers})
+ --support-material-buildplate-only
+ Only create support if it lies on a build plate. Don't create support on a print. (default: no)
--dont-support-bridges
Experimental option for preventing support material from being generated under bridged areas (default: yes)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 85e98471e..14f4a657a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -58,6 +58,7 @@ add_library(libslic3r STATIC
${LIBDIR}/libslic3r/GCode/SpiralVase.cpp
${LIBDIR}/libslic3r/GCodeReader.cpp
${LIBDIR}/libslic3r/GCodeSender.cpp
+ ${LIBDIR}/libslic3r/GCodeTimeEstimator.cpp
${LIBDIR}/libslic3r/GCodeWriter.cpp
${LIBDIR}/libslic3r/Geometry.cpp
${LIBDIR}/libslic3r/IO.cpp
diff --git a/t/fill.t b/t/fill.t
index c9cb21391..710e60536 100644
--- a/t/fill.t
+++ b/t/fill.t
@@ -2,7 +2,7 @@ use Test::More;
use strict;
use warnings;
-plan tests => 93;
+plan tests => 95;
BEGIN {
use FindBin;
@@ -86,6 +86,23 @@ sub scale_points (@) { map [scale $_->[X], scale $_->[Y]], @_ }
'paths don\'t cross hole') or done_testing, exit;
}
}
+
+ # rotated square
+ $filler->set_angle(PI/4);
+ $filler->set_dont_adjust(0);
+ $filler->set_min_spacing(0.654498);
+ $filler->set_endpoints_overlap(unscale(359974));
+ $filler->set_density(1);
+ $filler->set_layer_id(66);
+ $filler->set_z(20.15);
+ {
+ my $e = Slic3r::ExPolygon->new(
+ Slic3r::Polygon->new([25771516,14142125],[14142138,25771515],[2512749,14142131],[14142125,2512749]),
+ );
+ my $paths = $test->($e);
+ is(scalar @$paths, 1, 'one continuous path') or done_testing, exit;
+ ok abs($paths->[0]->length - scale(3*100 + 2*50)) - scaled_epsilon, 'path has expected length';
+ }
}
{
diff --git a/utils/estimate-gcode-time.pl b/utils/estimate-gcode-time.pl
new file mode 100755
index 000000000..43c558b68
--- /dev/null
+++ b/utils/estimate-gcode-time.pl
@@ -0,0 +1,21 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+BEGIN {
+ use FindBin;
+ use lib "$FindBin::Bin/../lib";
+ use local::lib "$FindBin::Bin/../local-lib";
+}
+
+use Slic3r;
+
+die "Usage: estimate-gcode-time.pl FILE\n"
+ if @ARGV != 1;
+
+my $estimator = Slic3r::GCode::TimeEstimator->new;
+$estimator->parse_file($ARGV[0]);
+printf "Time: %d minutes and %d seconds\n", int($estimator->time / 60), $estimator->time % 60;
+
+__END__
diff --git a/utils/send-gcode.pl b/utils/send-gcode.pl
index 0b803baa6..d87e6826a 100644
--- a/utils/send-gcode.pl
+++ b/utils/send-gcode.pl
@@ -14,7 +14,8 @@ use Slic3r;
die "Usage: send-gcode.pl SERIALPORT BAUDRATE GCODE_FILE\n"
if @ARGV != 3;
-my $serial = Slic3r::GCode::Sender->new($ARGV[0], $ARGV[1]);
+my $serial = Slic3r::GCode::Sender->new;
+$serial->connect($ARGV[0], $ARGV[1]);
1 until $serial->is_connected;
print "Connected to printer\n";
diff --git a/var/wand.png b/var/wand.png
new file mode 100755
index 000000000..44ccbf812
Binary files /dev/null and b/var/wand.png differ
diff --git a/xs/Build.PL b/xs/Build.PL
index 619cc879f..2fc5b33c1 100644
--- a/xs/Build.PL
+++ b/xs/Build.PL
@@ -70,6 +70,9 @@ if (defined $ENV{BOOST_INCLUDEDIR}) {
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};
}
@@ -99,6 +102,9 @@ if (defined $ENV{BOOST_LIBRARYPATH}) {
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};
}
diff --git a/xs/MANIFEST b/xs/MANIFEST
index 527912b3a..d01b3ead3 100644
--- a/xs/MANIFEST
+++ b/xs/MANIFEST
@@ -72,6 +72,8 @@ src/libslic3r/GCodeReader.cpp
src/libslic3r/GCodeReader.hpp
src/libslic3r/GCodeSender.cpp
src/libslic3r/GCodeSender.hpp
+src/libslic3r/GCodeTimeEstimator.cpp
+src/libslic3r/GCodeTimeEstimator.hpp
src/libslic3r/GCodeWriter.cpp
src/libslic3r/GCodeWriter.hpp
src/libslic3r/Geometry.cpp
@@ -182,6 +184,7 @@ xsp/Filler.xsp
xsp/Flow.xsp
xsp/GCode.xsp
xsp/GCodeSender.xsp
+xsp/GCodeTimeEstimator.xsp
xsp/GCodeWriter.xsp
xsp/Geometry.xsp
xsp/GUI.xsp
diff --git a/xs/src/admesh/stlinit.c b/xs/src/admesh/stlinit.c
index a191e3d76..f83056621 100644
--- a/xs/src/admesh/stlinit.c
+++ b/xs/src/admesh/stlinit.c
@@ -131,6 +131,12 @@ stl_count_facets(stl_file *stl, const char *file) {
if((!fread(&header_num_facets, sizeof(int), 1, stl->fp)) || (num_facets != header_num_facets)) {
fprintf(stderr,
"Warning: File size doesn't match number of facets in the header\n");
+
+ if(num_facets > header_num_facets) {
+ // this file is garbage.
+ stl->error = 1;
+ return;
+ }
}
}
/* Otherwise, if the .STL file is ASCII, then do the following */
diff --git a/xs/src/libslic3r/Config.cpp b/xs/src/libslic3r/Config.cpp
index 2937f7d64..68d4837c1 100644
--- a/xs/src/libslic3r/Config.cpp
+++ b/xs/src/libslic3r/Config.cpp
@@ -242,48 +242,48 @@ ConfigDef::merge(const ConfigDef &other)
}
bool
-ConfigBase::has(const t_config_option_key &opt_key) {
- return (this->option(opt_key, false) != NULL);
+ConfigBase::has(const t_config_option_key &opt_key) const {
+ return this->option(opt_key) != NULL;
}
void
ConfigBase::apply(const ConfigBase &other, bool ignore_nonexistent) {
- // get list of option keys to apply
- t_config_option_keys opt_keys = other.keys();
-
+ // apply all options
+ this->apply_only(other, other.keys(), ignore_nonexistent);
+}
+
+void
+ConfigBase::apply_only(const ConfigBase &other, const t_config_option_keys &opt_keys, bool ignore_nonexistent) {
// loop through options and apply them
- for (t_config_option_keys::const_iterator it = opt_keys.begin(); it != opt_keys.end(); ++it) {
- ConfigOption* my_opt = this->option(*it, true);
+ for (const t_config_option_key &opt_key : opt_keys) {
+ ConfigOption* my_opt = this->option(opt_key, true);
if (my_opt == NULL) {
if (ignore_nonexistent == false) throw "Attempt to apply non-existent option";
continue;
}
// not the most efficient way, but easier than casting pointers to subclasses
- bool res = my_opt->deserialize( other.option(*it)->serialize() );
+ bool res = my_opt->deserialize( other.option(opt_key)->serialize() );
if (!res) {
- std::string error = "Unexpected failure when deserializing serialized value for " + *it;
+ std::string error = "Unexpected failure when deserializing serialized value for " + opt_key;
CONFESS(error.c_str());
}
}
}
bool
-ConfigBase::equals(ConfigBase &other) {
+ConfigBase::equals(const ConfigBase &other) const {
return this->diff(other).empty();
}
// this will *ignore* options not present in both configs
t_config_option_keys
-ConfigBase::diff(ConfigBase &other) {
+ConfigBase::diff(const ConfigBase &other) const {
t_config_option_keys diff;
- t_config_option_keys my_keys = this->keys();
- for (t_config_option_keys::const_iterator opt_key = my_keys.begin(); opt_key != my_keys.end(); ++opt_key) {
- if (other.has(*opt_key) && other.serialize(*opt_key) != this->serialize(*opt_key)) {
- diff.push_back(*opt_key);
- }
- }
+ for (const t_config_option_key &opt_key : this->keys())
+ if (other.has(opt_key) && other.serialize(opt_key) != this->serialize(opt_key))
+ diff.push_back(opt_key);
return diff;
}
@@ -501,16 +501,6 @@ DynamicConfig::optptr(const t_config_option_key &opt_key, bool create) {
return this->options[opt_key];
}
-template
-T*
-DynamicConfig::opt(const t_config_option_key &opt_key, bool create) {
- return dynamic_cast(this->option(opt_key, create));
-}
-template ConfigOptionInt* DynamicConfig::opt(const t_config_option_key &opt_key, bool create);
-template ConfigOptionBool* DynamicConfig::opt(const t_config_option_key &opt_key, bool create);
-template ConfigOptionBools* DynamicConfig::opt(const t_config_option_key &opt_key, bool create);
-template ConfigOptionPercent* DynamicConfig::opt(const t_config_option_key &opt_key, bool create);
-
t_config_option_keys
DynamicConfig::keys() const {
t_config_option_keys keys;
@@ -524,6 +514,16 @@ DynamicConfig::erase(const t_config_option_key &opt_key) {
this->options.erase(opt_key);
}
+void
+DynamicConfig::clear() {
+ this->options.clear();
+}
+
+bool
+DynamicConfig::empty() const {
+ return this->options.empty();
+}
+
void
DynamicConfig::read_cli(const std::vector &tokens, t_config_option_keys* extra)
{
diff --git a/xs/src/libslic3r/Config.hpp b/xs/src/libslic3r/Config.hpp
index 127efa06d..39e8f2f68 100644
--- a/xs/src/libslic3r/Config.hpp
+++ b/xs/src/libslic3r/Config.hpp
@@ -644,14 +644,21 @@ class ConfigBase
ConfigBase() : def(NULL) {};
ConfigBase(const ConfigDef* def) : def(def) {};
virtual ~ConfigBase() {};
- bool has(const t_config_option_key &opt_key);
+ bool has(const t_config_option_key &opt_key) const;
const ConfigOption* option(const t_config_option_key &opt_key) const;
ConfigOption* option(const t_config_option_key &opt_key, bool create = false);
+ template T* opt(const t_config_option_key &opt_key, bool create = false) {
+ return dynamic_cast(this->option(opt_key, create));
+ };
+ template const T* opt(const t_config_option_key &opt_key) const {
+ return dynamic_cast(this->option(opt_key));
+ };
virtual ConfigOption* optptr(const t_config_option_key &opt_key, bool create = false) = 0;
virtual t_config_option_keys keys() const = 0;
void apply(const ConfigBase &other, bool ignore_nonexistent = false);
- bool equals(ConfigBase &other);
- t_config_option_keys diff(ConfigBase &other);
+ void apply_only(const ConfigBase &other, const t_config_option_keys &opt_keys, bool ignore_nonexistent = false);
+ bool equals(const ConfigBase &other) const;
+ t_config_option_keys diff(const ConfigBase &other) const;
std::string serialize(const t_config_option_key &opt_key) const;
virtual bool set_deserialize(t_config_option_key opt_key, std::string str, bool append = false);
double get_abs_value(const t_config_option_key &opt_key) const;
@@ -672,10 +679,11 @@ class DynamicConfig : public virtual ConfigBase
DynamicConfig& operator= (DynamicConfig other);
void swap(DynamicConfig &other);
virtual ~DynamicConfig();
- template T* opt(const t_config_option_key &opt_key, bool create = false);
virtual ConfigOption* optptr(const t_config_option_key &opt_key, bool create = false);
t_config_option_keys keys() const;
void erase(const t_config_option_key &opt_key);
+ void clear();
+ bool empty() const;
void read_cli(const std::vector &tokens, t_config_option_keys* extra);
void read_cli(const int argc, const char **argv, t_config_option_keys* extra);
diff --git a/xs/src/libslic3r/Fill/FillRectilinear.cpp b/xs/src/libslic3r/Fill/FillRectilinear.cpp
index c74da2877..e02c3a298 100644
--- a/xs/src/libslic3r/Fill/FillRectilinear.cpp
+++ b/xs/src/libslic3r/Fill/FillRectilinear.cpp
@@ -37,9 +37,14 @@ FillRectilinear::_fill_single_direction(ExPolygon expolygon,
if (bounding_box.size().x < min_spacing) return;
// Due to integer rounding, rotated polygons might not preserve verticality
- // (i.e. when rotating by PI/2 two points having the same x coordinate
- // they might get different y coordinates), thus the first line will be skipped.
- bounding_box.offset(-1);
+ // (i.e. when rotating by PI/2 two points having the same y coordinate
+ // they might get different x coordinates), thus the first line will be skipped.
+ // Reducing by 1 is not enough, as we observed normal squares being off by about 30
+ // units along x between points supposed to be vertically aligned (coming from an
+ // axis-aligned polygon edge). We need to be very tolerant here, especially when
+ // making solid infill where lack of lines is visible.
+ bounding_box.min.x += SCALED_EPSILON;
+ bounding_box.max.x -= SCALED_EPSILON;
// define flow spacing according to requested density
if (this->density > 0.9999f && !this->dont_adjust) {
diff --git a/xs/src/libslic3r/GCode/SpiralVase.cpp b/xs/src/libslic3r/GCode/SpiralVase.cpp
index b56c9e58b..9299da86a 100644
--- a/xs/src/libslic3r/GCode/SpiralVase.cpp
+++ b/xs/src/libslic3r/GCode/SpiralVase.cpp
@@ -39,7 +39,7 @@ SpiralVase::process_layer(const std::string &gcode)
{
GCodeReader r = this->_reader; // clone
r.parse(gcode, [&total_layer_length, &layer_height, &z, &set_z]
- (GCodeReader &, GCodeReader::GCodeLine &line) {
+ (GCodeReader &, const GCodeReader::GCodeLine &line) {
if (line.cmd == "G1") {
if (line.extruding()) {
total_layer_length += line.dist_XY();
diff --git a/xs/src/libslic3r/GCodeReader.cpp b/xs/src/libslic3r/GCodeReader.cpp
index 1a0742864..6ad937bbd 100644
--- a/xs/src/libslic3r/GCodeReader.cpp
+++ b/xs/src/libslic3r/GCodeReader.cpp
@@ -1,6 +1,7 @@
#include "GCodeReader.hpp"
#include
#include
+#include
#include
namespace Slic3r {
@@ -17,59 +18,73 @@ GCodeReader::parse(const std::string &gcode, callback_t callback)
{
std::istringstream ss(gcode);
std::string line;
- while (std::getline(ss, line)) {
- GCodeLine gline(this);
- gline.raw = line;
- if (this->verbose)
- std::cout << line << std::endl;
-
- // strip comment
- {
- size_t pos = line.find(';');
- if (pos != std::string::npos) {
- gline.comment = line.substr(pos+1);
- line.erase(pos);
- }
- }
-
- // command and args
- {
- std::vector args;
- boost::split(args, line, boost::is_any_of(" "));
-
- // first one is cmd
- gline.cmd = args.front();
- args.erase(args.begin());
-
- for (std::string &arg : args) {
- if (arg.size() < 2) continue;
- gline.args.insert(std::make_pair(arg[0], arg.substr(1)));
- }
- }
-
- // convert extrusion axis
- if (this->_extrusion_axis != 'E') {
- const auto it = gline.args.find(this->_extrusion_axis);
- if (it != gline.args.end()) {
- std::swap(gline.args['E'], it->second);
- gline.args.erase(it);
- }
- }
-
- if (gline.has('E') && this->_config.use_relative_e_distances)
- this->E = 0;
-
- if (callback) callback(*this, gline);
-
- // update coordinates
- if (gline.cmd == "G0" || gline.cmd == "G1" || gline.cmd == "G92") {
- this->X = gline.new_X();
- this->Y = gline.new_Y();
- this->Z = gline.new_Z();
- this->E = gline.new_E();
- this->F = gline.new_F();
+ while (std::getline(ss, line))
+ this->parse_line(line, callback);
+}
+
+void
+GCodeReader::parse_line(std::string line, callback_t callback)
+{
+ GCodeLine gline(this);
+ gline.raw = line;
+ if (this->verbose)
+ std::cout << line << std::endl;
+
+ // strip comment
+ {
+ size_t pos = line.find(';');
+ if (pos != std::string::npos) {
+ gline.comment = line.substr(pos+1);
+ line.erase(pos);
}
}
+
+ // command and args
+ {
+ std::vector args;
+ boost::split(args, line, boost::is_any_of(" "));
+
+ // first one is cmd
+ gline.cmd = args.front();
+ args.erase(args.begin());
+
+ for (std::string &arg : args) {
+ if (arg.size() < 2) continue;
+ gline.args.insert(std::make_pair(arg[0], arg.substr(1)));
+ }
+ }
+
+ // convert extrusion axis
+ if (this->_extrusion_axis != 'E') {
+ const auto it = gline.args.find(this->_extrusion_axis);
+ if (it != gline.args.end()) {
+ std::swap(gline.args['E'], it->second);
+ gline.args.erase(it);
+ }
+ }
+
+ if (gline.has('E') && this->_config.use_relative_e_distances)
+ this->E = 0;
+
+ if (callback) callback(*this, gline);
+
+ // update coordinates
+ if (gline.cmd == "G0" || gline.cmd == "G1" || gline.cmd == "G92") {
+ this->X = gline.new_X();
+ this->Y = gline.new_Y();
+ this->Z = gline.new_Z();
+ this->E = gline.new_E();
+ this->F = gline.new_F();
+ }
+}
+
+void
+GCodeReader::parse_file(const std::string &file, callback_t callback)
+{
+ std::ifstream f(file);
+ std::string line;
+ while (std::getline(f, line))
+ this->parse_line(line, callback);
}
void
diff --git a/xs/src/libslic3r/GCodeReader.hpp b/xs/src/libslic3r/GCodeReader.hpp
index 267ac0e18..c627fc851 100644
--- a/xs/src/libslic3r/GCodeReader.hpp
+++ b/xs/src/libslic3r/GCodeReader.hpp
@@ -25,6 +25,7 @@ class GCodeReader {
GCodeLine(GCodeReader* _reader) : reader(_reader) {};
bool has(char arg) const { return this->args.count(arg) > 0; };
+ float get_float(char arg) const { return atof(this->args.at(arg).c_str()); };
float new_X() const { return this->has('X') ? atof(this->args.at('X').c_str()) : this->reader->X; };
float new_Y() const { return this->has('Y') ? atof(this->args.at('Y').c_str()) : this->reader->Y; };
float new_Z() const { return this->has('Z') ? atof(this->args.at('Z').c_str()) : this->reader->Z; };
@@ -44,7 +45,7 @@ class GCodeReader {
bool travel() const { return this->cmd == "G1" && !this->has('E'); };
void set(char arg, std::string value);
};
- typedef std::function callback_t;
+ typedef std::function callback_t;
float X, Y, Z, E, F;
bool verbose;
@@ -53,6 +54,8 @@ class GCodeReader {
GCodeReader() : X(0), Y(0), Z(0), E(0), F(0), verbose(false), _extrusion_axis('E') {};
void apply_config(const PrintConfigBase &config);
void parse(const std::string &gcode, callback_t callback);
+ void parse_line(std::string line, callback_t callback);
+ void parse_file(const std::string &file, callback_t callback);
private:
GCodeConfig _config;
diff --git a/xs/src/libslic3r/GCodeSender.cpp b/xs/src/libslic3r/GCodeSender.cpp
index c1568790e..237009392 100644
--- a/xs/src/libslic3r/GCodeSender.cpp
+++ b/xs/src/libslic3r/GCodeSender.cpp
@@ -8,16 +8,36 @@
#include
#include
-#if defined(__APPLE__) || defined(__linux) || defined(__OpenBSD__)
+#if defined(__APPLE__) || defined(__OpenBSD__)
#include
#endif
-#if __APPLE__
+#ifdef __APPLE__
#include
#include
#endif
-#ifdef __linux
+#ifdef __linux__
#include
-#include
+#include
+#include "/usr/include/asm-generic/ioctls.h"
+
+/* The following definitions are kindly borrowed from:
+ /usr/include/asm-generic/termbits.h
+ Unfortunately we cannot just include that one because
+ it would redefine the "struct termios" already defined
+ the already included by Boost.ASIO. */
+#define K_NCCS 19
+struct termios2 {
+ tcflag_t c_iflag;
+ tcflag_t c_oflag;
+ tcflag_t c_cflag;
+ tcflag_t c_lflag;
+ cc_t c_line;
+ cc_t c_cc[K_NCCS];
+ speed_t c_ispeed;
+ speed_t c_ospeed;
+};
+#define BOTHER CBAUDEX
+
#endif
//#define DEBUG_SERIAL
@@ -65,7 +85,6 @@ GCodeSender::connect(std::string devname, unsigned int baud_rate)
this->open = true;
this->reset();
} catch (boost::system::system_error &e) {
- printf("Caught error\n");
this->set_error_status(true);
return false;
}
@@ -87,6 +106,9 @@ GCodeSender::connect(std::string devname, unsigned int baud_rate)
boost::thread t(boost::bind(&asio::io_service::run, &this->io));
this->background_thread.swap(t);
+ // always send a M105 to check for connection because firmware might be silent on connect
+ this->send("M105", true);
+
return true;
}
@@ -107,27 +129,17 @@ GCodeSender::set_baud_rate(unsigned int baud_rate)
ioctl(handle, IOSSIOSPEED, &newSpeed);
::tcsetattr(handle, TCSANOW, &ios);
#elif __linux
- termios ios;
- ::tcgetattr(handle, &ios);
- ::cfsetispeed(&ios, B38400);
- ::cfsetospeed(&ios, B38400);
- ::tcflush(handle, TCIFLUSH);
- ::tcsetattr(handle, TCSANOW, &ios);
-
- struct serial_struct ss;
- ioctl(handle, TIOCGSERIAL, &ss);
- ss.flags = (ss.flags & ~ASYNC_SPD_MASK) | ASYNC_SPD_CUST;
- ss.custom_divisor = (ss.baud_base + (baud_rate / 2)) / baud_rate;
- //cout << "bbase " << ss.baud_base << " div " << ss.custom_divisor;
- long closestSpeed = ss.baud_base / ss.custom_divisor;
- //cout << " Closest speed " << closestSpeed << endl;
- ss.reserved_char[0] = 0;
- if (closestSpeed < baud_rate * 98 / 100 || closestSpeed > baud_rate * 102 / 100) {
- printf("Failed to set baud rate\n");
- }
-
- ioctl(handle, TIOCSSERIAL, &ss);
- printf("< set_baud_rate: %u\n", baud_rate);
+ termios2 ios;
+ if (ioctl(handle, TCGETS2, &ios))
+ printf("Error in TCGETS2: %s\n", strerror(errno));
+ ios.c_ispeed = ios.c_ospeed = baud_rate;
+ ios.c_cflag &= ~CBAUD;
+ ios.c_cflag |= BOTHER | CLOCAL | CREAD;
+ ios.c_cc[VMIN] = 1; // Minimum of characters to read, prevents eof errors when 0 bytes are read
+ ios.c_cc[VTIME] = 1;
+ if (ioctl(handle, TCSETS2, &ios))
+ printf("Error in TCSETS2: %s\n", strerror(errno));
+
#elif __OpenBSD__
struct termios ios;
::tcgetattr(handle, &ios);
@@ -296,17 +308,20 @@ GCodeSender::on_read(const boost::system::error_code& error,
{
this->set_error_status(false);
if (error) {
+ #ifdef __APPLE__
if (error.value() == 45) {
// OS X bug: http://osdir.com/ml/lib.boost.asio.user/2008-08/msg00004.html
this->do_read();
- } else {
- // printf("ERROR: [%d] %s\n", error.value(), error.message().c_str());
- // error can be true even because the serial port was closed.
- // In this case it is not a real error, so ignore.
- if (this->open) {
- this->do_close();
- this->set_error_status(true);
- }
+ return;
+ }
+ #endif
+
+ // printf("ERROR: [%d] %s\n", error.value(), error.message().c_str());
+ // error can be true even because the serial port was closed.
+ // In this case it is not a real error, so ignore.
+ if (this->open) {
+ this->do_close();
+ this->set_error_status(true);
}
return;
}
@@ -343,6 +358,7 @@ GCodeSender::on_read(const boost::system::error_code& error,
// extract the first number from line
boost::algorithm::trim_left_if(line, !boost::algorithm::is_digit());
size_t toresend = boost::lexical_cast(line.substr(0, line.find_first_not_of("0123456789")));
+ toresend++; // N is 0-based
if (toresend >= this->sent - this->last_sent.size()) {
{
boost::lock_guard l(this->queue_mutex);
@@ -461,8 +477,8 @@ GCodeSender::do_send()
if (line.empty()) return;
// compute full line
- this->sent++;
std::string full_line = "N" + boost::lexical_cast(this->sent) + " " + line;
+ this->sent++;
// calculate checksum
int cs = 0;
diff --git a/xs/src/libslic3r/GCodeTimeEstimator.cpp b/xs/src/libslic3r/GCodeTimeEstimator.cpp
new file mode 100644
index 000000000..c6fa353b4
--- /dev/null
+++ b/xs/src/libslic3r/GCodeTimeEstimator.cpp
@@ -0,0 +1,78 @@
+#include "GCodeTimeEstimator.hpp"
+#include
+#include
+
+namespace Slic3r {
+
+void
+GCodeTimeEstimator::parse(const std::string &gcode)
+{
+ GCodeReader::parse(gcode, boost::bind(&GCodeTimeEstimator::_parser, this, _1, _2));
+}
+
+void
+GCodeTimeEstimator::parse_file(const std::string &file)
+{
+ GCodeReader::parse_file(file, boost::bind(&GCodeTimeEstimator::_parser, this, _1, _2));
+}
+
+void
+GCodeTimeEstimator::_parser(GCodeReader&, const GCodeReader::GCodeLine &line)
+{
+ // std::cout << "[" << this->time << "] " << line.raw << std::endl;
+ if (line.cmd == "G1") {
+ const float dist_XY = line.dist_XY();
+ const float new_F = line.new_F();
+
+ if (dist_XY > 0) {
+ //this->time += dist_XY / new_F * 60;
+ this->time += _accelerated_move(dist_XY, new_F/60, this->acceleration);
+ } else {
+ //this->time += std::abs(line.dist_E()) / new_F * 60;
+ this->time += _accelerated_move(std::abs(line.dist_E()), new_F/60, this->acceleration);
+ }
+ //this->time += std::abs(line.dist_Z()) / new_F * 60;
+ this->time += _accelerated_move(std::abs(line.dist_Z()), new_F/60, this->acceleration);
+ } else if (line.cmd == "M204" && line.has('S')) {
+ this->acceleration = line.get_float('S');
+ } else if (line.cmd == "G4") { // swell
+ if (line.has('S')) {
+ this->time += line.get_float('S');
+ } else if (line.has('P')) {
+ this->time += line.get_float('P')/1000;
+ }
+ }
+}
+
+// Wildly optimistic acceleration "bell" curve modeling.
+// Returns an estimate of how long the move with a given accel
+// takes in seconds.
+// It is assumed that the movement is smooth and uniform.
+float
+GCodeTimeEstimator::_accelerated_move(double length, double v, double acceleration)
+{
+ // for half of the move, there are 2 zones, where the speed is increasing/decreasing and
+ // where the speed is constant.
+ // Since the slowdown is assumed to be uniform, calculate the average velocity for half of the
+ // expected displacement.
+ // final velocity v = a*t => a * (dx / 0.5v) => v^2 = 2*a*dx
+ // v_avg = 0.5v => 2*v_avg = v
+ // d_x = v_avg*t => t = d_x / v_avg
+ acceleration = (acceleration == 0.0 ? 4000.0 : acceleration); // Set a default accel to use for print time in case it's 0 somehow.
+ auto half_length = length / 2.0;
+ auto t_init = v / acceleration; // time to final velocity
+ auto dx_init = (0.5*v*t_init); // Initial displacement for the time to get to final velocity
+ auto t = 0.0;
+ if (half_length >= dx_init) {
+ half_length -= (0.5*v*t_init);
+ t += t_init;
+ t += (half_length / v); // rest of time is at constant speed.
+ } else {
+ // If too much displacement for the expected final velocity, we don't hit the max, so reduce
+ // the average velocity to fit the displacement we actually are looking for.
+ t += std::sqrt(std::abs(length) * 2.0 * acceleration) / acceleration;
+ }
+ return 2.0*t; // cut in half before, so double to get full time spent.
+}
+
+}
diff --git a/xs/src/libslic3r/GCodeTimeEstimator.hpp b/xs/src/libslic3r/GCodeTimeEstimator.hpp
new file mode 100644
index 000000000..dd301c929
--- /dev/null
+++ b/xs/src/libslic3r/GCodeTimeEstimator.hpp
@@ -0,0 +1,24 @@
+#ifndef slic3r_GCodeTimeEstimator_hpp_
+#define slic3r_GCodeTimeEstimator_hpp_
+
+#include "libslic3r.h"
+#include "GCodeReader.hpp"
+
+namespace Slic3r {
+
+class GCodeTimeEstimator : public GCodeReader {
+ public:
+ float time = 0; // in seconds
+
+ void parse(const std::string &gcode);
+ void parse_file(const std::string &file);
+
+ protected:
+ float acceleration = 9000;
+ void _parser(GCodeReader&, const GCodeReader::GCodeLine &line);
+ static float _accelerated_move(double length, double v, double acceleration);
+};
+
+} /* namespace Slic3r */
+
+#endif /* slic3r_GCodeTimeEstimator_hpp_ */
diff --git a/xs/src/libslic3r/Layer.cpp b/xs/src/libslic3r/Layer.cpp
index 722b539e5..4837af9c0 100644
--- a/xs/src/libslic3r/Layer.cpp
+++ b/xs/src/libslic3r/Layer.cpp
@@ -197,11 +197,11 @@ Layer::make_perimeters()
// merge the surfaces assigned to each group
SurfaceCollection new_slices;
- for (std::map::const_iterator it = slices.begin(); it != slices.end(); ++it) {
- ExPolygons expp = union_ex(it->second, true);
- for (ExPolygons::iterator ex = expp.begin(); ex != expp.end(); ++ex) {
- Surface s = it->second.front(); // clone type and extra_perimeters
- s.expolygon = *ex;
+ for (const auto &it : slices) {
+ ExPolygons expp = union_ex(it.second, true);
+ for (ExPolygon &ex : expp) {
+ Surface s = it.second.front(); // clone type and extra_perimeters
+ s.expolygon = ex;
new_slices.surfaces.push_back(s);
}
}
@@ -274,6 +274,8 @@ Layer::detect_surfaces_type()
Layer* const &lower_layer = this->lower_layer;
// collapse very narrow parts (using the safety offset in the diff is not enough)
+ // TODO: this offset2 makes this method not idempotent (see #3764), so we should
+ // move it to where we generate fill_surfaces instead and leave slices unaltered
const float offs = layerm.flow(frExternalPerimeter).scaled_width() / 10.f;
const Polygons layerm_slices_surfaces = layerm.slices;
diff --git a/xs/src/libslic3r/LayerHeightSpline.cpp b/xs/src/libslic3r/LayerHeightSpline.cpp
index 505d6d8db..f2997a1d9 100644
--- a/xs/src/libslic3r/LayerHeightSpline.cpp
+++ b/xs/src/libslic3r/LayerHeightSpline.cpp
@@ -11,36 +11,34 @@
namespace Slic3r {
-LayerHeightSpline::LayerHeightSpline(coordf_t object_height)
-: _object_height(object_height), _layer_height_spline(NULL)
+LayerHeightSpline::LayerHeightSpline()
+: _object_height(0)
{
- this->_is_valid = false;
- this->_update_required = true;
- this->_layers_updated = false;
- this->_layer_heights_updated = false;
+ this->_is_valid = false;
+ this->_update_required = true;
+ this->_layers_updated = false;
+ this->_layer_heights_updated = false;
}
LayerHeightSpline::LayerHeightSpline(const LayerHeightSpline &other)
-: _object_height(other._object_height), _layer_height_spline(NULL)
{
+ *this = other;
+}
+LayerHeightSpline& LayerHeightSpline::operator=(const LayerHeightSpline &other)
+{
+ this->_object_height = other._object_height;
this->_original_layers = other._original_layers;
this->_internal_layers = other._internal_layers;
this->_internal_layer_heights = other._internal_layer_heights;
- this->_is_valid = other._is_valid;
- this->_update_required = other._update_required;
- this->_layers_updated = other._layers_updated;
- this->_layer_heights_updated = other._layer_heights_updated;
- if(this->_is_valid) {
- this->_updateBSpline();
- }
-}
-
-LayerHeightSpline::~LayerHeightSpline()
-{
- if (this->_layer_height_spline) {
- delete this->_layer_height_spline;
+ this->_is_valid = other._is_valid;
+ this->_update_required = other._update_required;
+ this->_layers_updated = other._layers_updated;
+ this->_layer_heights_updated = other._layer_heights_updated;
+ if(this->_is_valid) {
+ this->_updateBSpline();
}
+ return *this;
}
/*
@@ -48,7 +46,7 @@ LayerHeightSpline::~LayerHeightSpline()
*/
bool LayerHeightSpline::hasData()
{
- return this->_is_valid;
+ return this->_is_valid;
}
/*
@@ -59,21 +57,21 @@ bool LayerHeightSpline::hasData()
*/
bool LayerHeightSpline::updateRequired()
{
- bool result = true; // update spline by default
- if(!this->_update_required && this->_is_valid) {
- result = false;
- }
- this->_update_required = true; // reset to default after request
- return result;
+ bool result = true; // update spline by default
+ if(!this->_update_required && this->_is_valid) {
+ result = false;
+ }
+ this->_update_required = true; // reset to default after request
+ return result;
}
/*
* Don't require an update for exactly one iteration.
*/
void LayerHeightSpline::suppressUpdate() {
- if (this->_is_valid) {
- this->_update_required = false;
- }
+ if (this->_is_valid) {
+ this->_update_required = false;
+ }
}
/*
@@ -82,27 +80,27 @@ void LayerHeightSpline::suppressUpdate() {
*/
bool LayerHeightSpline::setLayers(std::vector layers)
{
- this->_original_layers = layers;
+ this->_original_layers = layers;
- // generate updated layer height list from layers
- this->_internal_layer_heights.clear();
- coordf_t last_z = 0;
- for (std::vector::const_iterator l = this->_original_layers.begin(); l != this->_original_layers.end(); ++l) {
- this->_internal_layer_heights.push_back(*l-last_z);
- last_z = *l;
- }
+ // generate updated layer height list from layers
+ this->_internal_layer_heights.clear();
+ coordf_t last_z = 0;
+ for (std::vector::const_iterator l = this->_original_layers.begin(); l != this->_original_layers.end(); ++l) {
+ this->_internal_layer_heights.push_back(*l-last_z);
+ last_z = *l;
+ }
- // add 0-values at both ends to achieve correct boundary conditions
- this->_internal_layers = this->_original_layers;
- this->_internal_layers.insert(this->_internal_layers.begin(), 0); // add z = 0 to the front
- //this->_internal_layers.push_back(this->_internal_layers.back()+1); // and object_height + 1 to the end
- this->_internal_layer_heights.insert(this->_internal_layer_heights.begin(), this->_internal_layer_heights[0]);
- //this->_internal_layer_heights.push_back(0);
+ // add 0-values at both ends to achieve correct boundary conditions
+ this->_internal_layers = this->_original_layers;
+ this->_internal_layers.insert(this->_internal_layers.begin(), 0); // add z = 0 to the front
+ //this->_internal_layers.push_back(this->_internal_layers.back()+1); // and object_height + 1 to the end
+ this->_internal_layer_heights.insert(this->_internal_layer_heights.begin(), this->_internal_layer_heights[0]);
+ //this->_internal_layer_heights.push_back(0);
- this->_layers_updated = true;
- this->_layer_heights_updated = false;
+ this->_layers_updated = true;
+ this->_layer_heights_updated = false;
- return this->_updateBSpline();
+ return this->_updateBSpline();
}
@@ -114,23 +112,23 @@ bool LayerHeightSpline::setLayers(std::vector layers)
*/
bool LayerHeightSpline::updateLayerHeights(std::vector heights)
{
- bool result = false;
+ bool result = false;
- // do we receive the correct number of values?
- if(heights.size() == this->_internal_layers.size()-1) {
- this->_internal_layer_heights = heights;
- // add leading and trailing 0-value
- this->_internal_layer_heights.insert(this->_internal_layer_heights.begin(), this->_internal_layer_heights[0]);
- //this->_internal_layer_heights.push_back(0);
- result = this->_updateBSpline();
- }else{
- std::cerr << "Unable to update layer heights. You provided " << heights.size() << " layers, but " << this->_internal_layers.size()-1 << " expected" << std::endl;
- }
+ // do we receive the correct number of values?
+ if(heights.size() == this->_internal_layers.size()-1) {
+ this->_internal_layer_heights = heights;
+ // add leading and trailing 0-value
+ this->_internal_layer_heights.insert(this->_internal_layer_heights.begin(), this->_internal_layer_heights[0]);
+ //this->_internal_layer_heights.push_back(0);
+ result = this->_updateBSpline();
+ }else{
+ std::cerr << "Unable to update layer heights. You provided " << heights.size() << " layers, but " << this->_internal_layers.size()-1 << " expected" << std::endl;
+ }
- this->_layers_updated = false;
- this->_layer_heights_updated = true;
+ this->_layers_updated = false;
+ this->_layer_heights_updated = true;
- return result;
+ return result;
}
/*
@@ -138,14 +136,13 @@ bool LayerHeightSpline::updateLayerHeights(std::vector heights)
*/
void LayerHeightSpline::clear()
{
- this->_original_layers.clear();
- this->_internal_layers.clear();
- this->_internal_layer_heights.clear();
- delete this->_layer_height_spline;
- this->_layer_height_spline = NULL;
- this->_is_valid = false;
- this->_layers_updated = false;
- this->_layer_heights_updated = false;
+ this->_original_layers.clear();
+ this->_internal_layers.clear();
+ this->_internal_layer_heights.clear();
+ this->_layer_height_spline.reset();
+ this->_is_valid = false;
+ this->_layers_updated = false;
+ this->_layer_heights_updated = false;
}
@@ -154,28 +151,28 @@ void LayerHeightSpline::clear()
*/
std::vector LayerHeightSpline::getInterpolatedLayers() const
{
- std::vector layers;
- if(this->_is_valid) {
- // preserve first layer for bed contact
- layers.push_back(this->_original_layers[0]);
- coordf_t z = this->_original_layers[0];
- coordf_t h;
- coordf_t h_diff = 0;
- coordf_t eps = 0.0001;
- while(z <= this->_object_height) {
- h = 0;
- // find intersection between layer height and spline
- do {
- h += h_diff/2;
- h = this->_layer_height_spline->evaluate(z+h);
- h_diff = this->_layer_height_spline->evaluate(z+h) - h;
- } while(std::abs(h_diff) > eps);
- z += h;
- layers.push_back(z);
- }
- // how to make sure, the last layer is not higher than object while maintaining between min/max layer height?
- }
- return layers;
+ std::vector layers;
+ if(this->_is_valid) {
+ // preserve first layer for bed contact
+ layers.push_back(this->_original_layers[0]);
+ coordf_t z = this->_original_layers[0];
+ coordf_t h;
+ coordf_t h_diff = 0;
+ coordf_t eps = 0.0001;
+ while(z <= this->_object_height) {
+ h = 0;
+ // find intersection between layer height and spline
+ do {
+ h += h_diff/2;
+ h = this->_layer_height_spline->evaluate(z+h);
+ h_diff = this->_layer_height_spline->evaluate(z+h) - h;
+ } while(std::abs(h_diff) > eps);
+ z += h;
+ layers.push_back(z);
+ }
+ // how to make sure, the last layer is not higher than object while maintaining between min/max layer height?
+ }
+ return layers;
}
/*
@@ -183,11 +180,11 @@ std::vector LayerHeightSpline::getInterpolatedLayers() const
*/
const coordf_t LayerHeightSpline::getLayerHeightAt(coordf_t height)
{
- coordf_t result = 0;
- if (this->_is_valid) {
- result = this->_layer_height_spline->evaluate(height);
- }
- return result;
+ coordf_t result = 0;
+ if (this->_is_valid) {
+ result = this->_layer_height_spline->evaluate(height);
+ }
+ return result;
}
/*
@@ -195,27 +192,27 @@ const coordf_t LayerHeightSpline::getLayerHeightAt(coordf_t height)
*/
bool LayerHeightSpline::_updateBSpline()
{
- bool result = false;
- //TODO: exception if not enough points?
+ bool result = false;
+ //TODO: exception if not enough points?
- delete this->_layer_height_spline;
- this->_layer_height_spline = new BSpline(&this->_internal_layers[0],
- this->_internal_layers.size(),
+ this->_layer_height_spline.reset(new BSpline(&this->_internal_layers[0],
+ this->_internal_layers.size(),
&this->_internal_layer_heights[0],
0,
1,
- 0);
+ 0)
+ );
- if (this->_layer_height_spline->ok()) {
- result = true;
- } else {
- result = false;
- std::cerr << "Spline setup failed." << std::endl;
- }
+ if (this->_layer_height_spline->ok()) {
+ result = true;
+ } else {
+ result = false;
+ std::cerr << "Spline setup failed." << std::endl;
+ }
- this->_is_valid = result;
+ this->_is_valid = result;
- return result;
+ return result;
}
diff --git a/xs/src/libslic3r/LayerHeightSpline.hpp b/xs/src/libslic3r/LayerHeightSpline.hpp
index 9a72a748b..0c46744f0 100644
--- a/xs/src/libslic3r/LayerHeightSpline.hpp
+++ b/xs/src/libslic3r/LayerHeightSpline.hpp
@@ -4,16 +4,16 @@
#include "libslic3r.h"
#include "BSpline/BSpline.h" // Warning: original BSplineBase.h/cpp merged into BSpline.h/cpp to avoid dependency issues caused by Build::WithXSpp which tries to compile all .cpp files in /src
-
namespace Slic3r {
class LayerHeightSpline
{
public:
- LayerHeightSpline(coordf_t object_height);
+ LayerHeightSpline();
LayerHeightSpline(const LayerHeightSpline &other);
- ~LayerHeightSpline();
+ LayerHeightSpline& operator=(const LayerHeightSpline &other);
+ void setObjectHeight(coordf_t object_height) { this->_object_height = object_height; };
bool hasData(); // indicate that we have valid data
bool updateRequired(); // indicate whether we want to generate a new spline from the layers
void suppressUpdate();
@@ -37,7 +37,7 @@ class LayerHeightSpline
std::vector _original_layers;
std::vector _internal_layers;
std::vector _internal_layer_heights;
- BSpline *_layer_height_spline;
+ std::unique_ptr> _layer_height_spline;
};
}
diff --git a/xs/src/libslic3r/LayerRegionFill.cpp b/xs/src/libslic3r/LayerRegionFill.cpp
index 954f1d135..d6b567ceb 100644
--- a/xs/src/libslic3r/LayerRegionFill.cpp
+++ b/xs/src/libslic3r/LayerRegionFill.cpp
@@ -246,6 +246,12 @@ LayerRegion::make_fill()
// apply half spacing using this flow's own spacing and generate infill
f->density = density/100;
f->dont_adjust = false;
+ /*
+ std::cout << surface.expolygon.dump_perl() << std::endl
+ << " layer_id: " << f->layer_id << " z: " << f->z
+ << " angle: " << f->angle << " min-spacing: " << f->min_spacing
+ << " endpoints_overlap: " << f->endpoints_overlap << std::endl << std::endl;
+ */
Polylines polylines = f->fill_surface(surface);
if (polylines.empty())
continue;
diff --git a/xs/src/libslic3r/Model.cpp b/xs/src/libslic3r/Model.cpp
index 5243799ca..e85b0c7c9 100644
--- a/xs/src/libslic3r/Model.cpp
+++ b/xs/src/libslic3r/Model.cpp
@@ -433,6 +433,7 @@ ModelObject::ModelObject(Model *model, const ModelObject &other, bool copy_volum
volumes(),
config(other.config),
layer_height_ranges(other.layer_height_ranges),
+ layer_height_spline(other.layer_height_spline),
origin_translation(other.origin_translation),
_bounding_box(other._bounding_box),
_bounding_box_valid(other._bounding_box_valid),
@@ -463,6 +464,7 @@ ModelObject::swap(ModelObject &other)
std::swap(this->volumes, other.volumes);
std::swap(this->config, other.config);
std::swap(this->layer_height_ranges, other.layer_height_ranges);
+ std::swap(this->layer_height_spline, other.layer_height_spline);
std::swap(this->origin_translation, other.origin_translation);
std::swap(this->_bounding_box, other._bounding_box);
std::swap(this->_bounding_box_valid, other._bounding_box_valid);
@@ -514,6 +516,7 @@ ModelObject::add_instance()
ModelInstance* i = new ModelInstance(this);
this->instances.push_back(i);
this->invalidate_bounding_box();
+ this->layer_height_spline.setObjectHeight(this->raw_bounding_box().size().z);
return i;
}
@@ -523,6 +526,7 @@ ModelObject::add_instance(const ModelInstance &other)
ModelInstance* i = new ModelInstance(this, other);
this->instances.push_back(i);
this->invalidate_bounding_box();
+ this->layer_height_spline.setObjectHeight(this->raw_bounding_box().size().z);
return i;
}
@@ -532,6 +536,9 @@ ModelObject::delete_instance(size_t idx)
ModelInstancePtrs::iterator i = this->instances.begin() + idx;
delete *i;
this->instances.erase(i);
+ if(!this->instances.empty()) {
+ this->layer_height_spline.setObjectHeight(this->raw_bounding_box().size().z);
+ }
this->invalidate_bounding_box();
}
@@ -546,6 +553,7 @@ ModelObject::clear_instances()
{
while (!this->instances.empty())
this->delete_last_instance();
+
}
// this returns the bounding box of the *transformed* instances
diff --git a/xs/src/libslic3r/Model.hpp b/xs/src/libslic3r/Model.hpp
index 36571ff5d..79b00de69 100644
--- a/xs/src/libslic3r/Model.hpp
+++ b/xs/src/libslic3r/Model.hpp
@@ -7,6 +7,7 @@
#include "Layer.hpp"
#include "Point.hpp"
#include "TriangleMesh.hpp"
+#include "LayerHeightSpline.hpp"
#include