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
12,804 Commits 288 Branches 260 Tags
Commit Graph

387 Commits

Author SHA1 Message Date
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
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
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
Arjen Hiemstra
c550dd5072 Use the active container stack for determining activeQualityVariantId 
Contributes to CURA-2271
 2016-10-06 16:41:51 +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
fieldOfView
556431b984 Fix error when no machine is selected 2016-10-03 22:40:28 +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
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
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
Jack Ha
8934555bd6 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-29 14:09:54 +02:00
Jack Ha
03c66e6e62 use resolveOrValue for adhesion_type. contributes to CURA-2232 2016-09-29 14:09:19 +02:00
fieldOfView
040f49e474 Fix cases where there is no "normal" quality 
CURA-2494
 2016-09-29 13:48:23 +02:00
Simon Edwards
bfa92b6b40 Correctly update the selected quality and quality changes after changing material. 
Contributes to CURA-2451 Changing material does not update quality profile to correct profile
 2016-09-27 17:09:04 +02:00
Simon Edwards
c902fef372 Removed a dead line. 
Contributes to CURA-2320 Filtering Quality-Changes profiles on material?
 2016-09-27 14:16:25 +02:00
Simon Edwards
4bb6ddaf28 Correctly update the quality profiles in the extruders when changing quality changes, taking the different materials into account. 
Contributes to CURA-2320 Filtering Quality-Changes profiles on material?
 2016-09-27 14:11:19 +02:00
Jaime van Kessel
960a390350 Ensure that the correct properties get set for writing profiles to g-code 
CURA-2462
 2016-09-27 14:05:56 +02:00
Jaime van Kessel
9e47a87375 If no quality container can be found, use empty instead 
CURA-2462
 2016-09-27 13:26:44 +02:00
fieldOfView
3d7680a983 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-26 10:58:57 +02:00
fieldOfView
3d61b7fb75 Prevent signal storm when changing a property 
Contributes to CURA-2429
 2016-09-26 10:58:15 +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
Jaime van Kessel
51dee95c8f Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-21 16:37:39 +02:00
Jaime van Kessel
92389365b6 If a machine inherits qualities, it tries to select the correct variant ID's as well 
CURA-2424
 2016-09-21 16:36:45 +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
Jack Ha
2b4377b509 Fixed update resolvements by moving signal emits. CURA-2232 2016-09-20 14:03:55 +02:00
Jaime van Kessel
aac395cb79 Settings that are not settable per extruder but used by settings who are are now also copied 
CURA-2409
 2016-09-19 13:01:31 +02:00
Jack Ha
692eb42aa7 When switching nozzle or material, drop mismatching quality changes. CURA-2248 2016-09-15 17:05:14 +02:00
fieldOfView
151fcfdda6 Update method order for readability 2016-09-14 15:15:54 +02:00
Simon Edwards
8086646de1 When reverting a user setting be sure to delete it from all of the stacks, global and extruder. 
Contributes to CURA-2232 No resolvement strategy for prime_tower_enable and platform adhesion
 2016-09-13 11:33:33 +02:00
Jaime van Kessel
2441275f29 Added message when incompatbile material is selected 
CURA-2271
 2016-09-09 12:57:50 +02:00
fieldOfView
8b7a8327e8 Allow machinedefinitions to specify another definition to inherit qualities from 
CURA-1780
 2016-09-08 18:49:34 +02:00
fieldOfView
46acc4d351 Update wording 
CURA-2236
 2016-09-06 08:32:51 +02:00
Jaime van Kessel
3227507297 An empty quality container will now give a "not supported" warning 
CURA-2236
 2016-09-05 13:31:36 +02:00
Jaime van Kessel
51d653beba Added logging if material container was not found 
CURA-2236
 2016-09-05 12:40:38 +02:00
Jaime van Kessel
67636d6f3c _updateMaterial container now correctly returns generic material 
CURA-2236
 2016-09-05 12:01:05 +02:00
Jaime van Kessel
3df1eb00da Added some extra checks when changing quality profiles 
Contributes to ultimaker/cura#960
 2016-09-02 10:56:27 +02:00
Jaime van Kessel
2c8b9290f8 Made checking if inheritance is allowed more explicit 
CURA-2108
 2016-08-31 11:41:33 +02:00
Jaime van Kessel
dcbf7b5a35 When unable to find quality for material, we also use inherited files (if any) to resolve it 
CURA-2108
 2016-08-30 16:01:21 +02:00
Jaime van Kessel
0a811b2164 Added more logging to changing of containers 
CURA-2108
 2016-08-30 15:42:37 +02:00
Jaime van Kessel
4c61c66a4b Changing profiles now also forces defocus of setting fields 
CURA-2180
 2016-08-30 11:02:33 +02:00