GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 22:29:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
35,073 Commits 286 Branches 260 Tags
Commit Graph

301 Commits

Author SHA1 Message Date
Ghostkeeper
b60b13e5bf
Use container tree to check for variants when serialising 
Not the variant manager, because it's deprecated.

Contributes to issue CURA-6600.
 2019-08-27 15:47:41 +02:00
Jaime van Kessel
2417705dfd Prevent crashes when duplicating a material 
CURA-6600
 2019-08-19 11:42:52 +02:00
Remco Burema
7fb9642e45 Replace deprecated .getContainer() calls with .container 
part of CURA-6600
 2019-08-15 13:40:08 +02:00
Ghostkeeper
6a8e1557c3
Merge branch 'feature_intent' into feature_intent_container_tree 
Conflicts:
	.gitlab-ci.yml
	cura/Machines/MaterialManager.py
	cura/Machines/VariantManager.py
	cura/Settings/ContainerManager.py
	cura/Settings/MachineManager.py
	tests/TestMachineManager.py
 2019-08-13 14:59:05 +02:00
Ghostkeeper
5bbb44bfdf
Remove buildplate loading of materials and don't check if variant is there 
So now we no longer make material subprofiles per buildplate.
And now we create subprofiles for variants regardless if the variant exists or not.

Contributes to issue CURA-6600.
 2019-08-12 16:49:57 +02:00
Ghostkeeper
1bd287f888
Move getting variant manager out of the loop 
This mostly just makes it easier for me to debug where the manager is obtained from the deprecated singleton signal.

Contributes to issue CURA-6600.
 2019-08-12 16:49:57 +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
Ghostkeeper
02ff433c92
Use set for unordered collections of things 
Contributes to issue CURA-6672.
 2019-07-22 17:07:07 +02:00
Jaime van Kessel
00f21069e7 Ensure that metadata entries in cura namespace are stored correctly 
CURA-6672
 2019-07-22 16:41:08 +02:00
Diego Prado Gesto
9590262f18 Change the name of the original depriming settings 
Change to align with the name in the XML material files.

Contributes to CURA-6662.
 2019-07-16 09:55:50 +02:00
Ghostkeeper
faf256b2f0
Rename deprime settings with the new name 
These have been renamed for greater clarity. We also have to rename them on this side now.

Contributes to issue CURA-6329.
 2019-06-26 16:41:51 +02:00
Ghostkeeper
23abcd6fd6
Merge branch 'master' into CURA-6329_add_crystallinity_setting 2019-06-19 10:49:20 +02:00
Lipu Fei
51dc7b1b8e Fix value update in material profile 
CURA-6590
 2019-06-18 11:23:28 +02:00
Ghostkeeper
36a206b418
Also remove translation for break preparation temperature 
This setting is no longer used. If I don't remove it, it'll complain when syncing materials with the printer because it tries to serialise the material profiles then.

Contributes to issue CURA-6329.
 2019-06-04 17:23:20 +02:00
Ghostkeeper
a0c3738a49
Add translations for deprime settings 
These need to be read for the deprime experiments in the PPA.

Contributes to issue CURA-6329.
 2019-06-04 17:07:59 +02:00
Lipu Fei
3e91f89ffe Add build volume temperature 
CURA-6156
 2019-04-26 07:43:03 +02:00
Ghostkeeper
cf9ab5a5cd
Don't serialize 'compatible' metadata key 
It is already serialised in the 'hardware compatible' settings.
 2019-04-25 10:55:17 +02:00
Ghostkeeper
943503cac7
Fix iterating over 'hardware compatible' keys 
This is both faster and actually functions properly.

Contributes to issue CURA-6272.
 2019-03-05 15:25:39 +01:00
Ghostkeeper
650204dae7
Merge branch '4.0' 2019-02-21 09:09:19 +01:00
Remco Burema
f81ad58836 Merge branch 'ppa_contribute_compatible_format' into 4.0 2019-02-20 11:29:24 +01:00
Jaime van Kessel
9a1d8ea5f9 Don't serialize "definition" for material profile 
CURA-5787
 2019-02-20 10:46:49 +01:00
Ghostkeeper
fe9d106332
Remove debug prints 2019-02-19 11:48:10 +01:00
Ghostkeeper
cc94441b54
Fix serialising materials with Ultimaker S5 in it 
Contributes to issue CURA-5787.
 2019-02-14 17:45:25 +01:00
Ghostkeeper
d6f116b156
Don't crash on editing metadata entries of non-registered materials 
Sometimes we need to create a temporary material profile just to save it to file.

Contributes to issue CURA-5787.
 2019-02-14 14:03:38 +01:00
Ghostkeeper
e2a7a68883
Give a warning when you can't update metadata because it's read-only 
This bit me in the bum today.
 2019-02-14 13:26:20 +01:00
Jaime van Kessel
5c94a8223d Added button that is shown when instruction_link is set in the profile 
CURA-5916
 2019-02-07 16:08:50 +01:00
Lipu Fei
1fb6441327 Fix default hardware type NOZZLE in XML material 
CURA-5716
 2018-09-11 11:20:00 +02:00
Jaime van Kessel
d9e23bf02b Fix issue caused by making metadata of containerNode private 2018-09-11 10:42:42 +02:00
Lipu Fei
066a00653a Add one more layer to the decision tree 2018-08-02 17:15:34 +02:00
Lipu Fei
a303f394c8 Move VariantType to VariantType.py 
Less circular dependencies for imports.
 2018-08-02 16:11:55 +02:00
Ian Paschal
8f7370db6c Merge remote-tracking branch 'origin/master' into feature_send_material_profiles 2018-07-02 12:37:56 +02:00
Ghostkeeper
a401c1d64f
Disambiguate between list of metadatas and metadata 
Because MyPy doesn't allow a variable to change its type later.

Contributes to issue CURA-5330.
 2018-06-15 17:03:04 +02:00
Diego Prado Gesto
dc4556647a CURA-5330 Fix code style in XmlMaterialProfile plugin 2018-06-14 16:49:26 +02:00
Ghostkeeper
bb366afc2b
Merge branch 'master' into feature_send_material_profiles 2018-06-13 16:57:16 +02:00
Ghostkeeper
dd750ce125
Fix serializing flow-temperature graph 
This graph needs to have its own format in the XML material profiles, which wasn't implemented.

Contributes to issue CURA-5034.
 2018-06-12 16:37:59 +02:00
Ghostkeeper
d5878772e8
Fix reading flow temperature graph from XML files 
These have their own nice little subtags that we don't even parse.

Contributes to issue CURA-5034.
 2018-06-12 16:12:03 +02:00
Ghostkeeper
2dcb185a32
First ask the printer which profiles it already has 
Only let the printer have one profile per GUID and make sure it's the one with the highest version.

Contributes to issue CURA-5034.
 2018-06-12 12:50:33 +02:00
Ghostkeeper
54a03723ab
Set encoding correctly when opening files everywhere 
Otherwise the encoding is interpreted differently on Windows and Mac.
 2018-06-11 11:09:07 +02:00
Diego Prado Gesto
e5699918ea CURA-5444 Also get the metadata even if the material was marked as not 
compatible.
 2018-06-08 12:03:46 +02:00
Diego Prado Gesto
2a3eed30ab CURA-5444 Always create the instance of the material even if it is not 
compatible, otherwise it will never show as
incompatible if the material profile doesn't define hotends in the
machine.
 2018-06-08 11:21:17 +02:00
Diego Prado Gesto
97a1aa1a2b Fix a crash in MaterialManager when the brand of the material is None. 
Fix other possible cases when the type or the color are also None.
 2018-06-07 10:54:23 +02:00
Ghostkeeper
f5a7707139
Show ConfigurationErrorMessage when loading faulty XML files 
This is consistent with the rest of Cura's behaviour.
 2018-05-25 11:24:31 +02:00
Diego Prado Gesto
ba234f5c8a Remove debug prints 2018-05-23 09:38:16 +02:00
Diego Prado Gesto
b8417bcccb If the label tag exists in the xml material file, but without any string 
in it, the label.text return None and then it makes Cura crashing when
creating the models.
This is intended to fix the issue #3750
 2018-05-23 09:34:21 +02:00
ChrisTerBeke
ddc9da63b8
Still raise exception when loading incorrect material file 2018-05-16 19:22:02 +02:00
ChrisTerBeke
c13b77d8a1
Do not load material when no GUID is present instead of crashing Cura 2018-05-16 19:18:09 +02:00
Ghostkeeper
6d3fed8f52
Allow getContainer() to return None 
And in the rest of the locations we must then check if it's None and handle that gracefully.
Here we assume that the getContainer message shows a message to the user if necessary. For now we'll just log it.

Contributes to issue CURA-5045.
 2018-03-26 15:48:03 +02:00
fieldOfView
251e24fedc Merge branch 'master' into feature_xmlmaterials_cura_settings 2018-03-23 14:57:31 +01:00
fieldOfView
e7ca4f327e Fix reading and writing yes/no as boolean values 2018-03-22 16:55:12 +01:00
fieldOfView
a85c42c246 Merge branch 'master' into feature_xmlmaterials_cura_settings 2018-03-21 21:51:52 +01:00