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
Jaime van Kessel
0229fd8676
Fixed issue with first startup
2016-12-12 11:00:19 +01:00
jack
8fdc0a40ce
Merge pull request #1235 from Ultimaker/project_save_dialog
...
Project save dialog
2016-12-12 10:41:49 +01:00
Jaime van Kessel
998b14086e
Profile tab is now also translated
...
CURA-2744
2016-12-09 17:00:18 +01:00
Jaime van Kessel
0f910ae7a2
Merge branch 'master' of github.com:Ultimaker/Cura into project_save_dialog
2016-12-08 12:37:40 +01:00
Jaime van Kessel
36d743384c
Initial work for adding a save dialog for project saving
...
CURA-1263
2016-12-08 11:56:42 +01:00
Jack Ha
3efc5d63ef
Improved layout, removed material name from extruder name. CURA-2763
2016-12-06 16:11:08 +01:00
Jaime van Kessel
58e7e6ef5a
Added default_printing_temperature property
...
CURA-2586
2016-12-06 11:38:56 +01:00
Jack Ha
be5a6e421b
Merge branch 'master' of github.com:Ultimaker/Cura
2016-12-05 14:09:56 +01:00
Jack Ha
601d3fa554
Added blurSettings when switching machine to prevent taking values from old machine. CURA-3065
2016-12-05 14:09:33 +01:00
Jaime van Kessel
e0168aac11
Improved logging for _replaceQualityChangesInStack
...
CURA-3042
2016-12-05 13:05:59 +01:00
Jaime van Kessel
5d1ba828bc
Closing load project screen cancels loading of workspace
...
CURA-1263
2016-12-02 15:15:34 +01:00
Jaime van Kessel
a5c38e0591
Assign the empty containers before handling the globalcontainer changed signal
2016-12-02 15:08:18 +01:00
Jack Ha
e888603dd5
Cura startup with setting errors now also results in Unable to slice.
2016-11-28 14:31:28 +01:00
Jaime van Kessel
bde1e05273
Changing an instanceContainer now re-checks the error state of the stacks
...
CURA-2861
2016-11-25 14:54:32 +01:00
Jaime van Kessel
361aee3e3c
Resolve value is now correctly displayed in profilesPage
...
CURA-2844
2016-11-25 13:29:46 +01:00
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