GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-11 00:09:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,053 Commits 290 Branches 260 Tags
Commit Graph

3053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
64c92caa58 Update documentation of ExtruderManager class 
Contributes to issues CURA-1278 and CURA-340.
 2016-06-06 15:15:33 +02:00
Ghostkeeper
77c918a0a7 Remove superfluous singleton pattern 
The qmlRegisterSingletonType function already makes sure it is a singleton.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-06 15:15:33 +02:00
Ghostkeeper
7950dfaa07 Document activeExtruderStackId 
Contributes to issues CURA-340, CURA-351 and CURA-1278.
 2016-06-06 15:15:33 +02:00
Ghostkeeper
70e6c8093e Explicitly return None if no global container stack 
That's what it does. This is more clear than doing 'pass' or something.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-06 15:15:33 +02:00
Ghostkeeper
d1be5b6c02 Create extruder train for each train in a machine 
We had the functionality, but this function was not yet called!

Contributes to issues CURA-1278 and CURA-340.
 2016-06-06 15:15:33 +02:00
Ghostkeeper
927d33145f Move creating extruder manager logic to ExtruderManager 
This logic was both in Extruder.py and in MachineManagerModel.py due to a planning mishap.

Contributes to issues CURA-1278 and CURA-340.
 2016-06-06 15:15:33 +02:00
Ghostkeeper
79c37d667e Add extruder stack only when it's completely built 
Probably better for concurrency reasons, though that is not a problem yet at this moment.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-06 15:14:58 +02:00
Ghostkeeper
bfc880b61a Add extruder container stack to registry 
Contributes to issues CURA-1278 and CURA-351.
 2016-06-06 15:14:58 +02:00
Ghostkeeper
357997c984 Add user profile to container registry 
This will allow it to be saved when restarting Cura and such.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-06 15:14:58 +02:00
Ghostkeeper
2660b2a68f Give default empty machine_extruder_ids 
Works also if the machine has no machine_extruder_ids metadata.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-06 15:14:58 +02:00
fieldOfView
a2db4740b9 Fix removing custom (quality) profiles 
CURA-1585
 2016-06-06 15:09:21 +02:00
fieldOfView
a139809b75 Fix showing profiles created using the dropdown menu in the dropdown and on the profiles manager 
CURA-1585
 2016-06-06 13:39:11 +02:00
fieldOfView
3752a6bbef Show rename profile dialog after creating a profile from the profiles dropdown 
CURA-1585
 2016-06-06 13:02:20 +02:00
fieldOfView
22857bf3e1 Disable export profile button when no profile is selected 
CURA-1585
 2016-06-06 12:14:10 +02:00
Jaime van Kessel
ffd309f816 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-06 10:19:14 +02:00
Jaime van Kessel
c7340c3b21 Temporary removed multi extruder stack so slicing works again 2016-06-06 10:18:19 +02:00
Thomas Karl Pietrowski
a3e5c06572
Adding debian to gitignore 
Got a link here my packaging files. As Cura does not come with packaging
files itself, we can add this ignore here.
 2016-06-06 08:55:36 +02:00
fieldOfView
b7a441d263 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-06 08:40:14 +02:00
fieldOfView
b88f2847ef Fix saving machine instances to the cura profile 
CURA-340, see c79b7bdd7a
 2016-06-06 08:39:38 +02:00
Ghostkeeper
e8b66b919a Merge pull request #771 from thopiekar/master-buildtype-in-splashscreen 
Splashscreen: Another (and last) correction
 2016-06-06 08:34:07 +02:00
Ghostkeeper
5d840e6430 Merge pull request #770 from thopiekar/master-eclipse-pydev 
Ignoring Eclipse+PyDev project files
 2016-06-06 08:29:44 +02:00
Thomas Karl Pietrowski
1171bf112c Ignoring Eclipse+PyDev project files 2016-06-06 06:43:07 +01:00
Thomas Karl Pietrowski
e03c3b95c5 Splashscreen: Another (and last) correction 
Now all the needed changes should be done.
 2016-06-06 06:36:30 +01:00
Ghostkeeper
a948c7bcc6
Set colours of extruder selection to material colour 
Ubuntu Unity doesn't seem to listen to these colours at all though.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-05 16:18:07 +02:00
Ghostkeeper
c50d0a97da
Load extruder combobox synchronously 
Asynchronously causes Qt 5.4 to give a segfault.

Contributes to issues CURA-351 and CURA-1278.
 2016-06-05 16:18:07 +02:00
Ghostkeeper
b4782e9b12
Pass definition to _uniqueName instead of name 
This function expects the entire definition.

Contributes to issueS CURA-1278 and CURA-351.
 2016-06-05 16:18:07 +02:00
Ghostkeeper
9b2acf0317
Remove print statement 
Contributes to issues CURA-1278 and CURA-351.
 2016-06-05 16:18:06 +02:00
Ghostkeeper
d810c7ddbb
Properly reload extruders at the start 
The extruder manager was too late to catch the initial global stack switch and machine switch. Now it just always reloads the extruders at the beginning.

Contributes to issues CURA-1278 and CURA-351.
 2016-06-05 16:17:55 +02:00
fieldOfView
9aa8ca3292 Fix uninitialised variable 
CURA-1619
 2016-06-05 16:03:31 +02:00
fieldOfView
c21475abd7 Prevent multiple machines having the same custom name 
Caused by container vs containerstack confusion
Fixes CURA-1606 and CURA-1649
 2016-06-05 14:05:56 +02:00
fieldOfView
ead91db062 Fix activating another container stack when the currently active stack is removed 
CURA-1632
 2016-06-05 13:54:55 +02:00
Jaime van Kessel
cb742cf7ce Fixed saving of machines again 2016-06-05 12:53:41 +02:00
Jaime van Kessel
8b294fbe97 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-05 12:45:29 +02:00
Jaime van Kessel
b63c308694 Changed order of loading containers so extruder stacks don't fail anymore 
CURA-340
 2016-06-05 12:45:02 +02:00
fieldOfView
a52cd9f2ef Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-05 12:22:37 +02:00
fieldOfView
d13b5adda6 Codestyle & comments 
CURA-1619
 2016-06-05 12:22:23 +02:00
Jaime van Kessel
783134031b Settings can now be set by extruder 
CURA-340
 2016-06-05 12:17:35 +02:00
Jaime van Kessel
64ded3299e Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-05 12:02:10 +02:00
Jaime van Kessel
1e44abb9be Added activeExtruder stack to machineManager model 
CURA-340
 2016-06-05 12:01:46 +02:00
Jaime van Kessel
eeb1882c2f Merge pull request #765 from thopiekar/master-buildtype-in-splashscreen 
Fixing a typo
 2016-06-05 11:38:20 +02:00
Jaime van Kessel
c79b7bdd7a Machine manager now creates ExtruderTrainStacks 
CURA-340
 2016-06-05 11:34:29 +02:00
Thomas Karl Pietrowski
d6acb78bd4 Fixing a typo 
Had that change locally here, but for a reason I forgot to commit that
fix. Oops..
 2016-06-05 09:59:57 +01:00
Jaime van Kessel
2f3352bfa0 Added default values when adding variant & materials 
CURA-1612
 2016-06-05 10:45:47 +02:00
Jaime van Kessel
0e09d4a349 Merge branch 'thopiekar-master-buildtype-in-splashscreen' 2016-06-05 10:28:51 +02:00
Jaime van Kessel
cb0df43f4b Merge branch 'master-buildtype-in-splashscreen' of git://github.com/thopiekar/Cura into thopiekar-master-buildtype-in-splashscreen 2016-06-05 10:28:33 +02:00
Arjen Hiemstra
0a9382aa11 Fix exclusiveGroup for machine selection in the menu 
Contributes to CURA-1278
 2016-06-04 21:22:21 +02:00
Arjen Hiemstra
2d77ddada4 Add ABS/CPE quality profiles for UM2(E)+ 
Contributes to CURA-1612
 2016-06-04 21:21:57 +02:00
Arjen Hiemstra
312097c523 Specify UMO as having materials 
Contributes to CURA-1612
 2016-06-04 21:21:24 +02:00
Arjen Hiemstra
e0ebe960ac Update standard quality profiles 
Contributes to CURA-1612
 2016-06-04 21:19:29 +02:00
Arjen Hiemstra
65a563027d Specify preferred material/quality as wildcards 
This way it becomes a lot simpler to match them

Contributes to CURA-1612
 2016-06-04 21:19:05 +02:00