Commit Graph

2765 Commits

Author SHA1 Message Date
1d463fc23f ENABLE_3DCONNEXION_DEVICES -> Another small refactoring of Mouse3DController 2019-10-04 07:58:01 +02:00
243cb5d524 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-04 07:34:43 +02:00
ffa544ade3 Merge remote-tracking branch 'origin/ys_extruders_color' 2019-10-03 14:25:25 +02:00
da7275bdea Merge remote-tracking branch 'origin/ys_manipulation_panel_rw' 2019-10-03 14:24:20 +02:00
f315681804 ENABLE_3DCONNEXION_DEVICES -> Refactored Mouse3DController to simplify code 2019-10-03 12:16:59 +02:00
b15757a126 ENABLE_3DCONNEXION_DEVICES - Added missing return lines 2019-10-03 12:09:49 +02:00
587effbedf ENABLE_3DCONNEXION_DEVICES -> Refactored Mouse3DController to be unaware of current active GLCanvas3D 2019-10-03 11:38:31 +02:00
a554304038 ENABLE_3DCONNEXION_DEVICES -> Serialization of mouse device parameters into config 2019-10-03 10:26:28 +02:00
7007d81519 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-03 08:07:13 +02:00
63f31ce4db Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-10-02 22:51:18 +02:00
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
8bc569284e Corrected editor position and size 2019-10-02 16:14:40 +02:00
36d3f90fad ENABLE_3DCONNEXION_DEVICES - Added imgui dialog to edit 3Dconnexion device parameters 2019-10-02 15:55:26 +02:00
9e01740db6 More improvements 2019-10-02 15:02:13 +02:00
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
4171a6a80d Improvements for 15902766d0 2019-10-02 14:08:36 +02:00
d87f2d11ae Fix OSX build 2019-10-02 12:17:02 +02:00
15902766d0 Workaround for extruder editing under OSX 2019-10-02 11:53:50 +02:00
644cc8c6b4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-02 11:01:31 +02:00
fbe38fb2a4 #3008 - Generate all mipmaps up to size 1x1 2019-10-02 10:57:07 +02:00
a0b46a4019 Merge remote-tracking branch 'origin/master' into ys_extruders_color 2019-10-01 18:20:59 +02:00
d7ebc4de5b Added color for extruder 2019-10-01 18:19:28 +02:00
710adca6fe Don't disable pad around object parameters if supports are disabled. 2019-10-01 14:57:37 +02:00
45b81f1805 Fixed "unhandled unknown exception", when try to change an extruder count.
Side effect after 86b258f727.
2019-10-01 14:27:51 +02:00
93a157e26c Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-09-30 16:25:31 +02:00
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
d58dedd459 ENABLE_3DCONNEXION_DEVICES -> Increased limit of device buttons 2019-09-30 15:58:45 +02:00
b11704d380 Merge branch 'et_3dconnexion' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 15:38:13 +02:00
520a51c62f hidapi: Fix include path 2019-09-30 15:20:23 +02:00
7c8732d560 Merge branch 'et_3dconnexion' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 15:19:36 +02:00
eabaa21df2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 15:19:21 +02:00
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
c07a193b4e Implemented BitmapChoiseRenderer 2019-09-30 14:34:29 +02:00
f5593c05aa Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-09-30 14:04:45 +02:00
904bbcc006 Fix of SPE-1035 (Wrong filament color updating for multi-material print) 2019-09-30 13:59:26 +02:00
b425ee50a9 Merge remote-tracking branch 'remotes/origin/et_pull_2922' 2019-09-30 10:23:16 +02:00
7f7b3e0b0b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 08:15:20 +02:00
5ded376fe2 An attempt to fix #2997
More fixes might be needed on the other platforms
2019-09-28 09:57:26 +02:00
1aa559585c Added missing include 2019-09-27 15:26:13 +02:00
4b3eab0ed9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-27 14:52:30 +02:00
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
1a03b664b9 Some changes for alignments in manipulation panel 2019-09-25 15:04:39 +02:00
6f8a9bc1ff Fixed visual hints in 3D scene not disappearing when tabbing out of size z field in object manipulators sidebar 2019-09-25 13:05:18 +02:00
dbc51a140d Fixed erroneous use of logical OR where bitwise OR was meant
Also, PrintBase::SlicingStatus enum had two entries assigned to 0 - removed the one that was never used
2019-09-25 12:18:30 +02:00
efb9ef37f6 Merge remote-tracking branch 'origin/master' into ys_manipulation_panel_rw 2019-09-25 11:33:19 +02:00
fdbe339622 Fixed gizmo scale for objects added to scene using the new context menu 2019-09-25 11:25:14 +02:00
6faf67d90c Add binding for ManipulationEditors 2019-09-25 11:25:05 +02:00
7861fa5086 Whitespace changes to supress misleading indentation warnings
These appear in newer gcc when spaces and tabs are mixed
2019-09-24 16:01:01 +02:00
b2e7081d31 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-09-24 14:33:20 +02:00
9607fbeb6d Fix of SPE-1027 2019-09-24 14:32:59 +02:00