2387 Commits

Author SHA1 Message Date
jack
fee73c352c Merge pull request #1481 from Ultimaker/feature_override_profile
Feature override profile
2017-03-01 13:52:05 +01:00
Jaime van Kessel
6cf1fa4121 Removed uneeded global container changed signal hook
CURA-3221
2017-03-01 13:27:25 +01:00
Jaime van Kessel
1ba8ee2051 Fixed issue that in some cases not all changed settings for all extruders were shown
CURA-3221
2017-03-01 11:35:06 +01:00
Jaime van Kessel
9b63f1237a Instead of the setting function we now show the calculated value for settingoverride dialog
CURA-3221
2017-03-01 09:48:26 +01:00
Simon Edwards
807542cc1f Fixed a merge problem.
CURA-3431 Not possible to export a profile
2017-02-28 14:38:28 +01:00
Jaime van Kessel
4d32bbda99 Values are now converted to string.
For some reason this causes a different rounding to occur. I don't know why, but it does solve the problem

CURA-3221
2017-02-28 13:42:35 +01:00
Jaime van Kessel
85b58c9296 Pressing the discard button now actually discards the changes
CURA-3221
2017-02-28 12:35:08 +01:00
Jaime van Kessel
2462699982 Switching profiles now shows a new dialog with all the changes.
CURA-3221
2017-02-28 10:25:42 +01:00
Simon Edwards
18368f3ad4 Type hints and fixes for ContainerManager. 2017-02-26 21:07:08 +01:00
Simon Edwards
4ab6b74930 Fixed a bunch of error which were reported by PyCharm's code analysis. 2017-02-26 21:05:09 +01:00
Jaime van Kessel
ab28cb4615 Fix import changes
These broke the importing & exporting of profiles
2017-02-22 17:06:28 +01:00
Jack Ha
bb955ca5ab Tickle the backend if per object settings are changed. CURA-3273 2017-02-21 16:12:25 +01:00
Ghostkeeper
83b290b8d3
Use full import path for parent class
Something seems off with the build for some reason. I'm trying to fix it this way.
2017-02-17 12:42:11 +01:00
Ghostkeeper
cec3eebace
Replace list-to-set cast with normal set literal
Don't know who did this but he did wrong, yo.
2017-02-17 10:16:11 +01:00
Jack Ha
78de5412a2 Merge branch 'master' into layer_view3_cleanup 2017-02-15 10:57:24 +01:00
Simon Edwards
92cee4a9d7 Merge branch 'master' into python_type_hinting 2017-02-13 16:31:31 +01:00
Jaime van Kessel
e8c5f81c79 Merge branch 'feature_preheat_bed' of github.com:Ultimaker/Cura 2017-02-13 14:16:50 +01:00
Ghostkeeper
34dccfd6a6
Fix updating extruder names on machine switch
The extruder name is asked from the extruder manager, so that the signal from extruder manager properly updates it once the new name is available.

Contributes to issue CURA-3161.
2017-02-13 11:57:01 +01:00
Arjen Hiemstra
a63b4646e9 Postpone containersChanged signals of all active stacks
This avoids things taking longer because the not-active extruder stack
was still emitting containersChanged.
2017-02-07 17:01:52 +01:00
Arjen Hiemstra
0292756ad7 Do not limit containersChanged methods to a single container type
This may trigger a few extra updates, but allows us to use signal
compression in the postponesignals context manager, which greatly
improves performance.
2017-02-07 16:28:08 +01:00
Arjen Hiemstra
927055806c Postpone containersChanged signals when doign setActive* calls
This makes sure we do not trigger everything three times when switching
variants.
2017-02-07 16:26:44 +01:00
Ghostkeeper
425dbf1ad8
Only check for validationState changes if it's not already a value change
No need to check the second if-statement in most cases.

Contributes to issue CURA-3291.
2017-02-01 16:29:59 +01:00
Ghostkeeper
3ac9036b4a
Only listen for other container stack errors if multi-extrusion
It's not even necessary to check otherwise. Requesting an extruder stack would give None anyway, which would give errors.

Contributes to issue CURA-3291.
2017-02-01 16:28:45 +01:00
Ghostkeeper
a0ba1188a1
Always listen to changes on all extruder stacks of the current machine
We need to listen for changes on all extruder stacks because the values might change and therefore the validation states might change. The value of a different extruder stack could change if you change a global value that has impact on a per-extruder value via inheritance, or in this case if a limit-to-extruder property specifies that the setting should be changed on a different stack. It could change on the stack that is not active in either case.
This might have some performance impact, but it is very small. Other than layer_height there aren't many global settings that have impact on multiple extruders via inheritance. And via limit-to-extruder there will typically only be one changed value which you want to update for. Changing layer height will be a bit slower though.

Contributes to issue CURA-3291.
2017-02-01 16:17:12 +01:00
Ghostkeeper
362c5835ee
Don't use limit_to_extruder if it evaluates to -1
The default value for the limit_to_extruder property is -1. So no need to check if the property exists. Just check if it is positive.

Contributes to issue CURA-3291.
2017-02-01 14:42:06 +01:00
Ghostkeeper
ed2b09c975
Fix getting limit to extruder property
Apparently it didn't even reach this code up until now. Well, now it does.

Contributes to issue CURA-3291.
2017-02-01 14:26:37 +01:00
Ghostkeeper
039015e3df
Don't unnecessarily copy extruder stacks to list
You're just looping over it. No need to actually make a list out of it.

Contributes to issue CURA-3291.
2017-02-01 14:24:03 +01:00
Ghostkeeper
7d536e2f8b
Clarify global container stack checking code in _checkStacksHaveErrors
The order of operations was a bit weird. This made the code unclear and also required an extra check in an if-statement. This is simpler and theoretically even a bit faster.

Contributes sorta to issue CURA-3291.
2017-02-01 14:17:23 +01:00
Ghostkeeper
31e88aa5af
Also check for errors via limit_to_extruder settings
The error should then not be checked in the active stack but in the stack which has the correct setting value.

Contributes to issue CURA-3291.
2017-02-01 14:14:50 +01:00
Jack Ha
5a2aa8846b Added extruder count detection to layer view. CURA-3273 2017-01-30 13:29:35 +01:00
Jaime van Kessel
092f42ef28 Revert "Only emit signal when the active extruder actually changes"
This reverts commit 4e8fb254f67790c6f97e12f1d365521ce0235933.
2017-01-25 16:20:10 +01:00
Jaime van Kessel
4e8fb254f6 Only emit signal when the active extruder actually changes 2017-01-24 13:14:10 +01:00
Simon Edwards
d5c96c1aae Removed a line of debug. 2017-01-18 13:49:18 +01:00
Simon Edwards
4fecf55b3b Use double quotes instead of singles. 2017-01-17 20:56:50 +01:00
Simon Edwards
fb70eb6813 Merge branch 'master' into python_type_hinting 2017-01-17 08:42:55 +01:00
Simon Edwards
a5181f157e Applied the profiler's pyqtSlot decorator to all of the code. 2017-01-10 13:35:39 +01:00
Jaime van Kessel
f598a49c4b Order of extruders is now sorted by position
CURA-1263
2016-12-16 13:29:51 +01:00
Jaime van Kessel
ff18a314ef Added extruder information to workspace summary dialog
CURA-1263
2016-12-16 13:16:11 +01:00
Jaime van Kessel
8391a7971b Added machine type to workspace summary dialog
CURA-1263
2016-12-16 12:40:59 +01:00
Jaime van Kessel
0e09de195b Added num user settings to save project dialog 2016-12-16 11:50:50 +01:00
Ghostkeeper
c7a8ffb3c0
Set quality to empty if no profiles for current material type
This then causes the text 'Not supported' to appear to the user, indicating that for his foreign material we have no known quality profiles.

Contributes to issue CURA-3144.
2016-12-15 16:41:56 +01:00
Arjen Hiemstra
f04dc88d2c Do not use resolve for profile display when source is quality changes
Fixes CURA-3115
2016-12-15 15:36:38 +01:00
Jack Ha
2cf181080a Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-14 16:53:22 +01:00
Jack Ha
a9a9390aa6 Solved (with an ugly fix) that after loading some projects, 'Slicing...' appears without doing anything. CURA-1263 2016-12-14 16:52:49 +01:00
Jaime van Kessel
0d9b64c8bd Fixed race condition which caused kitten to pop up when deleting printer. 2016-12-14 11:49:20 +01:00
Jack Ha
4085cfe67e Fix crash loading almost empty project. Added return value to functions in SettingInheritanceManager 2016-12-13 16:03:26 +01:00
Simon Edwards
d4619da358 Merge branch 'master' into python_type_hinting 2016-12-13 14:39:35 +01:00
Jack Ha
6e8e7d090d Fix for Not Supported when adding a new machine. CURA-3042 2016-12-12 16:46:19 +01:00
Simon Edwards
74e5798509 Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py.
CURA-2917
2016-12-12 16:05:35 +01:00
Arjen Hiemstra
94a50362e1 Fix translation of category headers on profiles page
Contributes to CURA-3123 (No, not really, but I do not want to make a
new issue)
2016-12-12 16:02:51 +01:00