2387 Commits

Author SHA1 Message Date
Ghostkeeper
557173e799
Merge branch '2.7' 2017-08-24 15:33:01 +02:00
Lipu Fei
3d44d3c4ca Add logging and minor fix for project loading
CURA-4204
2017-08-23 17:42:40 +02:00
Lipu Fei
3805d2ff9e Add comments for HACK in project loading
CURA-4204
2017-08-23 17:37:59 +02:00
Lipu Fei
c37782d544 Stop slicing when a new slice is needed
CURA-4206
2017-08-23 17:19:48 +02:00
Lipu Fei
d662770b22 Fix setting new material for stacks
CURA-4204

When a new material is created during project file loading, the material
for each stack is set according to the parent material ID, but actually
the child material should be used. This fix uses a hack to find the
corresponding child material for a stack so when a user chooses to
create a new material during project file loading, the material can be
correctly set.
2017-08-23 16:27:28 +02:00
Jaime van Kessel
b1160c2c37 Labels in layerview now correctly use font
Fixes #2309
2017-08-23 14:02:02 +02:00
Lipu Fei
5564d80950 Merge branch '2.7' 2017-08-23 13:02:05 +02:00
Lipu Fei
7a2493dd2f Use per-object stack instead of the active extruder
CURA-4186
2017-08-23 12:32:20 +02:00
Ghostkeeper
b58fb0d05d
Merge branch '2.7' 2017-08-23 09:23:29 +02:00
Ghostkeeper
90860c67c2
Minor tweaks suggested by fieldOfView
See the comments in this commit: c4d23437f2
2017-08-23 09:23:04 +02:00
Lipu Fei
16764f4750 Create user containers for newly created custom FDM printer extruders
CURA-4188

The newly created extruder stacks don't have user containers, so the
user changes cannot be saved. This fix makes sure that in the upgrade,
user containers will be created.
2017-08-22 17:37:25 +02:00
Lipu Fei
e17a88fe11 Merge branch '2.7' 2017-08-22 16:06:36 +02:00
Lipu Fei
39ab740adb Adding binding for per-object settings to update stack ID
CURA-4186

The stack ID to use for a setting in per-object settings is not updated
when it is set to limit to extruder.
2017-08-22 13:35:51 +02:00
Lipu Fei
812e262f39 When deserialising a material, also update the material derived from it
CURA-4204
2017-08-22 11:29:35 +02:00
Lipu Fei
3d75342a11 Stop the loop if any extruder is found
CURA-4188
2017-08-22 10:51:14 +02:00
Lipu Fei
72575eaf37 Rename function to _acquireNextUniqueCustomFdmPrinterExtruderStackIdIndex()
CURA-4188
2017-08-22 10:44:22 +02:00
Lipu Fei
1332489391 Add comments for upgradeMachineStack()
CURA-4188
2017-08-22 10:42:33 +02:00
Ghostkeeper
db640c6f3d
Merge branch '2.7' 2017-08-21 00:58:15 +02:00
Ghostkeeper
df88772071
Add input checking for incorrect responses from printers
We should not crash when getting invalid data. Just put a warning in the log there and ignore the message for the rest.
2017-08-21 00:57:25 +02:00
Ghostkeeper
b917511528
Merge branch '2.7' 2017-08-18 16:58:21 +02:00
Ghostkeeper
b7493ae1a8
Also pull limit_to_extruder settings into per-object setting stack
Only for settings that are limited by a setting on the stack.

Contributes to issue CURA-4186.
2017-08-18 16:57:13 +02:00
Ghostkeeper
3c36c3427c
Cache top of stack for efficiency
Otherwise you need to retrieve this container for every key again. Doesn't matter much, but a bit.

Contributes to issue CURA-4186.
2017-08-18 15:36:15 +02:00
Ghostkeeper
4a788dfbdd
Reduce indentation by inverting input check
Reads a bit easier.

Contributes to issue CURA-4186.
2017-08-18 15:02:49 +02:00
Lipu Fei
f0d5187896 Merge remote-tracking branch '2.7' 2017-08-18 13:43:00 +02:00
Lipu Fei
67cfb064e6 Fix upgrading custom FDM printers from 2.5
CURA-4188

Custom FDM printers in 2.5 don't have multi-extrusion support but they
do since 2.6. Upgrading from 2.5 to 2.6 will not create the missing
extruder stacks for the old custom FDM printers, which causes a crash.
This fix makes sure that all custom FDM printers will have 8 extruder
stacks during the upgrade so that Cura can still start normally and
those printers will still be usable.
2017-08-18 13:06:46 +02:00
Ghostkeeper
64753f8c8b
Merge branch '2.7' 2017-08-18 10:42:14 +02:00
Ghostkeeper
9a00c07c3d
Also upgrade variants
Variants can be customised as well, you know.
2017-08-18 09:59:51 +02:00
Ghostkeeper
a44eb0152d
Repair globalPropertyProvider for per-object settings panel
Otherwise we can't find the correct limit_to_extruder property.

Contributes to issue CURA-4186.
2017-08-17 20:17:32 +02:00
Lipu Fei
b9397aaa57 Check the content of definition changes container in SliceInfo
CURA-4107

Now we always create a definition changes container for a stack,
checking if the definition changes is empty in SliceInfo doesn't work.
It should check the content too.
2017-08-16 12:50:09 +02:00
Lipu Fei
b74c09dec8 Merge branch '2.7' 2017-08-16 11:51:26 +02:00
Jaime van Kessel
33f843b73a Added name of output device
CURA-4160
2017-08-16 10:52:13 +02:00
Lipu Fei
4ad62daf61 Generate new unique names for new machines from the project files
CURA-4144

Generate a new name for the machine loaded from a project file instead
of using new ID as the new name.
2017-08-16 08:30:13 +02:00
alekseisasin
dc629f7c91 Solved incorrect printer name after loading a project from file
CURA-4144
2017-08-15 23:48:35 +02:00
alekseisasin
3116ff829c Merge pull request #2200 from fieldOfView/fix_monitoritem_size
Adapt camera image to available space
2017-08-15 15:04:18 +02:00
alekseisasin
7ad7fb0a3c Merge pull request #2200 from fieldOfView/fix_monitoritem_size
Adapt camera image to available space
2017-08-15 14:45:34 +02:00
Lipu Fei
9aa65eab44 Merge branch '2.7' 2017-08-15 14:43:36 +02:00
Lipu Fei
da8b55cf62 Make sure stacks will have non-empty definitionChanges in project loading
CURA-4107

In old Cura, there is no definitionChanges container, so loading a
project file from an old version will result in stacks with empty
defnitionChanges. This will cause an unnecessary auto-slice problem when
we switch between the extruder tabs for the first time. This action will
trigger a piece code in MachineAction which creates a definitionChanges
container for the active stack if it is empty. This eventually triggers
a propertyChanged signal and results in an unncessary auto-slicing.
2017-08-15 14:38:49 +02:00
Lipu Fei
3ebaacfa11 Use the extruder count in the global stack in project loading
CURA-4167

Custom FDM printers have multiple extruder stacks by default but not all
of them may be used. The actual number of extruders depends on what's
defined in the global stack. Because in the current architecture,
single-extrusion machines don't have extruder stacks, in project
loading, the extruder count in the global stack should be used so these
cases can be handled properly.
2017-08-15 14:19:23 +02:00
Lipu Fei
3a46a337ff In SliceInfo, use the global stack if it is a single-extrusion machine
CURA-4167

Single extrusion machines don't have extruder stacks in the current
architecture.
2017-08-15 14:19:23 +02:00
Ghostkeeper
59058ad77f
Merge branch '2.7' 2017-08-15 11:24:00 +02:00
Lipu Fei
026244fb53 Add comments for conflict detection
CURA-4143
2017-08-15 10:49:11 +02:00
Lipu Fei
9ff6ae010a Use findInstanceContainers() for definition_changes
CURA-4167
2017-08-15 10:44:23 +02:00
Ghostkeeper
6349f1b5e6
Add context for 'Browse plugins' translated text
So that the translator knows what sort of text this is. It's the menu item in the application menu.

Contributes to issue CURA-4113.
2017-08-14 14:55:50 +02:00
Ghostkeeper
7ab6a551c1
Clarify that XML material tags don't get translated
Some of the translators got this wrong last time. Let's see how good they read this next time...

Contributes to issue CURA-4113.
2017-08-14 13:54:11 +02:00
Ghostkeeper
76e0156076
Merge branch '2.7' 2017-08-11 11:18:15 +02:00
Ghostkeeper
b03847447f
Take manufacturer from XML profile if available
Otherwise we fall back to the manufacturer in the machine definition. If that fails too, we fall back to Unknown (rather than an empty string).

Contributes to issue CURA-4157.
2017-08-11 11:13:23 +02:00
Lipu Fei
0a76e5c38f Merge branch '2.7' 2017-08-09 16:59:56 +02:00
Lipu Fei
66b26bafd4 Show quality name in project loading summary
CURA-4142

In case the quality changes container is not there, show the quality
name of the quality profile.
2017-08-09 13:27:00 +02:00
Lipu Fei
98b72fb971 Merge branch '2.7' 2017-08-09 13:16:43 +02:00
Lipu Fei
ccabbd8ca0 Mark definition changes container found instead of conflict
CURA-4143

Reverts 65554b60e19507635c79048dc73862e6b25ec0ec
2017-08-09 13:12:06 +02:00