Commit Graph
100 Commits
Author SHA1 Message Date
Enrico Turri 7c56cc9f22 Follow-up of f912fecad5 -> option to swap y/z axes extended to rotations 2020-03-20 16:13:08 +01:00
Enrico Turri f912fecad5 3DConnexion devices: added option to swap y/z translations 2020-03-20 13:09:42 +01:00
enricoturri1966 cd5154b8e1 Fixed tooltip reappering after leaving imgui dialog 2020-03-19 15:12:18 +01:00
enricoturri1966 5b3ca3e4b7 Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip 2020-03-19 14:06:49 +01:00
enricoturri1966 2501cf64c0 Modified mouse events handling for gizmobar
The gizmobar was consuming the mouse up event preventing the gizmos to update their tooltip

The gizmobar was also consuming the mouse dragging event transforming a gizmo manipulation into a scene rotation
2020-03-19 14:05:49 +01:00
Enrico Turri 5a4e80fdb2 Added readme.md file for imgui 2020-03-19 10:43:48 +01:00
enricoturri1966 739d8131ab Modified mouse events handling for toolbar
The toolbar was consuming the mouse up event preventing the gizmos to update their tooltip
2020-03-18 16:59:30 +01:00
enricoturri1966 9da16aeaa9 Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip 2020-03-18 14:27:02 +01:00
enricoturri1966 61f3b53ef8 Fixed conflicts after merge with master 2020-03-18 14:26:44 +01:00
enricoturri1966 cd55b235ad Canvas tooltip constrained inside canvas 2020-03-18 14:13:50 +01:00
enricoturri1966 c5552843ab Merge branch 'et_gizmos_tooltip' of https://github.com/prusa3d/PrusaSlicer into et_gizmos_tooltip 2020-03-18 13:36:01 +01:00
enricoturri1966 8a824bb8c2 Refactoring 2020-03-18 13:35:46 +01:00
enricoturri1966 1c1a6b933a Fixed interference between tooltips and imgui dialogs 2020-03-18 10:46:46 +01:00
enricoturri1966 f4aa9c5b0e #3858 - Added missing reset for fan speed visualization 2020-03-18 08:10:05 +01:00
enricoturri1966 a85a2b2e2a Attempt to fix build on Linux 2020-03-17 15:47:49 +01:00
enricoturri1966 166389e6a8 Initial delay for ImGUI-based tooltip 2020-03-17 14:35:56 +01:00
enricoturri1966 7a1fa3d847 Canvas' tooltip using ImGUI 2020-03-17 13:01:38 +01:00
enricoturri1966 12c0170e3c Attempt to fix gizmos tooltip on Mac 2020-03-17 11:02:32 +01:00
enricoturri1966 df6170b9bd Fixed gizmos' tooltips 2020-03-17 09:41:54 +01:00
enricoturri1966 a0ed240af1 Generate gizmos' tooltip on demand 2020-03-16 16:37:22 +01:00
enricoturri1966 19d93b3b01 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-03-16 13:35:15 +01:00
enricoturri1966 350a85cf43 #3034 - Keyboard shortcuts for 'Delete selected' and 'Delete all' commands enabled also in Preview 2020-03-16 13:34:53 +01:00
enricoturri1966 ffe404fc5b Fixed gizmos' tooltips 2020-03-16 12:45:39 +01:00
Enrico Turri 3684eea53d Follow-up of 4a59a45d51 -> missed cleanup 2020-03-13 13:20:38 +01:00
Enrico Turri 3fd6c8a2ff #2922 - Fan speed for gcode visualization modified as proposed by rongith 2020-03-13 08:25:48 +01:00
Enrico Turri 4c16ce442f #3816 - Use constrained camera when navigating the 3D scene with regular mouse, if free camera is not selected 2020-03-12 09:29:24 +01:00
Enrico Turri 9aa5c13c15 Fixed initial position of top toolbars 2020-03-11 14:15:36 +01:00
Enrico Turri 2c9bd86a70 Fix of crash and/or assert when changing language 2020-03-11 12:19:52 +01:00
Enrico Turri 1d337b0e24 #3791 - Linear zoom for 3DConnexion devices 2020-03-10 13:43:49 +01:00
Enrico Turri a6a9ab9dc7 Follow-up of 6c36577e8e -> World Z axis set to vertical when disconnecting 3d mouse 2020-03-10 13:02:39 +01:00
Enrico Turri 33470f7f6d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-03-10 12:03:26 +01:00
Enrico Turri 4ca03c3f8a #3802 - Fixed objects list's context menu showing up when moving mouse after changing selection 2020-03-10 12:03:08 +01:00
Enrico Turri 56fa84c9d9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-03-09 15:23:38 +01:00
Enrico Turri 6c36577e8e #3782 - World Z axis always vertical for non-free camera 2020-03-09 15:23:29 +01:00
Enrico Turri 7cb92ef5e8 #3646 - Ask user whether remove from recent projects list a project no longer available 2020-03-02 12:33:17 +01:00
Enrico Turri dff9af20a4 Follow-up of 47604b6326 -> Fixed layout at startup 2020-02-28 11:19:46 +01:00
Enrico Turri 5ca4698400 Reduce max texture size if physical ram is smaller than 6GB 2020-02-27 15:38:35 +01:00
Enrico Turri d6b86b5e2b Workaround to remove crash when closing PrusaSlicer on OSX 10.9.5 2020-02-27 14:55:27 +01:00
Enrico Turri 47604b6326 #3707 - Fixed buttons layout after closing preference dialog 2020-02-26 10:18:04 +01:00
Enrico Turri 69e1e46dd7 Fixed reload from disk for modifiers 2020-02-26 08:56:05 +01:00
Enrico Turri 0ce730e79a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-02-13 13:55:27 +01:00
Enrico Turri faf9dd27db Merge remote-tracking branch 'origin/et_shortcuts_dialog' 2020-02-13 13:45:25 +01:00
Enrico Turri 8e4274e100 Fixed conflicts after merge with master 2020-02-13 13:41:42 +01:00
Enrico Turri 4a59a45d51 ENABLE_SHOW_SCENE_LABELS set as default 2020-02-13 13:24:52 +01:00
Enrico Turri 6914f688f8 ENABLE_BACKWARD_COMPATIBLE_RELOAD_FROM_DISK set as default 2020-02-13 12:43:19 +01:00
Enrico Turri 847efec2ed ENABLE_6DOF_CAMERA set as default 2020-02-13 12:13:54 +01:00
Enrico Turri 904263d231 ENABLE_CONFIGURABLE_PATHS_EXPORT_TO_3MF_AND_AMF set as default 2020-02-13 11:25:34 +01:00
Enrico Turri b0218daafe ENABLE_MODIFIED_TOOLBAR_TEXTURES set as default 2020-02-13 09:50:06 +01:00
Enrico Turri 5797c9edc2 ENABLE_3DCONNEXION_Y_AS_ZOOM set as default 2020-02-13 09:20:20 +01:00
Enrico Turri c55173eba4 Follow-up of 00ecafe3d5 -> Fix of #3650 moved into 'SLAPrint::output_filename()' as the previous fix was breaking the export from GUI 2020-02-12 15:39:04 +01:00
Enrico Turri d350d001fc New keyboard shortcuts dialog -> Bigger default size 2020-02-12 15:02:22 +01:00
Enrico Turri 4d556b40d1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_shortcuts_dialog 2020-02-12 15:01:53 +01:00
Enrico Turri 00ecafe3d5 #3650 - Fixed extension of exported file when processing models for sla printers from command line 2020-02-12 14:23:54 +01:00
Enrico Turri c33dc5c2fe New keyboard shortcuts dialog -> Scrollable pages and resizable dialog 2020-02-12 11:25:36 +01:00
Enrico Turri b5152e4126 New keyboard shortcuts dialog -> Fixed items order and use wxNotebook on top 2020-02-12 08:49:56 +01:00
Enrico Turri 742c6b6746 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_shortcuts_dialog 2020-02-12 08:09:22 +01:00
Enrico Turri 9689d006c0 Rework of keyboard shortcut dialog layout -> use wxChoicebook 2020-02-11 15:12:35 +01:00
Enrico Turri c0ee66fd52 Rework of keyboard shortcut dialog layout -> use wxNotebook at left 2020-02-11 15:01:32 +01:00
Enrico Turri e327d8a6d4 Rework of keyboard shortcut dialog layout -> use wxNotebook on top 2020-02-11 14:39:27 +01:00
Enrico Turri afb129bb5d Rework of keyboard shortcut dialog layout -> use wxListbook at left 2020-02-11 14:33:19 +01:00
Enrico Turri dc375be682 Rework of keyboard shortcut dialog layout -> use wxListbook on top 2020-02-11 14:27:44 +01:00
Enrico Turri 0966707d40 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-02-10 12:37:12 +01:00
Enrico Turri 0f5f2bc519 Reintroduce rotation limits for camera for FDM printers 2020-02-10 12:36:52 +01:00
Enrico Turri a1c0a29af2 ENABLE_BACKWARD_COMPATIBLE_RELOAD_FROM_DISK - Fixed inconsistencies for splitted and cutted objects 2020-02-07 09:49:48 +01:00
Enrico Turri ef32cd6059 Fixed conflicts after merge with master 2020-02-06 15:28:50 +01:00
Enrico Turri c6ca180142 Use frontend data to update labels 2020-02-06 15:19:53 +01:00
Enrico Turri 3981e25f75 Fixed labels auto-sizing 2020-02-06 12:06:39 +01:00
Enrico Turri bfea105c2e Fixed mmissing #if ENABLE_SHOW_SCENE_LABELS 2020-02-06 10:39:42 +01:00
Enrico Turri a430ff546e Merge remote-tracking branch 'origin/et_labels' 2020-02-06 09:58:44 +01:00
Enrico Turri a72be256f8 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-06 09:57:48 +01:00
Enrico Turri f37a31596c Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-06 09:15:15 +01:00
Enrico Turri 5c4b481e35 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-05 15:27:20 +01:00
Enrico Turri a04c72b0c9 Fixed unneded auto-extra frame render 2020-02-05 15:27:11 +01:00
Enrico Turri fce9f77472 Translations with arrow keys with modifiers:
Shift -> slower translations

Ctrl -> translations in camera space
2020-02-05 13:14:50 +01:00
Enrico Turri 3ec4b77dcd Added item menu 'Edit/Show labels' and removed labels activation from preferences dialog 2020-02-04 14:42:26 +01:00
Enrico Turri 9f536291b0 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-04 14:41:50 +01:00
Enrico Turri dc393e2f0a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-04 12:28:06 +01:00
Enrico Turri 87daba9288 Movements and rotations by keyboard indipendent from gizmos:
Left arrow = Decrease X by 1mm

Right arrow = Increase X by 1mm

Up arrow = Decrease Y by 1mm

Down arrow = Increase Y by 1mm

PgUp = Rotate 45 degrees CCW

PgDown = Rotate 45 degrees CW
2020-02-04 11:42:58 +01:00
Enrico Turri 648060f4ec Smoother movements/rotations when using arrow keys 2020-02-04 10:31:50 +01:00
Enrico Turri 3371fa42da Follow-up of e042cab8fa -> Avoid polluting undo/redo stack 2020-02-04 09:32:09 +01:00
Enrico Turri c6310e49b3 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-02-03 16:05:41 +01:00
Enrico Turri e042cab8fa Follow-up of 8453c88482, c09091c407 and 9d55121695 -> Use key down event in place of key up event 2020-02-03 16:05:13 +01:00
Enrico Turri f09bed32b6 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-02-03 15:48:56 +01:00
Enrico Turri 03680bb014 Follow-up of 3a99b23ec7 -> F5 accelerator added also to objects list 2020-02-03 15:47:09 +01:00
Enrico Turri 8453c88482 Cut Gizmo -> added movements using arrow keys:
Up arrow = increase Z by 1mm

Down arrow = decrease Z by 1mm
2020-02-03 15:00:49 +01:00
Enrico Turri c09091c407 Rotate Gizmo -> added rotations using arrow keys:
Left arrow = 90 degrees around Z axis CCW

Right arrow = 90 degrees around Z axis CW

Up arrow = 45 degrees around Z axis CCW

Down arrow = 45 degrees around Z axis CW
2020-02-03 14:51:25 +01:00
Enrico Turri 9d55121695 Move Gizmo -> added movements using arrow keys:
Left arrow = decrease X by 1mm

Right arrow = increase X by 1mm

Up arrow = increase Y by 1mm

Down arrow = decrease Y by 1mm
2020-02-03 14:39:16 +01:00
Enrico Turri 1ee2f16a71 3D scene labels transparent to mouse click 2020-02-03 13:24:11 +01:00
Enrico Turri 6fa49f5931 Added sequential print order id to 3D scene labels 2020-02-03 11:44:26 +01:00
Enrico Turri 0937c576ac Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-03 11:43:37 +01:00
Enrico Turri 251a7d1329 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-03 08:23:55 +01:00
Enrico Turri 61e9cb0f72 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-01-31 12:15:14 +01:00
Enrico Turri 3a99b23ec7 #3580 - Added menu item 'Edit/Reload from disk' and F5 key acceleration to reload the entire plater 2020-01-31 12:15:04 +01:00
Enrico Turri 0407634824 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-01-29 15:46:48 +01:00
Enrico Turri e679bcced6 Follow-up of 17a6b696e7 -> Fixed missing imgui window size initialization 2020-01-29 15:40:56 +01:00
Enrico Turri 16fa68df0c Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-01-29 14:46:09 +01:00
Enrico Turri da3cb30b7c Follow-up of 17a6b696e7 -> Fixed build when tech ENABLE_6DOF_CAMERA is disabled 2020-01-29 14:44:03 +01:00
Enrico Turri 504413cc91 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-01-29 12:31:50 +01:00
Enrico Turri f7f1e2ce42 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-01-29 12:09:34 +01:00
Enrico Turri 17a6b696e7 Workaround to fix SPE-1082 + refactoring of 6 dof camera 2020-01-29 12:08:38 +01:00