Commit Graph

1194 Commits

Author SHA1 Message Date
d55dbf437c Merge branch 'master' into tm_arrange_selection 2019-07-17 17:25:31 +02:00
302eaf16cb Really fix build for msvc 2019-07-17 16:47:09 +02:00
6174d776b4 Fix for msvc build. 2019-07-17 14:34:28 +02:00
3eeb453e9a Solved issue with virtual bed management.
libnest2d: Fix for unclosed polygons after merge.
2019-07-17 13:32:31 +02:00
b3217c191d Priority for wipe tower, Increased safety distance from bed edges.
* WipeTowerInfo class extended in plater (WipeTower) instead of GLCanvas3D
* Bed origin support in ModelInstance and WipeTower
2019-07-16 18:33:42 +02:00
b2d67c3e56 Wipe tower fix (do not skip the first toolchange when printing without the wipe tower)
Also, test multi.t updated so it matches new logic of inserting custom gcodes
2019-07-16 13:10:09 +02:00
2604b9e059 Fixed compilation issue 2019-07-16 09:19:00 +02:00
b68d5950ac Arrange cache in ModeInstance and logical bed remembered. 2019-07-15 17:30:44 +02:00
d2c908ef7f Merge branch 'master' into lm_warnings 2019-07-15 13:26:55 +02:00
72e28fb1d3 Updated tooltips on custom gcodes to match actual PrusaSlicer behaviour to reflect recent changes 2019-07-15 11:49:30 +02:00
e8e35579dd Merge remote-tracking branch 'remotes/origin/vb_undo_redo' 2019-07-15 11:34:18 +02:00
ff69c030d7 Merge branch 'lm_improving_wipe_tower'. Summary of changes:
- wipe tower respects max volumetric flow, slowing down with PVA etc is not hardcoded anymore
- wipe tower is now allowed for multiple-extruder printers. single extruder stuff is not used in that case (ramming, cooling, etc.)
- start/end filament and toolchange custom gcodes are now inserted differently than before - see 41164a9
- some refactoring, e.g. the abstract WipeTower class was eradicated
2019-07-15 10:25:38 +02:00
9539a4860c Not handling logical beds in arrange() 2019-07-12 21:17:11 +02:00
4f922fc49c GCodeAnalyzer now recognizes tool-changing commands with MakerWare and Sailfish flavor
These firmwares use M135 Tn and M108 Tn commands for changing active tool, which the analyzer did not recognize. The toolpaths were then rendered in wrong color, extruder offset etc. This surfaced in issue https://github.com/prusa3d/PrusaSlicer/issues/2566
2019-07-12 12:56:41 +02:00
2f43e228f3 Tech ENABLE_SVG_ICONS set as default 2019-07-12 10:13:35 +02:00
a9ab3b2a8f Added color number in legend texture for color prints 2019-07-09 15:47:34 +02:00
dad7ed919a Merge branch 'et_color_print_times' of https://github.com/prusa3d/PrusaSlicer 2019-07-09 14:24:24 +02:00
b061a5de6c Merge branch 'master' into tm_builtin_pad 2019-07-09 13:21:26 +02:00
ed7e380d07 Fixing broken SLA slicing: SPE-984 2019-07-09 13:12:55 +02:00
fa2cb5d501 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_color_print_times 2019-07-08 08:45:11 +02:00
96ea3c6de8 Color change time estimates 2019-07-08 08:40:20 +02:00
445cd20919 Undo / Redo fixes 2019-07-05 19:06:19 +02:00
50890b0637 Documented the cereal library manual patching (FIXME!) 2019-07-05 11:42:36 +02:00
7dfc50e795 Trying to fix some Linux & OSX compilation issues. 2019-07-04 23:34:18 +02:00
2c3e630a36 Trying to make all C++ of the platforms happy. 2019-07-04 22:52:33 +02:00
1f3b546dbb Simplified the "cereal" includes to not clash with Perl includes 2019-07-04 22:09:14 +02:00
3ff7dd2b4f Trying to fix some template resolution on Linux 2019-07-04 21:02:08 +02:00
8953e0980c Fixed merge issues. 2019-07-04 20:49:46 +02:00
3d046c1380 Yet another compilation fix. 2019-07-04 20:25:52 +02:00
d98aa0f91d Merge remote-tracking branch 'origin/master' into vb_undo_redo 2019-07-04 20:22:15 +02:00
b52a3cbb9e Merge remote-tracking branch 'origin/ys_undo_redo' into vb_undo_redo 2019-07-04 20:15:50 +02:00
13936a4c33 Removed some junk templates, which pass compilation on Windows
even if they are invalid.
2019-07-04 19:59:45 +02:00
f49a107dfb Fix of compilation on Linux 2019-07-04 19:48:00 +02:00
0f682282bf Update object list after undo/redo 2019-07-04 19:46:46 +02:00
ef9495150e WIP Undo / Redo : serialization / deserialization of object selection. 2019-07-04 14:35:04 +02:00
f0beb6511c Merge remote-tracking branch 'origin/master' into ys_new_features 2019-07-04 14:26:05 +02:00
6a4aa6b059 Wip in Nester interface 2019-07-04 13:58:18 +02:00
2bde3e12f2 WIP Undo / Redo: First Undo in the history of PrusaSlicer! 2019-07-04 10:45:41 +02:00
b475a174d7 WIP still with arrange return value. 2019-07-03 19:24:41 +02:00
dcd396e3d8 Deal with infinite box. 2019-07-03 15:06:10 +02:00
07e2066dd3 WIP Undo / Redo: Serializing the configs of ModelObject / ModelVolume
/ ModelMaterial as separate objects to conserve memory.
2019-07-03 13:43:54 +02:00
1ba1fd2b97 WIP UndoRedo: Added Undo/Redo stack, added Platter::take_snapshot(),
experimental snapshots on loading STLs and increasing / decreasing
model instances.
2019-07-02 16:42:23 +02:00
182436e75f Partial arrange starts to work again. 2019-07-02 15:24:40 +02:00
2db15c620b Fixed colot_print issues:
* Disabled color change information for the SLA and FFF-multimaterial presets
* Corrected switch between "color print" and "feature type" on Preview
2019-07-02 14:06:58 +02:00
be10f94d1a Unify AutoArranger subclasses 2019-07-02 12:15:53 +02:00
297928fecc Fix build against system-provided qhull 2019-07-02 11:43:07 +02:00
f213e7570e Fix broken partial arrange 2019-07-02 10:32:01 +02:00
a5f5840c1b Still WIP 2019-07-01 18:22:07 +02:00
45a5576e8a Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-29 12:38:03 +02:00
7e9b4257e1 Adapt find_new_position is WIP. Cleaning up comments. 2019-06-28 18:27:15 +02:00