Commit graph

9690 commits

Author SHA1 Message Date
Lipu Fei
a320784a6d For a per-object setting, use the user-defined value first
CURA-4186

In a per-object setting, if there is user defined value, use that first.
If the value is default, then evaluate it with the normal routine.
2017-08-25 12:19:05 +02:00
Lipu Fei
414901ae84 Force update the provider when the setting's limit_to_extruder gets changed
CURA-4186

In the per-object settings, when a setting's limit_to_extruder gets
changed, its value should be updated too.
2017-08-25 11:58:40 +02:00
Lipu Fei
c44e527305 Remove warning in /PerObjectContainerStack
CURA-4186
2017-08-25 11:57:52 +02:00
Lipu Fei
f85a76b4bd Fix per-object settings qml 2017-08-24 17:38:16 +02:00
Lipu Fei
50a7e8146f Add a dedicated stack class for per-object settings
CURA-4186

Add a dedicated stack class PerObjectContainerStack for per-object
settings to evaluate limit_to_extruder values correctly.
2017-08-24 17:09:28 +02:00
Lipu Fei
365379f735 Add missing context in getProperty() in global and extruder stacks
CURA-4186

All getProperty() calls should use the provided context.
2017-08-24 17:01:03 +02:00
Lipu Fei
2ec7c14422 Fix PerObjectSettingsPanel.qml
CURA-4186

- The UI shouldn't be bound to the limit_to_extruder stack, it should
  always be bound to the per-object stack.
- The ActiveTool.getValue() calls cannot be bound in QML, so use a
  Connections to update the values based on signals.
2017-08-24 16:57:12 +02:00
Lipu Fei
759d44dbef Add stack context for function evaluation
CURA-4186
2017-08-23 14:39:08 +02:00
Lipu Fei
7a2493dd2f Use per-object stack instead of the active extruder
CURA-4186
2017-08-23 12:32:20 +02:00
fieldOfView
32a863d9dc Find a material with the correct diameter when adding a printer 2017-08-23 11:13:36 +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
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
Jaime van Kessel
fd6ee6ee3c Merge branch 'pirate' of github.com:Ultimaker/Cura into 2.7 2017-08-22 10:53:51 +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
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
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
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
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
b20711ef7c Remove incorrect maximum extruder count check
CURA-4188
2017-08-17 16:36:57 +02:00
Lipu Fei
16cfb768d2 Move dont show again checkbox above the buttons
CURA-4113

The Don't show again checkbox is on the same row with the buttons. In
some translations, the text for the checkbox is very long, which
overlaps with the button.
2017-08-16 16:07:02 +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
Ghostkeeper
abcec2157e
Use the lowest of the layer heights for initial layer height
This was discussed with the materials team. A layer height of 0.4mm for a 0.4mm nozzle could give problems. This would be even worse with a 0.25mm nozzle.
2017-08-16 11:29:13 +02:00
Jaime van Kessel
33f843b73a Added name of output device
CURA-4160
2017-08-16 10:52:13 +02:00
Ghostkeeper
17a615d30c
Don't translate HTML tags and variable names
It says so in the context of the build dimensions translation. Not yet in the context of the HTML tags with <filename> and such, but it will do that for the next translation round properly.

Contributes to issue CURA-4113.
2017-08-15 15:32:23 +02:00
Ghostkeeper
31757f4ce1
Merge branch '2.7' of https://github.com/Patola/Cura into Patola-2.7 2017-08-15 15:29:24 +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
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
Lipu Fei
e67286c0d8 Do not add extruder stacks for single-extrusion machines
CURA-4167

In the current architecture, single-extrusion machines don't have
extruder stacks.
2017-08-15 14:19:23 +02:00
Ghostkeeper
3110349f5e
Fix misunderstood translation
Literally it should've been 'weergavenaam', but I'm now opting for a less literal translation because weergavenaam sounds so weird.

Contributes to issue CURA-4113.
2017-08-15 14:15:51 +02:00
Cláudio Sampaio (Patola)
0449e4e63a Updated brazilian portuguese translation 2017-08-15 09:06:50 -03:00
Ghostkeeper
1f778e8d2f
Fix translated replacement strings
Bad translators! Bad! It even says so in the context!

Contributes to issue CURA-4113.
2017-08-15 11:13:48 +02:00
Ghostkeeper
8f46733dec
Correct whitespace of fatal exception text
It's not salient for our translation files really, since it is displayed in QML in the end which removes those. It is salient for gettext though, which gives an error when one message ends in a newline and the other doesn't.

Contributes to issue CURA-4113.
2017-08-15 11:05:50 +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
cbc60c7689
Minor fixes for German translations
Contributes to issue CURA-4113.
2017-08-15 09:58:42 +02:00
Ghostkeeper
262691c1ff
Update German translations
These are the translations from Bothof. They look mostly correct.

Contributes to issue CURA-4113.
2017-08-15 09:56:57 +02:00
Ghostkeeper
f6c84e054b
Fix HTML tags
They shouldn't be translated. Bad translator! BAD!

Contributes to issue CURA-4113.
2017-08-15 09:28:42 +02:00
Ghostkeeper
4f471ea1a4
Update Spanish translations
These are the updates from Bothof. I found some older mistakes here, which I'll solve next.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
1e1e6386fc
Update Finnish translation
These are the translation files from Bothof. They are excellent as far as I could detect.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
22d7312265
Minor fixes to French translations
These must've been in there for a while...

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
cd8b485e98
Update French translations
These are the new translations from Bothof. I've found some mistakes in cura.po which I'll fix in the next commit to make it clear which changes are from me.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00