bubnikv
6b3c24359b
Merge branch 'master' into amf_activate_existing_presets
2018-06-28 22:00:10 +02:00
bubnikv
082f88ad5f
gcc / clang did not like backslashes inside comments
2018-06-28 21:46:23 +02:00
bubnikv
26b003073b
Renamed the "compatible_printers_condition" and "inherits" vectors
...
to "compatible_printers_condition_cummulative" and "inherits_cummulative"
when storing to AMF/3MF/Config files.
Improved escaping of strings stored / loaded from config files.
2018-06-28 20:13:01 +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
bubnikv
68e82a7348
Merge branch 'master' into amf_activate_existing_presets
2018-06-27 10:33:14 +02:00
bubnikv
22463343a7
Fixed integration tests.
2018-06-26 13:22:24 +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
bubnikv
082ed95a94
Activate existing projects after loading AMF/3MF/Config: Initial implementation.
2018-06-22 14:17:03 +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
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
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
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
Enrico Turri
0faaef76e8
C++ code cleanup
2018-06-12 12:18: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
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
f4a687703c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-08 08:30:55 +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
Enrico Turri
40bb0b6f55
Fixed overflow in Polygon::area()
2018-06-05 16:07:09 +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
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
YuSanka
16a5029d58
Fixed issue #875 and updated Slic3rPE.pot
2018-06-04 12:13:07 +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
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
e4aff5b08a
Feedrate on the first layer of the wipe tower properly set (bugfix)
2018-05-29 09:07:23 +02:00
Enrico Turri
c51ce63b9b
3DScene layer editing overlay completely moved to c++
2018-05-25 15:56:14 +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
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