Lukas Matena
97b9de47b4
Merge branch 'master' into dev
2020-03-24 21:51:05 +01:00
enricoturri1966
c6d5ad1517
Refactoring of toolbars' tooltip generation
2020-03-24 12:26:30 +01:00
YuSanka
5215b2ecb2
Fix of #3889
2020-03-23 22:47:35 +01:00
enricoturri1966
c480041487
Close undo/redo windows when an item in the list is selected
2020-03-23 16:00:56 +01:00
enricoturri1966
b8c4369c4f
ImGui upgraded to version 1.75 + fixes required by upgrade
2020-03-23 12:41:16 +01:00
bubnikv
92162d8fe5
Merge branch 'et_bug_fixes'
2020-03-20 17:19:46 +01:00
bubnikv
4938d5ab63
Fixed orientations of some 3D connexion axes when in the swapped YZ mode.
2020-03-20 17:19:20 +01:00
Enrico Turri
7c56cc9f22
Follow-up of f912fecad5
-> option to swap y/z axes extended to rotations
2020-03-20 16:13:08 +01:00
YuSanka
ec381c5854
Update of Settings in ObjectList from Tab::update() is suppressed, if Undo/Redo is not completed
2020-03-20 13:45:37 +01:00
Enrico Turri
f912fecad5
3DConnexion devices: added option to swap y/z translations
2020-03-20 13:09:42 +01:00
enricoturri1966
5b24a0fb91
Fixed conflicts after merge with master
2020-03-20 10:55:37 +01:00
Slic3rPE
b4a7822098
Fixed Command character on OSX in ImGUI
2020-03-19 16:10:16 +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
bubnikv
be2fd7164c
ImGUI characters for OSX keyboard keyboard modifiers are only contained
...
in the CJK fonts, not in the regular fonts. Load them from CJK fonts
even for non CJK languages.
2020-03-19 13:32:34 +01:00
bubnikv
966b2ce371
Fixing spurious deselection of objects when switching from 3d path
...
preview to plater using the bottom tool bar & left mouse click.
This is result of the recent commits refactoring the mouse focus
over toolbars handling. 739d8131ab
2020-03-19 12:39:25 +01:00
bubnikv
8f762168ba
Adding special OS characters for keyboard shortcuts to ImGUI font map.
2020-03-19 09:52:24 +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
bubnikv
a901b17d33
Merge branch 'et_gizmos_tooltip' of https://github.com/Prusa3d/PrusaSlicer into et_gizmos_tooltip
2020-03-18 14:28:54 +01:00
bubnikv
79951630ec
Hiding the tooltip when the window gets deactivated and reactivated.
2020-03-18 14:28:43 +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
Lukas Matena
37be82c8aa
Tooltips are rendered unformatted so percent signs in them do not break rendering
2020-03-18 13:50:08 +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
bubnikv
067e128651
Suppress tooltips when the mouse is processed by an ImGUI dialog.
2020-03-18 13:23:07 +01:00
enricoturri1966
1c1a6b933a
Fixed interference between tooltips and imgui dialogs
2020-03-18 10:46:46 +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
2ab8a474c2
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_slope_shader
2020-03-17 07:59:10 +01:00
YuSanka
8233a910b9
Fix of #3303
...
+ Fixed wrong update of selection in object and scene, when change selection in ObjectList after editing of values in Height range modifiers.
Repro:
1. Add 2 objects
2. Add Height range modifiers for one of them
3. Select range
4. Edit some of values
5. Select other object.
Expected behavior:
1. Edited value is saved
2. New object is selected in object list and on the 3D scene_selection
Real behavior:
1. New object is selected in object list and on the 3D scene_selection
But:
2. Every next selection in object list has no update on the scene or "temporary" panel
3. Selection from the scene updates selection in ObjectList
But:
4. Next editing of layer range and press "Enter" causes a crash
2020-03-16 21:32:48 +01:00
enricoturri1966
a0ed240af1
Generate gizmos' tooltip on demand
2020-03-16 16:37:22 +01:00
bubnikv
6bace46be1
Revert " #3034 - Keyboard shortcuts for 'Delete selected' and 'Delete all' commands enabled also in Preview"
...
It is too late before 2.2.0-final.
This reverts commit 350a85cf43
.
2020-03-16 14:25:05 +01:00
enricoturri1966
505181ddfd
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_slope_shader
2020-03-16 14:19:30 +01:00
enricoturri1966
abcd01d64a
ENABLE_SLOPE_RENDERING - Do not apply slope shading to modifiers and small refactoring
2020-03-16 14:17:19 +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
bubnikv
c1e92a5759
Fix of
...
"Print settings reloaded with 0.05 layer and fill percentage changed
after click on modified profile #3755 "
Combo box callback was not removing the "(modified)" suffix.
2020-03-16 09:57:20 +01:00
enricoturri1966
ac4d9ea172
Fixed conflicts after merge with master
2020-03-16 08:09:52 +01:00
bubnikv
6bf56d5cb4
Updated the "Remove user profiles" message at the install wizard to
...
indicate that it does nothing to user profiles.
2020-03-15 12:19:56 +01:00
bubnikv
2e1aef87a1
The import of system profiles was improved to not inherit
...
the "renamed_from" field as it is specific to a concrete profile.
Prusa Research system profile was annotated with "renamed_from"
to indicate that the PETG profiles were renamed from PET somewhere
after PrusaSlicer 2.2.1 release.
2020-03-15 08:38:17 +01:00
bubnikv
7f3ac39757
Fixed conversion of installed presets from PrusaSlicer 2.1.1 to 2.2.0
2020-03-14 20:18:31 +01:00
bubnikv
a3ded8fa95
Reworked filaments / SLA materials in installation wizard:
...
1) When the wizard is initialized, filament and SLA profile names
are verified and current names of renamed profiles are resolved.
Fixes "Add/Remove Filaments is not hiding all of the un-checked filaments #3835 "
2) When adding a printer model, default materials are installed in case
the printer model has no default material installed.
3) When leaving the Filaments or SLA materials page, and some printer models
have no material installed, those Printer Models are listed
in a message box and only for those printer models the default
materials are installed.
2020-03-14 18:35:42 +01:00
bubnikv
fcb04039e8
New shorcut _L() for _(L())
...
New shorcut _u8L() for _utf8(L())
2020-03-14 17:51:56 +01:00
bubnikv
dc1ffe15a8
Revert "Added "Filament spool weight" option to filament options"
...
This reverts commit 3d3e36ba8d
.
The change is too risky just before the PrusaSlicer 2.2.0 final release
and the feature may need a bit of polishing before release.
2020-03-14 09:49:12 +01:00
Lukas Matena
c731f04331
Follow-up of previous commit - check that gizmos are enabled
...
To be on the safe side, reinstate one part of
the check that the previous code did.
2020-03-14 09:46:48 +01:00
bubnikv
99ff6763a1
Layer height editing: Fixed to satisfy the minimum layer heigth,
...
improved wording of the tooltips indicating why a new layer height range
cannot be inserted.
2020-03-14 09:44:29 +01:00
bubnikv
af4a5c3f8a
Synchronization of skirt input field enable / disable state
...
in the parameter tab.
An inconsistency between the slicing back-end and the parameter page
has been fixed, where the slicing back end only creates skirt for
non-zero number of skirt loops even if the minimum skirt extrusion is set.
2020-03-14 09:44:28 +01:00
Lukas Matena
ac103f334c
Actual fix of the rare crash recently mentioned in e547a0c
...
The problem was in fact elsewhere. After an object is added, it is necessary to
update the gizmos. GLGizmoManager::update_data needs to be called, but regardless
of whether any gizmo is currently opened (which is what is_running returns).
To reproduce the crash that this fixes: add an object, delete it, add another one,
open SLA gizmo -> crash
2020-03-14 09:18:49 +01:00
bubnikv
6b58f67fb8
"inifinit_skirt" renamed to "draft_shield"
...
Polished the tooltip for the draft shield.
Legacy conversion from old skirt_heigth == -1 to draft_shield = 1
2020-03-14 07:46:39 +01:00
bubnikv
b97a12da98
Documented the previous merge.
2020-03-14 07:14:45 +01:00
bubnikv
37b3780a72
Merge remote-tracking branch 'remotes/origin/et_free_camera'
2020-03-14 07:02:08 +01:00
bubnikv
87303951a7
Little refactoring of get_mouse_position_in_control() for const
...
correctness and readability.
2020-03-14 07:00:09 +01:00
YuSanka
79be13438e
Fixed context menu issues, related to #3802 fixed with commit ( 4ca03c3f8a
)
...
The code which caused an impossibility to edit objects in list under OSX using mouse right click, is deleted
2020-03-13 23:22:09 +01:00
bubnikv
3234823a1a
Windows do not send an update on insert / eject of an SD card into
...
an external SD card reader. Windows also do not send an update
on software eject of a FLASH drive. We can likely use the Windows
WMI API, but it will be quite time consuming to implement,
therefore we lower the polling interval back to two seconds.
https://www.codeproject.com/Articles/10539/Making-WMI-Queries-In-C
https://docs.microsoft.com/en-us/windows/win32/wmisdk/wmi-start-page
https://docs.microsoft.com/en-us/windows/win32/wmisdk/com-api-for-wmi
https://docs.microsoft.com/en-us/windows/win32/wmisdk/example--receiving-event-notifications-through-wmi-
2020-03-13 19:30:41 +01:00
bubnikv
d3236f5e70
Merge remote-tracking branch 'remotes/origin/ys_improvements'
2020-03-13 16:52:12 +01:00
bubnikv
76f9aaf13c
Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer
2020-03-13 16:52:07 +01:00
YuSanka
0f5f0b6333
Toggled "Skirt height" option in respect to "Use unlimit skirt" option
2020-03-13 16:31:27 +01:00
YuSanka
380fffd248
Merge remote-tracking branch 'origin/master' into ys_improvements
2020-03-13 16:05:46 +01:00
bubnikv
c8b177966d
Merge remote-tracking branch 'remotes/origin/ys_improvements'
2020-03-13 16:01:30 +01:00
Lukas Matena
e547a0c3d1
Fix of a rare crash on opening an SLA gizmo (supports or hollow)
2020-03-13 15:58:59 +01:00
bubnikv
2e6a5e7783
Fixed crash in skirt preview for multiple objects with different height
...
and full size skirt used as a draft shield.
2020-03-13 15:57:07 +01:00
bubnikv
324b9d4f67
Fixed compilation on Linux / OSX
2020-03-13 15:11:40 +01:00
enricoturri1966
b36051af82
New tech ENABLE_SLOPE_RENDERING - 1st installment of rendering objects colored by facets slope
2020-03-13 15:09:07 +01:00
bubnikv
98fc01afe7
Fix of compilation on OSX and Linux, update of camera after 3D mouse
...
disconnect moved to the main thread.
2020-03-13 14:57:45 +01:00
bubnikv
2f6326a2eb
Windows specific refactoring of Mouse3DController and RemovableDriveManager.
...
PrusaSlicer newly registers by Windows operating system for HID USB
plug / unplug notifications and for Volume attach / detach notifications,
and the background threads of the two respective services are waken up
on these Windows notifications.
The RemovableDriveManager also wakes up every 30 seconds to cope with
the drives ejected from Windows Explorer or from another application,
for example Cura, for which Windows OS does not send out notifications.
2020-03-13 14:19:14 +01:00
Enrico Turri
3684eea53d
Follow-up of 4a59a45d51
-> missed cleanup
2020-03-13 13:20:38 +01:00
YuSanka
56c6193ff4
Merge remote-tracking branch 'origin/ys_add_new_options' into ys_improvements
2020-03-13 11:49:51 +01:00
bubnikv
45e0079356
Refactoring of suppress background process update for clarity.
2020-03-12 16:11:25 +01:00
bubnikv
1d5249f9b0
Fix of #3660 : Background processing restart and error messages
...
are suppressed while tracking a pop-up menu.
2020-03-12 16:05:39 +01:00
YuSanka
6a6790b8e7
Implemented disabling of Add buttons if next layer range couldn't be added
...
+ Fixed "Layer ranges" expand.
2020-03-12 15:11:31 +01:00
bubnikv
f71d3e63f2
Changed location of vendor specific thumbnail images of printers:
...
These images are newly stored inside the resources/profiles/VENDOR_NAME/,
they should be named by the printer_model identifier suffixed with
"_thumbnail.png"
All the existing printer thumbnails were moved and renamed,
thumbnails for the 3rd party printers were added, marked as Beta.
2020-03-12 14:13:08 +01:00
bubnikv
b71161265f
Follow-up on 550e5c2fbb3a5151e18b573f246fa78dcef8e964
...
Fixed some spurious moves of data that should have not been moved.
2020-03-12 12:57:52 +01:00
David Kocik
3858257e28
info message - ejecting of sd/flash has failed
2020-03-12 12:57:52 +01:00
bubnikv
e2274bfc83
Saving one enumeration of external drives when deciding whether
...
to verify the file saved or not.
2020-03-12 12:43:09 +01:00
David Kocik
b941560736
RemovableDriveManager: not calling update from status()
...
Update was called too often on main thread mostly from status() causing delays
2020-03-12 11:57:05 +01:00
bubnikv
c145d60df4
Improvement in the RemovableDriveManager update function:
...
Don't call the update() if it is already running. Wait for the
other instance to finish instead.
2020-03-12 11:30:58 +01:00
bubnikv
ccbf5379ab
More detailed logging of hid_init() on unixes to detect why
...
loading of "libudev.so.1" or "libudev.so.0" failed.
2020-03-12 09:42:25 +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
bubnikv
6664a548d6
Show busy cursor on eject, improves
...
2.2.0-RC Eject is very slow in Linux #3795
2020-03-11 18:25:05 +01:00
bubnikv
cd381d6b4f
More robust vendor profile parsing.
2020-03-11 18:12:16 +01:00
bubnikv
1484d98997
Merge remote-tracking branch 'remotes/origin/vb_add_layer_range_osx'
2020-03-11 14:33:40 +01:00
Enrico Turri
9aa5c13c15
Fixed initial position of top toolbars
2020-03-11 14:15:36 +01:00
YuSanka
481719ed15
Fix of #3797 : OSX specific bug:
...
Added missed invalidation for a bKilledFocus flag.
Without this invalidation TextCtrl updates their value only each odd try.
2020-03-11 14:07:00 +01:00
bubnikv
ed760ae932
Fixed a fishy null pointer reference bug reported by ASAN time to time.
2020-03-11 13:58:31 +01:00
Enrico Turri
4d39050dcd
Fixed conflict after merge with master
2020-03-11 13:16:15 +01:00
Enrico Turri
2c9bd86a70
Fix of crash and/or assert when changing language
2020-03-11 12:19:52 +01:00
YuSanka
7fd9c736b3
Implemented "Use unlimited skirt" option
2020-03-11 11:43:08 +01:00
Slic3rPE
e47e487fe2
Fix of a crash on OSX after changing a layer range value and then
...
pressing the "add layer" button.
2020-03-11 09:10:25 +01:00
Enrico Turri
591c73a4dd
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager
2020-03-10 13:45:36 +01:00
Enrico Turri
1d337b0e24
#3791 - Linear zoom for 3DConnexion devices
2020-03-10 13:43:49 +01:00
Enrico Turri
a8dff7038f
Fixed conflicts after merge with master
2020-03-10 13:09:32 +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