GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 01:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,148 Commits 294 Branches 267 Tags
Commit Graph

1040 Commits

Author SHA1 Message Date
Jaime van Kessel
fb6d86dc88 Also override getTop(), as curaContainerStack enforces it being a instanceContainer 
This helps with the type hinting.
 2017-05-12 16:39:24 +02:00
Ghostkeeper
0cc4f90920
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-12 16:34:19 +02:00
Jaime van Kessel
7ee5a66c64 CuraContainerStack now overrides getBottom, so it always returns a definition 2017-05-12 16:32:00 +02:00
Jaime van Kessel
77204fc4b0 Type hinting & unused code removal 2017-05-12 16:27:37 +02:00
Jaime van Kessel
2b64e92a99 Removed unused imports 2017-05-12 16:13:09 +02:00
Ghostkeeper
5bc613c3e0
Don't use string for default version 
No need to go via string and cast that to int, just return int directly.

Contributes to issue CURA-3427.
 2017-05-12 14:44:46 +02:00
Jaime van Kessel
167f616a7c Decreased interval of extruder timer 2017-05-12 14:34:45 +02:00
Jaime van Kessel
ef2aa3b2b2 Empty InstanceContainers are now correctly handled by setActiveMaterial again 
CURA-3789
 2017-05-12 13:59:31 +02:00
Ghostkeeper
0f5814e52f
Add setting_version and check against it 
This breaks all profiles since they have the wrong setting version, of course. Have to change that in every instance container now...

Contributes to issue CURA-3427.
 2017-05-12 12:58:15 +02:00
Arjen Hiemstra
fdc6fbbac1 Handle limit_to_extruder in {Extruder,Global}Stack getProperty 
This way we do not need to special case limit_to_extruder and instead
always use limit_to_extruder if it is set.

Contributest to CURA-3738
 2017-05-11 17:50:12 +02:00
fieldOfView
f5347a4593 Add documentation and a spot of logging 2017-05-11 16:37:32 +02:00
fieldOfView
24159aaf66 Fix activating newly created materials 2017-05-11 14:08:15 +02:00
fieldOfView
5339055f9a Fix unlinking materials 2017-05-11 13:10:32 +02:00
fieldOfView
0d67d42300 Fix created materials being a linked to themselves 2017-05-11 12:53:53 +02:00
fieldOfView
e45f04f391 Merge branch 'master' into fix_material_uniqueness 2017-05-11 12:23:01 +02:00
Jaime van Kessel
fd340a1270 Empty containers now also trigger extruder model update 2017-05-10 16:25:23 +02:00
Jaime van Kessel
27d6bebf32 Adding a new printer now activates it again 
CURA-3783
 2017-05-10 16:12:01 +02:00
Jaime van Kessel
bfb76540d0 InstanceContainerchanged is now also on a timer. 
This greatly reduces the signal storm resulting from changing quality / material in multi extrusion machines.

CURA-3780
 2017-05-10 13:22:34 +02:00
Jaime van Kessel
e313794b12 Fixed posponing of certain events 
CURA-3780
 2017-05-10 13:16:49 +02:00
Jaime van Kessel
2375c832be Revert "ReplaceQuality changes only emits signals if there was a change" 
This reverts commit 9a387f9ee2beb705afe959df92d405fc81720ccf.
 2017-05-10 11:50:17 +02:00
Jaime van Kessel
801c282c97 Only update ExtrudersModel when material changes 
CURA-3780
 2017-05-10 10:59:21 +02:00
Jaime van Kessel
42fc703516 Added a few profiling decorators to expensive methods 2017-05-10 10:45:07 +02:00
Jaime van Kessel
9a387f9ee2 ReplaceQuality changes only emits signals if there was a change 
CURA-3780
 2017-05-10 10:33:40 +02:00
Jaime van Kessel
3d429e44ae Updating extruders now also works with timer 
CURA-3780
 2017-05-10 09:59:19 +02:00
Jaime van Kessel
19bc6bb710 All error checks now use the timer instead of re-checking multiple times. 
This significantly speeds up all setting / container changes for multi extrusion machines

CURA-3780
 2017-05-09 14:38:57 +02:00
Jaime van Kessel
6493bcd5b5 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-09 14:02:09 +02:00
Jaime van Kessel
40c9e45532 Send specific signals for container changes if we know the type 
CURA-3780
 2017-05-09 14:01:37 +02:00
Lipu Fei
5706a540d9 Only set global stack in addMachine() if there was none 2017-05-09 13:57:02 +02:00
fieldOfView
eba75a726e Set brand and material to "Custom" so it is less like copying Generic PLA 2017-05-09 12:58:50 +02:00
Jaime van Kessel
bd25448021 Changes to make um2 upgrade work with new stack changes 
CURA-3742
 2017-05-08 15:03:39 +02:00
Jaime van Kessel
3f9a5fbcbb Changed logging so it doesn't look like it's printing lists 2017-05-08 14:22:36 +02:00
fieldOfView
3fbdaf6c17 Ignore values of extruders that are inactive for the current machine instance 
extrudervalues() would include the values of extruders whose position >= machine_extruder_count. This can happen in machine definitions that have more extruders than machine_extruder_count, eg Custom FDM printer.
 2017-05-08 13:43:09 +02:00
fieldOfView
98b127851b Fix setting number of extruders when hasVariants is set 2017-05-08 12:54:12 +02:00
Jack Ha
8680c6d79d Changed addExtruder exception to a warning to let Custom FDM Printer work again. Removed unused imports. CURA-3757 2017-05-08 11:27:19 +02:00
Jack Ha
1fe142ad1f Fix crashing Cura when switching multi extruder machine to single extruder machine while object selected. CURA-3776 2017-05-08 10:50:15 +02:00
fieldOfView
f3c2df3ab4 Properly return a string when creating/duplicating a material 2017-05-08 10:22:41 +02:00
Lipu Fei
91b22edb06 Fix missing imports in CuraContainerRegistry 
CURA-3497
 2017-05-04 16:19:18 +02:00
Arjen Hiemstra
230740ed64 Fixup extruders that were converted from ContainerStack on load 
We need to make sure the extruder stacks get the proper next stack set,
even when converting them from ContainerStack. Since the conversion can
make no guarantees about the loading order, we need to add an extra step
to post-process the extruders.

Contributes to CURA-3497
 2017-05-04 15:44:16 +02:00
Ghostkeeper
ea9e0e2e9c
Replace material without needing to find its index 
We have an easy setter for this.

Contributes to issue CURA-3497.
 2017-05-03 17:09:33 +02:00
Ghostkeeper
c42d092b0f
Merge branch 'master' into cura_containerstack 2017-05-03 15:21:01 +02:00
Ghostkeeper
86f1a0559f
Add documentation and further specify except around disconnecting signals 
Catch just a TypeError instead of all exceptions. Added documentation to say why we catch a TypeError there. Also splitted up the try-except block for the 3 disconnects, just so that if the first fails we still try to disconnect from the other two.

Contributes to issue CURA-3497.
 2017-05-03 14:56:52 +02:00
Arjen Hiemstra
d95488a940 Use the new stack properties so we can properly create quality changes 
Contributes to CURA-3497
 2017-05-03 13:16:57 +02:00
Arjen Hiemstra
aad623fab6 Correct a typo in CuraContainerStack::findDefaultQuality 
Contributes to CURA-3497
 2017-05-03 13:16:19 +02:00
Jaime van Kessel
9a46a24b19 Profile menu now correctly marks active qualties as checked 
CURA-3497
 2017-05-03 13:13:09 +02:00
Jaime van Kessel
d83b4daf78 Switching from quality_changes to quality profile is now possible again 
CURA-3497
 2017-05-03 11:23:59 +02:00
Jaime van Kessel
c8f823154c Instead of searching for a container with type, we now use the newly introduced properties 
CURA-3497
 2017-05-03 11:10:39 +02:00
Jaime van Kessel
f062322ebf Switching from dual extrusion to single extrusion machine is now possible again 
CURA-3497
 2017-05-03 10:59:07 +02:00
Jaime van Kessel
ab6240bd31 Replace quality(changes) in machine manager now uses new API as well 
CURA-3497
 2017-05-03 10:38:31 +02:00
Jaime van Kessel
a028297cb2 Machine manager now uses the new specific setters to switch instanceContainers 
CURA-3497
 2017-05-03 10:15:18 +02:00
Jaime van Kessel
8d80f20db7 Added way to dynamicly set loading order 
This is to ensure that Global stacks are loaded before extruders, so once the extruders are deseralized, they can always find the next (global) stack

CURA-3497
 2017-05-03 09:54:00 +02:00