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

616 commits

Author SHA1 Message Date
Jack Ha
371bdb8df1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-12 13:58:19 +02:00
Jack Ha
3f6877d2ec Keep per object extruder when switching machines. CURA-2533 2016-10-12 13:58:09 +02:00
Jaime van Kessel
67a02ee90e ActiveQualityType and activeQualityChangesId now use activeContainer 
CURA-2624
 2016-10-12 13:48:08 +02:00
Simon Edwards
df922f5382 Merge branch 'fix_unsupported_materials_warning' into 2.3 2016-10-12 13:15:06 +02:00
Jaime van Kessel
5e4c99f7e0 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-12 12:00:37 +02:00
Jaime van Kessel
f60146ad26 Active quality ID is selected from active stack instead of global 
CURA-2624
 2016-10-12 11:59:54 +02:00
Ghostkeeper
d9b428e6c8
Get material IDs from correct definition id if quality_definition 
For printers with a quality_definition, such as UM2E+, the material ID needs to be taken for the definition ID specified in the quality_definition metadata field. The self.activeQualityDefinitionId takes care of that, even though it is named wrong (as it applies to materials as well as quality profiles).

Contributes to issue CURA-2600.
 2016-10-12 11:42:07 +02:00
Simon Edwards
ef3e8dc4fa Make sure that the activeQualityChanged signal is emitted when the _active_container_stack changes. 
CURA-2271
 2016-10-12 11:31:18 +02:00
fieldOfView
34630fa646 Also show the "unsupported" warning when a custom profile is selected 
...by making sure we're looking at the quality container (not quality_changes) of the active extruder/stack

CURA-2271
 2016-10-11 16:36:32 +02:00
fieldOfView
e312530840 Fix errors on profiles page for unsupported material combinations 
CURA-2271
 2016-10-11 15:07:27 +02:00
fieldOfView
f2e054b449 Fix the active quality id 
activeQualityId and activeQualityName were not referencing the same profile. activeMaterialName seems to have the correct one.

CURA-2271
 2016-10-11 14:27:02 +02:00
fieldOfView
16d5633b74 Fix "unsupported" warning on UM2+ 0.25 and 0.8 variants 
Contributes to 2271, fixes 2616
 2016-10-11 14:21:40 +02:00
fieldOfView
fd5b512554 Hide incompatible material message when a compatible material is chosen 
CURA-2271
 2016-10-08 11:54:44 +02:00
Jaime van Kessel
dbea06689f Extruder manager now uses right definition for material selection 2016-10-07 17:42:56 +02:00
fieldOfView
0201f50523 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-10-06 17:28:39 +02:00
fieldOfView
71c22e8369 Ensure profiles are always exported in order (global, ex. 0, ex. 1, ...) 
The order is important because the importer expects this order.

CURA-2478
 2016-10-06 17:28:33 +02:00
Arjen Hiemstra
c550dd5072 Use the active container stack for determining activeQualityVariantId 
Contributes to CURA-2271
 2016-10-06 16:41:51 +02:00
fieldOfView
593687afee Fix display of custom profiles for printers that have no materials (UM2) 
CURA-2565
 2016-10-06 15:20:16 +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
Jack Ha
1fe574b351 Details of profile changes now shows changes in all stacks. CURA-2558 2016-10-06 11:49:50 +02:00
Simon Edwards
e4f60ccc34 Merge pull request #1027 from Ultimaker/profiles_revert_global_profile 
Revert "global_profile" reference changes while refixing import
 2016-10-06 11:05:05 +02:00
Simon Edwards
963fac7806 Filter the list of quality changes taking into account the quality(-type) profile they depend on. 
Contributes to CURA-2248 Duplicated profile not shown in the profile manager list
 2016-10-05 09:32:18 +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
Jack Ha
e66548099a Fixed signal routing when switching between different machines. CURA-2232 2016-10-04 15:25:22 +02:00
fieldOfView
85d1fa8a39 Fix error on profiles page when there is no active machine 2016-10-04 14:51:04 +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
10dc8f98b8 Highlight quality_changes values in manage profiles tabs... 
and strike out values that are overridden by a user value

CURA-2514
 2016-10-04 13:14:04 +02:00
fieldOfView
556431b984 Fix error when no machine is selected 2016-10-03 22:40:28 +02:00
fieldOfView
f55c35df6e Load extruder profiles into the correct extruder 
CURA-2478
 2016-10-03 22:40:05 +02:00
fieldOfView
144dcb5a65 Slightly more defensive programming in case of extruder mismatch 2016-10-03 22:18:38 +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
e7da471199 Fix showing profile values for extruders 
The profiles page would show the setting values in the quality profile, ignoring the quality_changes profile, because it could not find the appropriate quality_changes profile for the extruders

CURA-2478
 2016-10-03 17:04:46 +02:00
Jaime van Kessel
0e74b8eb08 setActiveMaterial now uses id instead of entire container to set quality 
CURA-2494
 2016-10-03 15:58:05 +02:00
Jaime van Kessel
527a503eac Added more logging to indicate changing of certain containers actually succeeded 2016-10-03 15:54:18 +02:00
Jaime van Kessel
18ba42122d Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-03 15:44:20 +02:00
Jaime van Kessel
7d9d751121 ProfilesModel is now updated when active variant or material is changed 
Contributes to CURA-2494
 2016-10-03 15:43:42 +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
5d1b77c551 Rename ProfilesPageModel.py to QualityAndUserProfilesModel.py. Step 2 of 2. 
Contributes to CURA-2414 Quality changes profiles are created incorrectly
 2016-10-03 15:19:32 +02:00
Simon Edwards
a0f345285d Rename ProfilesPageModel.py to QualityAndUserProfilesModel.py. Step 1 of 2. 
Contributes to CURA-2414 Quality changes profiles are created incorrectly
 2016-10-03 15:19:32 +02:00
Jaime van Kessel
513c05b78c Extruders model now listens to global container changed, instead of definition changed. 
This solves issue where switching between machines with the same definition did not cause extruder materials to be updated

CURA-2493
 2016-10-03 15:03:25 +02:00
fieldOfView
3c30275201 Import profiles as quality_changes profiles 
CURA-2478
 2016-10-03 11:52:28 +02:00
Ghostkeeper
257aff7c00
Fix license reference 
This file belongs to Cura.

Contributes to issue CURA-2248.
 2016-09-30 11:43:33 +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
Simon Edwards
cd45ef496b Handle materials which don't have any quality profiles of their own. Moved the quality_type computation code into the QualityManager. 
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
 2016-09-29 16:39:30 +02:00
fieldOfView
3982dc2046 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-29 16:05:32 +02:00