85 Commits

Author SHA1 Message Date
remi durand
2c8e531731 #949 Project is the current .3mf (or lack of)
- ask for saving the project if unsaved changes
 - ask for preset reset if new project
 - delete all : new project or just delete?
2021-03-21 04:38:49 +01:00
remi durand
ca3d8239c4 Merge remote-tracking branch 'remotes/prusa/master' 2021-01-09 17:11:12 +01:00
Vojtech Bubnik
7b9f2093bb Configuration layer: Support for vectors of FloatsOrPercents and
FloatsOrPercentsNullable, to support further filament overrides
of Print preset values, namely Avoid Crossing Perimeters.
2020-12-14 15:58:47 +01:00
supermerill
1a19b023f0 Merge remote-tracking branch 'remotes/prusa/master'
note: new infill connect, maybe a good idea to get the previous one in case it's better (no useless lines)
note2: fillline overextrude, tofix
2020-11-23 00:28:47 +01:00
supermerill
3799d533cc Export to prusa:
* now the .3mf contains the modified config compatible with purusaslicer
* now the superslicer settings are stored in their own file.
Note: projects saved with this version will transfer only prusa settings back to older superslicer version.
2020-11-22 12:17:49 +01:00
David Kocik
0a4ce079e8 escape_ampersand function and changed order of printer names and pictures in config wizard 2020-11-11 16:08:27 +01:00
supermerill
3aaedd671b Merge remote-tracking branch 'remotes/prusa/master' into dev
note: layer time is not working, chronology need formatting, temperature ok.
2020-10-18 03:50:08 +02:00
supermerill
6fdd615b6e Merge remote-tracking branch 'remotes/prusa/master' into dev 2020-10-18 00:27:32 +02:00
lukasmatena
89e4a78722
Merge pull request #4747 from wavexx/monospaced_gcode
Use monospaced fonts in gcode sections
2020-10-10 14:01:48 +02:00
supermerill
d6d4fc7764 Merge branch 'master' into dev 2020-10-01 00:09:04 +02:00
supermerill
14c7a8ad7f gap fill overlap
also move the perimeter & extperi overlap to region
2020-10-01 00:07:14 +02:00
supermerill
fc1ec534ad fix min/max value for config: now double, not int
fix some wrning
2020-09-24 16:49:04 +02:00
Vojtech Bubnik
067cde85f1 WIP Refactoring of exceptions:
1) All slicer's exceptions are now derived from Slic3r::Exception.
2) New exceptions are defined for slicing errors.
3) Exceptions are propagated to the Plater to show.
It remains to modify the slicing back-end to throw the new SlicingError
exceptions instead of std::runtime_error and to show the other exceptions
by a message dialog instead of a notification.
2020-09-14 18:03:22 +02:00
Yuri D'Elia
cd4ad5e78b Introduce ConfigOptionDef::is_code to select code_font() 2020-09-13 02:36:50 +02:00
supermerill
bf215bba85 compilation fixes
also some freepyscad update
2020-06-23 21:31:48 +02:00
supermerill
319d0552ed #211 % max speed reduction
waiting for a good name
2020-06-11 21:03:07 +02:00
supermerill
1afaa6ef49 create little hierarchy of config to better use ratio_over
fixes on ratio_over
fix Flow::extrusion_width (bad computation of first_layer_height)
fix enum visibility
moving test classes to prusaslicer test directory (wip)
all that because i was trying to write a test class for a modification in min_object_distance (and i didn't even start)
2020-05-31 03:54:58 +02:00
supermerill
9b60be0c1a Initial working prototype for the milling post-process 2020-05-29 21:01:30 +02:00
supermerill
3404430ef7 milling settings (wip)
also created extruder settings ui file
2020-05-28 18:14:23 +02:00
supermerill
27a6ce3aed Use full_label on setting override for object/modifiers. 2020-05-03 19:16:22 +02:00
supermerill
a6b055b484 #192 make percentage value-only percent-only like for infill ratio.
note: added some code to migrate automatically from float (0.9) to percent (90%). The reverse should not be a problem.
fields: bridge_flow_ratio over_bridge_flow_ratio bridge_overlap fill_top_flow_ratio first_layer_flow_ratio
2020-04-17 19:20:58 +02:00
supermerill
f087cf1239 Merge remote-tracking branch 'remotes/prusa/master'
seems to work
need to update profiles & ui
2020-03-26 12:10:30 +01:00
bubnikv
8d7f88b381 Imported error reporting when loading presets with option keys
or option values that our poor software does not understand.
This applies to configs added by some forks of slic3r, for example
slic3r++
PrusaSlicer has encountered an error: Failed loading the preset file: #3909
2020-03-25 16:04:11 +01:00
Lukas Matena
eb3b65d8af Fixing build against wxWidgets 3.0
The wxString saga continues. wxWidgets 3.0 don't have the wxString::FromUTF8(const std::string&) overload, we must use the GUI::from_u8 helper
Also wxWidgets 3.0 don't allow to disable wxString->const char* conversion, so calling show_info(wxWindow*, wxString, const char*) was ambiguous
Several includes moved around
2020-03-04 10:34:59 +01:00
bubnikv
25d6818fc7 Fix of
Opening saved project removes Print Host settings #3655
Octoprint Settings when Opening a .3MF file #3244

When loading a configuration file (from AMF, 3MF, .ini or .gcode),
and if the host settings ("print_host", "printhost_apikey", "printhost_cafile")
in the configuration file is empty, then the config is considered to be anonymized,
and these anonymized keys are loaded from the referenced "derived from" profile,
if it exists in user's PrusaSlicer configuration directory.

We are aware that this is a patch work and a better long term solution
is to separate physical printer settings from logical printer settings,
but this is a good enough solution for PrusaSlicer 2.2.0 release.
2020-02-18 14:13:56 +01:00
bubnikv
059bdb4711 Implemented handling of complex ConfigOptionFloatOrPercent chains
by the PlaceholderParser.

Namely, all the options with the "ratio_over" reference are now handled
correctly by the PlaceholderParser with the exception
of the "first_layer_extrusion_width", which overrides speed of extrusions
by their respective extrusion type.

Also the various extrusion widths (extrusion_width, first_layer_extrusion_width,
external_perimeter_extrusion_width etc.) produce the same numbers
as if ran through the back-end, with the assumption of not overriding
layer height by the variable layer height editing tool or layer height
modifiers.
2020-02-04 15:27:38 +01:00
supermerill
433bd46bee Expended option for settings ui files: widths, sidetext, simple/advanced/export mode support for lines. 2020-01-15 15:20:55 +01:00
supermerill
885330d54b wip label_width 2020-01-14 19:34:22 +01:00
bubnikv
79d7a0130f Fixing some missing throw statements.
Adding noexcept to move constructors / operators.
2020-01-13 17:41:40 +01:00
bubnikv
81187e7e0e Some refactoring and const correctness fixes. 2020-01-07 14:35:43 +01:00
bubnikv
9406b50447 Const correctness improvements:
removed some unnecessary const_casts that remove const.
2020-01-03 16:33:04 +01:00
supermerill
dda438c74b Merge commit '5e3e5492487690fb48cd7c4bb0b7e0e019e30a5c' (wip) 2019-12-05 20:53:02 +01:00
supermerill
7854bed9c4 enum for "Add settings" contextual menu
add missing category for options that need it for contextual menu.
todo: refactor even more to have an automatic tab.cpp, via a structured categories->subcat->line object tree created in-place, and also use that to order the contextual menu.
Also use only colored icon, as the greyscale version isn't in the resource repo anymore.
2019-11-04 01:19:01 +01:00
bubnikv
13cc74ef0a Ported test_config.cpp from upstream Slic3r.
Extended ConfigBase with set() functions similar to the upstream Slic3r.
ConfigBase::set_deserialize() newly throws if the operation fails.
Extrusion width parameters are newly tested for negative values.
2019-10-18 11:53:19 +02:00
bubnikv
98a71a557b Ported test_support_material.cpp from upstream slic3r.
Ported extension of ExtrusionEntityCollection::flatten() to disable
flattening of no_sort() collections.
2019-10-17 19:09:24 +02:00
bubnikv
c228a49fe0 Ported test_support_material from upstream Slic3r.
Reworked the FFF testing framework & ConfigBase::set_deserialize()
for more compact tests: set_deserialize() now accepts list
of key / value pairs.

Fixed an incorrect assert in LayerRegion.
2019-10-17 17:09:15 +02:00
bubnikv
69c8b1cd21 new cheaper constructor for DynamicPrintConfig from FullPrintConfig:
DynamicPrintConfig::full_print_config()
new cheaper constructors of DynamicConfig / DynamicPrintConfig from ConfigBase
Unit tests: ported test_model from upstream Slic3r, thanks @lordofhyphens
Unit tests refactored to use less autos and initializer lists for readibility,
DynamicPrintConfig is handled by value, not by shared pointer.
2019-10-16 11:16:50 +02:00
supermerill
89b2e62381 add parameters: fill_top_flow_ratio & fill_smooth_width
bugfix flow inaccuracies in FillSmooth.
TODO: do something about surface too small to be printed, particularly when 'only one perimeter top' -> don't extract them or use gapfill
2019-10-07 18:55:11 +02:00
tamasmeszaros
f29e18dad2 Fix crashing test executable on gcc 4.9 2019-10-02 14:42:28 +02:00
supermerill
2f042e030c Merge remote-tracking branch 'remotes/prusa/master'
not merged: fill.cpp, perimeter_generator, because they ahve been reworked and need to be understand fully before adding my extensive modifications.
To verify: glcanvas: maybe filament color selection is deleted (or the other one i added?)
2019-09-26 13:14:01 +02:00
Lukas Matena
7861fa5086 Whitespace changes to supress misleading indentation warnings
These appear in newer gcc when spaces and tabs are mixed
2019-09-24 16:01:01 +02:00
Lukas Matena
3f988b314c Fixed several warnings (Config.hpp and few other files) 2019-09-06 15:55:07 +02:00
supermerill
ccc05c08fd Merge commit '85d9a165636617c76d30be54a1cd99bd4e5663b0' 2019-08-28 23:03:09 +02:00
YuSanka
2d1c554758 Some reverts for commit 4cd4d2c8b5f8bea59da2a0fbdb096cb6b7391250 2019-08-14 17:07:30 +02:00
YuSanka
4cd4d2c8b5 Fixed wrong page selection for Printer Setting after application run 2019-08-13 17:09:42 +02:00
Lukas Matena
6da196b419 Corrected return value of ConfigOptionVector::apply_override to what was intended (this didn't cause any bug though, the return value is currently not used) 2019-08-05 15:24:49 +02:00
supermerill
773972cc2c Merge remote-tracking branch 'remotes/prusa/master'
WIP, in particular, have to review the custom beds svg/stl
2019-07-31 18:22:49 +02:00
YuSanka
d0d01ef7ab Merge remote-tracking branch 'origin/vb_filament_overrides' into ys_overrides 2019-07-28 22:01:48 +02:00
YuSanka
40a576a8ad Implemented update of the override filaments options from/to config 2019-07-28 22:00:39 +02:00
bubnikv
17edc289e9 Fixed missing return value. 2019-07-25 17:18:51 +02:00