GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 03:38:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,983 Commits 295 Branches 268 Tags
Commit Graph

2164 Commits

Author SHA1 Message Date
Remco Burema
f03c239041 Update some documentation. [CURA-6091] 2019-06-20 17:57:15 +02:00
Remco Burema
d076bfae77 Merge branch 'feature_intent_per_quality' of https://github.com/Ultimaker/Cura into feature_intent_per_quality 2019-06-20 17:49:41 +02:00
Remco Burema
fd80a6c1b6 Change some leftover pseudo-code to real code. 
Part of CURA-6091.
 2019-06-20 17:48:52 +02:00
Ghostkeeper
ede6efb799
Missing documentation 
Contributes to issue CURA-6091.
 2019-06-20 16:09:56 +02:00
Ghostkeeper
96c111553a
Implement selectDefaultIntent 
Bit of a weird one.

Contributes to issue CURA-6091.
 2019-06-20 15:30:57 +02:00
Ghostkeeper
aa0bf2f6ba
Implement selectIntent 
Selects a certain intent profile, applying it to the stack.

Contributes to issue CURA-6091.
 2019-06-20 15:27:07 +02:00
Ghostkeeper
744fbec38c
Implement defaultIntent 
We keep this function in as a way of documentation.

Contributes to issue CURA-6091.
 2019-06-20 15:12:53 +02:00
Ghostkeeper
2b775497b5
Implement complete code for currentAvailableIntentCategories 
There is an inconsistency here with the available quality types. It's documented in the function for now.

Contributes to issue CURA-6091.
 2019-06-20 15:06:24 +02:00
Ghostkeeper
28e2569c86
Implement complete code for currentAvailableIntents 
Slightly more complex than the original pseudocode was indicating: It needs to filter on the available quality types first in order to only show the quality types that can be printed with all extruders, but still show the union of all intents for those quality types.

Contributes to issue CURA-6091.
 2019-06-20 14:48:18 +02:00
Ghostkeeper
c83b9d158b
Final implementation of intentMetadatas and intentCategories 
Instead of pseudocode.

Contributes to issue CURA-6091.
 2019-06-20 14:02:34 +02:00
Ghostkeeper
64e3a99ad3
Also select correct quality level on the stack when changing intent 
Contributes to issue CURA-6091.
 2019-06-19 16:52:54 +02:00
Ghostkeeper
fa65875824
Add psuedocode/boilerplate for intent manager 
This won't run. Don't try to import this class yet. It's outlining what we need to implement to get intents per stack.

It does no form of caching at this point. Build first, optimise later, right.

Contributes to issue CURA-6091.
 2019-06-19 14:29:19 +02:00
Ghostkeeper
5ab1881a21
Merge branch 'master' into feature_intent 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> There is a new version upgrade in master, so the old one is sort of obsolete. We may have to move this part to a new version upgrade for 4.3.
	plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py
 2019-06-19 13:10:36 +02:00
Ghostkeeper
7fbdccffdb
Add typing 2019-06-18 12:00:22 +02:00
Ghostkeeper
02b0242807
Fix translatability of caution message 
Never put the formatting within the i18nc call. Always put the formatted string inside, but the formatting call outside of the function, like this:

    catalog.i18nc('@info', 'I am {age} years old.').format(age = my_age)

Otherwise, when looking up the translation for the string, it's going to try to look up the translation for the formatted string (with the age already filled in). It won't be able to find that because this sentence was not translated for all possible ages of a human.
In this case I can make it even easier on the translator because the list must always follow after the text.
 2019-06-14 11:00:52 +02:00
Jaime van Kessel
a98f88e6a3 Also move _getMachineTypeNameFromId to DiscoveredPrintersModel 
As this is only used by that model, there is no point in keeping it in the machine manager
 2019-06-07 15:04:19 +02:00
Jaime van Kessel
5eee3fc368 Move hasHumanReadableMachienTypeName to discovered printers 2019-06-07 15:01:30 +02:00
Jaime van Kessel
05a5f66856 Added few more deprecation warnings for functions that bloat the machine manager 2019-06-07 14:57:32 +02:00
Jaime van Kessel
1759e01b27 Make _geSettingFromAllExtruders use zip 
This is a bit cleaner to use
 2019-06-07 13:40:41 +02:00
Remco Burema
6f928ad97c Merge branch 'master' into feature_intent 2019-06-07 10:39:52 +02:00
Jaime van Kessel
35ec70a3cf Add a selector for the intent profile 
CURA-6534
 2019-06-05 11:13:32 +02:00
Ghostkeeper
228fb62e60
Handle functions in user or user-changes profiles 
Normally the user hasn't got any of these unless he selected a setting to be copied for all extruders.
 2019-06-03 14:15:40 +02:00
Jaime van Kessel
7cc4ac741c Add version upgrade that adds empty intent profile to the stacks 
CURA-6534
 2019-06-03 11:49:03 +02:00
Jaime van Kessel
a595feb24e Increase the version of the CuraContainer stack 
Since we added a new layer to it, it's version is one level higher (*DING*)

CURA-6534
 2019-06-03 11:10:20 +02:00
Jaime van Kessel
2e71ce2710 Added intent to the CuraContainerStack 
CURA-6534
 2019-06-03 10:52:19 +02:00
Jaime van Kessel
14d5fa5529 Add a bunch of tests for importing profiles 2019-05-31 13:59:54 +02:00
Jaime van Kessel
43360aace0 Add tests for ExportQualityProfile 2019-05-31 13:07:03 +02:00
Cherubim
63cd3a52ce
Don't reset all invisible settings 
Why would you need to reset all invisible settings? It shouldn't matter whether a setting is visible or not.
This is causing bugs because the settings that are being reset are not necessarily extruder-type settings (as that is checked below). They are being reset to the value self._default_extruder, which is not always a valid setting value.

Fixes #4274.
 2019-05-28 15:08:03 +02:00
Jaime van Kessel
76163636a1 Fix the simple create machine test 2019-05-24 16:36:39 +02:00
Lipu Fei
7c6c00df84 Merge remote-tracking branch 'origin/4.1' 2019-05-24 10:50:43 +02:00
Lipu Fei
27d6b9b53b Calculate bounding box for helper meshes 2019-05-24 10:49:35 +02:00
Lipu Fei
288770b991 Fix merge conflicts 2019-05-23 11:37:51 +02:00
Lipu Fei
fb33497ff1 Fix auto-slice for per-object settings 
CURA-6539
 2019-05-23 11:36:55 +02:00
Jaime van Kessel
c1818bcfbe Add test for CuraStackBuilder 2019-05-20 08:57:58 +02:00
Jaime van Kessel
314a6495c4 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-16 16:40:10 +02:00
Jaime van Kessel
915e0e2047 Only add extrudernr to used extruders if it actually exists 
This can cause issues when a profile got messed up (especially when using profiles between different custom machines)
 2019-05-16 15:41:52 +02:00
Jaime van Kessel
843bb6f5a3 Change some of the logging messages to info 
CURA-6525
 2019-05-15 17:25:31 +02:00
Lipu Fei
0023f5a45d Merge remote-tracking branch 'origin/4.1' 2019-05-07 14:32:03 +02:00
Lipu Fei
5e43e723e7 Fix activeMaterialsCompatible() 
CURA-6511

Looks like a merge conflict
 2019-05-07 14:28:13 +02:00
Diego Prado Gesto
5fffa200f7 Make the "Not supported" profile label translatable 
Contributes to CURA-6502.
 2019-05-07 12:04:19 +02:00
Jaime van Kessel
979b29400a Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-03 14:12:07 +02:00
Jaime van Kessel
e363f1af94 Remove hardcoded references to Ultimaker machines in QML 
We shouldn't hardocode machines in QML in any case. It also created issues
for other monitor / connection flows.
 2019-05-03 14:10:21 +02:00
Jaime van Kessel
5a25f8e050 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-05-03 13:19:34 +02:00
Jaime van Kessel
2e90078ec7 Fix incorrect deprecation message 2019-05-03 13:19:17 +02:00
Lipu Fei
2601e485da Merge remote-tracking branch 'origin/4.1' 2019-05-03 10:47:16 +02:00
Lipu Fei
0cc00efa79 Add doc for group_id 
CURA-6483
 2019-04-30 12:53:47 +02:00
Lipu Fei
d18c11a2c1 Fix filtering in switchPrinterType() 
CURA-6483
 2019-04-30 12:46:35 +02:00
Jaime van Kessel
6fbbed9c06 Merge branch '4.1' of github.com:Ultimaker/Cura 2019-04-30 10:51:33 +02:00
Lipu Fei
bed13bf42b Cleanup and make sure that group_name is set 2019-04-29 15:53:08 +02:00
Lipu Fei
d16da3da3a Add group_id and fix remove printer 
CURA-6483

 - Added a unique group_id (a GUID) to all created GlobalStack.
 - Changed version upgrade to generate unique group_ids for
   GlobalStacks.
 - RemoveMachine() now uses group_ids to remove hidden GlobalStacks.
 2019-04-29 15:53:08 +02:00