Commit Graph
100 Commits
Author SHA1 Message Date
Enrico Turri f5bef3707f Added missing include 2019-11-04 14:28:18 +01:00
Enrico Turri b3f53c96c7 Fixed update of 3D preview layout after changing printer after slicing 2019-10-30 08:28:40 +01:00
Enrico Turri 2d610f9b84 #3082 - Workaround to fix incorrect object position after applying gcode line G92 into custom gcode 2019-10-21 10:12:42 +02:00
Enrico Turri 28a6bd7c30 #3075 - Fixed Reload from disk command for .amf files 2019-10-21 08:48:38 +02:00
Enrico Turri 0285e8db2d Merge branch 'et_git_3010' of https://github.com/prusa3d/PrusaSlicer 2019-10-18 12:48:06 +02:00
Enrico Turri 658b1e219e ENABLE_GIT_3010_FIX set as default 2019-10-14 10:03:27 +02:00
Enrico Turri 76c9ddfd3e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_git_3010 2019-10-14 08:49:19 +02:00
Enrico Turri 8b4799d734 Do not show context menu when the user deletes sla support points by right clicking on them and the mouse pointer is hovering the selected object 2019-10-10 16:00:32 +02:00
Enrico Turri cc34860ddd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-10-10 14:45:09 +02:00
Enrico Turri e51d970b2e Fixed crash in Plater::priv::can_reload_from_disk() 2019-10-10 14:44:52 +02:00
Enrico Turri a65b8f462d #3008 - Reduced max size of bed texture 2019-10-10 09:35:21 +02:00
Enrico Turri a6a7303e25 Fixed context menu showing up when user right clicks on 3D scene and release the mouse button after dragging over the objects list 2019-10-09 13:39:24 +02:00
Enrico Turri 835ee148e5 Fixed conflicts after merging with master 2019-10-09 11:17:48 +02:00
Enrico Turri fbe38fb2a4 #3008 - Generate all mipmaps up to size 1x1 2019-10-02 10:57:07 +02:00
Enrico Turri 6293ff8ccd Fixed crash into GCodeTimeEstimator::post_process() while processing custom end g-code 2019-10-02 09:38:19 +02:00
Enrico Turri c5a5e6a61d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_git_3010 2019-10-02 08:13:11 +02:00
Enrico Turri 8d53c5e978 #3010 - Added tech ENABLE_GIT_3010_FIX - GCodeAnalyzer and GCodeTimeEstimator modified to properly process gcode lines G92 2019-10-01 09:48:42 +02:00
Enrico Turri 6f8a9bc1ff Fixed visual hints in 3D scene not disappearing when tabbing out of size z field in object manipulators sidebar 2019-09-25 13:05:18 +02:00
Enrico Turri fdbe339622 Fixed gizmo scale for objects added to scene using the new context menu 2019-09-25 11:25:14 +02:00
Enrico Turri 2fd5044460 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-09-24 14:13:22 +02:00
Enrico Turri 7c1706f7ee Follow-up of f4910cafed -> Fix extended to Mac 2019-09-24 14:13:03 +02:00
Enrico Turri a68a72a660 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-09-24 09:11:43 +02:00
Enrico Turri e6604afd05 #2972 - Fixed selection after adding an instance with autocenter active 2019-09-24 09:11:27 +02:00
Enrico Turri 2dc9949a4c ENABLE_ENHANCED_RELOAD_FROM_DISK set as default 2019-09-23 15:35:49 +02:00
Enrico Turri 82a52e8b21 #2922 - Port of commit: https://github.com/prusa3d/PrusaSlicer/pull/2922/commits/f42edd35ce9e438de2c5fcacb69bfa66d6a28bbc by jschuh 2019-09-23 14:56:27 +02:00
Enrico Turri 1115e77b38 ENABLE_ENHANCED_RELOAD_FROM_DISK -> Fixed export/import to/from .amf to keep compatibility with 3rd part software. 2019-09-23 13:54:49 +02:00
Enrico Turri 4a45c1aa41 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-23 12:34:18 +02:00
Enrico Turri 5eb4692442 ENABLE_ENHANCED_RELOAD_FROM_DISK -> Fixed export/import to/from .3mf to keep compatibility with 3rd part software. 2019-09-23 12:33:21 +02:00
Enrico Turri c0576a8770 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-23 08:27:01 +02:00
Enrico Turri ac305a77b3 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-20 11:19:24 +02:00
Enrico Turri d66bf7e1e1 Follow-up of 8aaff08355 -> Do not show the new context menu when the user pans the scene + cleanup 2019-09-20 11:19:06 +02:00
Enrico Turri 9e09c52ab0 #2948 - Max zoom takes in account custom bed model size 2019-09-20 09:53:35 +02:00
Enrico Turri 0de8245432 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-19 14:03:05 +02:00
Enrico Turri 355a7d6a8c Fixed empty filename when trying to export a plate where no object is selected and no object is printable 2019-09-19 14:01:17 +02:00
Enrico Turri 74747226f7 ENABLE_ENHANCED_RELOAD_FROM_DISK
1) Modified .zip.amf import/export to save/load volume matrices and source data

2) Incremented .zip.amf version to 3
2019-09-19 12:39:59 +02:00
Enrico Turri 3a40565d03 Added tech ENABLE_ENHANCED_RELOAD_FROM_DISK
1) Reworked void Plater::priv::reload_from_disk() to be more general

2) Added source data to class ModelVolume

3) Modified .3mf import/export to save/load volume matrices and source data

4) Incremented .3mf version to 2
2019-09-19 09:09:11 +02:00
Enrico Turri a37ad3b552 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-19 08:33:59 +02:00
Enrico Turri d2e8026a80 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-17 15:50:06 +02:00
Enrico Turri cd7895065a Fixed typo 2019-09-17 15:48:39 +02:00
Enrico Turri 73f0b32abe Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-17 15:40:28 +02:00
Enrico Turri f4910cafed Fixed selection after adding a modifier by loading it from file 2019-09-17 15:30:54 +02:00
Enrico Turri b8cf0db209 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-17 12:54:46 +02:00
Enrico Turri a93e63e296 Fixed object shifted after saving to/reloading from .3mf and .zip.amf a multivolume object with printable parts moved by user 2019-09-17 12:50:54 +02:00
Enrico Turri 5ae2a39e2f Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-17 08:19:57 +02:00
Enrico Turri 1624b634dd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-17 08:18:20 +02:00
Enrico Turri ffe62d543d Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-16 08:26:06 +02:00
Enrico Turri e1774f9085 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-16 08:25:57 +02:00
Enrico Turri 7fe691f14e Merge branch 'et_reload_from_disk' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-12 10:46:32 +02:00
Enrico Turri 724cc19ae5 Fixed object position after reload from disk 2019-09-12 10:44:38 +02:00
Enrico Turri 22ab022088 Merge branch 'et_reload_from_disk' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-11 15:36:23 +02:00
Enrico Turri c55a463c93 Do not show intermediate states in objects list while reloading from disk 2019-09-11 15:31:30 +02:00
Enrico Turri 26f3af4b16 Fixed modifiers after reload from disk 2019-09-11 15:02:57 +02:00
Enrico Turri af77eca9df Follow-up of 44c3493f7d -> error message logged only for multi-extruder printers 2019-09-11 10:02:27 +02:00
Enrico Turri cf5ec54d6f Merge branch 'et_reload_from_disk' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-11 09:16:15 +02:00
Enrico Turri 84f589ad5c Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-11 09:15:58 +02:00
Enrico Turri b383d9581a Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-11 09:01:44 +02:00
Enrico Turri 3835257ec2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-11 09:01:34 +02:00
Enrico Turri 7e5043961a Added missing include 2019-09-11 08:51:36 +02:00
Enrico Turri 44c3493f7d GCodeAnalyzer: Fixed a crash when encountering an invalid toolchange 2019-09-11 08:39:29 +02:00
Enrico Turri 27f01bb09e Fixed instance printable property after reload from disk 2019-09-10 11:16:59 +02:00
Enrico Turri 0387401d8e Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-10 08:39:10 +02:00
Enrico Turri 6507b7bf39 Fixed gizmos update after objects loading 2019-09-09 15:55:04 +02:00
Enrico Turri eae02f6cad Fixed handling of mouse left up event when moving an object while the place on face gizmo is active 2019-09-09 14:56:55 +02:00
Enrico Turri e7aaa0037d Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-09 12:15:24 +02:00
Enrico Turri 20ee14a2b3 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-09 12:15:13 +02:00
Enrico Turri 749a1863e5 Fixed rotate gizmo hovering 2019-09-09 12:11:49 +02:00
Enrico Turri 015d430f03 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-09-09 11:51:03 +02:00
Enrico Turri a30c35d240 Follow-up of 9b5edbfa5f -> added comments 2019-09-09 11:50:19 +02:00
Enrico Turri d954a70bbf Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-09-09 09:56:52 +02:00
Enrico Turri 9b5edbfa5f Fixed import from obj files 2019-09-09 09:56:36 +02:00
Enrico Turri ae0fc75b13 Merge branch 'et_reload_from_disk' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-09 08:42:39 +02:00
Enrico Turri 98d8fa37c9 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-09 08:28:16 +02:00
Enrico Turri 19616c4f93 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-06 17:53:17 +02:00
Enrico Turri e6366894da Fixed object settings after reload from disk 2019-09-06 17:26:08 +02:00
Enrico Turri 5b60fe272a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-06 17:25:39 +02:00
Enrico Turri 9cf3793aac Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-06 16:06:37 +02:00
Enrico Turri abd170fbf4 Follow-up of 6c3aae8f89 -> Fixed update of objects list when object has a unique instance 2019-09-06 15:50:54 +02:00
Enrico Turri 6c3aae8f89 Fixed update of instances in objects list after reload from disk 2019-09-06 15:10:07 +02:00
Enrico Turri 4f1747d5f6 Keep correct instance selection after reload from disk 2019-09-06 14:36:47 +02:00
Enrico Turri fe07bde385 Do not render intermediate states while reload from disk action is taking place 2019-09-06 13:49:15 +02:00
Enrico Turri a7a01bfc72 Keep selection after reload from disk 2019-09-06 13:11:20 +02:00
Enrico Turri d6c3c766aa Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-06 12:22:45 +02:00
Enrico Turri bda0246b5d Fix of #2868 -> Revert 2c9521c6d2 and partial revert of fab3634931 2019-09-06 09:44:39 +02:00
Enrico Turri bdbaecb7f8 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-05 09:55:08 +02:00
Enrico Turri 9b550fbd5b Improved time estimator post-processing 2019-09-05 09:54:44 +02:00
Enrico Turri 3f5511faa3 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-05 08:14:34 +02:00
Enrico Turri 308f601a99 Removed another bunch of compile warnings 2019-09-04 10:46:51 +02:00
Enrico Turri 6bbc97f24d Removed a bunch of compile warnings 2019-09-04 09:47:00 +02:00
Enrico Turri 0dfeee6caf Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-09-02 15:15:36 +02:00
Enrico Turri d0513fc2da Fixed update of application's title bar when trying to import a non compatible .3mf or .amf project 2019-09-02 15:15:28 +02:00
Enrico Turri 292bff027e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-09-02 13:02:44 +02:00
Enrico Turri 729bd529dc Fixed typo 2019-09-02 13:02:28 +02:00
Enrico Turri bbfe420769 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-09-02 11:56:33 +02:00
Enrico Turri 0b03f0eb66 2nd attempt to fix non compatible (newer) .3mf and .amf import error handling on Linux and OsX 2019-09-02 11:55:14 +02:00
Enrico Turri 813a73e614 Attempt to fix non compatible (newer) .3mf and .amf import error handling on Linux and OsX 2019-09-02 09:38:45 +02:00
Enrico Turri fb9adaa661 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-08-30 14:11:09 +02:00
Enrico Turri f1f1b515cd Fixed update of both canvas when compressed bed textures have been completely sent to gpu 2019-08-30 14:10:59 +02:00
Enrico Turri f26d5effd9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-08-30 10:33:38 +02:00
Enrico Turri bb65ad6f2c Do not apply out of bed detection for non printable volumes 2019-08-30 10:33:21 +02:00
Enrico Turri beed31ad58 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-08-30 09:35:50 +02:00