GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-28 23:04:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,636 Commits 287 Branches 260 Tags
Commit Graph

1866 Commits

Author SHA1 Message Date
Ghostkeeper
2f917c2841
Change definition ID upon reading profile 
Implements CURA-6713.
 2019-09-03 15:38:41 +02:00
Ghostkeeper
c41af1b9a0
Remove user-visible XML tags 
These XML tags are outside of the i18n call and are therefore not removed by gettext. They should not be present there.
 2019-09-03 14:00:09 +02:00
Lipu Fei
69e9dc1313 Allow importing "not supported" profiles 
CURA-6542
 2019-08-27 09:08:19 +02:00
Jaime van Kessel
108b22932b Override saveDirtyContainers with Cura specific logic 2019-08-26 14:55:30 +02:00
Ghostkeeper
648999e32b
Use regex literal instead of normal literal for regex 
Hopefully this fixes the deprecation warning in newer Python versions.

Contributes to issue #6114.
 2019-08-08 09:46:21 +02:00
ChrisTerBeke
b2719af0e3 Merge branch 'master' into CS-234_network_plugin_code_quality 2019-08-02 15:30:04 +02:00
Jaime van Kessel
5f692f3028 Added missing typing 2019-08-02 15:16:29 +02:00
ChrisTerBeke
92d07ddb71 Merge branch 'master' into CS-234_network_plugin_code_quality 2019-08-02 12:44:56 +02:00
Lipu Fei
c841382bbd Add more info in exceptions 2019-08-02 11:12:16 +02:00
ChrisTerBeke
1aa70748af Consistent naming, some bug fixes 2019-07-29 17:24:10 +02:00
Jaime van Kessel
e0c2611a0a Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-26 12:47:13 +02:00
Jaime van Kessel
a3dad0fa09 Fix issue with deprecation and pyqtSlot 2019-07-26 10:55:55 +02:00
Ghostkeeper
be4e754984
Remove cache of material manager 
It doesn't make the code much simpler because the cache is also not a local variable.

Contributes to issue CURA-6679.
 2019-07-24 16:04:40 +02:00
Jaime van Kessel
d8ddcba091 Fix typing ignore for breath frist iterator 2019-07-23 13:40:40 +02:00
Jaime van Kessel
9ceb9ce18b Fix typing issues 
They were caused by upgrading to a higher mypy version, which found more mistakes
 2019-07-23 12:58:46 +02:00
Jaime van Kessel
1c93dffc22 Added deprecation warning to getExtruderName 2019-07-19 13:36:53 +02:00
Jaime van Kessel
a436d5e0bf Added missing cast to getMachine 2019-07-19 12:43:17 +02:00
Remco Burema
fea8262656 Listen to 'material-changed' since it doesn't update immediately. 
part of CURA-6590
 2019-07-03 16:14:08 +02:00
Jaime van Kessel
a7d419f497 Fix deprecation decorator breaking the getExtruder function 2019-07-01 11:18:54 +02:00
Jaime van Kessel
f329d7aed9 Made typing hint a bit more specific 2019-06-28 15:08:46 +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
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
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