GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 06:09:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,844 Commits 288 Branches 260 Tags
Commit Graph

363 Commits

Author SHA1 Message Date
Jaime van Kessel
bc8741ef08 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-19 10:40:32 +01:00
Lipu Fei
f26872ec1f Apply fix for single extrusion machines when a new global stack is added 
CURA-4713

Now the machines are not all loaded in the beginning, so the old way of
adding extruder stacks for old single-extrusion machines don't work.
With this fix, it now happens whenever a global stack is added to the
registry.
 2017-12-15 14:51:48 +01:00
Jaime van Kessel
24bd32477a Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-14 13:03:02 +01:00
Jack Ha
19b56404c6 Fix empty quality slider on start. 
It seemed that:
- MachineManager was not connected to all the correct signals
- After connecting to the correct signal, ProfilesModel was not yet updated when looping over it in SidebarSimple

Because ProfilesModel's constructor already requests the MachineManager, we cannot do connect itemsChanged the way around as well.

CURA-4707
 2017-12-13 13:33:05 +01:00
Ghostkeeper
430f3dad27
Use GlobalContainerStack.definition instead of .getBottom 
If we know it's a CuraContainerStack we can use .definition safely.

Contributes to issue CURA-4243.
 2017-12-08 16:57:48 +01:00
Ghostkeeper
1029d4509c
Merge branch 'master' into feature_local_container_server 2017-12-08 16:03:05 +01:00
Jaime van Kessel
9ccd643f64 Repaired the monitor icon not being updated 
CL-541
 2017-12-08 14:36:53 +01:00
Jaime van Kessel
c28c20dbd7 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-08 10:22:16 +01:00
Diego Prado Gesto
9561827bda CURA-4680 Checking if there is global stack in the ExtruderManager. 
Intead of checking for it in all the methods in MachineManager, now the
check is done in ExtruderManager when there is no printer in the list.
 2017-12-06 14:12:51 +01:00
Jaime van Kessel
aba8bd89c3 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-06 13:33:20 +01:00
Lipu Fei
c0a502f99c Check if there is an active machine before doing anything else 
CURA-4680
 2017-12-06 11:48:14 +01:00
Jack Ha
41cde7c7f4 Fix connecting material name change signal on startup. Contributes to CURA-4243. 2017-12-04 17:07:37 +01:00
Lipu Fei
14c84d835a Make quality switching clear 
CURA-4650
 2017-12-01 09:55:38 +01:00
Ghostkeeper
838e49f3da
Pass just metadata through quality manager instead of full containers 
Where we only need metadata, we should pass metadata instead of full containers.
Also add some type hinting.

Contributes to issue CURA-4243.
 2017-11-29 14:33:04 +01:00
Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server 
Contributes to issue CURA-4243.
 2017-11-29 13:06:08 +01:00
Ghostkeeper
8707396ad7
Remove isReadOnly functionality 
Everyone should now ask it from the container registry.

Contributes to issue CURA-4243.
 2017-11-28 17:30:00 +01:00
Ghostkeeper
381d9bf3f1
Log which file caused it to go wrong 
Contributes to issue CURA-4243.
 2017-11-28 16:15:20 +01:00
ChrisTerBeke
8cfaa44580 Fix resolving global stack definition when switching variant - CURA-4620 2017-11-27 16:40:23 +01:00
Jaime van Kessel
083eee2e9d Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-11-27 13:43:39 +01:00
ChrisTerBeke
8082c092e5 Fix setting extruder definition in user changes container 2017-11-27 09:54:10 +01:00
Aleksei S
bb2be70dac Finds candidate quality profile for fdmextruder 
CURA-4620
 2017-11-25 02:25:36 +01:00
Jaime van Kessel
219e285b20 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-11-24 09:23:21 +01:00
Jack Ha
3b5ed70113 CURA-4602 Fixed active custom profile selected check 2017-11-22 16:15:06 +01:00
ChrisTerBeke
532cfd8404 Fix showing correct quality changes in dropdown list after upgrading - CURA-4482 2017-11-22 10:48:21 +01:00
Lipu Fei
aeb478bb4b Should only show Keep/Discard dialog when it's needed 
CURA-4599
 2017-11-22 09:32:17 +01:00
Lipu Fei
31c859b3d7 Show Keep/Discard dialog after the containers have been changed 
CURA-4599

Or the default values will reflect those before the switch.
 2017-11-22 09:18:20 +01:00
Jaime van Kessel
0f78b05802 Connection states changes are now tied into the UI again 
CL-541
 2017-11-21 15:12:23 +01:00
ChrisTerBeke
657a91c525 Merge pull request #2685 from Ultimaker/container_stack_improvements 
Container stack improvements
 2017-11-20 17:42:26 +01:00
Lipu Fei
e246784df2 Use parseBool() for metadata bool values 
CURA-4482
 2017-11-17 12:43:30 +01:00
ChrisTerBeke
e23e6cfa31 Fix for global quality in case of user created quality profile - CURA-4482 2017-11-01 13:59:21 +01:00
ChrisTerBeke
957009a768 Fix finding global quality for multi extrusion machines - CURA-4482 2017-10-31 17:32:21 +01:00
ChrisTerBeke
2e1da58570 Cleanup - CURA-4482 2017-10-31 17:06:34 +01:00
ChrisTerBeke
e7f1900f71 Remove layer height from custom profiles in dropdown as it might have changed - CURA-4482 2017-10-31 14:01:15 +01:00
ChrisTerBeke
569047693e Rename loop variable to be more explicit - CURA-4482 2017-10-31 13:55:47 +01:00
ChrisTerBeke
bc6984a0ed Fixes for selecting active variant, material and quality - CURA-4482 2017-10-31 13:19:28 +01:00
ChrisTerBeke
f36c9ffbc0 Create extruder stack for single extrusion machines when adding new machine - CURA-4482 2017-10-31 09:49:24 +01:00
Chris ter Beke
9806ec7374 Resolve merge conflicts with master - CURA-4482 2017-10-31 09:22:03 +01:00
ChrisTerBeke
d718e6e36c Create extruder stack for single extruder machines on start - CURA-4482 2017-10-31 09:08:20 +01:00
Ghostkeeper
839c8ccc52
Fix 'Could not get metadata of container <empty string>' 
Turns out that the side bar header was requesting the metadata before the active material was set. Now I'm just saying that if the active material was not set, it should not be compatible.

Contributes to issue CURA-4243, side-ways.
 2017-10-30 11:15:41 +01:00
Diego Prado Gesto
fb88dd6326 CURA-4492 Postponed signals are now emitted even if we need user 
interaction when changing quality profiles
 2017-10-27 13:32:51 +02:00
ChrisTerBeke
b91824aab1 Move towards making extruder manager a first class citizen - CURA-4482 2017-10-26 17:54:36 +02:00
ChrisTerBeke
8378c6f3c9 Always add extruder quality changes when getting quality changes by name - CURA-4482 2017-10-26 14:30:18 +02:00
ChrisTerBeke
d6ef96a825 Add todo comment 2017-10-26 14:07:47 +02:00
ChrisTerBeke
0021dee84b Always use extruder stacks when copying value to all extruder - CURA-4482 2017-10-26 14:04:05 +02:00
ChrisTerBeke
0b57096056 Always use extruder stacks when switching global container in machine manager - CURA-4482 2017-10-26 13:44:47 +02:00
ChrisTerBeke
7975420901 Always set active extruder index when loading active machine on start - CURA-4482 2017-10-26 13:34:59 +02:00
Lipu Fei
2f441ba7e1 Remove debugging log lines 
CURA-4451
 2017-10-26 11:36:59 +02:00
Chris ter Beke
b95ba24530 Remove some changes, debugging - CURA-4451 
WIP - CURA-4451

correctly show not supported when any of the extruders has a not supported profile - CURA-4451

Clean up and add comments - CURA-4451
 2017-10-26 09:23:27 +02:00
ChrisTerBeke
c1139c5c45 Update stack error checking when switching matchines - CURA-4447 2017-10-24 13:38:14 +02:00
ChrisTerBeke
d2ef373d19 Also apply container changes when no user interaction is required - CURA-4447 2017-10-23 15:50:42 +02:00