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

1750 commits

Author SHA1 Message Date
jack
8faa69795a Merge pull request #1039 from Ultimaker/not_supported_qualities 
Show the warning color for unsupported materials/qualities
 2016-10-12 17:35:05 +02:00
Jaime van Kessel
6e9acf77c0 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-12 17:27:01 +02:00
Ghostkeeper
fcb88f06ab
Fix typo in incompatibility warning message 
This is the actual fix that we couldn't do due to the string freeze.

Contributes to issue CURA-2626.
 2016-10-12 16:18:54 +02:00
Simon Edwards
c3cf762451 Show the warning color for unsupported materials/qualities by using the new 'supported' metadata flag. 
CURA-2271
 2016-10-12 15:57:50 +02:00
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
Jack Ha
aefa21c76b Moved functions to better place. CURA-2449 CURA-2589 2016-10-11 13:05:24 +02:00
fieldOfView
879ab529f2 Fix deleting grouped object using the context-menu 
CURA-2573
 2016-10-10 17:48:00 +02:00
Arjen Hiemstra
c6afb14a09 Return the empty container if there are no results when listing qualities 
Contributes to CURA-2271
 2016-10-10 13:34:45 +02:00
Arjen Hiemstra
68662561e8 Return empty quality instead of None in QualityManager::findQualityByQualityType 
Contributes to CURA-2271
 2016-10-10 13:23:43 +02:00
Jack Ha
83caa334a2 Also wait for lock file in saveSettings. CURA-2449 2016-10-10 09:09:31 +02:00
Jack Ha
fc0417bd45 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-09 11:54:48 +02:00
Jack Ha
8b0d6e974a Added lock file writing and checking. CURA-2449 2016-10-09 11:54:34 +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
2aa3e1e931 Fix documentation 
CURA-2248
 2016-10-06 15:41:20 +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
Jaime van Kessel
39623ba2b8 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-06 13:50:18 +02:00
Jaime van Kessel
fb24e55268 _getBasicMaterial now correctly filters on variants as well 
CURA-2248
 2016-10-06 13:49:43 +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
Jaime van Kessel
2b117c0450 Added printer type to output device 
CURA-2475
 2016-10-05 14:31:12 +02:00
Jaime van Kessel
448c8436dc Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-05 09:40:46 +02:00
Jaime van Kessel
ad80678bc2 Gracefully handle case if no material was found 
CURA-2494
 2016-10-05 09:40:16 +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
d4556ba4c5 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-10-04 14:06:06 +02:00
fieldOfView
ff12f999be Fixed error when duplicating protected profiles 
CURA-2478
 2016-10-04 14:05:55 +02:00
Jaime van Kessel
601fdf51fc Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-04 13:40:39 +02:00
Jaime van Kessel
bac0ea94a1 Removed nozzle offset from prime area 
CURA-2520
 2016-10-04 13:40:31 +02:00
fieldOfView
fc310f2732 Fix duplicating profiles 
CURA-2478
 2016-10-04 13:21:17 +02:00