Commit Graph

10033 Commits

Author SHA1 Message Date
5fb187982a Merge remote-tracking branch 'origin/ys_manipulation_panel_rw' 2019-10-03 14:24:20 +02:00
c64f563e63 ENABLE_3DCONNEXION_DEVICES -> Refactored Mouse3DController to simplify code 2019-10-03 12:16:59 +02:00
2e21a1129f ENABLE_3DCONNEXION_DEVICES - Added missing return lines 2019-10-03 12:09:49 +02:00
a8760a5526 ENABLE_3DCONNEXION_DEVICES -> Refactored Mouse3DController to be unaware of current active GLCanvas3D 2019-10-03 11:38:31 +02:00
42030bc6c7 ENABLE_3DCONNEXION_DEVICES -> Serialization of mouse device parameters into config 2019-10-03 10:26:28 +02:00
ae14252377 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-03 08:07:13 +02:00
16f891994d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-10-02 22:51:18 +02:00
87ad8cc3dd 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
dd1da058cf Corrected editor position and size 2019-10-02 16:14:40 +02:00
869d1ca48d ENABLE_3DCONNEXION_DEVICES - Added imgui dialog to edit 3Dconnexion device parameters 2019-10-02 15:55:26 +02:00
5bc08c9078 More improvements 2019-10-02 15:02:13 +02:00
6342bbba2f 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
fbea68e6dc Improvements for 15902766d0 2019-10-02 14:08:36 +02:00
24f7e77593 Fix OSX build 2019-10-02 12:17:02 +02:00
452eaf9cc8 Workaround for extruder editing under OSX 2019-10-02 11:53:50 +02:00
59a88dee84 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-02 11:01:31 +02:00
27428d9ed2 #3008 - Generate all mipmaps up to size 1x1 2019-10-02 10:57:07 +02:00
5e11b824de Merge remote-tracking branch 'origin/master' into ys_extruders_color 2019-10-01 18:20:59 +02:00
ce3db145e4 Added color for extruder 2019-10-01 18:19:28 +02:00
20b86bbe8f Reworked pad creation algorithm with new parameters:
* brim size
* force pad around object everywhere
2019-10-01 14:58:37 +02:00
5977c7715b Don't disable pad around object parameters if supports are disabled. 2019-10-01 14:57:37 +02:00
424ebebab4 Fixed "unhandled unknown exception", when try to change an extruder count.
Side effect after 86b258f727.
2019-10-01 14:27:51 +02:00
ec845a47d2 Merge branch 'master' into lm_low_wipe_tower 2019-10-01 13:24:25 +02:00
540525397f Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-09-30 16:25:31 +02:00
8357f1a119 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
b5f1f6ea2f Merge branch 'master' into materials 2019-09-30 16:12:48 +02:00
0400384d70 ENABLE_3DCONNEXION_DEVICES -> Increased limit of device buttons 2019-09-30 15:58:45 +02:00
30a8639f3f Merge branch 'et_3dconnexion' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 15:38:13 +02:00
e40b6ba364 hidapi: Fix include path 2019-09-30 15:20:23 +02:00
f261ee53e4 Merge branch 'et_3dconnexion' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 15:19:36 +02:00
9fa961d693 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 15:19:21 +02:00
89d0b105d4 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
6c52a6c192 Implemented BitmapChoiseRenderer 2019-09-30 14:34:29 +02:00
07798b51aa Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-09-30 14:04:45 +02:00
682b9e0d46 Fix of SPE-1035 (Wrong filament color updating for multi-material print) 2019-09-30 13:59:26 +02:00
4bfc7f9faa Merge remote-tracking branch 'remotes/origin/et_pull_2922' 2019-09-30 10:23:16 +02:00
8dbbf36466 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-30 08:15:20 +02:00
5bf68de25e An attempt to fix #2997
More fixes might be needed on the other platforms
2019-09-28 09:57:26 +02:00
5bf722f015 Added missing include 2019-09-27 15:26:13 +02:00
c0f4c1d288 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-09-27 14:52:30 +02:00
f4b29a4107 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
68f099b299 Changed default values.
And bottle_volume is preferred to recalculation instead of bottle_weight
2019-09-27 12:08:08 +02:00
515c7e3baf Implemented possibility to set a resin cost 2019-09-26 16:36:31 +02:00
df4e1dc325 Some changes for alignments in manipulation panel 2019-09-25 15:04:39 +02:00
be6cac24ec 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
2fa1094b4e 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
c5b4789d5c Merge remote-tracking branch 'origin/master' into ys_manipulation_panel_rw 2019-09-25 11:33:19 +02:00
daaf6079a7 Fixed gizmo scale for objects added to scene using the new context menu 2019-09-25 11:25:14 +02:00
0e5c18aa6a Add binding for ManipulationEditors 2019-09-25 11:25:05 +02:00
a34a1341c5 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