3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-10-10 15:27:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 17
3120 commits 330 branches 295 tags 714 MiB
Commit graph

574 commits

Author SHA1 Message Date
Ghostkeeper
f461ed0f5f
Document singleton 
Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 10:38:59 +02:00
Ghostkeeper
ec26579473
Remove unused _repopulate function 
It is replaced by the addMachineExtruders function.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-08 10:38:48 +02:00
fieldOfView
b452af5dbf Update Profile dropdown when renaming a quality profile 
CURA-1585
 2016-06-07 19:31:35 +02:00
fieldOfView
f7480baca2 Fix selecting another quality when the currently active quality is removed 
CURA-1585
 2016-06-07 19:25:12 +02:00
fieldOfView
21b1891c0e Make unique name generation more robust and simpler 
CURA-1585
 2016-06-07 18:55:27 +02:00
fieldOfView
4d0bb217af Fix crash when enabling setting visibility for adhesion_extruder_nr or support_extruder_nr 
The fix is likely not what was intended by the author of the offending code (and does not seem to be functional), but at least it fixes the hard crash outlined in CURA-1666
 2016-06-07 18:13:19 +02:00
fieldOfView
cca432742b Fix creating a name for a new MachineManagerModel 
CURA-1585
 2016-06-07 17:01:08 +02:00
fieldOfView
f7e299a750 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-07 15:58:08 +02:00
fieldOfView
b2782ced0a Fix "renaming" profiles/machines to their current name without adding an increment 
CURA-1585
 2016-06-07 15:56:59 +02:00
Jaime van Kessel
5761307b33 Updated deepcopy to correctly copy the instance container 
CURA-1636
 2016-06-07 15:45:51 +02:00
Jaime van Kessel
57ce8edcd3 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-07 14:56:46 +02:00
Jaime van Kessel
d2405a24d2 Perobject stacks are no longer saved 
CURA-1278
 2016-06-07 14:56:29 +02:00
Ghostkeeper
499a0557bd
Fix checking if an extruder train already exists 
Contributes to issues CURA-340 and CURA-1278.
 2016-06-07 14:00:31 +02:00
Ghostkeeper
a9376cffd1
Fix logging 
Specify the fully qualified name.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-07 14:00:31 +02:00
Ghostkeeper
8feed746bf
Re-apply part of b991743053 that worked 
This was indeed a mistake.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-07 14:00:31 +02:00
Ghostkeeper
08d116590d
Revert "Fix ExtruderManager.py" 
That is not a fix. That is a patch.

This reverts commit b991743053.
 2016-06-07 14:00:31 +02:00
Jaime van Kessel
84a9691390 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-07 13:33:46 +02:00
Jaime van Kessel
4695862b49 Added deepcopy function to settingOverrideDecorator 
CURA-1636
 2016-06-07 13:33:19 +02:00
fieldOfView
b991743053 Fix ExtruderManager.py 2016-06-07 13:30:13 +02:00
Ghostkeeper
253061cfa4
Remove unused import 
The _uniqueName function was using this but it was moved to ContainerRegistry.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-07 13:24:19 +02:00
Ghostkeeper
c5b07debdc
Remove iterability from ExtruderManager 
This is no longer used.

Contributes to issues CURA-1278 and CURA-340.
 2016-06-07 13:24:19 +02:00
Ghostkeeper
227c0f9f8c
Move _uniqueName to ContainerRegistry 
It's not specific to any type of container and we might re-use this anyway.

Contributes to issues CURA-1278 and CURA-340.
 2016-06-07 13:24:19 +02:00
fieldOfView
3257d949eb Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-07 12:00:03 +02:00
fieldOfView
4fb66afe06 Mark duplicated profiles as non-read-only 
CURA-1585
 2016-06-07 11:58:44 +02:00
Ghostkeeper
66bf0831f3
Document _uniqueName 
This function should really just be moved to ContainerRegistry... I'll do that later.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-07 11:55:14 +02:00
Ghostkeeper
dff94b4559
Make ExtruderManager a QML context item 
There were two singletons of this manager: One created by QML and managed by QML, and one created by us and managed by our own singleton pattern. That won't work! So we now manage just our own singleton type, and make it a context item for QML so it can use the manager too.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-07 11:55:14 +02:00
Ghostkeeper
9fe5435963
Rename parameter in _uniqueName 
Original means the original name. That's better.

Contributes to issues CURA-1278 and CURA-340.
 2016-06-07 11:55:14 +02:00
Ghostkeeper
890303da14
Add function to add all extruder trains of a machine 
This function only adds extruder trains if they have not been added already.

Contributes to issues CURA-340 and CURA-1278.
 2016-06-07 11:55:14 +02:00
fieldOfView
bbc33f5d70 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-07 11:01:24 +02:00
Jaime van Kessel
0a84867132 Fixed multiple typos / missing things in extrudermanager 2016-06-07 09:33:29 +02:00
fieldOfView
05643eca11 Fix renaming profiles from the Profiles page 
CURA-1585
 2016-06-07 08:11:53 +02:00
fieldOfView
5235f74adf Prevent unique names like "profile #10 #2" 
CURA-1606, CURA-1585
 2016-06-06 17:47:33 +02:00
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