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

185 Commits

Author SHA1 Message Date
Lipu Fei
8ea3c879f4 Fix quality profile update 
CURA-5453

Should take into account that the custom profile being updated may not
have a quality_changes container for each stack, and Cura should create
one if this is the case, so the user changes results can be stored.
 2018-06-11 10:48:22 +02:00
Lipu Fei
051dd7a6e9 WIP: Make application initialization and start up more clear 
- Create SingleInstance class to handling single instance stuff.
 - Instead of calling getInstance() everywhere, initialize each object
   explicitly in order when application starts and getInstance()s do not
   create instances any more and they merely return the created
   instances.
 - Only set initial values in construtor functions __init__(). Move the
   initialization of context-aware (i.e. things that depend on other
   things) to separate functions.
 - Split application creation and initialziation into several steps and
   them should be called explicitly in the correct order.
 2018-05-04 09:57:02 +02:00
Ghostkeeper
572721e20d
Catch ContainerFormatError when deserialising containers 
Only the deserialize() functions themselves may pass the ContainerFormatError on, because their callers will have to handle those errors anyway.

Contributes to issue CURA-5045.
 2018-04-06 13:26:16 +02:00
Ghostkeeper
6d3fed8f52
Allow getContainer() to return None 
And in the rest of the locations we must then check if it's None and handle that gracefully.
Here we assume that the getContainer message shows a message to the user if necessary. For now we'll just log it.

Contributes to issue CURA-5045.
 2018-03-26 15:48:03 +02:00
Lipu Fei
a115956575 Do not show a material itself in its linked material list 2018-03-16 10:40:16 +01:00
Jack Ha
d889795721 CURA-4400 correctly cope with quality changes that conflict with the current enabled extruders 2018-03-12 14:15:49 +01:00
Jack Ha
a3d6127dcb CURA-4400 removed unnecessary correctExtruderSettings 2018-03-12 11:33:54 +01:00
Jack Ha
3b8d470323 Merge branch 'master' into feature_enable_disable_extruder 2018-03-08 09:35:49 +01:00
Lipu Fei
2a10c9a2d7 Move assertion in _performMerge() 
CURA-5070
 2018-03-08 09:10:45 +01:00
Jack Ha
bad637eb14 CURA-4400 fixed merge conflicts 2018-03-05 16:47:40 +01:00
Lipu Fei
3004b146ad Fix: move createQualityChanges() to QualityManager 
CURA-4606
 2018-03-05 13:36:13 +01:00
Lipu Fei
5d5932547c Cleanup imports for ContainerManager 2018-03-03 15:07:42 +01:00
Lipu Fei
c93643bc2f Move createMaterial() to MaterialManager 2018-03-02 17:30:19 +01:00
Lipu Fei
5f0bb3a283 Move removeMaterial() to MaterialManager 2018-03-02 17:20:26 +01:00
Lipu Fei
7642afb9fe Move duplicateMaterial() to MaterialManager 2018-03-02 17:16:35 +01:00
Lipu Fei
ca785c9df3 Move duplicateQualityChanges() to QualityManager 2018-03-02 17:08:58 +01:00
Lipu Fei
355b8cbac3 Move renameQualityChangesGroup() into QualityManager 2018-03-02 16:58:50 +01:00
Lipu Fei
8324f4f44e Move removeQualityChangesGroup() into QualityManager 2018-03-02 16:47:25 +01:00
Lipu Fei
6cae82a64e Fix comments for createQualityChanges() 2018-03-02 16:42:10 +01:00
Lipu Fei
c6128ef5ba Move setMaterialName() into MaterialManager 2018-03-02 16:22:22 +01:00
Jack Ha
ba7b18a88b CURA-4400 corrected getProperty in correctExtruderSettings 2018-03-01 15:02:35 +01:00
Lipu Fei
07824c21e1 Move getMachineDefinitionIDForQualitySearch() into QualityManager.py 2018-02-28 11:48:20 +01:00
Lipu Fei
950f6708c4 Make sure to generate unique name for duplicated quality changes 2018-02-27 14:20:43 +01:00
Lipu Fei
17d3be03b4 Use getMaterialManager() in ContainerManager 2018-02-26 19:38:44 +01:00
Jack Ha
c23827cfa1 CURA-4606 CURA-5003 activate duplicated material and always switch to correct material after some material change 2018-02-26 16:33:25 +01:00
Jack Ha
11be94c735 Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager 2018-02-26 09:30:33 +01:00
Lipu Fei
f487c5b084 Fix profile management page 2018-02-22 23:31:41 +01:00
Jack Ha
cad6a3bb3d CURA-4606 CURA-5003 select and activate material after create, duplicate 2018-02-22 17:14:23 +01:00
Lipu Fei
d2ffd59431 Switch to the new quality profile when it is created 2018-02-22 16:53:13 +01:00
Lipu Fei
70d5cd2462 Fix: Replace all activeQualityName with activeQualityOrQualityChangesName 2018-02-21 14:30:33 +01:00
Lipu Fei
27f7d16a57 WIP: Make import/export profile work 2018-02-19 21:47:12 +01:00
Lipu Fei
7e84e7570f WIP: Cleanup ContainerManager 2018-02-19 21:02:33 +01:00
Lipu Fei
2cd9891000 WIP: Fix material QVariant type 2018-02-19 21:00:49 +01:00
Lipu Fei
3fffc2c621 WIP: Cleanup old QualityManager 2018-02-19 20:50:14 +01:00
Lipu Fei
d4db41503f WIP: Cleanup ContainerManager 2018-02-19 20:43:05 +01:00
Lipu Fei
5b37de8adb WIP: Fix quality renaming 2018-02-19 20:33:36 +01:00
Lipu Fei
486bcae677 WIP: Fix remove quality 2018-02-19 20:21:02 +01:00
Jack Ha
bd10f23311 CURA-4606 reimplemented duplicate profile 2018-02-19 16:47:04 +01:00
Jack Ha
7a78f9821f CURA-4606 fixed Create profile 2018-02-19 16:15:35 +01:00
Lipu Fei
f7f9c68fcc WIP: Refactor setMaterialName() 2018-02-16 14:23:11 +01:00
Lipu Fei
e5cc7efdf2 WIP: Cleanup ContainerManager 2018-02-16 14:23:11 +01:00
Lipu Fei
581699cd8d WIP: Make material import work 2018-02-16 14:23:11 +01:00
Lipu Fei
0b859bb308 WIP: Make material export work 2018-02-16 14:23:11 +01:00
Lipu Fei
4f29fc9ab2 WIP: make material creation work 2018-02-16 14:23:11 +01:00
Lipu Fei
779f49f545 WIP: Make material removal work in material management dialog 2018-02-16 14:23:11 +01:00
Lipu Fei
a5afaab467 WIP: Fix material duplication and metadata update 2018-02-16 14:23:11 +01:00
Lipu Fei
f024f45cfe WIP: Rework Material management page 2018-02-16 14:23:11 +01:00
Lipu Fei
f0d9fba2f5 WIP: Create MaterialManager 2018-02-16 14:20:02 +01:00
Diego Prado Gesto
701ac7f91e Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-01 09:05:32 +01:00
alekseisasin
e5c72cfdc5 Validate material profile 
CURA-4851
 2018-01-31 14:58:44 +01:00