688a559b5f
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2019-10-09 11:31:48 +02:00
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
835ee148e5
Fixed conflicts after merging with master
2019-10-09 11:17:48 +02:00
e6ce74957f
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-10-09 09:58:39 +02:00
8cdcac6ad8
First implementations for an extension of color change feature :
...
Added context menu for "plus" button on DoubleSlider
2019-10-09 09:28:50 +02:00
4ec6199ef1
ENABLE_3DCONNEXION_DEVICES -> Added translation and rotation customizable parameter deadzone
2019-10-08 14:32:05 +02:00
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
b7db5a9558
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-10-08 13:38:27 +02:00
9447d3e1b5
ENABLE_3DCONNEXION_DEVICES -> Mouse3DController reworked to handle reports of length 7 bytes and 13 bytes
2019-10-08 13:38:08 +02:00
9a9c3bac39
Fixup of 47a8b49
2019-10-08 11:05:59 +02:00
8fcd4e4407
ENABLE_3DCONNEXION_DEVICES -> added debug code to get 3Cconnexion device product id
2019-10-08 09:52:56 +02:00
8aa33a9e05
ENABLE_3DCONNEXION_DEVICES -> Hack for filtering out mouse wheel events coming from 3Dconnexion driver
2019-10-08 08:44:50 +02:00
272e9f11e3
Merge branch 'tm_arrange_test_extend'
2019-10-07 17:57:34 +02:00
fd6d32135b
Merge branch 'master' into materials
2019-10-07 17:23:37 +02:00
570c038eb7
ConfigWizard: Fix printer pre-selection on fresh config
2019-10-07 17:21:45 +02:00
72ac8d68f0
Extend libnest tests, remove some warnings, faster catch2 compilation.
...
Also, improve libnest2d::nest interface.
2019-10-07 17:16:40 +02:00
47a8b49f8b
Fixed get extruder color for SLA presets
2019-10-07 12:36:16 +02:00
eda01341d0
ConfigWizard: Fix a memory access issue between PageMaterial instances
2019-10-07 11:10:18 +02:00
6f85b0885a
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
2019-10-07 09:31:43 +02:00
0ba9fbaf0c
ENABLE_3DCONNEXION_DEVICES -> Update 3D scene only when mouse 3D device send update messages
2019-10-07 09:31:23 +02:00
5bf3d5aabf
Merge branch 'tm_sla_tests'
2019-10-04 18:34:08 +02:00
5a94ac9499
ENABLE_3DCONNEXION_DEVICES -> Automatic detection of plugging/unplugging 3Dconnexion devices
2019-10-04 10:59:27 +02:00
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
e675a5d5c6
Reworked pad creation algorithm with new parameters:
...
* brim size
* force pad around object everywhere
2019-10-01 14:58:37 +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
61cee54dd3
Merge branch 'master' into lm_low_wipe_tower
2019-10-01 13:24:25 +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