3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Remove old 'category' metadata

Browse source 
Most of it was incorrect and very inconsistent too. These are not used by our code any more.
This commit is contained in:
Ghostkeeper 2020-04-28 09:27:31 +02:00
parent 33d78fd692
commit f4f990708f
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
45 changed files with 737 additions and 770 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/definitions/Mark2_for_Ultimaker2.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "TheUltimakerCommunity",
"manufacturer": "Foehnsturm",
"category": "Other",
"weight": 0,
"has_variants": true,
"has_materials": true,

1
resources/definitions/alya3dp.def.json
View file

@ -7,7 +7,6 @@
"visible": true,
"author": "ALYA",
"manufacturer": "Kati Hal ARGE",
"category": "Other",
"file_formats": "text/x-gcode",
"platform": "alya_platform.stl",
"platform_offset": [-60, -45, 75 ],

1
resources/definitions/alyanx3dp.def.json
View file

@ -7,7 +7,6 @@
"visible": true,
"author": "ALYA",
"manufacturer": "Kati Hal ARGE",
"category": "Other",
"file_formats": "text/x-gcode",
"platform": "alya_nx_platform.stl",
"platform_offset": [-104, 0, 93 ],

1
resources/definitions/anet3d.def.json
View file

@ -5,7 +5,6 @@
"metadata": {
"author": "Tiger.He",
"manufacturer": "Anet",
"category": "anet3d",
"visible": false,
"file_formats": "text/x-gcode",
"first_start_actions": ["MachineSettingsAction"],

1
resources/definitions/anycubic_4max.def.json
View file

@ -7,7 +7,6 @@
"visible": true,
"author": "Jason Scurtu",
"manufacturer": "Anycubic",
"category": "Other",
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker2",
"platform": "anycubic_4max_platform.stl",

1
resources/definitions/anycubic_chiron.def.json
View file

@ -7,7 +7,6 @@
"visible": true,
"author": "Patrick Glatt",
"manufacturer": "Anycubic",
"category": "Other",
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker2",
"platform": "anycubic_chiron_platform.obj",

1
resources/definitions/bibo2_dual.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "unknown",
"manufacturer": "BIBO",
"category": "Other",
"file_formats": "text/x-gcode",
"has_materials": true,
"machine_extruder_trains": {

1
resources/definitions/builder_premium_large.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "Builder SZ",
"manufacturer": "Builder",
"category": "Other",
"quality_definition": "builder_premium_small",
"file_formats": "text/x-gcode",
"platform": "builder_premium_platform.stl",

1
resources/definitions/builder_premium_medium.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "Builder SZ",
"manufacturer": "Builder",
"category": "Other",
"quality_definition": "builder_premium_small",
"file_formats": "text/x-gcode",
"platform": "builder_premium_platform.stl",

1
resources/definitions/builder_premium_small.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "Builder SZ",
"manufacturer": "Builder",
"category": "Other",
"file_formats": "text/x-gcode",
"platform": "builder_premium_platform.stl",
"platform_offset": [-126, -36, 117],

1
resources/definitions/creality_cr-x.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "SRC",
"manufacturer": "Creality3D",
"category": "Other",
"file_formats": "text/x-gcode",
"platform": "cr-x.stl",
"has_variants": false,

1
resources/definitions/custom.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "Ultimaker",
"manufacturer": "Custom",
"category": "Custom",
"file_formats": "text/x-gcode",
"has_materials": true,
"machine_extruder_trains":

1
resources/definitions/deltacomb.def.json
View file

@ -7,7 +7,6 @@
"author": "Gabriele Rossetti",
"visible": true,
"manufacturer": "Deltacomb 3D",
"category": "Other",
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker2",
"platform": "deltacomb.stl",

1
resources/definitions/dxu.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "TheUltimakerCommunity",
"manufacturer": "DXU",
"category": "Other",
"has_variants": true,
"has_materials": true,
"has_machine_materials": false,

1
resources/definitions/erzay3d.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "Alexander Kirsanov",
"manufacturer": "Robokinetika",
"category": "Other",
"file_formats": "text/x-gcode",
"machine_extruder_trains":
{

1
resources/definitions/fabtotum.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "FABtotum",
"manufacturer": "FABtotum",
"category": "Other",
"file_formats": "text/x-gcode",
"platform": "fabtotum_platform.stl",
"has_machine_quality": true,

1
resources/definitions/fdmprinter.def.json
View file

@ -5,7 +5,6 @@
{
"type": "machine",
"author": "Ultimaker",
"category": "Other",
"manufacturer": "Unknown",
"setting_version": 13,
"file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g",

1
resources/definitions/gmax15plus.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "gcreate",
"manufacturer": "gcreate",
"category": "Other",
"file_formats": "text/x-gcode",
"platform": "gmax_1-5_xt-plus_s3d_full model_150707.stl",
"has_machine_quality": true,

1
resources/definitions/gmax15plus_dual.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "GTL_180109",
"manufacturer": "gCreate",
"category": "Other",
"file_formats": "text/x-gcode",
"platform": "gmax_1-5_xt-plus_s3d_full model_150707.stl",
"has_variants": true,

1
resources/definitions/imade3d_jellybox_root.def.json
View file

@ -5,7 +5,6 @@
"metadata": {
"author": "IMADE3D",
"manufacturer": "IMADE3D",
"category": "Ultimaker",
"visible": false,
"file_formats": "text/x-gcode",
"exclude_materials": [

1
resources/definitions/kupido.def.json
View file

@ -7,7 +7,6 @@
"visible": true,
"author": "ALYA",
"manufacturer": "Kati Hal ARGE",
"category": "Other",
"file_formats": "text/x-gcode",
"platform_offset": [ 0, 0, 0],
"exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", "ultimaker_nylon_black", "ultimaker_nylon_transparent", "ultimaker_pc_black", "ultimaker_pc_transparent", "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", "ultimaker_pp_transparent", "ultimaker_pva", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", "ultimaker_tpu_red", "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla","tizyx_pla","tizyx_abs","tizyx_pla_bois" ],

1
resources/definitions/leapfrog_bolt_pro.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "Karan and Vincent 20191104",
"manufacturer": "Leapfrog B.V.",
"category": "Other",
"platform": "leapfrog_bolt_pro_platform.stl",
"platform_offset": [0, 0, -14],
"file_formats": "text/x-gcode",

1
resources/definitions/malyan_m200.def.json
View file

@ -5,7 +5,6 @@
"metadata": {
"author": "Brian Corbino, Tyler Gibson",
"manufacturer": "Malyan",
"category": "Other",
"file_formats": "text/x-gcode",
"platform": "malyan_m200_platform.stl",
"platform_offset": [0, -0.25, 0],

1
resources/definitions/mbot3d_grid4.def.json
View file

@ -5,7 +5,6 @@
"metadata": {
"author": "Magicfirm",
"manufacturer": "Magicfirm",
"category": "Other",
"visible": true,
"file_formats": "text/x-gcode",
"platform_offset": [

1
resources/definitions/mbot3d_grid4_dual.def.json
View file

@ -5,7 +5,6 @@
"metadata": {
"author": "Magicfirm",
"manufacturer": "Magicfirm",
"category": "Other",
"visible": true,
"file_formats": "text/x-gcode",
"platform_offset": [

1
resources/definitions/monoprice_select_mini_v1.def.json
View file

@ -5,7 +5,6 @@
"metadata": {
"author": "Brian Corbino, Tyler Gibson",
"manufacturer": "Monoprice",
"category": "Other",
"file_formats": "text/x-gcode",
"quality_definition": "malyan_m200",
"visible": true,

1
resources/definitions/monoprice_select_mini_v2.def.json
View file

@ -5,7 +5,6 @@
"metadata": {
"author": "Tyler Gibson",
"manufacturer": "Monoprice",
"category": "Other",
"file_formats": "text/x-gcode",
"has_machine_quality": true,
"has_materials": true,

1
resources/definitions/mp_mini_delta.def.json
View file

@ -5,7 +5,6 @@
"metadata": {
"author": "MPMD Facebook Group",
"manufacturer": "Monoprice",
"category": "Other",
"file_formats": "text/x-gcode",
"platform": "mp_mini_delta_platform.stl",
"supports_usb_connection": true,

1
resources/definitions/raise3D_N2_dual.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "Raise3D",
"manufacturer": "Raise3D",
"category": "Other",
"file_formats": "text/x-gcode",
"has_materials": true,
"machine_extruder_trains":

1
resources/definitions/raise3D_N2_plus_dual.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "Raise3D",
"manufacturer": "Raise3D",
"category": "Other",
"file_formats": "text/x-gcode",
"has_materials": true,
"machine_extruder_trains":

1
resources/definitions/raise3D_N2_plus_single.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "Raise3D",
"manufacturer": "Raise3D",
"category": "Other",
"file_formats": "text/x-gcode",
"has_materials": true,
"machine_extruder_trains":

1
resources/definitions/raise3D_N2_single.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "Raise3D",
"manufacturer": "Raise3D",
"category": "Other",
"file_formats": "text/x-gcode",
"has_materials": true,
"machine_extruder_trains":

1
resources/definitions/skriware_2.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "Skriware",
"manufacturer": "Skriware",
"category": "Other",
"file_formats": "text/x-gcode",
"platform_offset": [
0,

1
resources/definitions/stereotech_ste320.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "Stereotech",
"manufacturer": "Stereotech LLC.",
"category": "Other",
"platform": "stereotech_ste320_platform.obj",
"platform_texture": "StereotechSte320backplate.png",
"platform_offset": [

1
resources/definitions/strateo3d.def.json
View file

@ -6,7 +6,6 @@
{
"author": "M.K",
"manufacturer": "eMotionTech",
"category": "Other",
"visible": true,
"file_formats": "text/x-gcode",
"has_machine_quality": true,

1
resources/definitions/ubuild-3d_mr_bot_280.def.json
View file

@ -6,7 +6,6 @@
"visible": true,
"author": "uBuild-3D",
"manufacturer": "uBuild-3D",
"category": "Other",
"file_formats": "text/x-gcode",
"has_materials": true,
"preferred_quality_type": "draft",

1
resources/definitions/ultimaker.def.json
View file

@ -5,7 +5,6 @@
"metadata": {
"author": "Ultimaker",
"manufacturer": "Ultimaker B.V.",
"category": "Ultimaker",
"visible": false,
"exclude_materials": [ "generic_hips", "generic_petg", "structur3d_dap100silicone" ]
},

1
resources/definitions/ultimaker_s3.def.json
View file

@ -5,7 +5,6 @@
"metadata": {
"author": "Ultimaker",
"manufacturer": "Ultimaker B.V.",
"category": "Ultimaker",
"visible": true,
"file_formats": "application/x-ufp;text/x-gcode",
"platform": "ultimaker_s3_platform.obj",

1
resources/definitions/ultimaker_s5.def.json
View file

@ -5,7 +5,6 @@
"metadata": {
"author": "Ultimaker",
"manufacturer": "Ultimaker B.V.",
"category": "Ultimaker",
"visible": true,
"file_formats": "application/x-ufp;text/x-gcode",
"platform": "ultimaker_s5_platform.obj",

1
resources/definitions/uni_print_3d.def.json
View file

@ -6,7 +6,6 @@
{
"visible": true,
"author": "Alexander Rössler",
"category": "Other",
"manufacturer": "TheCoolTool",
"file_formats": "text/x-ngc;text/x-gcode",
"platform": "uni_print_3d_platform.stl",

1
resources/definitions/winbo_dragonl4.def.json
View file

@ -5,7 +5,6 @@
"metadata": {
"author": "Winbo",
"manufacturer": "Winbo Smart Tech Co., Ltd.",
"category": "Other",
"visible": true,
"file_formats": "text/x-gcode",
"supports_usb_connection": false,

1
resources/definitions/winbo_mini2.def.json
View file

@ -5,7 +5,6 @@
"metadata": {
"author": "Winbo",
"manufacturer": "Winbo Smart Tech Co., Ltd.",
"category": "Other",
"visible": true,
"file_formats": "text/x-gcode",
"supports_usb_connection": true,

1
resources/definitions/winbo_superhelper105.def.json
View file

@ -5,7 +5,6 @@
"metadata": {
"author": "Winbo",
"manufacturer": "Winbo Smart Tech Co., Ltd.",
"category": "Other",
"visible": true,
"file_formats": "text/x-gcode",
"supports_usb_connection": true,

1
resources/definitions/winbo_superhelper155.def.json
View file

@ -5,7 +5,6 @@
"metadata": {
"author": "Winbo",
"manufacturer": "Winbo Smart Tech Co., Ltd.",
"category": "Other",
"visible": true,
"file_formats": "text/x-gcode",
"supports_usb_connection": true,

13
tests/Settings/TestDefinitionContainer.py
View file

@ -45,6 +45,18 @@ def test_definitionIds(file_path):
definition_id = os.path.basename(file_path).split(".")[0]
assert " " not in definition_id # Definition IDs are not allowed to have spaces.
@pytest.mark.parametrize("file_path", definition_filepaths)
def test_noCategory(file_path):
"""
Categories for definition files have been deprecated. Test that they are not
present.
:param file_path: The path of the machine definition to test.
"""
with open(file_path, encoding = "utf-8") as f:
json = f.read()
metadata = DefinitionContainer.deserializeMetadata(json, "test_container_id")
assert "category" not in metadata[0]
## Tests all definition containers
@pytest.mark.parametrize("file_path", machine_filepaths)
def test_validateMachineDefinitionContainer(file_path, definition_container):
@ -59,7 +71,6 @@ def test_validateMachineDefinitionContainer(file_path, definition_container):
with patch("UM.VersionUpgradeManager.VersionUpgradeManager.getInstance", MagicMock(return_value = mocked_vum)):
assertIsDefinitionValid(definition_container, file_path)
def assertIsDefinitionValid(definition_container, file_path):
with open(file_path, encoding = "utf-8") as data:
json = data.read()