Commit graph

2888 commits

Author SHA1 Message Date
Enrico Turri
32a42f2808 Added tech ENABLE_THUMBNAIL_GENERATOR -> 1st installment of generation of thumbnail from plater (WIP) 2019-10-22 16:02:31 +02:00
YuSanka
0d89fd84db Fixed a case when (under OSX) after some manipulation with an object or a part and then add some setting from 3dScene, "Revert button(s)" are still appear(s) in right panel 2019-10-22 10:30:07 +02:00
Enrico Turri
d4f190a0c1 Fixed build on Linux and Mac 2019-10-21 15:20:36 +02:00
Enrico Turri
3ce3f33c9c Mouse3DController::connect_device() -> Modified logic to detect and select plugged device 2019-10-21 14:21:51 +02:00
Enrico Turri
c47ca5a2c0 Mouse3DController -> Added debug output of device serial number 2019-10-21 11:30:29 +02:00
Enrico Turri
76a2f72e97 Follow-up of a065c92302 -> proper enabling of debug output 2019-10-21 11:12:56 +02:00
Enrico Turri
a065c92302 Mouse3DController -> Enabled debug output to check device connection on Linux and Max 2019-10-21 11:06:18 +02:00
Enrico Turri
93ae170113 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-17 08:09:23 +02:00
bubnikv
1964ac2e89 Ported test_skirt_brim from upstream Slic3r, thanks @lordofhyphens 2019-10-15 16:31:20 +02:00
Enrico Turri
e6403a74ef ENABLE_3DCONNEXION_DEVICES tech set as default 2019-10-11 15:51:36 +02:00
Enrico Turri
1c05d88c00 ENABLE_3DCONNEXION_DEVICES -> Added support for 3Dconnexion universal receiver and battery level report 2019-10-11 15:29:57 +02:00
Enrico Turri
a7972bcc77 ENABLE_3DCONNEXION_DEVICES -> Debug output of device features 2019-10-11 09:16:20 +02:00
Enrico Turri
8998a8e756 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-11 08:19:24 +02:00
YuSanka
62b7892fa1 OSX: Call m_extruder_editor->Hide(), when extruder selection in ObjectList is changed 2019-10-10 16:13:27 +02:00
Enrico Turri
9ea501cab2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-10 16:01:24 +02:00
Enrico Turri
8b4799d734 Do not show context menu when the user deletes sla support points by right clicking on them and the mouse pointer is hovering the selected object 2019-10-10 16:00:32 +02:00
Enrico Turri
4d1cfda14a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-10 15:44:52 +02:00
Enrico Turri
cc34860ddd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-10-10 14:45:09 +02:00
Enrico Turri
e51d970b2e Fixed crash in Plater::priv::can_reload_from_disk() 2019-10-10 14:44:52 +02:00
Enrico Turri
7caa596b95 ENABLE_3DCONNEXION_DEVICES -> Refactoring and code cleanup 2019-10-10 11:55:17 +02:00
Lukas Matena
0dfbfa62df wxExtensions.cpp: BitmapChoiceRenderer now updates config immediately after its combobox closes
This was needed because for some reason, the combobox would not lose focus when mouse left the ObjectList on Linux (KILL_FOCUS forces the update).
The update could be bypassed on Win too by changing extruder and hitting shortcut to reslice.
2019-10-10 11:03:55 +02:00
Enrico Turri
068b7e86a9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-10 10:50:06 +02:00
Enrico Turri
f4654e376e ENABLE_3DCONNEXION_DEVICES -> Slightly increased camera target movement limits 2019-10-10 10:49:47 +02:00
Enrico Turri
a65b8f462d #3008 - Reduced max size of bed texture 2019-10-10 09:35:21 +02:00
Enrico Turri
ded6d44389 Fixed build on OsX 2019-10-10 09:29:55 +02:00
Enrico Turri
aae1250921 ENABLE_3DCONNEXION_DEVICES -> Experimental input queues with max size 2019-10-10 09:04:44 +02:00
Enrico Turri
3a5823bc2e ENABLE_3DCONNEXION_DEVICES -> Added temporary debug output to measure input queue sizes 2019-10-09 15:23:30 +02:00
Enrico Turri
5888477473 ENABLE_3DCONNEXION_DEVICES -> Reworked deadzone check 2019-10-09 14:39:28 +02:00
Enrico Turri
a735ec1b48 ENABLE_3DCONNEXION_DEVICES -> Added tech ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT for debug output 2019-10-09 14:18:43 +02:00
Enrico Turri
b41a0656b9 ENABLE_3DCONNEXION_DEVICES -> Reworked parsing of data coming from device 2019-10-09 14:01:13 +02:00
Enrico Turri
589e003de0 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-09 13:41:09 +02:00
Enrico Turri
a6a7303e25 Fixed context menu showing up when user right clicks on 3D scene and release the mouse button after dragging over the objects list 2019-10-09 13:39:24 +02:00
YuSanka
1ade11fd57 Fixed OSX build 2019-10-09 13:15:03 +02:00
YuSanka
2afaefad24 Bugfix for extruders Column: suppress draw bitmap for Instance and allow Extruder editing for Layer Range 2019-10-09 12:36:13 +02:00
Enrico Turri
9fc1cc6f84 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-09 12:16:44 +02:00
YuSanka
688a559b5f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-10-09 11:31:48 +02:00
YuSanka
c1bb34cc4d Some changing in implementation of emulate_kill_focus according to new code architecture.
+ Cleaning of the code from unused parts
2019-10-09 11:24:28 +02:00
Enrico Turri
835ee148e5 Fixed conflicts after merging with master 2019-10-09 11:17:48 +02:00
Enrico Turri
e6ce74957f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-09 09:58:39 +02:00
Enrico Turri
4ec6199ef1 ENABLE_3DCONNEXION_DEVICES -> Added translation and rotation customizable parameter deadzone 2019-10-08 14:32:05 +02:00
Lukas Matena
fdf9272fbe Wipe tower brim width is now part of WipeTowerData class, so it can be used wherever needed 2019-10-08 13:50:51 +02:00
Enrico Turri
b7db5a9558 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-08 13:38:27 +02:00
Enrico Turri
9447d3e1b5 ENABLE_3DCONNEXION_DEVICES -> Mouse3DController reworked to handle reports of length 7 bytes and 13 bytes 2019-10-08 13:38:08 +02:00
Lukas Matena
9a9c3bac39 Fixup of 47a8b49 2019-10-08 11:05:59 +02:00
Enrico Turri
8fcd4e4407 ENABLE_3DCONNEXION_DEVICES -> added debug code to get 3Cconnexion device product id 2019-10-08 09:52:56 +02:00
Enrico Turri
8aa33a9e05 ENABLE_3DCONNEXION_DEVICES -> Hack for filtering out mouse wheel events coming from 3Dconnexion driver 2019-10-08 08:44:50 +02:00
tamasmeszaros
272e9f11e3 Merge branch 'tm_arrange_test_extend' 2019-10-07 17:57:34 +02:00
Vojtech Kral
fd6d32135b Merge branch 'master' into materials 2019-10-07 17:23:37 +02:00
Vojtech Kral
570c038eb7 ConfigWizard: Fix printer pre-selection on fresh config 2019-10-07 17:21:45 +02:00
tamasmeszaros
72ac8d68f0 Extend libnest tests, remove some warnings, faster catch2 compilation.
Also, improve libnest2d::nest interface.
2019-10-07 17:16:40 +02:00
YuSanka
47a8b49f8b Fixed get extruder color for SLA presets 2019-10-07 12:36:16 +02:00
Vojtech Kral
eda01341d0 ConfigWizard: Fix a memory access issue between PageMaterial instances 2019-10-07 11:10:18 +02:00
Enrico Turri
6f85b0885a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-07 09:31:43 +02:00
Enrico Turri
0ba9fbaf0c ENABLE_3DCONNEXION_DEVICES -> Update 3D scene only when mouse 3D device send update messages 2019-10-07 09:31:23 +02:00
tamasmeszaros
5bf3d5aabf Merge branch 'tm_sla_tests' 2019-10-04 18:34:08 +02:00
Enrico Turri
5a94ac9499 ENABLE_3DCONNEXION_DEVICES -> Automatic detection of plugging/unplugging 3Dconnexion devices 2019-10-04 10:59:27 +02:00
Enrico Turri
1d463fc23f ENABLE_3DCONNEXION_DEVICES -> Another small refactoring of Mouse3DController 2019-10-04 07:58:01 +02:00
Enrico Turri
243cb5d524 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-04 07:34:43 +02:00
YuSanka
ffa544ade3 Merge remote-tracking branch 'origin/ys_extruders_color' 2019-10-03 14:25:25 +02:00
YuSanka
da7275bdea Merge remote-tracking branch 'origin/ys_manipulation_panel_rw' 2019-10-03 14:24:20 +02:00
Enrico Turri
f315681804 ENABLE_3DCONNEXION_DEVICES -> Refactored Mouse3DController to simplify code 2019-10-03 12:16:59 +02:00
Enrico Turri
b15757a126 ENABLE_3DCONNEXION_DEVICES - Added missing return lines 2019-10-03 12:09:49 +02:00
Enrico Turri
587effbedf ENABLE_3DCONNEXION_DEVICES -> Refactored Mouse3DController to be unaware of current active GLCanvas3D 2019-10-03 11:38:31 +02:00
Enrico Turri
a554304038 ENABLE_3DCONNEXION_DEVICES -> Serialization of mouse device parameters into config 2019-10-03 10:26:28 +02:00
Enrico Turri
7007d81519 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-03 08:07:13 +02:00
YuSanka
63f31ce4db Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-10-02 22:51:18 +02:00
YuSanka
b3603a09fc Fixed a bug: Wrong save of a preset if the preset is already exist.
Step to repro:
1. Select system "Some_preset" preset
2. Make some changes
3. Save preset with "Some_preset - Copy" name.
=>  "Some_preset - Copy" is selected, there is/are marked option(s) only different from system preset.
repeate 1-3 steps
=>  "Some_preset - Copy" is selected, there is/are marked option(s) different from DEFAULT preset.
2019-10-02 22:50:55 +02:00
YuSanka
8bc569284e Corrected editor position and size 2019-10-02 16:14:40 +02:00
Enrico Turri
36d3f90fad ENABLE_3DCONNEXION_DEVICES - Added imgui dialog to edit 3Dconnexion device parameters 2019-10-02 15:55:26 +02:00
YuSanka
9e01740db6 More improvements 2019-10-02 15:02:13 +02:00
tamasmeszaros
d5dcba00b1 Time conversion functions with tests.
Fixes issue with incorrect characters in time strings on UI.
Fix platform dependency


Fix return value with incorrect strings.


Just use strptime and strftime on all platforms.

Emulate strptime on msvc... because they don't have it and their get_time is buggy.
2019-10-02 14:44:11 +02:00
YuSanka
4171a6a80d Improvements for 15902766d0 2019-10-02 14:08:36 +02:00
YuSanka
d87f2d11ae Fix OSX build 2019-10-02 12:17:02 +02:00
YuSanka
15902766d0 Workaround for extruder editing under OSX 2019-10-02 11:53:50 +02:00
Enrico Turri
644cc8c6b4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-02 11:01:31 +02:00
Enrico Turri
fbe38fb2a4 #3008 - Generate all mipmaps up to size 1x1 2019-10-02 10:57:07 +02:00
YuSanka
a0b46a4019 Merge remote-tracking branch 'origin/master' into ys_extruders_color 2019-10-01 18:20:59 +02:00
YuSanka
d7ebc4de5b Added color for extruder 2019-10-01 18:19:28 +02:00
tamasmeszaros
e675a5d5c6 Reworked pad creation algorithm with new parameters:
* brim size
* force pad around object everywhere
2019-10-01 14:58:37 +02:00
tamasmeszaros
710adca6fe Don't disable pad around object parameters if supports are disabled. 2019-10-01 14:57:37 +02:00
YuSanka
45b81f1805 Fixed "unhandled unknown exception", when try to change an extruder count.
Side effect after 86b258f727.
2019-10-01 14:27:51 +02:00
bubnikv
93a157e26c Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-09-30 16:25:31 +02:00
bubnikv
272479826f Refactoring of the G-code preview for lower memory allocation
and for separation of concerns:

The final G-code preview no more uses ExtrusionPaths structure
to hold the G-code path data extracted by parsing the G-code.
Instead, the ExtrusionPath class has been trimmed down back to
the original size before the G-code preview was introduced,
and a new GCodePreviewData::Extrusion::Path class was created to hold
the additional path data as the extruder ID, color change ID
and fan speed.
2019-09-30 16:25:26 +02:00
Vojtech Kral
eb93d2a32d Merge branch 'master' into materials 2019-09-30 16:12:48 +02:00
Enrico Turri
d58dedd459 ENABLE_3DCONNEXION_DEVICES -> Increased limit of device buttons 2019-09-30 15:58:45 +02:00
Enrico Turri
b11704d380 Merge branch 'et_3dconnexion' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 15:38:13 +02:00
Vojtech Kral
520a51c62f hidapi: Fix include path 2019-09-30 15:20:23 +02:00
Enrico Turri
7c8732d560 Merge branch 'et_3dconnexion' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 15:19:36 +02:00
Enrico Turri
eabaa21df2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 15:19:21 +02:00
Vojtech Kral
82fed1790a 3D connexion support on Linux:
- Replace hidapi/linux/hid.c with the hidraw variant (link to udev)
- Add CMakeLists.txt for hidapi, refactor
- Add udev rules file (no installation so far)
2019-09-30 14:59:21 +02:00
YuSanka
c07a193b4e Implemented BitmapChoiseRenderer 2019-09-30 14:34:29 +02:00
YuSanka
f5593c05aa Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-09-30 14:04:45 +02:00
YuSanka
904bbcc006 Fix of SPE-1035 (Wrong filament color updating for multi-material print) 2019-09-30 13:59:26 +02:00
bubnikv
b425ee50a9 Merge remote-tracking branch 'remotes/origin/et_pull_2922' 2019-09-30 10:23:16 +02:00
Enrico Turri
7f7b3e0b0b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 08:15:20 +02:00
Lukas Matena
5ded376fe2 An attempt to fix #2997
More fixes might be needed on the other platforms
2019-09-28 09:57:26 +02:00
Enrico Turri
1aa559585c Added missing include 2019-09-27 15:26:13 +02:00
Enrico Turri
4b3eab0ed9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-27 14:52:30 +02:00
Enrico Turri
f958cfd2ff ENABLE_3DCONNEXION_DEVICES - 1st installment of support for 3Dconnexion devices
Implemented using hidapi library (https://github.com/libusb/hidapi) and https://github.com/koenieee/CrossplatformSpacemouseDriver/tree/master/SpaceMouseDriver as reference

Unsolved issues:

- When manipulating the SpaceNavigator wxWidgets generates a mouse wheel event that needs to be filtered out

- wxWidgets does not detect devices being connected/disconnected to the pc

- Current state forces a continuous rendering

- Current state misses dependence on camera zoom

- Non intuitive movement limits

- Translation and rotation speed factors are hardcoded

- Number of device buttons hardcoded
2019-09-27 14:52:19 +02:00
YuSanka
1a03b664b9 Some changes for alignments in manipulation panel 2019-09-25 15:04:39 +02:00