GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-09 02:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,356 Commits 290 Branches 260 Tags
Commit Graph

2372 Commits

Author SHA1 Message Date
Jaime van Kessel
ddd4a46e76 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-19 12:42:21 +02:00
Jaime van Kessel
75c788c31a Moved check for top container setting function up in the code 
Should improve performance a bit. CURA-2361
 2016-09-19 12:40:05 +02:00
Jaime van Kessel
642b6b1ca3 Updated documentation 
CURA-2361
 2016-09-19 12:37:13 +02:00
Ghostkeeper
fd181ca0c3
Fix display of extruder values for enums 
It wasn't always a list of ints. For enums, it's a list of strings. We have several other types. Just use variant.

Contributes to issue CURA-2232.
 2016-09-16 15:56:22 +02:00
Jaime van Kessel
482ea83284 Hiding a setting forces settingInheritance manager to re-evaluate 
CURA-2361
 2016-09-16 15:32:16 +02:00
Jaime van Kessel
6d2520ffbb _settingIsOverwritingInheritance now also checks if there is a non setting value before it 
CURA-2361
 2016-09-16 14:25:44 +02:00
Jaime van Kessel
4f547fff8d Category setting icon now becomes invible if clicked 
CURA-2361
 2016-09-16 13:58:26 +02:00
Jaime van Kessel
132ed1d258 Pressing inheritance button for category now makes all inherited children visible 
CURA-2361
 2016-09-16 13:10:14 +02:00
Jaime van Kessel
7793cb16d1 Updated documentation 
CURA-2361
 2016-09-16 12:49:15 +02:00
Jaime van Kessel
615ec67b1b Enabled property is now taken into account for inheritance override 
CURA-2361
 2016-09-16 11:49:23 +02:00
Jaime van Kessel
9a7057ce65 Use recursive check to add categories to list 
CURA-2361
 2016-09-16 11:45:57 +02:00
Jaime van Kessel
b43a5a7e31 Change order of initialisation, so we don't overwrite list with empty data 
CURA-2361
 2016-09-16 11:28:12 +02:00
Jaime van Kessel
e282e35b9c Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-16 11:19:19 +02:00
Jaime van Kessel
5d84490d70 SettingInheritance manager now has a complete list of all settings that have inheritance overridden 
CURA-2361
 2016-09-16 11:18:20 +02:00
Jaime van Kessel
50f7c41ae4 Added SettingsInheritanceManager 
CURA-2361
 2016-09-16 09:38:52 +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
fieldOfView
ab50ac0d89 Don't show possibly incorrect materials in print monitor 2016-09-14 13:59:00 +02:00
Jaime van Kessel
02c1a8d069 Fixed wrong indenting 2016-09-14 12:52:15 +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
4088cc0f7e Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-13 11:54:48 +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
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
8f65ed4c4e 0 is now seen as a correct value by QualitySettingsModel 
CURA-2293
 2016-09-12 15:36:57 +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
2441275f29 Added message when incompatbile material is selected 
CURA-2271
 2016-09-09 12:57:50 +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
fieldOfView
40ae75f54f Merge branch '2.3' of https://github.com/Ultimaker/Cura into 2.3 2016-09-08 18:50:53 +02:00
fieldOfView
8b7a8327e8 Allow machinedefinitions to specify another definition to inherit qualities from 
CURA-1780
 2016-09-08 18:49:34 +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
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
73b9a142d2 Auto generate name now works if base_name is empty string 
CURA-2220
 2016-09-02 11:42:14 +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
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
Jaime van Kessel
6ff258d7e0 Single extrusion machines now show correct values for profiles in tab 
CURA-2214
 2016-08-31 14:52:41 +02:00
Jaime van Kessel
2c8b9290f8 Made checking if inheritance is allowed more explicit 
CURA-2108
 2016-08-31 11:41:33 +02:00
fieldOfView
82f6f20bc1 Restore profiles overview for single extrusion printers 
CURA-2214
 2016-08-30 16:42:41 +02:00
fieldOfView
5cd3cfca45 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-30 16:26:33 +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
Jaime van Kessel
fbbbdb61e3 Merge branch 'feature_material_inheritance' of github.com:Ultimaker/Cura 2016-08-30 16:05:10 +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
fieldOfView
b09e8bb1c9 Use active quality(-changes) name when creating a new profile 
CURA-2220
 2016-08-30 15:56:53 +02:00
Jaime van Kessel
0a811b2164 Added more logging to changing of containers 
CURA-2108
 2016-08-30 15:42:37 +02:00