Commit graph

2372 commits

Author SHA1 Message Date
Jaime van Kessel
7a4deb725a Clarified switching message
CURA-2898
2016-11-25 11:43:56 +01:00
Jack Ha
b88ed76b7c Solve merge conflict PrinterOutputDevice. CURA-1263 2016-11-24 13:55:22 +01:00
Jaime van Kessel
8c35c8fbc3 Inheritance manager no longer sees settings as setting if they use enum value 2016-11-23 17:27:27 +01:00
Jaime van Kessel
b6df2b90dd Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-23 14:06:17 +01:00
Jaime van Kessel
a8887406ac ValidationState checking in MachineManager now properly takes functions into account
CURA-2840
2016-11-23 14:05:33 +01:00
Jack Ha
c3320bb1a4 Change settings to settings/overrides in selected messages. CURA-2898 2016-11-23 13:33:12 +01:00
Jaime van Kessel
c1dda7505c Inheritance manager now also checks for inheritance if enabled property changed
CURA-2860
2016-11-23 12:47:54 +01:00
Jaime van Kessel
e17eda9a33 Removed debug prints
CURA-2860
2016-11-22 15:25:54 +01:00
Jaime van Kessel
75e067cab7 No longer select last_entry that isn't in the list
CURA-2860
2016-11-22 15:24:01 +01:00
Simon Edwards
5884509af1 More type checking fixes after the merge.
CURA-2917
2016-11-22 11:51:18 +01:00
Simon Edwards
98a6568313 Merge branch 'master' into python_type_hinting 2016-11-22 11:15:04 +01:00
Simon Edwards
14afd9eab7 Heaps to changes to get the Cura code through the type checker (with minimal checking).
CURA-2917
2016-11-21 21:36:08 +01:00
Jaime van Kessel
aca8110edd Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler 2016-11-21 13:45:04 +01:00
Jaime van Kessel
ac708d54b6 Importing invalid filetypes now gives proper error messages
CURA-2883
2016-11-18 16:46:54 +01:00
Jaime van Kessel
d0bae5acd7 Merge branch 'feature_bed_adhesion_none' of github.com:Ultimaker/Cura 2016-11-18 10:35:06 +01:00
Jaime van Kessel
9539774c0b Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler 2016-11-17 10:27:28 +01:00
Jaime van Kessel
053f0ca031 Replaced hack for setting extruders with more robust setter
CURA-1263
2016-11-16 14:54:48 +01:00
Ghostkeeper
2492b03c4f
Update disallowed area when object's extruder is changed
This calls _updateDisallowedAreas() but not rebuild(), so the change is not visible at this moment.

Contributes to issue CURA-2625.
2016-11-15 13:10:58 +01:00
Jaime van Kessel
dffb54d901 Removed abundant whitespace 2016-11-14 17:54:38 +01:00
Jaime van Kessel
8ae0cfd848 Loading workspace now activates the machine and notifies everyone that it was changed
CURA-1263
2016-11-14 13:30:28 +01:00
Tim Kuipers
0c550859dd fix: don't register adhesion_extruder_nr as used if adhesion_type == none (CURA-759)
Also the old line obtained brim_line_count from the global stack, while it is settable_per_extruder!
Also we now assume selecting a brim means you want to print it.
I don't think having a brim line count of zero meant that you wouldnt get a brim; the minimal brim length also plays a role...
2016-11-14 12:39:41 +01:00
Ghostkeeper
48134619eb
Fix checking if we're single extrusion
We are single extrusion if the extruder count is less than or equal to 1, like in other places throughout Cura.

Contributes to issue CURA-2625.
2016-11-14 10:31:11 +01:00
Ghostkeeper
8d43f1c5f7
Take first layer extruder into account
Forgot about that one earlier.

Contributes to issue CURA-2625.
2016-11-11 17:18:15 +01:00
Ghostkeeper
14e736d9eb
Add function to find the extruders that are used
These are the extruders that are being used by the scene if it would currently be printed. You can ask the extruder stacks for stuff like the nozzle offset. This way we can determine the disallowed areas per extruder.

Contributes to issue CURA-2625.
2016-11-10 19:31:02 +01:00
Jaime van Kessel
867463f718 InheritanceManager now checks if a setting function can actually change before labeling it
CURA-2860
2016-11-04 15:59:01 +01:00
Jaime van Kessel
2eb1c61033 Merge branch 'feature_drag_curaprofile' of github.com:Ultimaker/Cura 2016-11-04 14:31:58 +01:00
Jaime van Kessel
720f37b17f Quality changes can now only be removed if they are not in use anywere
CURA-2846
2016-11-04 10:02:13 +01:00
Simon Edwards
cadf2115ac Merge pull request #1058 from Ultimaker/cura-2730
Changed MachineManager.isActiveStackValid to areStacksValid. CURA-2730
2016-11-01 16:17:04 +01:00
Jaime van Kessel
d897392eea Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-31 15:46:31 +01:00
Jaime van Kessel
41ed9661f6 FindQUalityByName now also uses fallback generic materials if no result was found
CURA-2852
2016-10-31 15:43:53 +01:00
Simon Edwards
1fbd179aaa Merge branch '2.3' 2016-10-31 13:30:20 +01:00
Simon Edwards
e74953c8bc Internal docs.
CURA-2823 Maximum build volume not met despite disabled settings
2016-10-31 13:29:54 +01:00
Ghostkeeper
9a8a5db06e
Fix documentation for getAllExtruderSettings
Didn't complete it previously. Oops.

Contributes to issue CURA-2823.
2016-10-31 12:41:29 +01:00
Ghostkeeper
6999a14821
Merge branch '2.3' 2016-10-31 10:55:54 +01:00
Thomas Karl Pietrowski
aa92428c04 Cleanup: Remove debug print 2016-10-30 16:45:45 +01:00
Ghostkeeper
d5ba89a026
Add function to get other properties than values from all extruders
I've made sure that the behaviour of getAllExtruderValues remains the same, so that this function may still be used by other pieces of code. It is now just a special case of getAllExtruderSettings. Please suggest a better naming scheme, if you like.

Contributes to issue CURA-2823.
2016-10-28 15:20:13 +02:00
Jaime van Kessel
78ab1f1a71 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-28 14:50:07 +02:00
Jaime van Kessel
af10438277 Fixed blurSetting
CURA-2835
2016-10-28 14:49:42 +02:00
Ghostkeeper
d33f6d2e44
Make regex match exactly on entire string
The carot indicates start of string, the dollar the end of string. So it must match on the entire string, not a piece of it.

Contributes to issue CURA-2692.
2016-10-28 13:33:36 +02:00
Ghostkeeper
4ef2caddf5
Remove debug prints
Oops.

Contributes to issue CURA-2692.
2016-10-28 13:33:36 +02:00
Jaime van Kessel
28eb4297c6 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-28 11:38:13 +02:00
Ghostkeeper
36fa4afc6c
Remove misguided attempt at representing UTF-8 encode length
It was commented out anyway. I also updated the documentation there.

Contributes to issue CURA-2692.
2016-10-28 09:55:19 +02:00
Ghostkeeper
717248bd78
Limit number of special characters
There is also a more advanced attempt that allows more, but I've commented it out because it doesn't quite work yet. Special characters now always count for 12.

Contributes to issue CURA-2652.
2016-10-27 21:55:58 +02:00
Ghostkeeper
37d1c0be36
Add validator for machine names
Currently this validator can't be used in QML due to a PyQt bug. I plan to call the validator manually upon receiving a signal that the text changed in a text box.

Contributes to issue CURA-2692.
2016-10-27 21:55:58 +02:00
Jaime van Kessel
999380cf1b Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-27 17:15:58 +02:00
Jaime van Kessel
1aa71d6171 Profiles model is now a singleton, to prevent the agressive garbage collecting to break stuff
CURA-2826
2016-10-27 14:26:43 +02:00
Jaime van Kessel
f35914299b Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-26 15:44:19 +02:00
Jaime van Kessel
a8486f88d7 Inheritance icon is correctly shown for single extrusion printers if setting has limit_to_extruder property
CURA-2752
2016-10-26 15:43:26 +02:00
Jaime van Kessel
a581942869 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-26 13:13:27 +02:00
Ghostkeeper
6c3b4b7f29
Prevent race condition before global container stack is made
Just properly check if there is a global container stack.
2016-10-26 09:50:42 +02:00