Commit Graph

1219 Commits

Author SHA1 Message Date
abfbcd5d17 Fixed conflicts after merge with master 2020-03-16 08:09:52 +01:00
f4baac9147 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
c7b425d5a2 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
a94b14e620 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
32f196549c Documented the previous merge. 2020-03-14 07:14:45 +01:00
cc837f090d Merge remote-tracking branch 'remotes/origin/ys_improvements' 2020-03-13 16:01:30 +01:00
0647e9c850 New tech ENABLE_SLOPE_RENDERING - 1st installment of rendering objects colored by facets slope 2020-03-13 15:09:07 +01:00
4cd1243a79 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
d48616c5e7 Merge remote-tracking branch 'origin/ys_add_new_options' into ys_improvements 2020-03-13 11:49:51 +01:00
31a205087e Refactoring of suppress background process update for clarity. 2020-03-12 16:11:25 +01:00
c521f1fdca 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
0c747450dd Follow-up on 550e5c2fbb3a5151e18b573f246fa78dcef8e964
Fixed some spurious moves of data that should have not been moved.
2020-03-12 12:57:52 +01:00
8219504137 info message - ejecting of sd/flash has failed 2020-03-12 12:57:52 +01:00
6c75c795df Saving one enumeration of external drives when deciding whether
to verify the file saved or not.
2020-03-12 12:43:09 +01:00
f757d06e0a 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
a9d4f9a5ea Fixed conflicts after merge with master 2020-03-10 13:09:32 +01:00
8ffdbd3dc4 Follow-up of 6c36577e8e -> World Z axis set to vertical when disconnecting 3d mouse 2020-03-10 13:02:39 +01:00
3c79e67780 Added "Filament spool weight" option to filament options 2020-03-09 17:01:05 +01:00
55306185b7 Fixed conflicts after merge with master 2020-03-09 16:03:15 +01:00
e31c043130 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-03-09 15:23:38 +01:00
0739909934 #3782 - World Z axis always vertical for non-free camera 2020-03-09 15:23:29 +01:00
7ecfbeb1da Add arrange support for unprintable items 2020-03-09 14:06:07 +01:00
872e629df5 Merge branch 'ys_detach_btn' 2020-03-06 17:41:43 +01:00
4ab8d47f78 keyboard and file menu shortcuts for save to sd card and eject 2020-03-06 15:35:47 +01:00
f2fce0f262 Refactoring of RemovableDriveManager:
1) On Windows and Linux, the device enumeration now runs at a background
   thread, while it ran on the UI thread on idle, which may have been
   blocking on some rare Windows setups, see GH #3515 #3733 #3746 #3766
2) On OSX, the device enumeration now relies on OS callback, no
   polling is required.
3) Refactored for cleaner interface.
2020-03-06 15:10:58 +01:00
f7b08ca8a9 Refactoring of RemovableDriveManager
1) On Windows and Linux, polling of removable drives is done at a background
   thread, not at a UI thread.
2) On OSX, there is no polling, but a OS notification callback.
3) Refactored for clarity of the RemovableDriveManager interface.
2020-03-06 14:49:21 +01:00
15559af285 Merge branch 'master' into ys_detach_btn 2020-03-06 14:40:28 +01:00
306de82493 Fixed :
* the editing of extruder color from PresetComboBox,
when incompatible filament preset is selected and red flag is shown.

*OSX specific bug : empty icons for PresetComboBox had non-scaled width
2020-03-06 14:22:14 +01:00
4500fe7d3d Fixed conflicts after merge with master 2020-03-05 10:41:11 +01:00
8c731efd53 Removed temporary debug output and clean up 2020-03-05 10:14:12 +01:00
c8ebadd1ac Merge remote-tracking branch 'remotes/origin/vb_3dconnexion_refactoring' 2020-03-05 09:56:06 +01:00
7b4830a827 Localization:
- Deleted redundant whitespaces before semicolons.
- All "\t" extracted from the phrases (The PhraseApp used to the translations "doesn't see" it, and as a result all translations missed them)
2020-03-05 07:49:05 +01:00
073d2e19cb Attempt to fix crash on MAC when closing using Command+Q 2020-03-04 15:19:48 +01:00
467315f25c Added temporary debug output to investigate crash on MAC when closing using Command+Q 2020-03-04 14:19:15 +01:00
248dc04892 Reworked the 3DConnexion interfacing code to run the device
enumeration / connect / disconnect and read out at the background
thread only.
2020-03-04 11:36:36 +01:00
bffd07baa6 Fixed some more warnings 2020-03-03 15:53:26 +01:00
bcf0a6c5c9 Removed SLA unused code
Mostly the dead-ends that were tried when hollowing was being implemented
2020-03-03 15:53:26 +01:00
35b59a3e13 Include cleanup in Plater, GLCanvas3D and GLGizmosManager 2020-03-03 15:53:26 +01:00
2a38f85772 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-03 11:10:59 +01:00
a29177d355 Fixing wxString::Format encoding mismatches (part 2) 2020-03-03 10:54:17 +01:00
d512f1814a Removed temporary debug output 2020-03-03 08:34:03 +01:00
5572e05356 Added temporary debug output 2020-03-02 15:22:41 +01:00
77d41a143c ENABLE_GCODE_VIEWER - Basic framework for new gcode viewer 2020-03-02 15:13:23 +01:00
11c37cdb45 Fix build on Linux and MAC 2020-03-02 13:09:12 +01:00
4af8741c62 View toolbar's initialization of icon size moved from GLCanvas3D::GLCanvas3D() to Plater::priv::priv() for OSX build 2020-03-02 12:45:04 +01:00
5407256c73 Fixed conflicts after merge with master 2020-03-02 11:35:03 +01:00
f61f6a98a5 GLCanvas3DManager moved from being a static member of _3DScene to be a normal member of GUI_App 2020-03-02 10:58:46 +01:00
371f238808 Fixed localization issue of the "Removable media unmounted" message.
Generalized the Slic3r::show_info() function to std::strings and
const char*
2020-02-29 12:03:07 +01:00
6b841c01b1 Follow-up of 47604b6326 -> Fixed layout at startup 2020-02-28 11:19:46 +01:00
9f51ceefec More polishing of translations 2020-02-27 14:11:20 +01:00