GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 22:29:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,116 Commits 286 Branches 260 Tags
Commit Graph

79 Commits

Author SHA1 Message Date
Simon Edwards
807542cc1f Fixed a merge problem. 
CURA-3431 Not possible to export a profile
 2017-02-28 14:38:28 +01:00
Simon Edwards
18368f3ad4 Type hints and fixes for ContainerManager. 2017-02-26 21:07:08 +01:00
Jaime van Kessel
ab28cb4615 Fix import changes 
These broke the importing & exporting of profiles
 2017-02-22 17:06:28 +01:00
Simon Edwards
4fecf55b3b Use double quotes instead of singles. 2017-01-17 20:56:50 +01:00
Simon Edwards
fb70eb6813 Merge branch 'master' into python_type_hinting 2017-01-17 08:42:55 +01:00
Simon Edwards
a5181f157e Applied the profiler's pyqtSlot decorator to all of the code. 2017-01-10 13:35:39 +01:00
Simon Edwards
74e5798509 Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py. 
CURA-2917
 2016-12-12 16:05:35 +01:00
Simon Edwards
5884509af1 More type checking fixes after the merge. 
CURA-2917
 2016-11-22 11:51:18 +01:00
Simon Edwards
98a6568313 Merge branch 'master' into python_type_hinting 2016-11-22 11:15:04 +01:00
Simon Edwards
14afd9eab7 Heaps to changes to get the Cura code through the type checker (with minimal checking). 
CURA-2917
 2016-11-21 21:36:08 +01:00
Jaime van Kessel
2eb1c61033 Merge branch 'feature_drag_curaprofile' of github.com:Ultimaker/Cura 2016-11-04 14:31:58 +01:00
Jaime van Kessel
720f37b17f Quality changes can now only be removed if they are not in use anywere 
CURA-2846
 2016-11-04 10:02:13 +01:00
Jaime van Kessel
d897392eea Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-31 15:46:31 +01:00
Jaime van Kessel
41ed9661f6 FindQUalityByName now also uses fallback generic materials if no result was found 
CURA-2852
 2016-10-31 15:43:53 +01:00
Thomas Karl Pietrowski
aa92428c04 Cleanup: Remove debug print 2016-10-30 16:45:45 +01:00
Arjen Hiemstra
f952b45a62 Use the machine/extruder ID as base for duplicated profile ID 
Instead of using the ID of the duplicated container, which would cause
the profile ID to be the old ID with the new ID appended.

Fixes CURA-2782
 2016-10-24 13:38:22 +02:00
Jack Ha
a23a922eec Drag profile into Cura; added importProfile(s), exportProfile to ContainerManager. CURA-787 2016-10-20 13:55:39 +02:00
fieldOfView
081ca8ea8d Merge current quality_changes values into newly created profiles 
Creating a profile with a custom profile as the active profile would ignore the settings of that custom profile.

CURA-2565
 2016-10-06 14:47:35 +02:00
fieldOfView
6d0da0d754 Revert "global_profile" reference changes while refixing import 
CURA-2518 and CURA-2478
 2016-10-04 17:21:33 +02:00
fieldOfView
77370d8599 Fix error duplicating profiles 
CURA-2478
 2016-10-04 14:49:56 +02:00
fieldOfView
7b42f52be9 Properly use classmethod to make sure ContainerManager is a singleton 
CURA-2478
 2016-10-04 14:28:39 +02:00
fieldOfView
d47f3c482f Static methods cannot call class methods 2016-10-04 14:14:55 +02:00
fieldOfView
ff12f999be Fixed error when duplicating protected profiles 
CURA-2478
 2016-10-04 14:05:55 +02:00
fieldOfView
fc310f2732 Fix duplicating profiles 
CURA-2478
 2016-10-04 13:21:17 +02:00
fieldOfView
046d0b5956 Rename extruder quality changes files when renaming a custom profile 
CURA-2484
 2016-10-03 22:17:56 +02:00
fieldOfView
e1d70ed4b6 Fix selecting quality_changes profiles for extruders 
Now that containers in a quality_changes set don't share a common name, the quality_changes containers for extruders have a metadata entry "global_profile" pointing to the global quality_changes container id.

Contributes to CURA-2478 and CURA-2484
 2016-10-03 21:58:34 +02:00
fieldOfView
2f57d0fb6e Import profiles for the current machine 
Takes into consideration printers that use quality-profiles from other printers, while gracefully handling mismatches in the number of extruders

Fixes CURA-2500, contributes to CURA-2478
 2016-10-03 15:29:25 +02:00
Simon Edwards
8c8cd86a08 Quality changes didn't have the right extruder ID set in some situations. 
CURA-2414 Quality changes profiles are created incorrectly
 2016-09-29 20:54:09 +02:00
Jaime van Kessel
3d8336449f Fixed renaming of quality_changes 
CURA-2479
 2016-09-29 14:07:52 +02:00
Jaime van Kessel
02232f7ca6 Added loging if we could not find profile to rename 
CURA-2479
 2016-09-29 13:56:14 +02:00
Simon Edwards
fe41098f1f Duplicate and Remove profile were recently broken in the cross fire. Fixed again. 
Contributes to CURA-2320 Filtering Quality-Changes profiles on material?
 2016-09-28 10:57:26 +02:00
Jack Ha
4547cfe504 Introduced resolveOrValue which fixes resolvement with dependencies for the most part. CURA-2232 2016-09-26 10:37:44 +02:00
Simon Edwards
983e963dd3 Fix for deleting quality changes profiles. 
Contributes to CURA-2414 Quality changes profiles are created incorrectly
 2016-09-22 11:59:03 +02:00
Simon Edwards
8cbe410e34 Fix for creating profiles via the Create button. 
Contributes to CURA-2414 Quality changes profiles are created incorrectly
 2016-09-22 11:07:25 +02:00
Simon Edwards
46dd4f6093 Fix for duplicating quality changes profiles on the UM2. 
Contributes to CURA-2414 Quality changes profiles are created incorrectly
 2016-09-21 16:51:30 +02:00
Simon Edwards
90dedc354c * Make sure that quality changes are machine dependent but material independent. 
* Correctly handle machines which derived (subclasses) from other machines.
* Some refactoring and a lot more comments.

Contributes to CURA-2414 Quality changes profiles are created incorrectly
 2016-09-21 15:26:20 +02:00
Jaime van Kessel
d6e95d2734 Added error state for container state if serialization data is none 
CURA-2359
 2016-09-13 14:54:17 +02:00
Jaime van Kessel
570843bbb0 Filtering containers now also takes quality_definition into account 
CURA-1780
 2016-09-13 11:54:16 +02:00
Jaime van Kessel
44092f0b96 Printers with a quality_definition now also create quality changes using that definition 
CURA-1780
 2016-09-12 13:00:01 +02:00
Jaime van Kessel
9770037398 If setting is false, it will still return false (instead of empty string) 
CURA-2271
 2016-09-09 11:44:41 +02:00
Jaime van Kessel
e7335d9814 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-09 10:53:21 +02:00
Jaime van Kessel
d34f54a3c7 Right type is now returned if metadata entry is not found 
CURA-2242
 2016-09-09 10:29:16 +02:00
Jack Ha
2138a87582 Busy with CURA-2159 2016-09-08 17:37:49 +02:00
Jaime van Kessel
8a8b55800b Duplicating materialContainers should now duplicate all related material containers 
CURA-2242
 2016-09-08 14:15:00 +02:00
fieldOfView
a52bb1422b Suggest unique name when creating/duplicating profiles 
CURA-2161
 2016-09-06 17:46:11 +02:00
Jaime van Kessel
73b9a142d2 Auto generate name now works if base_name is empty string 
CURA-2220
 2016-09-02 11:42:14 +02:00
Simon Edwards
a2f478f2ad Fix for "Creating two profiles causes the names to become messed up" 
CURA-2220
 2016-09-01 13:49:29 +02:00
fieldOfView
f7f4aa7659 Activate another profile when the user cancel out of generating a new profile 
CURA-2220
 2016-08-30 16:26:21 +02:00
fieldOfView
b09e8bb1c9 Use active quality(-changes) name when creating a new profile 
CURA-2220
 2016-08-30 15:56:53 +02:00
Jack Ha
2ae998737f Added materialspage Display Name field and made it work. CURA-1969 2016-08-25 09:54:22 +02:00