Commit graph

5240 commits

Author SHA1 Message Date
Enrico Turri
095062e371 3DConnexion settings dialog (Ctrl+M) shown only on Mac 2020-03-31 14:16:53 +02:00
Enrico Turri
f1ccd38258 Fixed shaders on Intel Cards - not allowed use of 'active' word 2020-03-31 12:51:50 +02:00
bubnikv
25d58faaad WIP: Windows specific 3Dconnexion using WM_INPUT.
This implementation works with the 3DConnexion driver (sic!)
if PrusaSlicer.xml is stored into c:\Program Files\3Dconnexion\3DxWare\3DxWinCore64\Cfg\

The implementation is inspired with Blender, see code inside WITH_INPUT_NDOF blocks.
2020-03-31 09:01:55 +02:00
tamasmeszaros
70baa0d246 Fix arrange for large beds 2020-03-30 13:26:24 +02:00
bubnikv
ec86d94f02 Workaround for the Prusa3D Fast (layer height 0.35mm) profile, which
collides with the maximum allowed layer height at the Printer Extruder
0.25mm.

Works around "MMU2s and supports on prusaslicer 2.2.0 issue #3919"
2020-03-27 14:15:09 +01:00
bubnikv
58192ba6c2 Win32 specific: Using SHChangeNotifyRegister to get notifications
on removable media insert / eject events.
From now on we no more poll for removable media on Windows.

Thanks @mjgtp from prusaprinters.org
See the following discussion:
https://forum.prusaprinters.org/forum/prusaslicer/prusaslicer-trying-to-access-my-floppy-disk-a

The final working code sample was taken from Chromium source code,
volume_mount_watcher_win.cc
2020-03-27 08:10:00 +01:00
bubnikv
3fdd643f49 Fix of PrusaSlicer trying to access my floppy disk (A:\)
Some customers seem to posses a floppy drive (sic!) and some floppy
drives start spinning if accessed just to check whether there is
a medium plugged in or not.

From now, the A: and B: drives are not checked anymore for removable
media. Now let's pray nobody maps an SD card or flash drive to A: or B:

Fixes
https://forum.prusaprinters.org/forum/prusaslicer/prusaslicer-trying-to-access-my-floppy-disk-a
2020-03-26 19:06:23 +01:00
bubnikv
a1aee69c5a Fixed a logical error in substitution of the selected language with
the system language: System language returned by Windows for pt_BR
is pt_PT, and this language was then used incorrectly to select
the dictionary.

Now the selected language is stored into PrusaSlicer.ini and
if a substitution is to be performed to select locales (not the dictionary)
based on the system recommended locales, this substitution is being
done in runtime just before switching the locales.
Fixes PrusaSlicer 2.3.0 - Language Portuguese (Brazilian) dont work #3901

Also hopefully fixed
LANGUAGE environment variable not respected #2970
by calling
wxTranslations::Get()->GetBestTranslation()
on Unix systems as well, which reads the "LANGUAGE" environment.
2020-03-26 14:27:18 +01:00
Lukas Matena
0054134ff8 Fix of #3916 (macOS crash when generating WarningTexture)
Likely the same cause as #3371, hopefully the same solution as presented in 4f1f507
2020-03-25 23:55:25 +01:00
bubnikv
b3cebdb672 Fix after merge 2020-03-25 17:55:46 +01:00
bubnikv
750e704b37 Merge remote-tracking branch 'remotes/origin/et_slope_shader' 2020-03-25 16:09:04 +01:00
bubnikv
8d7f88b381 Imported error reporting when loading presets with option keys
or option values that our poor software does not understand.
This applies to configs added by some forks of slic3r, for example
slic3r++
PrusaSlicer has encountered an error: Failed loading the preset file: #3909
2020-03-25 16:04:11 +01:00
enricoturri1966
dd34aef643 Follow-up of bfbcd45209 -> completed fix 2020-03-25 15:30:25 +01:00
enricoturri1966
bfbcd45209 Fixed build on Mac 2020-03-25 15:15:20 +01:00
enricoturri1966
a54d77699b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_canvas_manager 2020-03-25 14:54:10 +01:00
enricoturri1966
f12b39be25 Fixed conflicts after merge with master 2020-03-25 14:41:47 +01:00
bubnikv
faf8df7864 Show just a short build info at the application toolbar even on OSX. 2020-03-25 14:35:41 +01:00
bubnikv
4656102dba Compile with 32bit coord_t by default. 2020-03-25 14:35:41 +01:00
bubnikv
c27297f6cc 64bit coord_t
Vec3i as a vertex index to TriangleMesh constructor
2020-03-25 14:35:41 +01:00
enricoturri1966
ed0f3b3406 Small refactoring 2020-03-25 13:55:17 +01:00
tamasmeszaros
bf5d52f221 Only do OpenSSL override on Linux 2020-03-25 12:27:10 +01:00
YuSanka
de06c5d659 Merge remote-tracking branch 'origin/ys_fix_cb_selection' 2020-03-25 11:12:37 +01:00
tamasmeszaros
d207ea7dc5 Merge branch 'tm_cert_store' 2020-03-25 11:07:06 +01:00
enricoturri1966
10eb954c7e ENABLE_AUTO_CONSTRAINED_CAMERA set as default 2020-03-25 10:24:52 +01:00
enricoturri1966
3d6c9e54e9 ENABLE_THUMBNAIL_GENERATOR set as default 2020-03-25 10:15:02 +01:00
tamasmeszaros
1123689a22 Search for openssl cert store on app init, if the store is not present.
fixes  #3851
2020-03-25 09:41:29 +01:00
enricoturri1966
fac28ea27a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes 2020-03-25 09:34:17 +01:00
enricoturri1966
3990598f01 Fixed build when ENABLE_GIZMO_TOOLBAR_DRAGGING_FIX is disabled 2020-03-25 09:33:59 +01:00
enricoturri1966
df8def7545 Fixed build when ENABLE_CANVAS_TOOLTIP_USING_IMGUI is disabled 2020-03-25 09:22:37 +01:00
enricoturri1966
c300b66b7e ENABLE_MODIFIED_GIZMOBAR_MOUSE_EVENT_HANDLING merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI 2020-03-25 09:05:35 +01:00
enricoturri1966
69ca14a695 ENABLE_MODIFIED_TOOLBAR_MOUSE_EVENT_HANDLING merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI 2020-03-25 08:52:57 +01:00
enricoturri1966
6f1c99db34 ENABLE_CANVAS_DELAYED_TOOLTIP_USING_IMGUI merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI 2020-03-25 08:43:18 +01:00
enricoturri1966
36041ced26 ENABLE_CANVAS_CONSTRAINED_TOOLTIP_USING_IMGUI merged into ENABLE_CANVAS_TOOLTIP_USING_IMGUI 2020-03-25 08:31:15 +01:00
Lukas Matena
97b9de47b4 Merge branch 'master' into dev 2020-03-24 21:51:05 +01:00
enricoturri1966
7c72231fcd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes 2020-03-24 12:26:48 +01:00
enricoturri1966
c6d5ad1517 Refactoring of toolbars' tooltip generation 2020-03-24 12:26:30 +01:00
bubnikv
c3a9915fa1 Added the order of the print parameter priorities when slicing
from command line to command line help.
Follow up on
PrusaSlicer Console --load my_config.ini doesnt overwrites the 3mf profiles or not used. #3893
2020-03-24 11:59:55 +01:00
bubnikv
015a4a37dc Fix of a wrong order of processing the config sources when slicing
from command line. Fixes
PrusaSlicer Console --load my_config.ini doesnt overwrites the 3mf profiles or not used. #3893

The priority of config values is now:

1) Config keys from command line, for example --fill-pattern=stars
   (highest priority, overwrites everything below)
2) Config files loaded with --load
3) Config from 3mf
   (lowest priority)
2020-03-24 11:52:43 +01:00
bubnikv
ad5ae50933 Fix of Crash when trying to set up non-existent flashair (#3899)
fixed a typo in formatting text, throwing an exception.
2020-03-24 10:04:41 +01:00
enricoturri1966
a1ec38a7fb Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_bug_fixes 2020-03-24 08:08:12 +01:00
YuSanka
5215b2ecb2 Fix of #3889 2020-03-23 22:47:35 +01:00
enricoturri1966
4c1d867ba0 #3897 - Small optimisation in GCodePreviewData::RangeBase::get_color_at (thanks to rongith) 2020-03-23 16:12:52 +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
046f0dbfa2 Fixed a regression issue to PrusaSlicer 2.1.1
Custom printer with center of bed at 0,0 results in "toolpath outside print area" #3510
The G92 A0 B0 was incorrectly considered to be equal to just G92
to reset all axes.
2020-03-21 10:09:33 +01:00
bubnikv
1cbb822dd7 Enabled "clip multipart objects" by default, see discussion in
https://github.com/prusa3d/PrusaSlicer/issues/2803#issuecomment-524602137
2020-03-20 18:25:11 +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
bubnikv
a9fc39491e Fix of weird double extrusions with multiple regions and their
parameters being changed between slicing runs.
2020-03-20 13:37:13 +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
bubnikv
b1fbc2c59c Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2020-03-19 17:32:18 +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
Lukas Matena
6d23c08d00 WIP 2020-03-19 12:04:05 +01:00
Lukas Matena
f275461354 WIP: FDM supports gizmo now works with multiple part objects into some extent 2020-03-19 11:15:17 +01:00
Lukas Matena
1b05ecae8c WIP: FDM gizmo: triangles not facing the camera are no more selected with fdm selection tool 2020-03-19 11:15:17 +01:00
Lukas Matena
590569e8f6 WIP: Optimized the triangle selection so it does not iterate over all the triangles 2020-03-19 11:15:17 +01:00
Lukas Matena
2e71dcefc3 WIP: Added a circle cursor and naive logic to select triangles inside
Deselection is possible when holding shift
Triangles obscured by the mesh are selected nonetheless (so far)
2020-03-19 11:15:17 +01:00
Lukas Matena
08daddb5de WIP: First working implementation of the triangle selector for the FDM support gizmo 2020-03-19 11:15:17 +01:00
Lukas Matena
7afe7326b6 WIP: Duplicated the SLA gizmo for the FDM, removed what was not needed
Clipping plane and the m_model_object pointer keeping was duplicated
2020-03-19 11:15:17 +01:00
Enrico Turri
5a4e80fdb2 Added readme.md file for imgui 2020-03-19 10:43:48 +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
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
bubnikv
98fb8b626f Fix of Wipe to Infill causes severe overextrusion (thicker walls & infill) (#3842)
Regressinon in regard to PrusaSlicer 2.2.1 due to Vojtech's refactorings
for efficiency.
2020-03-17 09:41:54 +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
tamasmeszaros
5ed7d0aa29 Fix arrangement with items larger or equal to bed dimesions.
fixes #2897 
fixes #1186
2020-03-16 14:37:54 +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