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
21,576 Commits 289 Branches 260 Tags
Commit Graph

865 Commits

Author SHA1 Message Date
Jaime van Kessel
bba43fafcc
Remove another unused signal 2019-10-11 14:35:44 +02:00
Jaime van Kessel
be675d9343
Remove unused signal 2019-10-11 14:33:08 +02:00
Jaime van Kessel
05a6c9c3cf
Make code a bit smarter about reusing ExtruderConfigurationModels 
This prevents a lot of unneeded signal noise
 2019-10-11 11:04:16 +02:00
Jaime van Kessel
ec4817db87
Fix crash when syncing with configuration that has no printcores active 
CURA-6826
 2019-10-10 09:55:17 +02:00
Lipu Fei
44cb810c85 If None crash 
CURA-6869
 2019-10-09 22:28:58 +02:00
Lipu Fei
e5b90ee306 Fix is_experimental flag update 
CURA-6869
 2019-10-09 12:52:49 +02:00
Jaime van Kessel
987ccd28ba
Merge branch 'feature_intent' of github.com:Ultimaker/Cura 2019-10-08 16:23:03 +02:00
Jaime van Kessel
11f9992ebb
Merge pull request #6473 from Ultimaker/CURA-6632_intent_in_stats 
CURA-6632 Add intent into stats
 2019-10-08 16:19:19 +02:00
Lipu Fei
fb368a4788 Remove MachineManager.activeVariantNames 
CURA-6865
 2019-10-08 15:16:27 +02:00
Ghostkeeper
44a59a7f3b
Fix typing 
Discovered during work on CURA-6793.
 2019-10-08 12:44:10 +02:00
Jaime van Kessel
58fec04650
Don't emit a globalcontainer changed signal when only the name changed 
Apart form it being way to agressive (and thus, slowing things down), it
also caused a re-slice to be done when a printer was connected with another printer.
 2019-10-08 10:53:58 +02:00
Lipu Fei
8940097265 Separate black and grey text for quality menu 
CURA-6846
 2019-10-07 21:35:31 +02:00
Lipu Fei
74e7de1b54 Add intent into stats 
CURA-6632
 2019-10-07 21:11:40 +02:00
Jaime van Kessel
cb526f0f31
Merge branch 'CURA-6706_intents_on_quality_mgr_page' of github.com:Ultimaker/Cura into feature_intent 2019-10-07 16:14:24 +02:00
Lipu Fei
757b02ec42 Simply and fix quality name generation 
CURA-6846
 2019-10-07 13:30:33 +02:00
Lipu Fei
c42feae11c Make intents work on quality management page 
CURA-6706
 2019-10-07 09:22:47 +02:00
Ghostkeeper
6c0772cd4a
Provide activeQualityGroupName instead of QualityGroup(QObject) 
We don't need to inherit from QObject if we expose the name elsewhere. This prevents having workarounds for C++ vs QML ownership, and also allows us to test this while mocking out CuraApplication.

Done during Turbo Testing and Tooling.
 2019-10-04 15:35:32 +02:00
Lipu Fei
c528000268 Add activeQualityDisplayName to remove code duplication 
CURA-6846
 2019-10-04 14:26:20 +02:00
Jaime van Kessel
e197fe99fa
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-10-04 10:33:57 +02:00
Jaime van Kessel
c86f28cc9e
Ignore disabled extruders when checking for intent warning 
CURA-6601
 2019-10-04 10:33:13 +02:00
Lipu Fei
61a1b61756 Remove unnecessary activeQualityName property 
CURA-6846
 2019-10-04 10:27:39 +02:00
Lipu Fei
bd84c4d98d Show quality and intent a custom profile is based on 
CURA-6846
 2019-10-03 14:18:51 +02:00
Remco Burema
784396424c Get old diameter from old material instead of new candidate. 
part of CURA-6821
 2019-10-02 15:46:01 +02:00
Lipu Fei
179fa325fc
Merge pull request #6458 from Ultimaker/CURA-6817_intent_fix_sync_config 
Fix synchronise configurations (intent branch).
 2019-10-02 08:53:53 +02:00
Lipu Fei
89c35cd03c Simplify code 
CURA-6817
 2019-10-02 08:53:00 +02:00
Lipu Fei
be33a9aa7e Fix updating current root material IDs 
CURA-6821
 2019-10-02 08:41:05 +02:00
Remco Burema
a1d90c17da Fix synchronize configurations (intent branch). 
- Approximate diameter needed to be a string.
 - GUID-tag is mostly in capitals.
 - Workaround for an overload of 'get' not being called (default parameter didn't work somehow?).
part of CURA-6817
 2019-10-01 16:46:11 +02:00
Lipu Fei
c030328b7f Fix intent profile selection 
CURA-6810
 2019-10-01 15:21:01 +02:00
Lipu Fei
ad7b58e460 Get diameter from material container 
CURA-6821
 2019-10-01 15:05:35 +02:00
Lipu Fei
aaca4bb9a1 Fix KeyError in root material ID check 
CURA-6827
 2019-10-01 11:58:54 +02:00
Lipu Fei
51c96aecde Fix for-loop in updateMaterialWithVariant 
CURA-6821
 2019-10-01 11:43:46 +02:00
Lipu Fei
df105bc822 Fix update material due to compatible material diameter change 
CURA-6821
 2019-10-01 10:40:16 +02:00
Jaime van Kessel
916bb5a32b
Select correct intent when quality_changes has an intent category 2019-09-30 12:55:10 +02:00
Ghostkeeper
f33937eb7b
Use extruderList instead of extruders 
The extruders attribute is deprecated.

Found during testing and tooling.
 2019-09-27 15:25:41 +02:00
Jaime van Kessel
f5639192ee
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-09-26 16:27:19 +02:00
Jaime van Kessel
b19e7cd027
Add warning icon when not all extruders have same intent 
CURA-6601
 2019-09-26 16:26:55 +02:00
Remco Burema
e452c640d4 Set empty intent if quality is empty. 
... instead of crashing.
Not _really_ part of a ticket, but I'm solving  this now because otherwise I can't even _reproduce_ the steps for the bug in CURA-6807
 2019-09-26 14:02:21 +02:00
Lipu Fei
9ced5e9205 Fix QObject segfaults in QML 
CURA-6599
 2019-09-25 14:38:38 +02:00
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +02:00
Jaime van Kessel
56c7fb9f7d
Merge branch 'CURA-6800_project_file_intent' of github.com:Ultimaker/Cura into feature_intent 2019-09-24 10:34:21 +02:00
Ghostkeeper
557746a832
Partial fix for intent manager not finding correct profile in test 
Only in test.
 2019-09-23 15:17:15 +02:00
Lipu Fei
ddab8e204a Add typing 
CURA-6800
 2019-09-23 11:43:50 +02:00
Jaime van Kessel
2b4144386f
Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_container_tree 2019-09-19 14:56:12 +02:00
Jaime van Kessel
3e474c1107
Ensure that enabling & disabling an extruder gets handled correctly 
CURA-6775
 2019-09-19 14:54:58 +02:00
Lipu Fei
a3263da3f4
Merge pull request #6338 from Ultimaker/feature_intent_upgrade 
Feature intent upgrade
 2019-09-19 14:44:52 +02:00
Lipu Fei
6e625b2cf8 Fix typing 2019-09-19 14:34:52 +02:00
Jaime van Kessel
3730ea247d
Ensure that intent gets updated when changing quality / material 
CURA-6775
 2019-09-19 14:26:18 +02:00
Jaime van Kessel
c76c183c6b
Remove unused code 2019-09-19 13:45:13 +02:00
Jaime van Kessel
884a3ea819
Fix selection for intents if only one of the extruders has an intent 
CURA-6598
 2019-09-19 09:54:47 +02:00
Jaime van Kessel
49276db073
Fix display of intent in profile selection 
CURA-6598
 2019-09-19 09:39:52 +02:00