Commit graph

5880 commits

Author SHA1 Message Date
Jack Ha
bfdb5e68a1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-13 15:09:46 +02:00
Jack Ha
31b0f74874 Change url of cura stats. CURA-1445 2016-09-13 15:09:33 +02:00
Ghostkeeper
89fb92edbd
Disable upgrading current settings altogether
The current settings in 2.1 specified a machine instance. In 2.2 they specify a machine definition. There is not enough information in one file to be able to translate that.

Contributes to issue CURA-844.
2016-09-13 14:58:13 +02:00
Jaime van Kessel
b707c8d806 XML profile now returns serialization data even if it's read only
This way exporting read only profiles is possible again.

CURA-2359
2016-09-13 14:57:00 +02:00
jack
7d5eb493c7 Merge pull request #967 from thopiekar/master-CURA-1445
[CURA-1445] Adding hashes
2016-09-13 12:55:01 +02:00
fieldOfView
c43b277901 Fixed double import
3rd time lucky?
2016-09-13 11:53:46 +02:00
fieldOfView
d907bfb5e3 Fixed copy/paste error 2016-09-13 11:52:18 +02:00
fieldOfView
ebd9332823 Fix imports 2016-09-13 11:49:27 +02:00
fieldOfView
f527da2f3c Add message to layerview about incompatibility with wireprinting
The message is not currently shown yet, but added before the string freeze. CURA-2288
2016-09-13 11:01:26 +02:00
Jack Ha
fb3f03b446 Fixed XML setMetaDataEntry for changing too much meta data. Contributes to CURA-2159 2016-09-12 13:55:05 +02:00
Jack Ha
df536e158b Fixed XmlMaterialProfile serialize for booleans. Contributes to CURA-2159 2016-09-12 13:30:14 +02:00
Ghostkeeper
8249200121
Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-09 17:26:12 +02:00
Ghostkeeper
03c3b2ac2f
Make empty profile for current settings when upgrading from UM2+
This change causes the stack to make a new profile at the top to store current settings in.

Contributes to issue CURA-844.
2016-09-09 17:23:13 +02:00
fieldOfView
66fc85c6b2 Fix revert accident 2016-09-09 17:10:45 +02:00
Ghostkeeper
1e23141b18 Fall back to different quality depending on stack
Falling back to normal.inst.cfg isn't enough. That profile may be filtered out by the machine, variant and material. We need to fall back to a different quality profile depending on the machine, variant and material.

Contributes to issue CURA-844.
2016-09-09 16:20:06 +02:00
Ghostkeeper
ba6ce52d29 Use translation of built-in profiles instead of constructing it
Makes the code much simpler, though some repetition is hard-coded now.

Contributes to issue CURA-844.
2016-09-09 16:20:06 +02:00
Ghostkeeper
e77ab83084 Set quality to normal, not quality type
Even though this key says it's quality, it's not a quality profile, it's a quality type.

Contributes to issue CURA-844.
2016-09-09 16:20:06 +02:00
Ghostkeeper
318b6cf87b Always set type to quality_changes
Custom profiles are always quality changes. They should always say quality in the original anyway; that was an assumption we've made thousands of times.

Contributes to issue CURA-844.
2016-09-09 16:20:06 +02:00
Ghostkeeper
a4c47f26d6 Always set quality type to normal
We don't know the actual quality type, the quality profile that this profile is based on. Maybe there isn't one, even. As a solution we always base imported custom quality profiles on normal.

Contributes to issue CURA-844.
2016-09-09 16:20:06 +02:00
Ghostkeeper
84e91e2bf2 Add missing built-in profiles to _profile_translations
These profiles were not thought of as built-in. Instead, they were sorta constructed from pieces. That complex piece of code won't be necessary any more after I add this and after Cura 2.3 has proper profile inheritance again.

Contributes to issue CURA-844.
2016-09-09 16:20:06 +02:00
Jaime van Kessel
c2341f7cd2 Upgrade profile function now returns empty list if something went wrong.
Fixes CURA-1493
2016-09-09 13:23:22 +02:00
Jaime van Kessel
f81a5fe301 Removed very annoying message spam
CURA-2159
2016-09-09 13:09:15 +02:00
Jaime van Kessel
677d6556fb Refuse to slice when material is mismatched
CURA-2271
2016-09-09 13:02:19 +02:00
Jaime van Kessel
d68f6a4e9a Instead of discarding a profile if it's not compatible, we mark it as such.
The old approach was far to naive. We actually have 3 states;
- Supported (we have a profile)
- Not supported (Don't have a profile)
- Don't do this, lest you awaken the Old Gods (Error)

In case 1 and 3 we now do have a profile.

CURA-2271
2016-09-09 11:57:34 +02:00
Thomas Karl Pietrowski
8571087f3e CURA-1445: Using .join instead
Says in one line what I wanted to do.
2016-09-09 00:24:32 +02:00
fieldOfView
0828d4f1ca Fix dirty flag of incompatible_materials 2016-09-08 21:11:08 +02:00
Jack Ha
2138a87582 Busy with CURA-2159 2016-09-08 17:37:49 +02:00
Jaime van Kessel
96a1aafb80 Zipfile is now closed when it's done loading
CURA-2252
2016-09-08 14:23:35 +02:00
fieldOfView
4de78db87a Revert "Remove "infill mesh" as a standard visible setting"
This reverts commit 46942d7cf2.

It was not my decision to make
2016-09-08 14:04:58 +02:00
Jaime van Kessel
30e08da8aa Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-07 17:19:49 +02:00
Jaime van Kessel
9a84deb14e If buildplate has errors, slicing is not possible
CURA-2234
2016-09-07 17:19:20 +02:00
fieldOfView
dc282dc263 Fix Per Model Settings crash when switching to multiextrusion printer
CURA-2228
2016-09-07 16:51:03 +02:00
Ghostkeeper
b7c2a77277
Code style: Use double quotes for strings
Contributes to issue CURA-2252.
2016-09-07 15:59:14 +02:00
fieldOfView
20c9cb2547 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-07 15:38:39 +02:00
fieldOfView
a998d59693 Fix setting heated bed upgrade option
A new variant was created, but the property was set on the old variant.

CURA-2253
2016-09-07 15:38:27 +02:00
Jaime van Kessel
bbb211b0f6 Saving profile to g-code with empty container no longer results in empty string 2016-09-07 15:28:58 +02:00
Ghostkeeper
0794f9f31c Fix grammar in documentation
Contributes to issue CURA-1601.
2016-09-07 14:02:03 +02:00
Ghostkeeper
6c258e2214 Update copyright notice
Today we live in 2016.

Contributes to issue CURA-1601.
2016-09-07 14:02:02 +02:00
fieldOfView
26a6df4c4d Fix indentation
CURA-1601
2016-09-07 14:02:01 +02:00
fieldOfView
5d9e1c2458 Improve depth sorting on layers
CURA-1601
2016-09-07 14:02:01 +02:00
fieldOfView
f1b81dfad0 Code style
CURA-1601
2016-09-07 14:02:00 +02:00
fieldOfView
4e3f4162c2 Make background color a uniform
CURA-1601
2016-09-07 14:02:00 +02:00
fieldOfView
66f8a62e6c Move busy handling into LayerPass and cleanup
CURA-1601
2016-09-07 14:01:59 +02:00
fieldOfView
17b12b9048 Move layer data into LayerPass for cleaner access
CURA-1601
2016-09-07 14:01:58 +02:00
fieldOfView
2c35f0196d Code cleanup
CURA-1601
2016-09-07 14:01:10 +02:00
fieldOfView
b090eab221 Use renderpass to render layers above ghosts
CURA-1601
2016-09-07 14:01:09 +02:00
fieldOfView
90a1f5f8ed Revert "Revert "Show "ghosts" for all objects on the buildplate in layerview""
This reverts commit 0f9b989ae8.
2016-09-07 14:01:09 +02:00
fieldOfView
8c2a8944e8 Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-07 13:57:21 +02:00
fieldOfView
fe34938bce Update wording 2016-09-07 13:57:09 +02:00
Simon Edwards
cce94c8043 Added skin_overlap <= infill_overlap mapping.
Contributes to CURA-844 Profile converter 2.1 ==> 2.2
2016-09-07 11:32:25 +02:00