Commit Graph
100 Commits
Author SHA1 Message Date
tamasmeszaros 9e0e41af8f fix compilation of libnest2d on mac 2018-10-24 14:17:56 +02:00
tamasmeszaros 34e652b985 Fixing nesting crash in debug mode.
Also commented out unnecessary bloat from AppController
2018-10-23 17:20:31 +02:00
tamasmeszaros 4cee4f0e0e changing defaultly downloaded nlopt version to 2.5.0 2018-09-25 15:54:39 +02:00
tamasmeszaros 2306c1589a Polymorphic AppController for cli and gui modes. 2018-09-19 18:02:04 +02:00
tamasmeszaros 3f0968fb02 Refactoring member variable names for my classes to match our coding style. 2018-09-19 14:54:37 +02:00
tamasmeszaros 1a0b72de2c png export recovered with the new print object interface. 2018-09-19 14:32:38 +02:00
tamasmeszaros 2056f4c336 Zipper concept clarified. 2018-09-19 13:43:15 +02:00
tamasmeszaros 6b655f9aa3 Merge branch 'dev2' of github.com:prusa3d/Slic3r into dev2 2018-09-19 11:08:29 +02:00
tamasmeszaros 7708fb8ada Zipper implementation in gui level for png export. 2018-09-19 11:08:10 +02:00
tamasmeszaros 4d6fb52047 Removed explicit dependency of wxWidgets from PrintExport.hpp 2018-09-18 19:13:56 +02:00
tamasmeszaros 5fa99fd903 removing unnecessary artefacts FindFlann and duplicate c++11 standard definition in cmake. 2018-09-18 11:16:49 +02:00
tamasmeszaros bef19fe6da Merge remote-tracking branch 'origin/dev' into feature_arrange_with_libnest2d 2018-09-13 12:10:59 +02:00
tamasmeszaros 3c6afedcb1 Merge remote-tracking branch 'origin/dev' into feature_arrange_with_libnest2d 2018-09-11 12:38:29 +02:00
tamasmeszaros 6106ce9ff0 Abort semantics added.
Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
2018-09-11 12:36:24 +02:00
tamasmeszaros 1acee89006 Refinements for small item arrangement using the increased cpu power. 2018-09-07 12:03:49 +02:00
tamasmeszaros ec3e1403b6 Cleaning up and fixing localization issues with AppController. 2018-09-07 10:24:05 +02:00
tamasmeszaros ae2b4dd01c Merge remote-tracking branch 'origin/master' into parallel_arrange 2018-09-07 09:53:32 +02:00
tamasmeszaros 6e2ed48e5a Merge remote-tracking branch 'origin/feature_arrange_with_libnest2d' into dev
# Conflicts:
#	xs/src/slic3r/AppController.cpp
2018-08-31 10:55:55 +02:00
tamasmeszaros 4f53fc2a5f Merge remote-tracking branch 'origin/cpp_progress_status_bar' into dev
# Conflicts:
#	lib/Slic3r/GUI/MainFrame.pm
#	xs/src/slic3r/AppController.cpp
#	xs/src/slic3r/AppControllerWx.cpp
#	xs/src/slic3r/GUI/GUI.hpp
2018-08-30 17:35:49 +02:00
tamasmeszaros f5b1729af3 fixing build issues 2018-08-30 12:11:52 +02:00
tamasmeszaros 15ad0ef2f2 working C++ status bar.
Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
2018-08-30 11:55:10 +02:00
tamasmeszaros 9e2d48ff3b Almost working c++ status bar
Signed-off-by: tamasmeszaros <meszaros.q@gmail.com>
2018-08-30 11:54:08 +02:00
tamasmeszaros 055e90602e Merge remote-tracking branch 'origin/dev' into sla_base_pool 2018-08-28 15:17:35 +02:00
tamasmeszaros 4796ef3fb2 png export parameters routed to SLA print config. PngExportDialog disabled. 2018-08-28 14:55:40 +02:00
tamasmeszaros 057dfa56e3 fix build for Linux 2018-08-28 11:55:10 +02:00
tamasmeszaros 7cee4d53f9 added max merge distance parameter 2018-08-28 10:52:18 +02:00
tamasmeszaros b990b36da7 png export recovered 2018-08-27 16:58:20 +02:00
tamasmeszaros 1c4574d42e fix centroid error for two points and merge with dev. 2018-08-27 16:20:13 +02:00
tamasmeszaros 4c1bb6888c generalization for more than one concave hulls. 2018-08-27 15:18:28 +02:00
tamasmeszaros e667203825 FIxed build errors caused by merge and flipped normals of the SLA pool walls. 2018-08-27 11:59:37 +02:00
tamasmeszaros 3144cba5f9 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-08-27 10:20:48 +02:00
tamasmeszaros d749080261 Merge remote-tracking branch 'origin/dev' into sla_base_pool 2018-08-27 09:53:52 +02:00
tamasmeszaros 9036a11c7f Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-08-22 13:54:45 +02:00
tamasmeszaros e522ad1a00 Parallel placer now works with the custom Slic3r object function. Works an order of magnitude faster. 2018-08-22 13:52:41 +02:00
tamasmeszaros 6e77307880 Merge remote-tracking branch 'origin/eigenize' into sla_base_pool 2018-08-21 13:50:09 +02:00
tamasmeszaros 8194f9fb96 Edges now smoothed on the sides. 2018-08-21 13:20:43 +02:00
tamasmeszaros 8617b0a409 parallel nesting can be enabled but fails with the current objectfunction. 2018-08-20 16:34:35 +02:00
tamasmeszaros 0909059c54 figured out how to round the edges of the generated model. 2018-08-20 13:55:01 +02:00
tamasmeszaros 57cd39965f pool is has now bended walls. 2018-08-17 16:17:35 +02:00
tamasmeszaros 776f555790 wall generation with different top and bottom plates. 2018-08-17 15:11:30 +02:00
tamasmeszaros 1878c79ac7 Comments mostly 2018-08-16 17:58:45 +02:00
tamasmeszaros f297da0d01 Working curve approximation of the concave hull with clipper offset. 2018-08-16 17:47:05 +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
tamasmeszaros e8616b6a35 SLA base pool generation framework 2018-08-09 18:11:45 +02:00
tamasmeszaros e678368b23 fix compilation on linux and mac 2018-08-09 10:59:00 +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
tamasmeszaros 1764f3b57b Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-08-08 12:52:02 +02:00
tamasmeszaros ad92aa7486 Solution for stupid arrangement of rotated items and some fine tuning. 2018-08-08 12:51:17 +02:00
tamasmeszaros 20b7aad6d1 Bug fixes for the neighborhood detection 2018-08-07 19:51:23 +02:00
tamasmeszaros 08fb677583 Fine tuning of precision. 2018-08-07 14:23:57 +02:00
tamasmeszaros 224c0e74ea Precision raised and big item classification improved 2018-08-07 10:57:22 +02:00
tamasmeszaros d1bd5a51b2 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-08-06 20:13:29 +02:00
tamasmeszaros e1edb05bbb Better support for circular bed. 2018-08-06 20:13:04 +02:00
tamasmeszaros 3c32a7c3db Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-08-06 12:41:09 +02:00
tamasmeszaros db8762a93c bed shape detection works and circle shaped bed now supported with limited arrange quality. 2018-08-06 11:30:10 +02:00
tamasmeszaros 8da8ecb415 Bed shape detection in progress 2018-08-03 14:49:26 +02:00
tamasmeszaros e7e212cb52 Added a spatial index to speed up alignment score calculation. 2018-08-03 12:37:27 +02:00
tamasmeszaros 8e516bc3e4 reduce accuracy to acceptable performance 2018-08-02 19:25:19 +02:00
tamasmeszaros 9172a69e27 Nlopt build fix 2018-08-02 19:17:27 +02:00
tamasmeszaros 588456a5d9 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-08-02 17:51:47 +02:00
tamasmeszaros c8370b5408 New approach to big items with calculating the best alignment with other big items. 2018-08-02 17:51:11 +02:00
tamasmeszaros 66d1eb9b9d Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-08-02 13:16:11 +02:00
tamasmeszaros a7ba51bd11 Fixing the "last item doesn't fit" problem. 2018-08-02 13:15:30 +02:00
tamasmeszaros 6cdec7ac9a Prepare integration for arbitrary shaped print beds. 2018-07-30 16:41:35 +02:00
tamasmeszaros d136d61edd linest2d ready for arbitrary shaped beds. 2018-07-30 15:16:44 +02:00
tamasmeszaros 4e901a9db7 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-27 17:46:19 +02:00
tamasmeszaros f364bd1884 New object function considering item size categories (big and small) 2018-07-27 17:31:30 +02:00
tamasmeszaros 84f97e1f64 Improved libnest2d caching 2018-07-27 12:28:14 +02:00
tamasmeszaros c430f57187 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-26 12:58:52 +02:00
tamasmeszaros 629108265b Fix for SPE-421 and emergency fix for SPE-422 (needs further investigation) 2018-07-26 12:57:47 +02:00
tamasmeszaros 93ae3a0f1a Flip Y changed back to BOTTOM_LEFT
Merge remote-tracking branch 'origin/master' into feature_slice_to_png
2018-07-25 17:27:02 +02:00
tamasmeszaros ed0f073ef3 Small objects can now fit inside free space surrounded by objects. 2018-07-20 09:01:24 +02:00
tamasmeszaros 170034dd15 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-18 16:45:20 +02:00
tamasmeszaros 1745e5cff9 Small objects can now fit inside free space surrounded by objects. 2018-07-18 16:37:44 +02:00
tamasmeszaros eeeced1d6b Merge newest master 2018-07-18 10:26:03 +02:00
tamasmeszaros 9559ad77e5 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-07-18 10:14:28 +02:00
tamasmeszaros b82bc5feba Rasterizer fix to flip Y axis if it's coordinate origin is in the TOP_LEFT corner. 2018-07-18 09:46:55 +02:00
tamasmeszaros f54fd553fe Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-17 16:36:59 +02:00
tamasmeszaros 50424e33c6 Safety check for firstfit for larger objects than the print bed. 2018-07-17 16:35:48 +02:00
tamasmeszaros 86ba75d692 New objectfunction that makes a proper circle shaped pile on arrange. 2018-07-17 12:04:06 +02:00
tamasmeszaros 266ff2ad93 Build fix for linux 2018-07-16 16:37:14 +02:00
tamasmeszaros 67d69830e8 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-16 16:08:28 +02:00
tamasmeszaros 6bcd735655 Change to firstfit selection because DJD needs further testing. 2018-07-16 16:07:29 +02:00
tamasmeszaros eefa1678db Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-13 11:28:02 +02:00
tamasmeszaros 256d44cc43 Disabling reverse order checks in DJD selection. It causes unacceptable running times for large number of objects. 2018-07-13 11:26:59 +02:00
tamasmeszaros b26d1ef5bf Some comments 2018-07-04 14:36:14 +02:00
tamasmeszaros 0b914c5ea3 Customized object function for arrange algorithm to arrange into a circle.
Now we optimize for smallest diameter of the circle around the arranged pile of items. This implies that we can forget about pack efficiency but the result will be better for the heat characteristics of the print bed.
2018-07-04 14:11:21 +02:00
tamasmeszaros 4b9a504c04 Solution for SPE-347 (scale is not fed into the arrange alg) 2018-07-04 11:19:11 +02:00
tamasmeszaros a5d6064ad6 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-07-04 10:26:04 +02:00
tamasmeszaros fa7ca09e57 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-04 10:22:49 +02:00
tamasmeszaros d337fec8af Proper fix for SPE-324 2018-07-04 10:21:44 +02:00
tamasmeszaros 28bc54e5b7 Patch from Lubomír for CLI parameters 2018-07-03 17:59:49 +02:00
tamasmeszaros f3591d2a85 Libnest2D test fix 2018-07-03 16:39:13 +02:00
tamasmeszaros b4666e8174 Tryfix for Mac build... 2018-07-03 16:18:35 +02:00
tamasmeszaros 16ec625483 Eliminating signed comp warning 2018-07-03 15:09:12 +02:00
tamasmeszaros c73f702922 Filtering invalid geometries as per: SPE-337 2018-07-03 14:58:49 +02:00
tamasmeszaros 99f2d40b53 Remove progress indicators for individual threads. 2018-07-03 13:58:35 +02:00
tamasmeszaros 797c812f31 Stop the ongoing slicing process when attempting to export. 2018-07-03 13:12:15 +02:00
tamasmeszaros 033b7eb8ad Removing progress indicators for individual threads. 2018-07-03 12:43:17 +02:00
tamasmeszaros f00c17b959 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-07-03 11:40:35 +02:00