Commit Graph

201 Commits

Author SHA1 Message Date
Enrico Turri
fc0651702d Merge branch 'master' of https://github.com/prusa3d/Slic3r into gizmos_3d 2018-08-20 08:33:42 +02:00
Lukas Matena
db9580f40b Merge branch 'master' into lm_lay_flat_round_merged_facets 2018-08-17 15:45:02 +02:00
Vojtech Kral
7be24414f3 Build: Option to force generation of PDB file on MSVC Release build 2018-08-17 15:20:58 +02:00
Vojtech Kral
267712eb32 Build: Plumb perl include path
Thanks to @kortschak for contributing to this fix
Co-authored-by: Dan Kortschak <dan@kortschak.io>
2018-08-17 15:20:58 +02:00
tamasmeszaros
776f555790 wall generation with different top and bottom plates. 2018-08-17 15:11:30 +02:00
tamasmeszaros
f297da0d01 Working curve approximation of the concave hull with clipper offset. 2018-08-16 17:47:05 +02:00
Enrico Turri
da42b42a6c Merge branch 'opengl_to_cpp' of https://github.com/prusa3d/Slic3r into gizmos_3d 2018-08-15 14:39:40 +02:00
Lukas Matena
211790f8c3 Added qhull library to xs/src and cmake 2018-08-15 10:57:22 +02:00
tamasmeszaros
fbe415f88e Rough base pool geometry can be generated from convex hull or from the ground slice itself. 2018-08-13 18:23:49 +02:00
Enrico Turri
b6f6200bd5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-08-13 08:51:58 +02:00
tamasmeszaros
e8616b6a35 SLA base pool generation framework 2018-08-09 18:11:45 +02:00
tamasmeszaros
5164bec8ce Merge remote-tracking branch 'origin/master' into feature_slice_to_png
# Conflicts:
#	xs/CMakeLists.txt
2018-08-09 10:53:27 +02:00
Lukas Matena
705ccbe331 Added qhull library to xs/src and cmake 2018-08-07 12:20:15 +02:00
tamasmeszaros
6cdec7ac9a Prepare integration for arbitrary shaped print beds. 2018-07-30 16:41:35 +02:00
Enrico Turri
39c326ebae Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-27 14:41:05 +02:00
Vojtech Kral
a32bd17b75 FirmwareUpdater: MMU 2.0 / Caterina flashing 2018-07-27 13:27:52 +02:00
YuSanka
e0bb6bafd5 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-07-26 11:27:25 +02:00
Enrico Turri
c68bcb9e60 1st installment of 3D scene toolbar 2018-07-23 13:49:48 +02:00
tamasmeszaros
9559ad77e5 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-07-18 10:14:28 +02:00
tamasmeszaros
6bcd735655 Change to firstfit selection because DJD needs further testing. 2018-07-16 16:07:29 +02:00
tamasmeszaros
27b0926c19 Localization for app controller. 2018-07-03 10:22:55 +02:00
tamasmeszaros
478dd2a93f Proper localization of AppController 2018-07-02 16:15:21 +02:00
tamasmeszaros
d3b19382fe AppController reachable trough Plater.pm 2018-06-28 19:16:36 +02:00
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
ac9d81cfa0 Refactor and extensions to png export dialog. 2018-06-27 17:43:54 +02:00
tamasmeszaros
c28b602465 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-27 09:36:05 +02:00
tamasmeszaros
ae682b9cd3 Export dialog ready 2018-06-26 15:53:43 +02:00
YuSanka
2fae893af2 Fixed #998
Added detection of gtk2/gtk3 GUI libraries required by Alien::wxWidgets.
Added gtk2/gtk3 include paths, so we may call gtk2/3 API directly if needed for some workaround.
2018-06-26 10:37:36 +02:00
YuSanka
0371f368a4 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-06-26 09:26:27 +02:00
tamasmeszaros
99f6866a1d Merge branch 'feature_slice_to_png' of github.com:prusa3d/Slic3r into feature_slice_to_png
# Conflicts:
#	xs/src/slic3r/AppController.cpp
#	xs/src/slic3r/AppController.hpp
2018-06-25 17:13:36 +02:00
tamasmeszaros
f26cb9ebd6 Merge remote-tracking branch 'origin/master' into feature_slice_to_png
# Conflicts:
#	lib/Slic3r/GUI/MainFrame.pm
2018-06-25 13:24:37 +02:00
Tamás Mészáros
6737506b14 Separating wx and the app controller. 2018-06-25 12:40:01 +02:00
bubnikv
7863412687 Firwmare updater for the Einsy external flash memory,
to be used as a storage for localization strings.

Hacked into the avrdude Arduino STK500 (not STK500v2) protocol.
2018-06-19 18:46:37 +02:00
tamasmeszaros
5f310e1520 AppController class created to take the necessary app logic into C++. 2018-06-19 17:45:21 +02:00
bubnikv
5a56f08aad Merge remote-tracking branch 'remotes/origin/opengl_to_cpp' 2018-06-19 16:08:53 +02:00
bubnikv
734273a33a Merge remote-tracking branch 'remotes/origin/fix_model_by_win10' 2018-06-19 10:02:49 +02:00
tamasmeszaros
4328ecc287 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-18 12:17:19 +02:00
tamasmeszaros
230c681482 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-06-15 11:06:37 +02:00
YuSanka
3e0ff5e9ef Added LambdaObjectDialog 2018-06-14 21:48:06 +02:00
YuSanka
8899be8cca Started porting of the functions for object settings editing 2018-06-13 16:39:33 +02:00
Enrico Turri
b2cf576bf3 1st installment of gizmos 2018-06-13 09:12:16 +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
bubnikv
7dfe2e2595 Fixed mangling of UTF characters when converted implicitely to
wxString on Windows through the + operator.
2018-06-07 22:10:23 +02:00
tamasmeszaros
34c850fa9d initial NFP method with convex polygons working. 2018-06-05 12:02:45 +02:00
bubnikv
d05d3cb652 Initial working implementation of the "Fix by Netfabb" function. 2018-06-04 21:22:42 +02:00
bubnikv
e65fac5e84 Added initial implementation of fixing 3MFs through the Netfabb
API provided through the Windows 10 Universal Windows Platform API.
2018-06-04 17:27:33 +02:00
tamasmeszaros
a2eecdfb25 Output directory selection changed to zip file selection with file dialog. 2018-05-23 16:28:18 +02:00
tamasmeszaros
a52807df72 Using system libpng where present.
This avoids the crash caused on Linux where it should be present.
2018-05-23 15:21:13 +02:00
tamasmeszaros
a7298d9d89 Merge with latest master 2018-05-23 12:27:07 +02:00
tamasmeszaros
9c2d9b2ba3 OSX build fixes, again... 2018-05-22 15:13:07 +02:00
Enrico Turri
59af3fb866 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-22 08:33:23 +02:00
bubnikv
33f21422e6 Added friendly names to serial ports, added automatic selection of Prusa's printers in the firmware updater dialog 2018-05-21 18:58:22 +02:00
Vojtech Kral
af360d7097 Firmware updater GUI 2018-05-21 18:58:22 +02:00
Vojtech Kral
07817c8ee5 avrdude: Compilation on Windows/MSVC 2018-05-21 18:58:22 +02:00
Vojtech Kral
53b42bf921 CMake: Fix C compiler warning about C++ flags 2018-05-21 18:58:22 +02:00
Vojtech Kral
11a00b025f avrdude integration basics (WIP) 2018-05-21 18:58:20 +02:00
tamasmeszaros
1f01dbb1ec Fix link error on linux 2018-05-21 18:13:32 +02:00
tamasmeszaros
b3c49cbbe6 Fixing zlib and libpng build on Linux 2018-05-21 17:42:46 +02:00
tamasmeszaros
e6e078cbf7 Unneccessary AGG sources removed. Added libpng and zlib sources and static build in cmake. 2018-05-21 15:58:52 +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
tamasmeszaros
e1b9c13024 Rasterizer skeleton 2018-05-16 18:51:28 +02:00
Enrico Turri
5024fc4be7 OpenGL to c++ 1st installment - WIP 2018-05-09 10:47:04 +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
Vojtech Kral
3deeda0f73
Merge pull request #859 from prusa3d/updating
Updating
2018-05-02 14:35:43 +02:00
Vojtech Kral
9d9bcfe03f MSVC: Rename props file #857 2018-05-02 13:03:04 +02:00
Vojtech Kral
97a948fa52 Fix Perl path MSVC props file #857 2018-05-02 12:49:48 +02:00
Vojtech Kral
5624b8afd2 Add a new error dialog 2018-04-30 14:34:47 +02:00
Vojtech Kral
62d67d35ec Merge branch 'profile_changes_reset' into updating 2018-04-24 18:15:23 +02:00
Vojtech Kral
fea5603409 PresetUpdater: Bundle incompatibility / Slic3r downgrade scnario 2018-04-24 18:06:42 +02:00
YuSanka
48bbd2d22a Added new files to MackList 2018-04-20 15:02:54 +02:00
Vojtech Kral
214ad2925b Merge branch 'master' into updating 2018-04-16 17:32:58 +02:00
bubnikv
b79692c35e Merge remote-tracking branch 'remotes/origin/wipe_tower_improvements' 2018-04-13 16:43:35 +02:00
bubnikv
4275b15dcd Merge remote-tracking branch 'origin/updating' into config_snapshots 2018-04-10 16:46:15 +02:00
bubnikv
0694fad016 Initial implementation of the config snapshot dialog. 2018-04-10 16:27:42 +02:00
bubnikv
32c4cddb91 Ported the AboutDialog to C++, thanks @alexrj for the work.
New "configuration" menu over the snapshots, user preferences etc.
2018-04-09 17:03:37 +02:00
bubnikv
601185f113 Merge branch 'master' of https://github.com/prusa3d/slic3r 2018-04-06 16:49:59 +02:00
bubnikv
670061ac33 Initial implementation of configuration snapshotting. 2018-04-06 16:49:33 +02:00
Vojtech Kral
57e47a3296 AppConfig: Support for vendor / model / variant enable state 2018-04-06 13:24:02 +02:00
Vojtech Kral
3fcf194e39 ConfigWizard: Basic structure / WIP 2018-04-06 13:23:49 +02:00
Lukas Matena
7253028d79 Merge branch 'master' into wipe_tower_improvements 2018-04-06 12:33:12 +02:00
bubnikv
e37cbdfcfc Merge remote-tracking branch 'remotes/origin/profile_changes_reset' 2018-04-05 19:53:53 +02:00
Vojtech Kral
2b8da333ef Semver: Semantic version parsing and arithmetics 2018-04-05 14:22:11 +02:00
bubnikv
e931f75010 Work in progress: Good bye, Perl Threads! 2018-03-23 11:41:20 +01:00
YuSanka
08a8fe84a4 Merge remote-tracking branch 'origin/master' into profile_changes_reset 2018-03-22 14:18:48 +01:00
Lukas Matena
e30405d672 Merge branch 'master' into wipe_tower_improvements 2018-03-21 11:33:37 +01:00
bubnikv
0bd9918643 Implements SPE-159 "substitute accented letters with non-accented ones" 2018-03-16 18:20:47 +01:00
Lukas Matena
3d6f6530c0 Merge branch 'master' into wipe_tower_improvements 2018-03-16 14:06:23 +01:00
Vojtech Kral
c88d2780ce Octoprint (#796)
* Octoprint: GUI for CA file, improvements

* Octoprint: Add GUI for Bonjour lookup, bugfixes

* Octoprint: Bonjour browser: Cleanup Perl interaction

* Octoprint: Bonjour: Perform several broadcast, UI fixes

* Octoprint: Add files to localization list

* Http: Disable CA File setting on SSL backends that don't support it
2018-03-15 18:06:26 +01:00
Lukas Matena
e864238609 Merge branch 'project_specific_config' into wipe_tower_improvements 2018-03-15 14:05:45 +01:00
YuSanka
a41e55a773 Merge remote-tracking branch 'origin/profile_inheritance' into profile_changes_reset 2018-03-14 16:34:51 +01:00
Vojtech Kral
bd61c233a5 CMake target to generate the main pot file (#786) 2018-03-12 20:38:47 +01:00
bubnikv
30c859ac7f Added a lock icon to the list of filaments, added some
helper methods to PresetBundle.
2018-03-12 16:04:32 +01:00
Vojtech Kral
58788ef43a MSVC: Fix run and debug project settings (#771)
* MSVC: Fix run and debug project settings

* MSVC: Fix CMake infinite loop
2018-03-12 09:39:32 +01:00
Lukas Matena
1c6fa6660e Merge branch 'master' into wipe_tower_improvements 2018-03-09 15:10:15 +01:00
bubnikv
4a90ab1f6a Merge branch 'octoprint' 2018-03-06 11:39:44 +01:00
bubnikv
e26ccfc247 Fixed compilation on Windows,
removed debugging menu and debugging output.
2018-03-06 11:39:24 +01:00
bubnikv
51da42734a Merge remote-tracking branch 'origin/http+build' 2018-03-06 10:15:17 +01:00
Vojtech Kral
fc05eb898d WIP: Bonjour 2018-03-05 18:33:15 +01:00
Vojtech Kral
7cfc5204c8 WIP: OctoPrint 2018-03-05 18:33:15 +01:00