Commit Graph

4983 Commits

Author SHA1 Message Date
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
6f597f246a Merge pull request #3778 from sckunkle/master
Fix double space message.
2020-03-05 09:41:43 +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
745396dc49 Fix double space message. 2020-03-04 13:33:25 -06: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
6512c7bb99 Fixed some compilation warnings. 2020-03-04 13:06:21 +01:00
c8ea454d07 WIP: Fixed some compilation issues on OSX, fixed some "override" vs. "virtual"
warnings.
2020-03-04 12:48:04 +01:00
30c432c561 WIP 3Dconnexion refactoring: Fixing compilation on OSX 2020-03-04 12:18:59 +01:00
289d8a8a1c Disabled the 3DConnexion mouse scroll wheel spurious events filtering
on other platforms than Windows.
2020-03-04 11:55:47 +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
18fd7fa45f Fixing build against wxWidgets 3.0
The wxString saga continues. wxWidgets 3.0 don't have the wxString::FromUTF8(const std::string&) overload, we must use the GUI::from_u8 helper
Also wxWidgets 3.0 don't allow to disable wxString->const char* conversion, so calling show_info(wxWindow*, wxString, const char*) was ambiguous
Several includes moved around
2020-03-04 10:34:59 +01:00
7d65841d87 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-04 09:39:00 +01:00
9d704a7e3a Renormalization of the camera rotation quaternion after each change
fixes degeneration of the camera rotation on long rapid rotations.
2020-03-03 13:47:10 +01:00
2a38f85772 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-03 11:10:59 +01:00
4949150313 Fixing wxString::Format encoding mismatches (part 3) 2020-03-03 10:54:17 +01:00
a29177d355 Fixing wxString::Format encoding mismatches (part 2) 2020-03-03 10:54:17 +01:00
d58b5617cc Fixing wxString::Format encoding mismatches (part 1) 2020-03-03 10:54:17 +01:00
0a41c968df Fixed a width of an empty icon, which added to BitmapComboBox
Related to the #3759
2020-03-03 10:12:52 +01:00
60cb505e2b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-03 08:34:11 +01:00
d512f1814a Removed temporary debug output 2020-03-03 08:34:03 +01:00
5ac0d42d86 When loading installed filaments and SLA materials from PrusaSlicer.ini,
the "renamed_from" property of current profiles was not taken into account.
This lead to a situation where there were no MMU or SLA materials installed
after upgrade from PrusaSlicer 2.2.1 to 2.2. This should work now.
2020-03-02 16:15:41 +01:00
8bc4b2305a Fixed detection of OSX version 2020-03-02 15:55:36 +01:00
5572e05356 Added temporary debug output 2020-03-02 15:22:41 +01:00
30804fe960 Reintroduced tech ENABLE_HACK_CLOSING_ON_OSX_10_9_5 2020-03-02 14:37:01 +01:00
11c37cdb45 Fix build on Linux and MAC 2020-03-02 13:09:12 +01:00
aa9ea02375 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-02 12:45:42 +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
4a6c46529e Promote max_bridges_on_pillar to be a runtime parameter.
This way the user greater control over support tree branching and the amount of pillars created.
2020-03-02 12:43:00 +01:00
b123733b57 #3646 - Ask user whether remove from recent projects list a project no longer available 2020-03-02 12:33:17 +01:00
3b8c0b4bc7 Removed tech ENABLE_HACK_CLOSING_ON_OSX_10_9_5 2020-03-02 12:13:39 +01:00
4323f712a2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-02 11:42:10 +01:00
ff97c82c13 Fixed build on MAC 2020-03-02 11:40:35 +01:00
5407256c73 Fixed conflicts after merge with master 2020-03-02 11:35:03 +01:00
b5d742b1c3 Fix of #3739 (OSX: set width of "Editing" column
to avoid a column narrowing after a recreating of an application caused by a language changing)

+ Fix related to a bug, reported in #3617, about wrong placement of a "Purging volumes" button
translated to the some languages
2020-03-02 11:33:56 +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
184281f9da Merge branch 'vb_camera_rotation_quaternion' 2020-03-02 09:23:00 +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
e103034870 Updated printer profiles, bumped up version to 2.2.0-rc. 2020-02-29 10:53:18 +01:00
cbe780671a Fix of dark mode detection on macOS 10.12 and 10.13 2020-02-28 15:28:04 +01:00
0c63234e30 Free rotating camera reworked to rotate around the free rotation
axis in a single step.
2020-02-28 14:59:59 +01:00
5010d2cf89 Camera refactored to use quaternions primarily for processing
rotations due to numerical reasons (no need for normalization
and orthogonalization of the rotation matrix).
2020-02-28 13:29:05 +01:00
6b841c01b1 Follow-up of 47604b6326 -> Fixed layout at startup 2020-02-28 11:19:46 +01:00
3da9ef1aae Bugfix: SLA pad and supports were sometimes shown on instances that should have been hidden
The showing/hiding block cannot depend on whether the mesh was recently updated.
It would then not hide the supports and pad, which are calculated later than the hollowed mesh.
2020-02-27 17:58:27 +01:00
cfb00edd5d Disabled implicit conversion of wxString to std::string or const char*
and vice versa. Fixed one last implicit wxString conversion.
2020-02-27 17:02:08 +01:00
e25d703558 Reduce max texture size if physical ram is smaller than 6GB 2020-02-27 15:38:35 +01:00
915464e783 Small fix of clipping plane positioning
If the clipping plane is moved automatically after hollowed mesh was created, move the clipping plane and fix current direction so it is not reset when user wants to move it
This is a quick solution for the 2.2.0 release. It should be later refactored as mentioned in the code.
2020-02-27 15:18:15 +01:00
239ab3a8e3 Slight change in clipping plane updating after hollowing finishes
The clipping plane in SLA gizmos is only moved in case that the gizmo is currently active and hollowing is actually enabled.
2020-02-27 15:18:15 +01:00