GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 07:44:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,723 Commits 289 Branches 260 Tags
Commit Graph

715 Commits

Author SHA1 Message Date
Ghostkeeper
6c3b4b7f29
Prevent race condition before global container stack is made 
Just properly check if there is a global container stack.
 2016-10-26 09:50:42 +02:00
Arjen Hiemstra
aed23ca17e Merge branch '2.3' 
* 2.3:
  Expand logic for showing the inherit button in SettingItem
  Add a method to get overrides for a specified (extruder)stack
  Add global profiles for UM3 so this can be tested without dependencies
  Account for empty material when switching quality changes
  Set the global variant and material to empty for multi-extrusion machines
  Also properly set global profile when changing quality_changes profiles
  Add support for global quality profiles
 2016-10-24 17:10:41 +02:00
Jaime van Kessel
53f360ca1c Merge branch 'global_quality_profiles' of github.com:Ultimaker/Cura into 2.3 2016-10-24 14:23:50 +02:00
fieldOfView
df78bc47af Fix "critical" error when starting with no active machine 2016-10-24 11:01:14 +02:00
Arjen Hiemstra
2c2bf7823f Account for empty material when switching quality changes 
Contributes to CURA-2652
 2016-10-24 10:57:18 +02:00
Arjen Hiemstra
78ac4ef999 Set the global variant and material to empty for multi-extrusion machines 
For multi-extrusion machines, we do not want variant or material
profiles in the stack, because these are extruder specific and may cause
wrong values to be used for extruders that did not specify a value in
the extruder.

Contributes to CURA-2652
 2016-10-24 10:57:18 +02:00
Arjen Hiemstra
e1dafc8288 Also properly set global profile when changing quality_changes profiles 
Contributes to CURA-2652
 2016-10-24 10:57:18 +02:00
Arjen Hiemstra
e82b2c0f80 Add support for global quality profiles 
Instead of using one of the extruder profiles as global quality, use
proper global qualities.

Contributes to CURA-2646
 2016-10-24 10:57:18 +02:00
fieldOfView
5ce237502c Fix "critical" error when starting with no active machine 2016-10-23 11:25:26 +02:00
Tim Kuipers
86d682daae Merge branch '2.3' 2016-10-21 16:20:52 +02:00
Ghostkeeper
e02284b1f0
Expose determineQualityAndQualityChangesForQualityType 
It is needed to get the quality belonging to a certain quality changes ID that is not on the global stack. We already had this function that does just that.

Contributes to issue CURA-2737.
 2016-10-21 13:11:08 +02:00
Ghostkeeper
16491d8d23
Robustly get layer height even if quality has none 
If the quality profile doesn't define a layer height (which it currently always has) then this should still get the proper layer height. It proceeds properly down the stack now.

Contributes to issue CURA-2737.
 2016-10-21 11:51:10 +02:00
Ghostkeeper
021023a932
Add property to get the current profile's layer height 
This will then be displayed in the profile selection menu.

Contributes to issue CURA-2723.
 2016-10-20 17:14:45 +02:00
Jack Ha
d308cd45bc Moved function out of MachineManager, changed "Valid" to "HaveErrors". 
CURA-2730
 2016-10-20 16:16:33 +02:00
Jack Ha
98688bf013 Changed MachineManager.isActiveStackValid to MachineManager.areStacksValid. CURA-2730 2016-10-19 15:46:22 +02:00
Jaime van Kessel
9c73c248ed Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-16 16:14:47 +02:00
Jaime van Kessel
cda8fd5827 Revert buttons now work for single extrusion machines again 2016-10-16 16:14:05 +02:00
Jaime van Kessel
87fc0db543 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-16 13:16:21 +02:00
Jaime van Kessel
ff24def63c Use globalProfileId to check if we need to show changed settings 
CURA-2690
 2016-10-15 17:05:55 +02:00
Simon Edwards
e2a66b33e0 Merge branch '2.3' 2016-10-13 14:54:13 +02:00
Simon Edwards
8b487130d2 Take 'linked' settings into account when reverting. 
CURA-2640 Restore to default not per extruder
 2016-10-13 14:33:29 +02:00
Simon Edwards
79a62ec45f Only reset the setting for the currently selected extruder. 
CURA-2640 Restore to default not per extruder
 2016-10-13 13:48:15 +02:00
fieldOfView
c9ee7afcb8 Remove superfluous if statement 
CURA-2600
 2016-10-13 11:31:07 +02:00
Simon Edwards
8b75dd5f97 Merge branch '2.3' 2016-10-13 10:59:32 +02:00
Jaime van Kessel
c0654c56a0 Variants are now taken into account when auto updating material 
CURA-2600
 2016-10-12 19:04:18 +02:00
Jaime van Kessel
939ed60808 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-12 17:50:12 +02:00
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
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