205 Commits

Author SHA1 Message Date
Tim Kuipers
479f9ea6d2 refactor: global_inherits_stack ==> limit_to_extruder (CURA-2308) 2016-09-14 10:46:57 +02:00
fieldOfView
4de78db87a Revert "Remove "infill mesh" as a standard visible setting"
This reverts commit 46942d7cf23e32dcdf5dbf00440aa781061f4f65.

It was not my decision to make
2016-09-08 14:04:58 +02:00
fieldOfView
dc282dc263 Fix Per Model Settings crash when switching to multiextrusion printer
CURA-2228
2016-09-07 16:51:03 +02:00
Jaime van Kessel
1bafac94bd Value functions are now correcty copied when using per-object settings
CURA-2224
2016-09-07 09:55:22 +02:00
fieldOfView
a8d8a8a7ed CodeStyle 2016-08-30 14:09:16 +02:00
fieldOfView
4593e8615e Fix hiding extruder selection when switching to a signle extrusion printer
CURA-2207
2016-08-30 14:08:29 +02:00
Jaime van Kessel
fc5900c05a Width of the scrollview is now a bit wider, so minus signs don't fall off
CURA-2131
2016-08-22 16:30:56 +02:00
Jaime van Kessel
ea324eadc0 Added scroll bar to per object panel
If there are too many per object settings a scrollbar is now displayed

CURA-2131
2016-08-22 15:14:10 +02:00
Aldo Hoeben
f2d35cd57d Merge pull request #918 from Ultimaker/feature_terminology
Update UI texts to be compliant to Ultimaker dictionary
2016-08-15 11:35:19 +02:00
fieldOfView
5c63e5e13f Fix a typo in a comment
CURA-2113
2016-08-11 17:18:43 +02:00
fieldOfView
db028b7e5f Update "Select Settings dialog" when the user removes a setting
CURA-2102
2016-08-11 15:10:30 +02:00
Jaime van Kessel
91dfd971ca PerObject settings don't automatically get a user changed state
CURA-2113
2016-08-11 14:57:21 +02:00
fieldOfView
7aab8ad397 Change "object" to "model"
UXD-83
2016-08-10 17:55:51 +02:00
fieldOfView
b6bf02e0a0 Update swatch colors when changing materials
CURA-1971
2016-08-10 14:37:59 +02:00
fieldOfView
f817d30abc Change colour to color for consistency 2016-08-09 09:56:23 +02:00
fieldOfView
2c61fe3249 Tweak layout of Per Object Settings
CURA-1799
2016-08-08 15:41:20 +02:00
fieldOfView
ca2daae6ab Add a "show all" toggle to the select per object setting window
This way the user can add a setting that is not made visible in the sidebar. Adding a specific setting no longer needs a detour through the setting visibility preference page.

CURA-1799
2016-08-08 15:11:38 +02:00
fieldOfView
36abe075cf Restyle categories in add per object settings visibility dialog
... to match the Setting Visibility preference page
CURA-1799
2016-08-08 14:24:38 +02:00
fieldOfView
7020fd6903 Allow adding multiple per object settings at once
This reuses the "GUI pattern" of the main setting visibility page.
CURA-1799
2016-08-08 14:23:39 +02:00
Ghostkeeper
021a33d6bd
Always set value of added setting instance
The value property was sometimes not set. In the default case, this just added an empty setting instance (for a particular key), which appeared to do nothing until you've changed it. This appears correct because if it's not changed then it should be the same as the extruder's value, but if you then change the extruder's value it doesn't update its visible value but still has no value in the setting instance, so the value still falls back to the extruder and the setting ends up different from what is being displayed.

Contributes to issue CURA-1988.
2016-08-05 17:30:22 +02:00
Ghostkeeper
51d972941e
Handle rounding errors in stack_nr
Wouldn't want it to index extruder '1.0'.

Contributes to issue CURA-2067.
2016-08-05 12:05:01 +02:00
Ghostkeeper
92b154f5fe
More defensive check for global_inherits_stack extruder
This should never give the keyerror any more and always default back to non-global_inherits_stack mode.

Contributes to issue CURA-2067.
2016-08-05 11:59:32 +02:00
Ghostkeeper
de7f32da19
Convert global_inherits_stack to int before slicing
Sometimes it was accidentally converted to a float when it passes through Javascript.

Contributes to issue CURA-2055.
2016-08-04 13:25:51 +02:00
Ghostkeeper
ee95e90b4b
Fix display update bug in per-object panel
Setting .value creates a new Python attribute in the object. Setting with setProperty creates the setting property, like we wanted.

Contributes to issue CURA-2011.
2016-08-04 12:36:33 +02:00
Ghostkeeper
d97c9f6e4c
Don't use extruder fallback on single-extrusion machines
Due to a gnawing feeling in the back of my head, I tested this with an UM2 and adding settings failed there. This fixes it.

Contributes to issue CURA-2011.
2016-08-04 11:36:45 +02:00
Ghostkeeper
df1b6b8e88
Only get from extruder if global_inherits_stack is valid
Sometimes it is set to give -1 for some settings.

Contributes to issue CURA-2040.
2016-08-03 10:27:17 +02:00
Ghostkeeper
f568014e67
Add setting with value from support extruder stack
Upon adding the setting (making it visible) it takes the setting from the support extruder stack. It doesn't update afterwards.

Contributes to issue CURA-2011.
2016-08-02 16:49:38 +02:00
Ghostkeeper
5bd3d83c9e
Fix typos in documentation
Contributes to issue CURA-2011.
2016-08-02 16:49:38 +02:00
Arjen Hiemstra
186cd2034c Remove forced setting of extruder 0 on component complete
This would force the object's extruder to 0 every time the per object
panel would update, causing the extruder to be reset.

Fixes CURA-2026
2016-08-02 11:42:04 +02:00
Jaime van Kessel
7ff1b937e3 Perobject settings now use correct stacks to calculate values
CURA-1754
2016-07-29 15:19:50 +02:00
Jaime van Kessel
1147e915c1 Setting a instance to the same state no longer causes display to break
CURA-1985
2016-07-28 09:27:20 +02:00
fieldOfView
d64eff9947 Fix updating the Per Object Settings color swatch
CURA-1971
2016-07-26 18:54:55 +02:00
fieldOfView
ac0de58ecb Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 11:30:47 +02:00
fieldOfView
374ec8e577 Don't show user/quality emphasis on Per Object Settings 2016-07-25 11:30:30 +02:00
fieldOfView
7302baa7da Add icon to settings that can only be set globally (for all extruders)
CURA-1758
2016-07-21 15:12:25 +02:00
Jaime van Kessel
b5aa7c3545 Remove the extruder id from settingoverride decorator if the machine does not have multi extrusion
CURA-1876 & CURA-1768
2016-07-12 10:34:58 +02:00
fieldOfView
c36af13daf Fix PerObjectSettings, which were broken due to the material editing merge
CURA-342
2016-07-07 18:25:20 +02:00
Arjen Hiemstra
38ce6cd4b8 Make PerObjectSettingVisiblityHandler inherit SettingVisiblityHandler and some other cleanup 2016-06-23 13:33:51 +02:00
Arjen Hiemstra
10d572eae3 Fix expanded settings for Per Object settings tool 2016-06-23 13:32:04 +02:00
fieldOfView
08411e943c Reenable Per Object Settings tool in simple mode if the current printer has multiextrusion
and tweak Per Object Settings panel size

CURA-333
2016-06-22 18:46:24 +02:00
fieldOfView
11b120a483 Redesign extruder selection widget
Adds a colorswatch instead of coloring the whole widget (which looks like a warning state)

CURA-340
2016-06-13 18:23:53 +02:00
fieldOfView
213e20bf4b Enable per object settings for objects inside a group
CURA-1054
2016-06-13 16:55:10 +02:00
Ghostkeeper
d89c9d8827
Make getSelectedActiveExtruder return its misbegotten gains
It was getting a value from the decorator, then keeping it to itself all greedy like. It must return what it found.

Contributes to issue CURA-340.
2016-06-10 17:04:26 +02:00
Ghostkeeper
204bf4d7dd
Update visibility of extruder dropdown on change
It currently only works when switching to a dual-extrusion printer, since the model is not updated when switching away to a non-dual-extrusion printer...

Contributes to issue CURA-340.
2016-06-10 17:04:26 +02:00
Ghostkeeper
598ff1e398
Fix changing active extruder from per-object drop-down
Apparently this is the way you do it.

Contributes to issue CURA-340.
2016-06-09 19:06:17 +02:00
Ghostkeeper
f5f711b7dc
On extruder switch create OverrideDecorator if needed
The SettingOverrideDecorator is only applied if the node has a per-object setting. Now it also creates a decorator also if you've ever switched the extruder, which was needed because the decorator contains the information which extruder to print with.

Contributes to issue CURA-340.
2016-06-09 19:06:17 +02:00
Ghostkeeper
beb263025b
Make ExtruderSelector invisible if there is no choice in extruders
It doesn't yet update well if you keep the panel open while switching machines.

Contributes to issue CURA-340.
2016-06-09 17:01:21 +02:00
Ghostkeeper
bd76c3e30f
Add drop-down in per-object settings to select extruder
Actually selecting an extruder has no effect because there are dragons in that area and I need better armour with bonus damage against bugs before I venture in there.

Contributes to issues CURA-340 and CURA-1278.
2016-06-09 15:47:06 +02:00
Tim Kuipers
b3cfa62775 Merge branch 'feature_settings_restricted_to_settingsbases' 2016-06-09 13:11:30 +02:00
Ghostkeeper
af484b03d8
Fix typo in variable name 2016-06-08 11:29:24 +02:00