tamasmeszaros
85474e5803
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
...
# Conflicts:
# CMakeLists.txt
# lib/Slic3r/GUI/MainFrame.pm
2018-06-28 18:50:39 +02:00
tamasmeszaros
ad4d95f60c
AppController integration
2018-06-28 18:47:18 +02:00
tamasmeszaros
5446b9f1e5
Incorporating performance optimizations from libnest2d
2018-06-28 16:14:17 +02:00
Enrico Turri
dc25df7b32
Faster remaining times export
2018-06-28 13:57:28 +02:00
Lukas Matena
19f5863d75
Wipe tower fix - incorrect start/end position reported to the GCode generator when the tower was rotated
2018-06-28 10:22:04 +02:00
Enrico Turri
7d61b2076f
Faster remaining time calculation
2018-06-28 09:24:07 +02:00
Enrico Turri
9725966f38
Time estimate uses G1 lines containing E parameter for remaining time calculations
2018-06-28 08:52:07 +02:00
Lukas Matena
bb288f2a1b
Fixed a crash when complete_objects was turned on
2018-06-27 15:49:02 +02:00
Enrico Turri
7ff22b9413
Time estimate emitted to gcode at requested interval
2018-06-27 15:35:47 +02:00
Lukas Matena
54bd0af905
Infill wiping turned off by default and in some automatic tests
2018-06-27 15:07:37 +02:00
Lukas Matena
c11a163e08
Correct extruder is used for dontcare extrusions
2018-06-27 14:08:46 +02:00
bubnikv
68e82a7348
Merge branch 'master' into amf_activate_existing_presets
2018-06-27 10:33:14 +02:00
Lukas Matena
f8388abe17
'Dontcare' extrusions now don't force a toolchange + code reorganization
2018-06-26 14:12:25 +02:00
bubnikv
22463343a7
Fixed integration tests.
2018-06-26 13:22:24 +02:00
Lukas Matena
4dae6cbf60
Merge branch 'master' into wipe_tower_improvements
2018-06-26 12:58:04 +02:00
bubnikv
1175dc95f6
Storing and recovering the "compatible_printers_condition"
...
and "inherits" fields from / to the AMF/3MF/Config files.
The "compatible_printers_condition" are collected over all active profiles
(one print, possibly multiple filament, and one printer profile)
into a single vector.
2018-06-26 10:50:50 +02:00
Enrico Turri
3da21a4ce8
Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-25 08:27:09 +02:00
bubnikv
b5f97baa28
Merge remote-tracking branch 'remotes/origin/machine-limits-config' into add_kinematics
2018-06-22 17:44:12 +02:00
YuSanka
54c90ee948
Updated PrintConfig default values for machine limits
...
+ fixed incorrect default value setting for the TextCtrl
2018-06-22 16:13:34 +02:00
bubnikv
082ed95a94
Activate existing projects after loading AMF/3MF/Config: Initial implementation.
2018-06-22 14:17:03 +02:00
Lukas Matena
e2126c2dd6
Dedicated objects are now not ignored
2018-06-22 14:03:34 +02:00
Enrico Turri
f420ced581
Time estimators use initial data from config
2018-06-22 14:01:27 +02:00
Enrico Turri
00ef0610a5
Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-22 12:57:16 +02:00
Enrico Turri
f8982c0ca1
Merge branch 'machine-limits-config' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-22 12:30:15 +02:00
Enrico Turri
ac7d21b50a
Geometry info updated while using gizmos
2018-06-22 11:19:38 +02:00
YuSanka
9ba1af5834
Merge remote-tracking branch 'origin/master' into add_kinematics
2018-06-22 09:22:29 +02:00
YuSanka
4454c3437f
"Machine limits" page is completed
2018-06-21 16:15:56 +02:00
Enrico Turri
e89083090f
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-21 16:08:40 +02:00
Enrico Turri
e0db2a925d
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-21 16:08:20 +02:00
Lukas Matena
e622401599
Wipe tower bugfix - the tower was printed incorrectly when the rotation angle was close to 90 degrees
2018-06-21 14:05:07 +02:00
Lukas Matena
6669357c81
Merge branch 'master' into wipe_tower_improvements
2018-06-21 10:41:01 +02:00
Lukas Matena
bc5bd1b42b
Assigning of wiping extrusions improved
2018-06-21 10:16:52 +02:00
Enrico Turri
550f6e307f
Faster gizmos update
2018-06-21 08:37:04 +02:00
bubnikv
ac011aec6d
Removed dependencies of libslic3r on Slic3r GUI library.
2018-06-20 18:55:31 +02:00
bubnikv
02d4f3e14d
Provide a callback to libslic3r to translate texts.
...
Moved the "translate" functions to namespaces to avoid clashes
between the code in libslic3r and Slic3r GUI projects.
2018-06-20 18:33:46 +02:00
YuSanka
b6ebbdb94a
Updated "Machine limits"(Kinematics) page according to the new config
2018-06-20 16:30:55 +02:00
YuSanka
e0bd97ab9c
Merge remote-tracking branch 'origin/machine-limits-config' into add_kinematics
2018-06-20 14:26:51 +02:00
YuSanka
fd4feb689e
Added prototype for "Kinematics" Page
...
+ Added enum_labels to localizations
+ Added bold font for the name of Options Groups
2018-06-20 14:20:48 +02:00
bubnikv
6b2b970b9a
Added machine evelope configuration parameters
...
(the MachineEnvelopeConfig class).
Added localization support for libslic3r through a callback
(the callback is not registered yet, so the localization does nothing).
Localized the Print::validate() error messages.
2018-06-20 13:57:37 +02:00
Lukas Matena
8a47852be2
Refactoring of perimeters/infills wiping (ToolOrdering::WipingExtrusions now takes care of the agenda)
...
Squashed commit of the following:
commit 931eb2684103e8571b4a2e9804765fef268361c3
Author: Lukas Matena <lukasmatena@seznam.cz>
Date: Wed Jun 20 12:50:27 2018 +0200
ToolOrdering::WipingExtrusions now holds all information necessary for infill/perimeter wiping
commit cc8becfbdd771f7e279434c8bd6be147e4b321ee
Author: Lukas Matena <lukasmatena@seznam.cz>
Date: Tue Jun 19 10:52:03 2018 +0200
Wiping is now done as normal print would be (less extra code in process_layer)
commit 1b120754b0691cce46ee5e10f3840480c559ac1f
Author: Lukas Matena <lukasmatena@seznam.cz>
Date: Fri Jun 15 15:55:15 2018 +0200
Refactoring: ObjectByExtruder changed so that it is aware of the wiping extrusions
commit 1641e326bb5e0a0c69d6bfc6efa23153dc2e4543
Author: Lukas Matena <lukasmatena@seznam.cz>
Date: Thu Jun 14 12:22:18 2018 +0200
Refactoring: new class WipingExtrusion in ToolOrdering.hpp
2018-06-20 12:52:00 +02:00
Enrico Turri
fa9014fc8e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-20 08:32:27 +02:00
bubnikv
27faaa27f6
Merge remote-tracking branch 'remotes/origin/3mf_io'
2018-06-19 16:14:57 +02:00
bubnikv
6fef5a07ab
Merge remote-tracking branch 'remotes/origin/scene_manipulators'
...
Disabled the gizmos.
2018-06-19 16:12:36 +02:00
Enrico Turri
a3949b9f01
Object updated by scale gizmo
2018-06-18 15:07:17 +02:00
Enrico Turri
53f8706805
Rotate gizmo interaction with mouse
2018-06-15 16:16:55 +02:00
tamasmeszaros
230c681482
Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
2018-06-15 11:06:37 +02:00
Lukas Matena
29dd305aaa
Wiping into perimeters - bugfix (wrong order of perimeters and infills)
2018-06-13 11:48:43 +02:00
Enrico Turri
0faaef76e8
C++ code cleanup
2018-06-12 12:18:16 +02:00
Enrico Turri
7a08e665bc
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-12 11:56:16 +02:00
Enrico Turri
f8664fce71
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-12 11:55:57 +02:00
bubnikv
303ed0e6c9
Bumped up the version number to a final.
2018-06-12 11:53:09 +02:00
Enrico Turri
9a4e250c33
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-11 13:46:55 +02:00
Enrico Turri
efe6a29032
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-11 13:46:35 +02:00
bubnikv
6cafc7f121
Fix of a regression issue, which was certainly in 1.34.0, probably
...
even longer. An infill / perimeter overlap was not applied
when defined with absolute coordinates.
Fixes https://github.com/prusa3d/Slic3r/issues/964
2018-06-11 10:59:02 +02:00
Enrico Turri
bf2fd54578
reload_scene method of 3D class moved to c++
2018-06-08 09:40:00 +02:00
Enrico Turri
8867e8ca60
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-08 08:31:21 +02:00
Enrico Turri
f4a687703c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-08 08:30:55 +02:00
Lukas Matena
b6455b66bd
Wiping into infill/objects - invalidation of the wipe tower, bugfixes
2018-06-07 16:19:57 +02:00
Enrico Turri
766d1d52a9
Fixed import of model rotated clockwise from 3mf
2018-06-07 16:13:32 +02:00
Vojtech Kral
2e061994d4
Fix: GCodeSender: Line number resynchronisation
2018-06-07 15:41:34 +02:00
Enrico Turri
a8500d6bae
class 3D callbacks moved to c++
2018-06-07 11:18:28 +02:00
Lukas Matena
73452fd79d
More progress on 'wipe into dedicated object' feature (e.g. new value in object settings)
2018-06-06 18:24:42 +02:00
Enrico Turri
71d750c1b8
Remaining time gcode line exported only for Marlin firmware
2018-06-06 12:21:24 +02:00
Enrico Turri
4009fdcc18
Finalized format for gcode line containing remaining printing time
2018-06-06 11:00:36 +02:00
Enrico Turri
40bb0b6f55
Fixed overflow in Polygon::area()
2018-06-05 16:07:09 +02:00
Lukas Matena
4830593cac
Started to work on the 'wipe into dedicated object feature'
2018-06-05 12:50:34 +02:00
tamasmeszaros
34c850fa9d
initial NFP method with convex polygons working.
2018-06-05 12:02:45 +02:00
Enrico Turri
e8b32fa1df
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-05 10:54:35 +02:00
Enrico Turri
1f79713c15
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-05 10:54:15 +02:00
Enrico Turri
489bce5a18
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-06-05 10:53:20 +02:00
bubnikv
03518d2ff2
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-06-04 15:47:51 +02:00
Enrico Turri
4672a18b49
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-04 12:25:25 +02:00
Enrico Turri
109dde00b2
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-04 12:25:04 +02:00
Enrico Turri
78c32bdf9a
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-06-04 12:24:14 +02:00
Lukas Matena
7c9d594ff6
Fixed behaviour of infill wiping for multiple copies of an object
2018-06-04 12:15:59 +02:00
YuSanka
16a5029d58
Fixed issue #875 and updated Slic3rPE.pot
2018-06-04 12:13:07 +02:00
Lukas Matena
bdaa1cbdfd
Wiping into infill - no infills are now inadvertedly printed twice (hopefully)
2018-06-01 15:43:22 +02:00
Lukas Matena
2d24bf5f73
Wipe into infill - copies of one object are properly processed
2018-05-31 16:21:10 +02:00
Enrico Turri
6bf009edee
3DScene mouse event handler partially moved to c++ - part 2
2018-05-31 16:04:59 +02:00
Enrico Turri
30a3b2179b
3DScene timer and _variable_layer_thickness_action method moved to c++
2018-05-30 15:18:45 +02:00
Enrico Turri
5a8d1ffdba
Prototype for exporting estimated remaining time into gcode for default and silent mode
2018-05-30 12:08:03 +02:00
Lukas Matena
8bdbe41505
Wiping into infill should respect infill_first setting, marking moved to separate function
2018-05-30 11:56:30 +02:00
Lukas Matena
db22b2f504
Bugfix: first color of the wipe tower preview was incorrect with some models
2018-05-30 11:02:00 +02:00
Lukas Matena
b95a6f2626
Fix of previous commit
2018-05-29 15:29:20 +02:00
Enrico Turri
5c745485e1
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-29 13:56:41 +02:00
Enrico Turri
38d0c964d8
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-05-29 13:55:46 +02:00
Enrico Turri
363a964ebb
3DScene render method partially moved to c++
2018-05-29 13:54:34 +02:00
Lukas Matena
cb5f5c65b0
Analyzer tags for the wipe tower also generate layer height and line width (so the priming lines+brim are visible and ramming lines are correct width)
2018-05-29 12:41:40 +02:00
Lukas Matena
549351bbb4
Analyzer tags for the wipe tower also generate layer height and line width (so the priming lines+brim are visible and ramming lines are correct width)
2018-05-29 12:32:04 +02:00
Lukas Matena
e4aff5b08a
Feedrate on the first layer of the wipe tower properly set (bugfix)
2018-05-29 09:07:23 +02:00
Lukas Matena
c72ecb382d
Reduction is now correctly calculated for each region, soluble filament excluded from infill wiping
2018-05-28 15:33:19 +02:00
Lukas Matena
bfe4350a89
Calculation of wipe tower reduction corrected, new config option (wipe into infill)
2018-05-25 16:11:55 +02:00
Enrico Turri
c51ce63b9b
3DScene layer editing overlay completely moved to c++
2018-05-25 15:56:14 +02:00
Lukas Matena
132a67edb2
Wipe tower changes to reduce wiping volumes where appropriate
2018-05-24 17:24:37 +02:00
Lukas Matena
95795f249a
First steps in reorganizing infill order (to use infill instead of the wipe tower)
2018-05-24 14:05:51 +02:00
Enrico Turri
157a34bcd9
AMF I/O - Automatic detection if open file is zip archive or xml format
2018-05-24 09:57:12 +02:00
Lukas Matena
1d1c69f300
Merge branch 'master' into wipe_tower_improvements
2018-05-23 19:34:33 +02:00
Enrico Turri
486180c422
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-23 15:33:25 +02:00
bubnikv
a9499ae45c
Fix of a crash intruduced with e8247c5646
2018-05-23 13:19:25 +02:00
Enrico Turri
37ab7594fc
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-23 08:38:29 +02:00
bubnikv
076b293fec
Bumped up version numbers of the PrusaResearch.ini and the Slic3r itself.
2018-05-22 15:18:38 +02:00
Enrico Turri
85b6784dcb
Merge with master
2018-05-22 15:03:40 +02:00
bubnikv
306d77559e
Merge remote-tracking branch 'remotes/origin/scene_manipulators'
2018-05-22 14:32:07 +02:00
Enrico Turri
4e29147756
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-22 11:48:45 +02:00
Lukas Matena
e2f44a231e
A fix to use correct spacing with multiloop skirts
2018-05-22 10:50:38 +02:00
Lukas Matena
99293011e6
Corrected brim generation (width), enabling continuity with skirt
2018-05-18 12:19:54 +02:00
Enrico Turri
5224acad59
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-18 09:55:30 +02:00
Enrico Turri
6c6b8ccc42
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-18 09:55:21 +02:00
bubnikv
3f08ef70f1
Fix of extraneous infill over thin walls.
...
Fixes https://github.com/prusa3d/Slic3r/issues/670
and some of https://github.com/prusa3d/Slic3r/issues/895
PerimeterGenerator was using an unsafe clipper offset function,
which performed offset for both a contour and its holes together.
With this commit the offsets were replaced with their safe counterparts,
though these safe counterparts may be somehow slower
(performing offset on ExPolygon or ExPolygons, piece by piece).
Also there was a bug, where if the infill & gap fill consumed
everything of the polygon, a polygon one onion shell above was still
used for infill.
2018-05-18 09:52:09 +02:00
Enrico Turri
f34250ea6a
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-18 09:29:14 +02:00
Enrico Turri
255bec7432
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-18 09:29:05 +02:00
bubnikv
651c4ab0ae
Fixed a typo in AppConfig
2018-05-18 08:46:33 +02:00
Enrico Turri
d56b543ff8
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-18 08:32:19 +02:00
Enrico Turri
d85fd5501c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-18 08:32:09 +02:00
bubnikv
19221b749c
Fix of https://github.com/prusa3d/Slic3r/issues/869
2018-05-18 08:21:24 +02:00
Enrico Turri
7ca9f46b9c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-17 14:43:27 +02:00
Enrico Turri
f26bce2538
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-17 14:43:18 +02:00
bubnikv
35bf4aee7d
Fixed loading of configuraton values octoprint_host, support_material_threshold
...
They were incorrectly handled by the handle_legacy() function, which has been
ported from the upstream Slic3r without inspecting its content.
2018-05-17 14:08:50 +02:00
Enrico Turri
15f35a9e9e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-17 12:12:27 +02:00
Enrico Turri
74b0ed4b23
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-17 12:12:18 +02:00
tamasmeszaros
fd829580e9
Working arrange_objects with DJD selection heuristic and a bottom-left placement strategy.
2018-05-17 10:37:26 +02:00
bubnikv
e3d84407e0
Fix of https://github.com/prusa3d/Slic3r/issues/896
...
Fixed a bug in parsering a Point from a config file.
2018-05-17 10:30:20 +02:00
Enrico Turri
7a6d83e7eb
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-17 08:33:32 +02:00
Enrico Turri
853ebf6ad2
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-17 08:33:16 +02:00
bubnikv
4b87f71bbc
Fix of the previous commmit. gcc and clang rightfully complained about a typo.
2018-05-15 14:20:32 +02:00
bubnikv
868b400120
Merge branch 'master' of https://github.com/prusa3d/slic3r
2018-05-15 14:04:49 +02:00
bubnikv
7645e9cb7a
Added layer_num, layer_z variables to the end_gcode, end_filament_gcode,
...
added min(.,.), max(.,.) functions to the placeholder parser syntax.
2018-05-15 14:04:29 +02:00
Enrico Turri
c60bf694ef
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-15 12:22:44 +02:00
Enrico Turri
43784f3409
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-15 12:22:35 +02:00
Enrico Turri
a612b5b648
Replacement of xml escape characters when exporting to amf
2018-05-15 12:19:43 +02:00
Lukas Matena
1f62978251
Merge branch 'master' into wipe_tower_improvements
2018-05-15 11:22:58 +02:00
Enrico Turri
f4303ebdb8
1st attempt of perl callback from c++ for 3DScene
2018-05-15 09:50:01 +02:00
Enrico Turri
1edd2d01f0
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-14 10:01:27 +02:00
Lukas Matena
b6db3767a2
Bugfix: extruder temperature only changes when the temperature differs from the one last set (wipe tower)
2018-05-11 17:35:42 +02:00
Lukas Matena
03c6efe0d6
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-05-11 12:29:34 +02:00
Lukas Matena
d89f8128cd
Fixed a GCode preview crash on Linux due to returning a reference to temporary (issue #872 )
2018-05-11 12:28:31 +02:00
bubnikv
d620961c34
Fixed the version number. We have an alpha state as of today.
2018-05-10 18:37:57 +02:00
YuSanka
754bfd926b
Auto-correction of the input values according to the admissible range
2018-05-10 11:10:44 +02:00
Enrico Turri
86155ae4c0
Fixed conflict in previous merge
2018-05-09 10:28:26 +02:00
Enrico Turri
bd4061c3b0
Merge with master branch
2018-05-09 10:16:28 +02:00
Enrico Turri
8eb9ddc2eb
Max count of auto assigned extruders when splitting object set as dependent of current printer
2018-05-07 16:13:58 +02:00
Enrico Turri
c579ec7f5f
Fixed wrong extrusion paths detection with multimaterial objects
2018-05-07 14:23:07 +02:00
Enrico Turri
678cbd9d47
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-04 08:56:16 +02:00
bubnikv
19977edae2
Removed the "Broken croak" support, which was useful on broken
...
64bit Strawberry perl only. We don't use Strawberry perl anymore,
so this has been removed for clarity.
Added a PerlCallback wrapper to call a Perl subroutine from a C++ code.
2018-05-03 21:45:43 +02:00
Enrico Turri
717fbc1196
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-03 11:11:48 +02:00
Enrico Turri
d19b1162b3
Fixed normals on wipe tower box
2018-05-03 11:09:13 +02:00
Enrico Turri
65f3b52cad
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-02 15:17:32 +02:00
Enrico Turri
cb486522a8
Fixed crash when pressing 'A' with empty print bed
2018-05-02 14:55:17 +02:00
Enrico Turri
81636abaa9
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-02 14:45:42 +02:00
Lukas Matena
b4e63d47cb
Yet another attempt to fix the layer height profile validation
2018-05-02 10:56:06 +02:00