Commit Graph
100 Commits
Author SHA1 Message Date
Enrico Turri 76a2f72e97 Follow-up of a065c92302 -> proper enabling of debug output 2019-10-21 11:12:56 +02:00
Enrico Turri a065c92302 Mouse3DController -> Enabled debug output to check device connection on Linux and Max 2019-10-21 11:06:18 +02:00
Enrico Turri e773f667b1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-21 10:24:52 +02: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 93ae170113 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-17 08:09:23 +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 e6403a74ef ENABLE_3DCONNEXION_DEVICES tech set as default 2019-10-11 15:51:36 +02:00
Enrico Turri 1c05d88c00 ENABLE_3DCONNEXION_DEVICES -> Added support for 3Dconnexion universal receiver and battery level report 2019-10-11 15:29:57 +02:00
Enrico Turri a7972bcc77 ENABLE_3DCONNEXION_DEVICES -> Debug output of device features 2019-10-11 09:16:20 +02:00
Enrico Turri 8998a8e756 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-11 08:19:24 +02:00
Enrico Turri 9ea501cab2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-10 16:01:24 +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 4d1cfda14a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-10 15:44:52 +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 7caa596b95 ENABLE_3DCONNEXION_DEVICES -> Refactoring and code cleanup 2019-10-10 11:55:17 +02:00
Enrico Turri 068b7e86a9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-10 10:50:06 +02:00
Enrico Turri f4654e376e ENABLE_3DCONNEXION_DEVICES -> Slightly increased camera target movement limits 2019-10-10 10:49:47 +02:00
Enrico Turri a65b8f462d #3008 - Reduced max size of bed texture 2019-10-10 09:35:21 +02:00
Enrico Turri ded6d44389 Fixed build on OsX 2019-10-10 09:29:55 +02:00
Enrico Turri aae1250921 ENABLE_3DCONNEXION_DEVICES -> Experimental input queues with max size 2019-10-10 09:04:44 +02:00
Enrico Turri 3a5823bc2e ENABLE_3DCONNEXION_DEVICES -> Added temporary debug output to measure input queue sizes 2019-10-09 15:23:30 +02:00
Enrico Turri 5888477473 ENABLE_3DCONNEXION_DEVICES -> Reworked deadzone check 2019-10-09 14:39:28 +02:00
Enrico Turri a735ec1b48 ENABLE_3DCONNEXION_DEVICES -> Added tech ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT for debug output 2019-10-09 14:18:43 +02:00
Enrico Turri b41a0656b9 ENABLE_3DCONNEXION_DEVICES -> Reworked parsing of data coming from device 2019-10-09 14:01:13 +02:00
Enrico Turri 589e003de0 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-09 13:41:09 +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 9fc1cc6f84 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-09 12:16:44 +02:00
Enrico Turri 835ee148e5 Fixed conflicts after merging with master 2019-10-09 11:17:48 +02:00
Enrico Turri e6ce74957f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-09 09:58:39 +02:00
Enrico Turri 4ec6199ef1 ENABLE_3DCONNEXION_DEVICES -> Added translation and rotation customizable parameter deadzone 2019-10-08 14:32:05 +02:00
Enrico Turri b7db5a9558 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-08 13:38:27 +02:00
Enrico Turri 9447d3e1b5 ENABLE_3DCONNEXION_DEVICES -> Mouse3DController reworked to handle reports of length 7 bytes and 13 bytes 2019-10-08 13:38:08 +02:00
Enrico Turri 8fcd4e4407 ENABLE_3DCONNEXION_DEVICES -> added debug code to get 3Cconnexion device product id 2019-10-08 09:52:56 +02:00
Enrico Turri 8aa33a9e05 ENABLE_3DCONNEXION_DEVICES -> Hack for filtering out mouse wheel events coming from 3Dconnexion driver 2019-10-08 08:44:50 +02:00
Enrico Turri 6f85b0885a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-07 09:31:43 +02:00
Enrico Turri 0ba9fbaf0c ENABLE_3DCONNEXION_DEVICES -> Update 3D scene only when mouse 3D device send update messages 2019-10-07 09:31:23 +02:00
Enrico Turri 5a94ac9499 ENABLE_3DCONNEXION_DEVICES -> Automatic detection of plugging/unplugging 3Dconnexion devices 2019-10-04 10:59:27 +02:00
Enrico Turri 1d463fc23f ENABLE_3DCONNEXION_DEVICES -> Another small refactoring of Mouse3DController 2019-10-04 07:58:01 +02:00
Enrico Turri 243cb5d524 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-04 07:34:43 +02:00
Enrico Turri f315681804 ENABLE_3DCONNEXION_DEVICES -> Refactored Mouse3DController to simplify code 2019-10-03 12:16:59 +02:00
Enrico Turri b15757a126 ENABLE_3DCONNEXION_DEVICES - Added missing return lines 2019-10-03 12:09:49 +02:00
Enrico Turri 587effbedf ENABLE_3DCONNEXION_DEVICES -> Refactored Mouse3DController to be unaware of current active GLCanvas3D 2019-10-03 11:38:31 +02:00
Enrico Turri a554304038 ENABLE_3DCONNEXION_DEVICES -> Serialization of mouse device parameters into config 2019-10-03 10:26:28 +02:00
Enrico Turri 7007d81519 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-03 08:07:13 +02:00
Enrico Turri 36d3f90fad ENABLE_3DCONNEXION_DEVICES - Added imgui dialog to edit 3Dconnexion device parameters 2019-10-02 15:55:26 +02:00
Enrico Turri 644cc8c6b4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-02 11:01:31 +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 d58dedd459 ENABLE_3DCONNEXION_DEVICES -> Increased limit of device buttons 2019-09-30 15:58:45 +02:00
Enrico Turri b11704d380 Merge branch 'et_3dconnexion' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 15:38:13 +02:00
Enrico Turri 7c8732d560 Merge branch 'et_3dconnexion' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 15:19:36 +02:00
Enrico Turri eabaa21df2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 15:19:21 +02:00
Enrico Turri 7f7b3e0b0b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 08:15:20 +02:00
Enrico Turri 1aa559585c Added missing include 2019-09-27 15:26:13 +02:00
Enrico Turri 33bfc925c2 ENABLE_3DCONNEXION_DEVICES -> try a different hid.c for hidapi library on Linux 2019-09-27 15:02:38 +02:00
Enrico Turri 4b3eab0ed9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-27 14:52:30 +02:00
Enrico Turri f958cfd2ff ENABLE_3DCONNEXION_DEVICES - 1st installment of support for 3Dconnexion devices
Implemented using hidapi library (https://github.com/libusb/hidapi) and https://github.com/koenieee/CrossplatformSpacemouseDriver/tree/master/SpaceMouseDriver as reference

Unsolved issues:

- When manipulating the SpaceNavigator wxWidgets generates a mouse wheel event that needs to be filtered out

- wxWidgets does not detect devices being connected/disconnected to the pc

- Current state forces a continuous rendering

- Current state misses dependence on camera zoom

- Non intuitive movement limits

- Translation and rotation speed factors are hardcoded

- Number of device buttons hardcoded
2019-09-27 14:52:19 +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