3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 06:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
3049 commits 305 branches 272 tags 787 MiB
Commit graph

542 commits

Author SHA1 Message Date
Ghostkeeper
bcf7e0459b Merge branch 'master' of github.com:Ultimaker/Cura 
Conflicts:
	cura/MachineManagerModel.py
 2016-06-06 16:41:34 +02:00
fieldOfView
df71269f82 Mark custom profiles as not read-only 
CURA-1585
 2016-06-06 15:56:45 +02:00
fieldOfView
0b57728d9d Fix creating a unique name for profiles 
CURA-1585
 2016-06-06 15:55:14 +02:00
Ghostkeeper
84a9166241 Make extrudersChanged into a pyqtSignal 
This way we can listen for it on the cute side.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-06 15:15:33 +02:00
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
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
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
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
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
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
3413334c6d Update active material/quality when changing one of the lower levels 
Contributes to CURA-1612
 2016-06-04 21:17:27 +02:00
Thomas Karl Pietrowski
c62ab6e937 Adding a field of the build type to the spashscreen. 
For example, if the community distributes Cura in a different way, they
can set CURA_BUILDTYPE via 'cmake -DCURA_BUILDTYPE=' and whenever Cura
is launched " (PPA)" will be appended. Of course, this could be done by
appending " (PPA)" to CURA_VERSION, but in case of my Ubuntu/Debian
packaging it will only need one modification in debian/changelog to
change the version. During build (debian/rules) this version will be
read from debian/changelog.
Changing the version number across different files, is a waste of time.

Finally, we can use that field in the future to indicate debug or other
other special builds.
 2016-06-04 13:55:35 +02:00
Jaime van Kessel
490a8724e5 Fixed duplication of profiles 
CURA-1427
 2016-06-03 16:29:46 +02:00
Jaime van Kessel
d1d60e27cc Added function to duplicate container 
CURA-1427
 2016-06-03 15:25:08 +02:00
Jaime van Kessel
ea73f00aac Fixed case where validation state was set incorrectly 
CURA-1585
 2016-06-03 14:39:36 +02:00
Jaime van Kessel
b6b154e153 Fixed slowdown caused by validation check 
CURA-1585
 2016-06-03 13:34:06 +02:00
Jaime van Kessel
2b91b81f2d Added documentation 
CURA-1585
 2016-06-03 13:24:23 +02:00
Jaime van Kessel
5faf2f024f Added signal for validation state 
This improves the runtime speed somewhat
CURA-1585
 2016-06-03 13:14:49 +02:00
Jaime van Kessel
7b87143e65 Only value property events are now used 
This speeds the num events up a bit, but it's still a tad to slow

CURA-1585
 2016-06-03 13:07:35 +02:00
Jaime van Kessel
0dece95f0f Updating non-readonly profiles is now possible again 
CURA-1585
 2016-06-03 13:03:56 +02:00
Jaime van Kessel
d29cc37d6b Adds way to convert user settings into quality settings 
CURA-1585
 2016-06-03 11:58:59 +02:00
Jaime van Kessel
4fc565711d Added read-only property to profiles 
CURA-1585
 2016-06-03 11:19:33 +02:00