Commit Graph

13209 Commits

Author SHA1 Message Date
e42e25c933 1) Storing the physical_printer_settings_id into the 3MF, AMF, GCode.
2) Activating the physical_printer_settings_id when loading from 3MF, AMF, GCode.
   The physical printer is only activated if it references the printer_settings_id
   loaded from the same file.
3) When loading the presets from 3MF, AMF, GCode, the "external" profiles
   are no more created for profiles which differ from the local profiles
   the loaded profiles reference. Instead, the referenced profile is activated
   and modified with the loaded preset. If the referenced profile does not
   exist, but the profile refers to a system profile with the "inherits"
   fileds, the system profile is loaded and modified instead.
   This works for all profiles with the exception of multi-extruder
   printer with multiple filament profiles modified. In that case
   the first modified filament profile will be loaded as modified,
   while the other modified profiles will be loaded as "external".

This should fix
Physical printer + 3mf file, wrong preset used to generate gcode #5178
and possibly
https://github.com/prusa3d/PrusaSlicer/issues/5272
2020-12-04 10:48:51 +01:00
dcee9d7bfe Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_animations 2020-12-04 10:27:54 +01:00
4870656877 Import all valid files when dragging and dropping a set of files on the application 2020-12-04 09:15:55 +01:00
6835c5ad35 Fixed build on MAC 2020-12-03 15:40:52 +01:00
cc0688678c Fixed conflicts after merge with master 2020-12-03 15:27:34 +01:00
bcb2a4884b NotificationManager -> Separate notification update from its render to reduce the amount of scene refresh 2020-12-03 15:12:32 +01:00
4b040b8569 Merge branch 'tm_fix_split_arrange_crash'
fixes #2209
2020-12-03 15:00:06 +01:00
310de2f2ef Fix crash when splitting objects
fixes partially #2209
2020-12-03 14:58:56 +01:00
91b1d469eb Fix arrange with malformed contours 2020-12-03 14:58:09 +01:00
dea4c13677 Revert "Fix of Proxy secured print host URL. Special character on password #4187"
The whole URL line was incorrectly escaped including the http:// prefix,
which is not correct.
This reverts commit 1b720dbc3d.
2020-12-03 14:20:04 +01:00
6fd1143b1c Fix of Unexpected Behavior @ Application Open and When GCODE is Generated #5254
Icon not loaded from the exe on Windows.
2020-12-03 14:14:40 +01:00
624494eab6 Merge branch 'tm_arrange_bugfixes' 2020-12-03 14:09:55 +01:00
639ef33aab Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-12-03 13:49:20 +01:00
2a0a9af0c9 #5360 - GCode Viewer -> Added menu command to reload gcode file 2020-12-03 13:48:54 +01:00
6124f677ae Suppressed a check of printer_presets for the containing information about "Print Host upload", when presets ate exported from the amf/3mf 2020-12-03 13:25:23 +01:00
3dd9b8c718 Further improvement error reporting with buggy custom G-code sections #1516
1) The macro-processor sanitizes the source code line for invalid UTF-8
   characters. Ideally these invalid characters would be replaced with ?,
   they are just dropped as of now. Better than showing an empty string
   when converting to wxString though.
2) G-code export collects full error message for 1st occurence of an error
   for each custom G-code block.
3) The composite error message now displays the errors collected in 2).
4) The error window is now scaled bigger and the Slicer logo is smaller
   if the text is to be rendered with monospaced font, as the monospaced
   text will not be word wrapped.
2020-12-03 12:50:24 +01:00
844ea89432 Fix out of bed items after arrange.
Disabled outline decimation for arrange and added very small (EPSILON) safety offset to bed detection boundaries.
2020-12-03 12:00:12 +01:00
b251fea5fe Typo fix for b9c53adddb 2020-12-03 11:31:15 +01:00
306acbdfb4 Improvement of Improve error reporting with buggy custom G-code sections #1516
Errors in the file output templates are reported in mono-spaced font,
so that the arrow character ^ is displayed at the right column
pointing to the offending spot.
2020-12-03 11:03:16 +01:00
7afef2bbb5 OSX specific: Hot fix for the c503a4e424 2020-12-03 10:40:17 +01:00
c503a4e424 Increased width for Infill ComboBox and EditCtrls from Manipulation panel on right panel
+ Added updated POT-file
2020-12-03 10:35:21 +01:00
98055de28c External paths avoid crossing perimeters of holes 2020-12-03 09:43:21 +01:00
0a33aedc3a Documentation of OctoPrint behind HAProxy with basic auth enabled
in the print_host tooltip.
Improves Feature request: support for basic auth for octoprint #650
2020-12-03 08:22:55 +01:00
1b720dbc3d Fix of Proxy secured print host URL. Special character on password #4187
A raw URL was passed to libcurl, while it should have been URL encoded.
2020-12-03 08:07:13 +01:00
597a158a6e Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2020-12-03 07:30:26 +01:00
4412ba0f92 Fixes Spelling Error in Unsaved changes dialog (#5363) 2020-12-03 07:30:06 +01:00
4e9254ec5a Follow up fix for bed filling
fixes: 2813db8906
2020-12-02 18:08:30 +01:00
869ae0247e Use smarter object function in partial arrangement with empty bed. 2020-12-02 17:53:22 +01:00
2813db8906 Fix for bed filling with some existing items out of bed. 2020-12-02 17:52:40 +01:00
4e90df1ea5 Fix status indication glitch for bed filling 2020-12-02 17:50:12 +01:00
4f7f08d0de Further improvement on arrange settings handling 2020-12-02 14:04:39 +01:00
ae926bd1ed error_code in boost::filesystem::space to ensure the drive exists. Fix of #5354 2020-12-02 12:12:24 +01:00
b9c53adddb Linux specific, dark mode: Fixed a black text on a black background for the view mode buttons. 2020-12-02 11:58:08 +01:00
89ff8eef10 Preview class refactoring: Moved initialization of member variables
to header.
2020-12-02 11:38:10 +01:00
8df4d6a170 Add separate arrangement distance control for SLA mode 2020-12-02 10:28:13 +01:00
9d34d350a5 Localization: Update POT
+ Fixed translation for the "Extruder n" category on the Printer Settings Tab
 + Fixed a crash, when scrolling inside Search imGui with some localization (e.t. Russion)
2020-12-01 16:44:53 +01:00
f25e5c0ec6 Merge remote-tracking branch 'origin/master' into lh_avoid_crossing_perimeters 2020-12-01 14:31:22 +01:00
f0616b0736 Fixed return value of liang_barsky_line_clipping 2020-12-01 14:28:27 +01:00
3e73473334 fix rotation for initial placement 2020-12-01 14:12:20 +01:00
8027f6608a Fix arrange distance with enabled sequential printing
fixes #5258
2020-12-01 14:08:07 +01:00
d47e6bfd5c Stop showing Exporting finished notification after exporting error. 2020-12-01 13:04:19 +01:00
994b69f19b cleanup 2020-12-01 12:06:10 +01:00
247f3a7dbe Set boost to use utf8 for system messages (in cmake). Fix of #5180. 2020-12-01 12:06:10 +01:00
42a00a32df Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_animations 2020-12-01 10:43:32 +01:00
24a8f832bc Fixed activation of shortcut dialog with '?' key 2020-12-01 10:43:04 +01:00
e842077cc6 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_animations 2020-12-01 10:18:00 +01:00
430648471a Follow-up of 6ae1a10614 - Fixed typo 2020-12-01 10:17:35 +01:00
67d42c7053 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_animations 2020-12-01 08:45:50 +01:00
dc736f7855 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-12-01 08:33:20 +01:00
6ae1a10614 #5333 - Reworked navigation of preview's sliders using the keyboard 2020-12-01 08:33:06 +01:00