Commit Graph

3835 Commits

Author SHA1 Message Date
66ce638439 Fixed conflicts after merging with branch eigenize 2018-08-23 15:37:38 +02:00
2ec045a0fb Added SetSliderValues and GetActiveValue functions 2018-08-23 14:44:49 +02:00
a5fcdeec23 Merge branch 'gizmos_3d' of https://github.com/prusa3d/Slic3r into dev 2018-08-23 09:45:04 +02:00
85ae2d0d2f Merge branch 'master' into lm_lay_flat_round_merged_facets 2018-08-22 14:03:17 +02:00
0b21042606 Lay flat minor bugfix (ObjectCutDialog called a changed function using the old signature) 2018-08-22 14:02:32 +02:00
0c984c7584 Print host bugfixes / refactoring 2018-08-21 15:47:29 +02:00
86b67bbd42 Lay flat - rotation is now done in one go directly about the necessary axis 2018-08-21 15:40:11 +02:00
6e77307880 Merge remote-tracking branch 'origin/eigenize' into sla_base_pool 2018-08-21 13:50:09 +02:00
d4b73701d9 some code formatting 2018-08-21 11:12:53 +02:00
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
b0dd328fde Lay flat - icons and invalidation improvement 2018-08-20 11:27:25 +02:00
ab60d8adb4 Replaced coincides_with(const Line &line) with operator== 2018-08-17 18:27:07 +02:00
9e7634b6e8 Merged with master 2018-08-17 18:07:45 +02:00
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
72ba5c8ab4 Merge remote-tracking branch 'origin/convex_hull' into lm_lay_flat_round_merged_facets 2018-08-17 15:44:50 +02:00
296c53e336 Merge branch 'convex_hull' of https://github.com/prusa3d/Slic3r into gizmos_3d 2018-08-17 10:36:42 +02:00
048f3a03fe Fixed scale to size of objects with multiple instances 2018-08-17 10:12:43 +02:00
b6e0458201 Fixed lost selection of imported objects 2018-08-17 09:16:34 +02:00
3f72ca2a15 Merge remote-tracking branch 'origin/convex_hull' into lm_lay_flat_round_merged_facets 2018-08-16 08:56:18 +02:00
da42b42a6c Merge branch 'opengl_to_cpp' of https://github.com/prusa3d/Slic3r into gizmos_3d 2018-08-15 14:39:40 +02:00
6b4d8ac934 Removed plater's toolbar 2018-08-15 13:19:58 +02:00
92b578779e Test of update_extruder_in_config() 2018-08-14 16:10:58 +02:00
817fb5adb3 Test of item_changed_selection(obj_idx) 2018-08-14 15:35:54 +02:00
a2eff85fa8 Try to fix OSX crashing on UnselectAll 2018-08-14 14:13:07 +02:00
168d38df2b Fixed object sinking into print bed after parts import 2018-08-14 09:33:58 +02:00
25a6c7e30e Created a new gizmo for flattening an object 2018-08-13 09:45:18 +02:00
bb07100a4f Code cleanup 2018-08-13 09:23:10 +02:00
b6f6200bd5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-08-13 08:51:58 +02:00
4b8d7bd7fa Fry to fix OSX-crashing on UnselectAll 2018-08-10 14:02:47 +02:00
5164bec8ce Merge remote-tracking branch 'origin/master' into feature_slice_to_png
# Conflicts:
#	xs/CMakeLists.txt
2018-08-09 10:53:27 +02:00
adf003f0ed Correct preset/tabs updating according to the technology
+ some code refactoring
2018-08-08 16:22:56 +02:00
da16b28c14 Correct show_preset_comboboxes 2018-08-08 11:17:56 +02:00
2af2b05bd6 Correct switching between printer_technologies (show/hide according tabs) 2018-08-06 17:01:41 +02:00
4f52601081 Minor tweaks of UI texts,
optimization of the wipe tower invalidation,
show collisions of the wipe tower with known dimensions.
2018-08-06 16:31:51 +02:00
ea163edc41 Deregister the update callback on end of the application.
This fixes a crash on exit.
2018-08-05 23:36:25 +02:00
f694600054 Merge branch 'lm_wipe_tower_block_improvements' into lm_wipe_tower_block_improvements_merged 2018-08-02 13:29:39 +02:00
7683870350 New perl callback to force reloading of 3d scene after Purging volumes are changed
After the changes in previous commit, the 3D scene must be reloaded after the wipe tower
is invalidated. This can mostly be done on the C++ side, but reloading after Purging volumes
are changed required this C++ -> Perl call
2018-08-02 11:04:47 +02:00
d5f042b4b8 Wipe tower postprocessing, wipe tower block on 3D plate improved.
- it renders red with one egde as indeterminate, the front edge is where the wipe tower will start
- changing width changes depth of the block (as requested)
- the block shows the brim of the wipe tower
- after slicing, the block is rendered in usual dark green and takes the exact shape of the tower (also with brim)
- moving or rotationg the block after slicing does not invalidate the wipe tower (and hence the exact block dimensions are preserved)
- changing anything that invalidates the wipe tower reverts the block back to the "indeterminate" shape
- the block is not shown after slicing, if the wipe tower is not actually generated (printing single color object with the wipe tower enabled)

This required changes in the wipe tower generator, which now generates the tower
at origin with no rotation. Resulting gcode is postprocessed and transformed during
gcode export. This means the wipe tower needs not be invalidated when it is moved or rotated.
2018-08-02 11:04:04 +02:00
55e7a1af46 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-31 08:34:34 +02:00
09de343e65 Fixed slice info after re-export of gcode. Fixes #1081 2018-07-30 13:54:54 +02:00
c2993de6e0 Scale and rotation from scene to value updates correctly 2018-07-29 21:42:57 +02:00
c64cba8ec2 A few fixes on 3D scene toolbar 2018-07-27 14:38:19 +02:00
590773d77b Fixed conflict after merge with master 2018-07-27 12:15:35 +02:00
ddda5062c2 3D scene toolbar actions 2018-07-27 12:08:33 +02:00
987fc4c6df Merge remote-tracking branch 'origin/backspace_to_delete_on_osx' 2018-07-27 09:55:13 +02:00
3a1ec8285e Reddish background when detected out of print volume toolpaths 2018-07-27 09:38:39 +02:00
ca1a11742b After merging bug fixes 2018-07-26 15:47:18 +02:00
e0bb6bafd5 Merge remote-tracking branch 'origin/master' into new_main_page_ui 2018-07-26 11:27:25 +02:00
da18e25dfb Added callback for 3dScene updating after extruder changing 2018-07-26 10:59:03 +02:00
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