Commit Graph

3155 Commits

Author SHA1 Message Date
Enrico Turri
6a48d79b0b Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-09-03 08:35:13 +02:00
Martin Loidl
22569de00f fixes date for uploaded files 2018-09-01 11:23:33 +02:00
Enrico Turri
e79919ac2d Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-31 13:32:52 +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
Enrico Turri
ae9355e634 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-31 08:46:47 +02:00
Enrico Turri
bb4329c8d0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-08-31 08:33:42 +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
bubnikv
d57725ee18 Bumped up the version number to 1.41.0 release,
bundled updated PrusaResearch configs.
2018-08-30 16:08:25 +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
Enrico Turri
3750bd781e Enhanced gizmo scale 3D 2018-08-29 13:36:03 +02:00
Enrico Turri
4c80a104f5 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-29 13:35:22 +02:00
YuSanka
6c1b52afa2 Deleted "scale" column from object list 2018-08-29 13:11:30 +02:00
Enrico Turri
67ca355912 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-29 11:22:30 +02:00
YuSanka
7fd7d83470 Updated PrusaDoubleSlider icons 2018-08-29 11:21:22 +02:00
YuSanka
b1d418a799 Merge remote-tracking branch 'origin/dev' into new_main_page_ui 2018-08-29 10:06:29 +02:00
YuSanka
2dcfd74579 Try to fix object_ctrl_context_menu on OS X 2018-08-29 09:33:56 +02:00
Enrico Turri
f5a0ca5303 Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-08-29 08:44:57 +02:00
Enrico Turri
5ee106fbf9 Fixed transformation center for objects imported from 3mf files 2018-08-29 08:42:42 +02:00
YuSanka
a56ea9a616 Try to understand OSX crashing on context menu 2018-08-28 17:03:40 +02:00
Enrico Turri
4ffdb46110 Cached world matrix of GLVolume to speed up rendering 2018-08-28 16:08:43 +02:00
YuSanka
5557e59d43 Reorganized object settings pane
+ Added new control - PrusaLockButton
2018-08-28 15:51:53 +02:00
Enrico Turri
cfe49a20ad Removed unused methods 2018-08-28 15:19:53 +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
Enrico Turri
98a6468c81 Eigenized 3mf I/O 2018-08-28 14:30:36 +02:00
Enrico Turri
84fb7940b7 More eigenized gizmos 2018-08-28 13:23:28 +02:00
Enrico Turri
255e837d33 Removed 2D gizmos 2018-08-28 12:50:26 +02:00
Enrico Turri
4e37f9d232 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-28 12:05:30 +02:00
Enrico Turri
dd86546d0f Fixed rotate gizmo position after arrange 2018-08-28 12:05:16 +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
Enrico Turri
6ce686aff8 Fixed 3D scene mouse capture 2018-08-28 09:31:23 +02:00
Enrico Turri
41c093a258 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-28 09:04:12 +02:00
Enrico Turri
87565a0686 Tweaks to GLGizmoFlatten 2018-08-28 09:03:03 +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
Enrico Turri
b9bb821392 Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev 2018-08-27 14:56:23 +02:00
Enrico Turri
eb9f4ee777 Fixed moving center of rotate gizmo 2018-08-27 14:54:20 +02:00
Enrico Turri
4b25d3924b Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-27 14:01:03 +02:00
Enrico Turri
fef5a5252e Fixed conflicts after merging with master 2018-08-27 14:00:53 +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
bubnikv
4522811f5b Bumped up the version number to 1.41.0-beta2 2018-08-25 22:11:04 +02:00
bubnikv
78a7104994 Changed the wording of "Purge into this object's ..." to "Wipe ..." 2018-08-25 22:09:55 +02:00
YuSanka
d4c8bc0720 Fixed post-merge compilation problem 2018-08-24 16:56:42 +02:00
bubnikv
3c0d81e7d9 Merge remote-tracking branch 'remotes/origin/lm_lay_flat_round_merged_facets' 2018-08-24 16:39:24 +02:00
bubnikv
de0f8ec267 Merge remote-tracking branch 'remotes/origin/lm_retraction_fix' 2018-08-24 16:33:57 +02:00
YuSanka
02a325556d Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-24 16:28:34 +02:00
YuSanka
90fcdd4e5f Fixed post-commit compilation problems 2018-08-24 16:20:19 +02:00
Enrico Turri
220d430956 Mouse capture when dragging gizmos 2018-08-24 15:49:57 +02:00
Enrico Turri
cda135ada7 Removed scale and rotate actions from toolbar 2018-08-24 15:08:19 +02:00
YuSanka
8b148a4fe4 Merge remote-tracking branch 'origin/new_main_page_ui' into dev 2018-08-24 15:01:26 +02:00
Enrico Turri
bbc465fdf3 Added tooltip to gizmos 2018-08-24 14:11:41 +02:00
YuSanka
bb24ae9f03 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-24 13:58:21 +02:00
YuSanka
d90f5fa591 Added "one_layer" mode for PrusaDoubleSlider 2018-08-24 13:36:19 +02:00
YuSanka
774315fe07 Fixed after-merging compilation problems 2018-08-24 12:54:21 +02:00
Lukas Matena
be3b8e98da Edited captions and default values of the new parameters (initial loading and unloading speed) 2018-08-24 12:46:32 +02:00
Enrico Turri
bfac36174f Renamed private member functions in GLToolbar 2018-08-24 12:32:14 +02:00
YuSanka
ada6970053 Merge remote-tracking branch 'origin/SLA_ui' into dev 2018-08-24 12:20:24 +02:00
Enrico Turri
8a9d0023a7 Added snap to scale to rotate gizmo 2018-08-24 12:16:11 +02:00
Enrico Turri
5f6a8adf7c Modified render order of gizmos 2018-08-24 12:06:05 +02:00
Lukas Matena
e8aafd3c83 Lay flat - simple rejection of very small surfaces 2018-08-24 11:46:54 +02:00
Vojtech Kral
60a0375ff9 Firmware updater: Fix a race condition
avrdude: Handle OOM with configurable handler
2018-08-24 11:21:29 +02:00
Enrico Turri
7f542a0f85 3D gizmos grabbers always visible to picking pass 2018-08-24 11:17:53 +02:00
Enrico Turri
95ae2d715b Fixed direction of rotate gizmo around y axis 2018-08-24 10:32:05 +02:00
Enrico Turri
acdbd987f5 Use double in place of coordf_t 2018-08-24 10:20:00 +02:00
Enrico Turri
727a5fd997 Better fix for out of print volume detection 2018-08-24 10:03:34 +02:00
Enrico Turri
16259e6f26 Fixed out of print volume detection 2018-08-24 08:56:53 +02:00
Enrico Turri
7e228e6698 Fixed compile on Linux 2018-08-24 08:38:28 +02:00
Enrico Turri
66ce638439 Fixed conflicts after merging with branch eigenize 2018-08-23 15:37:38 +02:00
YuSanka
2ec045a0fb Added SetSliderValues and GetActiveValue functions 2018-08-23 14:44:49 +02:00
YuSanka
2a7059edb3 Added active icon for selected tick 2018-08-23 13:01:18 +02:00
Enrico Turri
a5fcdeec23 Merge branch 'gizmos_3d' of https://github.com/prusa3d/Slic3r into dev 2018-08-23 09:45:04 +02:00
YuSanka
8a9bdc55ee Added functions for tick adding/deleting 2018-08-22 18:00:48 +02:00
bubnikv
76d60070eb Eigenized the admesh structures
(stl_vertex, stl_normal).
2018-08-22 15:34:03 +02:00
bubnikv
6829704475 d .. 2018-08-22 15:03:35 +02:00
YuSanka
d2282c4bf9 Refactored code 2018-08-22 14:24:30 +02:00
Lukas Matena
85ae2d0d2f Merge branch 'master' into lm_lay_flat_round_merged_facets 2018-08-22 14:03:17 +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
Enrico Turri
0924bedd28 Enhanced behaviour of scale 3D gizmo 2018-08-22 11:22:07 +02:00
Martin Loidl
43f8f10445 fixed timestamp for duet upload
* Added missing time=
2018-08-22 11:02:31 +02:00
YuSanka
a5119a41a5 Added overriding of the DoGetBestSize() to correct control sizing on OSX and Linux/GTK 2018-08-22 10:44:11 +02:00
YuSanka
5cd4597d38 Fix for last commit 2018-08-22 08:54:07 +02:00
bubnikv
ac72cd779f Replaced Point3 with Eigen Vec3crd, removed Point3 from the Perl binding. 2018-08-21 22:14:47 +02:00
bubnikv
0b5b02e002 Eradicated the Pointf class, replaced with Eigen Vector3d 2018-08-21 21:05:24 +02:00
bubnikv
cae0806112 Eradicated most of Pointf extras compared to pure Eigen::Vector2d. 2018-08-21 20:34:45 +02:00
YuSanka
bc64154f21 PrusaDoubleSlider improvement
+ OnKeyDown
+ marked selected thumb
+ marked selected control
...
2018-08-21 17:48:52 +02:00
bubnikv
cb138a20b8 Completely replaced the homebrew Pointf3 class with Eigen Vec3d.
Replaced the unscale macro with a template, implemented templates
for unscaling Eigen vectors.
2018-08-21 17:43:05 +02:00
Lukas Matena
9e6234fe39 Lay flat - limit number of active surfaces to 255 (to avoid problems with picking pass) 2018-08-21 15:56:40 +02:00
Vojtech Kral
0c984c7584 Print host bugfixes / refactoring 2018-08-21 15:47:29 +02:00
Lukas Matena
86b67bbd42 Lay flat - rotation is now done in one go directly about the necessary axis 2018-08-21 15:40:11 +02:00
Lukas Matena
28c8e176b5 Yet another experimental parameter to adjust the initial loading speed of a newly loaded filament 2018-08-21 14:36:24 +02:00
Enrico Turri
889d0f1434 3D gizmo grabbers 2018-08-21 14:27:36 +02:00
Lukas Matena
2fe84fc199 Merge branch 'master' into lm_retraction_fix 2018-08-21 14:09:26 +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
Martin Loidl
ee9f7eaef6 Host upload backwards compatibility
* Added legacy code to preserve backwards compatibility
* renamed some cli option names  to better match option names
2018-08-21 11:12:53 +02:00
Martin Loidl
d4b73701d9 some code formatting 2018-08-21 11:12:53 +02:00
Martin Loidl
dd1fd66a47 Added possibility for upload to Duet
Further changes:
- Added new configuration option Host Type
- Added abstract base class for future printer hosts
- Moved location of upload dialog (also made it a little bit more configureable)
- added possibility to send file via postfield instead a new frame
2018-08-21 11:12:53 +02:00
bubnikv
c5256bdd2c Removed the Point::coincides_with_epsilon() method 2018-08-21 09:51:22 +02:00
Enrico Turri
edf03e00dd 3D rotate gizmo colored by axis in preview mode 2018-08-21 09:03:38 +02:00
Enrico Turri
743eee8b6e 1st installment of gizmo scale 3D 2018-08-21 08:50:35 +02:00
YuSanka
1b26cd414d DoubleSlider prototype 2018-08-21 02:03:10 +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
Lukas Matena
d197a5149a Added a missing header (numeric for std::accumulate) 2018-08-20 13:02:54 +02:00
Lukas Matena
3b86c57c8f Lay flat gizmo is rendered before the bed, so the surfaces are visible from below, and a rotation-related bugfix 2018-08-20 12:56:01 +02:00
Lukas Matena
b0dd328fde Lay flat - icons and invalidation improvement 2018-08-20 11:27:25 +02:00
Enrico Turri
53914e05c6 1st installment of gizmo rotate 3D 2018-08-20 10:23:17 +02:00
Enrico Turri
fc0651702d Merge branch 'master' of https://github.com/prusa3d/Slic3r into gizmos_3d 2018-08-20 08:33:42 +02:00
bubnikv
ab60d8adb4 Replaced coincides_with(const Line &line) with operator== 2018-08-17 18:27:07 +02:00
bubnikv
9e7634b6e8 Merged with master 2018-08-17 18:07:45 +02:00
bubnikv
0eba590fc6 Updated the Eigen library to 3.3.5 2018-08-17 17:33:29 +02:00
bubnikv
5b94f53cd7 Removed the Point::wkt() and Point::dump_perl() methods.
Added to_string() for the basis Eigen vector types.
2018-08-17 16:54:07 +02:00
tamasmeszaros
57cd39965f pool is has now bended walls. 2018-08-17 16:17:35 +02:00
bubnikv
65011f9382 Removed the x(), y(), z() Point/Pointf/Point3/Pointf3 accessors. 2018-08-17 15:53:43 +02:00
Lukas Matena
db9580f40b Merge branch 'master' into lm_lay_flat_round_merged_facets 2018-08-17 15:45:02 +02:00
Lukas Matena
72ba5c8ab4 Merge remote-tracking branch 'origin/convex_hull' into lm_lay_flat_round_merged_facets 2018-08-17 15:44:50 +02:00
Lukas Matena
3433e8e374 Fixed a few tooltips, changed default value for minimal purge on wipe tower 2018-08-17 15:42:46 +02:00
Lukas Matena
f9efcc36b6 Lay flat gizmo improvements - merge adjacent faces, compute and cache convex hull for entire ModelObject, refresh when moved, etc. 2018-08-17 15:40:47 +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
Lukas Matena
48b9793d3d Templated convex_hull function in Geometry.cpp 2018-08-17 15:20:35 +02:00
tamasmeszaros
776f555790 wall generation with different top and bottom plates. 2018-08-17 15:11:30 +02:00
bubnikv
1ba64da3fe Removed Point::scale(),translate(),coincides_with(),distance_to(),
distance_to_squared(),perp_distance_to(),negative(),vector_to(),
translate(), distance_to() etc,
replaced with the Eigen equivalents.
2018-08-17 14:14:24 +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
YuSanka
d10cdeb25f Delete previous experiments 2018-08-16 16:43:16 +02:00
Enrico Turri
115744b38d Merge branch 'convex_hull' of https://github.com/prusa3d/Slic3r into gizmos_3d 2018-08-16 13:54:56 +02:00
Enrico Turri
1fff2252bc Detection of out of print volume disabled for wipe tower of unknown size 2018-08-16 13:42:35 +02:00
Enrico Turri
d38816bd9c GLVolume use a pointer to ModelVolume's convex hull instead of a copy of it 2018-08-16 13:35:56 +02:00
Enrico Turri
2c9b41623a Fixed wipe tower loosing selection after displacement 2018-08-16 13:22:02 +02:00
YuSanka
eae7752d30 Corrections for the last commit 2018-08-16 10:43:56 +02:00
YuSanka
e6fce6e1f6 Try to handle wxEVT_KEY_DOWN on OSX 2018-08-16 09:46:34 +02:00
YuSanka
5de933b77e Try to fix evt_motion on OSX & GTK 2018-08-16 09:35:21 +02:00
YuSanka
3391ea050d Try to handle wxEVT_CHAR_HOOK on OSX 2018-08-16 09:12:24 +02:00
Lukas Matena
3f72ca2a15 Merge remote-tracking branch 'origin/convex_hull' into lm_lay_flat_round_merged_facets 2018-08-16 08:56:18 +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
YuSanka
8c7cc73da6 Update extruder value for the object from the beginning 2018-08-15 13:59:33 +02:00
bubnikv
3b89717149 Changing the internal representation of Point / Pointf / Point3 / Pointf3 to Eigen Matrix types:
Changed the Point3 / Pointf3 to derive from the Eigen Vec3crd / Vec3d.
Replaced the Point::concide_with() method calls with == operator.
Reduced some compiler warnings.
2018-08-15 13:51:40 +02:00
Enrico Turri
4d98d32199 Use of bounding box of rotated 3D convex hull for out of print volume detection 2018-08-15 12:50:06 +02:00
YuSanka
76249e5625 Fixed typo in LambdaObjectDialog. It was a reason of the wrong cube size updating for generic modifier "Cube".
+ some code cleaning
2018-08-15 12:47:46 +02:00
YuSanka
3e549c153d Improvement of extruder selection for the object/part according to the actually extruders count 2018-08-15 11:18:20 +02:00
Lukas Matena
211790f8c3 Added qhull library to xs/src and cmake 2018-08-15 10:57:22 +02:00
YuSanka
f0095d19be Some code refactoring 2018-08-15 10:09:05 +02:00