13626 Commits

Author SHA1 Message Date
Jaime van Kessel
cc2ad9dec0 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-19 13:15:52 +01:00
Jaime van Kessel
64d72c9d51 Fix where number of queued print jobs would be too big 2018-03-19 13:15:17 +01:00
Ghostkeeper
86f70ecd05
Merge branch 'M&P-Setting-Optimization' 2018-03-19 12:47:53 +01:00
Lipu Fei
b13bfaa8e1 Rename setVariantGroup() -> setVariant()
There is no such thing as VariantGroup.
2018-03-19 12:27:15 +01:00
Lipu Fei
4a0b3ace9e Fix missing getExtruderPositionValueWithDefault() error
PerObjectContainerStack was not a PerObjectContainerStack so it didn't
have getExtruderPositionValueWithDefault(), and this will break SliceInfo.
2018-03-19 12:23:42 +01:00
Jack Ha
906ebe12e1 CURA-4400 fix disallowed areas by fixing the limit_to_extruder -1 value 2018-03-19 11:46:43 +01:00
Lipu Fei
d676b85289 Fix createMaterial() for non-2.85 diameter materials
CURA-5113
2018-03-19 11:09:07 +01:00
Lipu Fei
2660d15857 Make "show all settings" work
CURA-5088

"Show All Settings" in setting visibility menu now sets all settings
to be visible.
2018-03-19 10:58:56 +01:00
Jack Ha
8f6f56a5e6 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-19 10:56:49 +01:00
Jack Ha
bd775cf32e CURA-4400 fix support_extruder_nr values in overhang angle and SliceInfo 2018-03-19 10:56:40 +01:00
Lipu Fei
7bf8e399ff Should always reslice upon settings changed
CURA-5115

When we switch a model from "support mesh" for example to "normal",
there will be no setting values in the per-object settings container,
but we should still trigger a reslice because settings have been changed.
2018-03-19 09:45:31 +01:00
Jaime van Kessel
f407663508 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-16 15:58:47 +01:00
Jaime van Kessel
1c7344fb92 Fix for monitor stage ocasionally crashing 2018-03-16 15:58:29 +01:00
Ian Paschal
22d3cd928f CURA-5090 Remove layer view data after clearing buildplate 2018-03-16 15:57:19 +01:00
Lipu Fei
43ac565c20 Fix visibility preset initialization
CURA-5088
2018-03-16 15:45:17 +01:00
Lipu Fei
5ca4203940 Remove material types that have no fallbacks from fallback_materials_map
CURA-5098
2018-03-16 15:12:54 +01:00
Ghostkeeper
4d5013d3ad
Remove unused variable
The variable name is re-used lower in the code. This value is unused though.
2018-03-16 15:08:57 +01:00
Lipu Fei
2aaaf106b4 Fix update material in MachineManager
CURA-5098
2018-03-16 15:05:37 +01:00
Ian Paschal
19de9b263b
Merge pull request #3505 from fieldOfView/feature_support_eraser_ux
Further improvements of the Support Eraser
2018-03-16 14:59:29 +01:00
fieldOfView
4be947af55 Fix codestyle 2018-03-16 14:55:20 +01:00
Ghostkeeper
5a5766f11a
Choose correct stream depending on output mode
We need a binary stream if we're writing in a binary format.

Contributes to issue CURA-5097.
2018-03-16 14:54:56 +01:00
Ghostkeeper
e74191f2db
Cache preferred format
I think that makes the code a bit easier to read. This is not really done to make it faster, just more semantic.

Contributes to issue CURA-5097.
2018-03-16 14:54:48 +01:00
fieldOfView
f05944bf29 Switch to translate tool when ctrl-clicking 2018-03-16 14:47:01 +01:00
THeijmans
4940f3b88b Retraction minimum travel update
Changed  it to 2 or 3 times line width, similar as with the 0.4mm profiles.  Was 5mm standard for all profiles with the 0.8mm printcore, except TPU.
2018-03-16 14:39:01 +01:00
fieldOfView
78a7299fc5 Maintain a selection when removing a mesh, so the tool stays active 2018-03-16 14:38:56 +01:00
fieldOfView
83168886d6 Parent added meshes to the parent node instead of creating a group
This requires a small change in PlatformPhysics, or otherwise the added mesh would still drop down.
2018-03-16 13:22:43 +01:00
Lipu Fei
ee4a6dc704 Always show confirm dialog upon material diameter change 2018-03-16 13:21:51 +01:00
Ian Paschal
f8283352c4
Merge pull request #3492 from fieldOfView/feature_support_eraser_ux
Support Eraser improvements
2018-03-16 13:20:00 +01:00
fieldOfView
8e26d27e80 Fix crash when clicking a non-slicable node 2018-03-16 13:15:24 +01:00
Diego Prado Gesto
36c5e0ad15 CURA-4870 Change message of the dialog when the connection with a printer/group already exists 2018-03-16 12:07:05 +01:00
Diego Prado Gesto
890fc8619b Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-16 11:53:23 +01:00
Diego Prado Gesto
747efda52b CURA-4870 Hide the configuration selector if the connection is lost. 2018-03-16 11:51:52 +01:00
Ghostkeeper
32cee75e47
Respect order of preference of output formats
Contributes to issue CURA-5097.
2018-03-16 11:49:51 +01:00
Diego Prado Gesto
a03a57fd60 Change the URL for redirect when checking material compatibility. 2018-03-16 11:10:35 +01:00
Lipu Fei
6058f632df Fix Enter key handling on material management page 2018-03-16 11:05:38 +01:00
Diego Prado Gesto
aa8d91faf6 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-16 10:58:56 +01:00
Diego Prado Gesto
06d028652d CURA-4870 Change code style 2018-03-16 10:58:31 +01:00
Lipu Fei
a115956575 Do not show a material itself in its linked material list 2018-03-16 10:40:16 +01:00
Lipu Fei
d78e2d56f7 Fix quality and variant processing in project loading
From version 22 to 24, there is an upgrade for "quality" that changes
it to "quality_changes", but for "quality", we don't have any upgrades.
2018-03-16 10:33:22 +01:00
Lipu Fei
518423f25b Fix broken settingsEnabled 2018-03-16 10:14:08 +01:00
Lipu Fei
579df7537b Fix upgrade from 26 to 27
Missing definition changes container.
2018-03-16 10:03:38 +01:00
fieldOfView
2a811c62d8 Ignore the first press after the selection has been cleared
if the selection is cleared with this tool active, there is no way to switch to another tool than to re-select an object (by clicking it) because the tool buttons in the toolbar will have been disabled. The mouse-event happens after the selection is changed, so we need to keep track of what the selection was previously by monitoring the selection state.
2018-03-15 23:58:22 +01:00
fieldOfView
d1d1307e6e Merge branch 'master' into feature_support_eraser_ux 2018-03-15 22:43:24 +01:00
Diego Prado Gesto
99d653cea5 CURA-4870 Don't allow to connect more than one instance to the same
group.
2018-03-15 20:01:47 +01:00
Diego Prado Gesto
222a18e698 Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 18:42:45 +01:00
Lipu Fei
f14ddb8711 Fix reset to default quality 2018-03-15 17:09:13 +01:00
Jack Ha
5a55c1817d Merge branch 'master' of github.com:Ultimaker/Cura 2018-03-15 17:02:44 +01:00
Jack Ha
f8709b6d1a CURA-4400 improved enabled / disabled extruder visually, improved colors of dark theme 2018-03-15 17:02:36 +01:00
Lipu Fei
3bb0a481f1 Simplify default quality reset 2018-03-15 17:01:05 +01:00
Aleksei S
3497736c88 Merge branch 'master' of github.com:Ultimaker/cura 2018-03-15 16:56:02 +01:00