GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 08:15:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,475 Commits 295 Branches 268 Tags
Commit Graph

21475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
c86f28cc9e
Ignore disabled extruders when checking for intent warning 
CURA-6601
 2019-10-04 10:33:13 +02:00
Jaime van Kessel
4793c77380
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-10-04 09:39:47 +02:00
Jaime van Kessel
f8951e4140
Add scrollbar to profile dropdown 
CURA-6843
 2019-10-04 09:39:26 +02:00
Ghostkeeper
38ae0e75f2
Fallback to fdmprinter if not has_machine_quality 
Contributes to issue CURA-6847.
 2019-10-03 16:25:09 +02:00
Lipu Fei
877bb1efdb Diable local printer ListView buffer to force redraw 
CURA-6793
 2019-10-03 15:56:00 +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
Lipu Fei
027768f151 Use machine def id as quality_definition fallback 
CURA-6847
 2019-10-03 12:56:22 +02:00
Lipu Fei
26b523f190 Fix quality profile menu size 
CURA-6838
 2019-10-03 12:37:11 +02:00
Lipu Fei
ba805b9da3 Fix QML errors 
CURA-6849
 2019-10-03 12:28:07 +02:00
Lipu Fei
2d59271a69 Remove hard-coded height 2019-10-03 12:28:07 +02:00
Jaime van Kessel
2059042e60
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-10-03 09:52:23 +02:00
Jaime van Kessel
1def289bb9
Fix crash when importing profile that has different quality_definition 
CURA-6847
 2019-10-03 09:51:45 +02:00
Lipu Fei
a93fd982dd Fix renaming custom profile 
CURA-6842
 2019-10-02 23:59:48 +02:00
Jaime van Kessel
fba7a6ff33
Fix importing profiles 
CURA-6847
 2019-10-02 17:01:21 +02:00
Jaime van Kessel
8beeac7fca
Make the radio button in the checkbar look consistent. 
The drake meme and CURA-6845 told me that it should look like that.
 2019-10-02 16:57:04 +02:00
Jaime van Kessel
ff3837bac5
Only show "Custom Profile" header if there are custom profiles 
CURA-6844
 2019-10-02 16:48:57 +02:00
Jaime van Kessel
c6850b4f73
Set right text color if menubutton is disbled 
CURA-6848
 2019-10-02 16:39:50 +02:00
Remco Burema
8f2caf362d Merge branch 'feature_intent' of https://github.com/Ultimaker/Cura into feature_intent 2019-10-02 16:12:14 +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
750632ec41 Merge remote-tracking branch 'origin/master' into feature_intent 2019-10-02 12:52:37 +02:00
Ian Paschal
2d03bc6bc3
Merge pull request #6461 from Ultimaker/CS-347_auto_switch_to_cloud 
Fix cloud connection auto fallback
 2019-10-02 11:45:58 +02:00
Ghostkeeper
2a4c387067
Add sideways move to not squash the primed amount onto the nozzle 
Provided by Psychonno and tested by MetalRobo in #6424.
 2019-10-02 11:44:24 +02:00
Jaime van Kessel
872d6365a9
Fix seam location if it's relative 2019-10-02 10:45:50 +02:00
Ghostkeeper
649ca99fe0
Only match on printer-specific materials, not variant-specific too 
If a submaterial doesn't exist for the current variant node but it does exist for a different variant node, then it would not be found in the variant-specific materials and then would be looked up in the printer-specific materials. It then depends on the order in which findInstanceContainersMetadata returns things for whether the actual printer-specific material is selected or a different variant-specific material is selected. No longer now, because the variant name is specified to be absent so it may not match on variant-specific profiles any more.
Maybe this even gives us a small performance gain when combining these dictionaries, since there are now like 80% fewer profiles in that query.

Contributes to issue CURA-6831.
 2019-10-02 08:55:13 +02:00
Ghostkeeper
0b610ccd58
Fix getting correct metadata entry for variant name 
Turns out that the material profiles deserialise the variant to the 'variant_name' metadata entry, not just 'variant'. This caused it to find no variant-specific material profiles at all anywhere. It would always fall back to the machine-specific names.

Contributes to issue CURA-6831.
 2019-10-02 08:55:12 +02:00
Ghostkeeper
c8be172343
Add debugging functionality to visualise the container tree 
Could be useful for later, don't you think?

Contributes to issue CURA-6831.
 2019-10-02 08:55:12 +02:00
Ghostkeeper
b245be6970
Remove has_machine_materials metadata 
It's not behaving as expected here. For instance, Ultimaker 3 wasn't specifying has_machine_materials and thus only the base materials would get loaded, but clearly the Ultimaker 3 has materials specialised for it.
Whether or not a printer has materials specialised for it is now determined by whether the specialisations exist in the material files. So we don't need the metadata entry any more. It seemed to have not been in use anyway, except by one printer which specified that has_machine_materials is true. I've now made it behave as if it's always true.

Contributes to issue CURA-6831.
 2019-10-02 08:55:04 +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
ChrisTerBeke
445743ab75
Use empty string as fallback value 2019-10-01 19:53:40 +02:00
ChrisTerBeke
76536fe715
Ensure string matching is done with strings 2019-10-01 19:52:40 +02:00
ChrisTerBeke
5f31551184
Fix checking for cases where machine creation failed 2019-10-01 19:41:02 +02:00
ChrisTerBeke
c3d846440d
Set some meta data before switching active stacks, fix manual added device pairing 2019-10-01 19:31:35 +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
296f8af59c Always clear ListModel so layer height selector will align properly 
CURA-6836
 2019-10-01 16:15:36 +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
55a5464ed3 Fix missing import 2019-10-01 11:41:17 +02:00
Lipu Fei
f867f3485e Fix TestIntentManager 2019-10-01 11:30:54 +02:00
Lipu Fei
bc524b2c14 Fix unit test due to QualityGroup parent changes 2019-10-01 11:26:10 +02:00
Lipu Fei
961e1e0d7e Fix material node update for empty_material 
CURA-6821
 2019-10-01 10:56:17 +02:00
Lipu Fei
df105bc822 Fix update material due to compatible material diameter change 
CURA-6821
 2019-10-01 10:40:16 +02:00
Lipu Fei
96a9bcccbb Merge remote-tracking branch 'origin/master' into feature_intent 2019-10-01 09:41:05 +02:00
Lipu Fei
609ceed140
Merge pull request #6426 from Ultimaker/CURA-6106_fix_interface_disappearing 
Warn when difference between X/Y distance and minimum X/Y distance is too big
 2019-10-01 09:40:05 +02:00
Ghostkeeper
ed9ec1d724
Align comment with the rest 
Looks nicer.
 2019-09-30 17:30:12 +02:00
Ghostkeeper
01b66ecaa0
Merge branch 'oorail/fix-jgaurora-z603s-end-print-problem' of https://github.com/oorail/Cura into oorail-oorail/fix-jgaurora-z603s-end-print-problem 2019-09-30 17:25:58 +02:00
oorail
d47ff60bf8 Optimized machine end gcode to move at F600 and in one command vs two 2019-09-30 09:51:44 -04:00