specify bot id type

This commit is contained in:
c.lamboo 2023-11-27 15:32:55 +01:00
parent ae047d2f8c
commit a9dcfaa032
12 changed files with 14 additions and 14 deletions

View file

@ -19,7 +19,7 @@ class VariantDatabaseHandler(DatabaseMetadataContainerController):
"definition": "text", "definition": "text",
"version": "text", "version": "text",
"setting_version": "text", "setting_version": "text",
"bot_id": "text", "bot_extruder_id": "text",
}, },
)) ))
self._container_type = InstanceContainer self._container_type = InstanceContainer

View file

@ -144,7 +144,7 @@ class MakerbotWriter(MeshWriter):
meta = dict() meta = dict()
meta["bot_type"] = global_stack.definition.getMetaDataEntry("bot_id") meta["bot_type"] = global_stack.definition.getMetaDataEntry("bot_machine_id")
bounds: Optional[AxisAlignedBox] = None bounds: Optional[AxisAlignedBox] = None
for node in nodes: for node in nodes:
@ -186,7 +186,7 @@ class MakerbotWriter(MeshWriter):
meta["uuid"] = print_information.slice_uuid meta["uuid"] = print_information.slice_uuid
materials = [extruder.material.getMetaData().get("bot_id") for extruder in extruders] materials = [extruder.material.getMetaData().get("bot_material_id") for extruder in extruders]
meta["material"] = materials[0] meta["material"] = materials[0]
meta["materials"] = materials meta["materials"] = materials
@ -198,7 +198,7 @@ class MakerbotWriter(MeshWriter):
meta["model_counts"] = [{"count": 1, "name": node.getName()} for node in nodes] meta["model_counts"] = [{"count": 1, "name": node.getName()} for node in nodes]
tool_types = [extruder.variant.getMetaDataEntry("bot_id") for extruder in extruders] tool_types = [extruder.variant.getMetaDataEntry("bot_extruder_id") for extruder in extruders]
meta["tool_type"] = tool_types[0] meta["tool_type"] = tool_types[0]
meta["tool_types"] = tool_types meta["tool_types"] = tool_types

View file

@ -9,7 +9,7 @@
"manufacturer": "Ultimaker B.V.", "manufacturer": "Ultimaker B.V.",
"file_formats": "application/x-makerbot", "file_formats": "application/x-makerbot",
"platform": "ultimaker_method_platform.stl", "platform": "ultimaker_method_platform.stl",
"bot_id": "lava_f", "bot_machine_id": "lava_f",
"exclude_materials": [ "exclude_materials": [
"dsm_", "dsm_",
"Essentium_", "Essentium_",

View file

@ -9,7 +9,7 @@
"manufacturer": "Ultimaker B.V.", "manufacturer": "Ultimaker B.V.",
"file_formats": "application/x-makerbot", "file_formats": "application/x-makerbot",
"platform": "ultimaker_method_xl_platform.stl", "platform": "ultimaker_method_xl_platform.stl",
"bot_id": "magma_10", "bot_machine_id": "magma_10",
"has_machine_materials": true, "has_machine_materials": true,
"has_machine_quality": true, "has_machine_quality": true,
"has_materials": true, "has_materials": true,

View file

@ -4,7 +4,7 @@ name = 1C
version = 4 version = 4
[metadata] [metadata]
bot_id = mk14_c bot_extruder_id = mk14_c
hardware_type = nozzle hardware_type = nozzle
setting_version = 22 setting_version = 22
type = variant type = variant

View file

@ -4,7 +4,7 @@ name = 1XA
version = 4 version = 4
[metadata] [metadata]
bot_id = mk14_hot bot_extruder_id = mk14_hot
hardware_type = nozzle hardware_type = nozzle
setting_version = 22 setting_version = 22
type = variant type = variant

View file

@ -4,7 +4,7 @@ name = 2XA
version = 4 version = 4
[metadata] [metadata]
bot_id = mk14_hot_s bot_extruder_id = mk14_hot_s
hardware_type = nozzle hardware_type = nozzle
setting_version = 22 setting_version = 22
type = variant type = variant

View file

@ -4,7 +4,7 @@ name = LABS
version = 4 version = 4
[metadata] [metadata]
bot_id = mk14_e bot_extruder_id = mk14_e
hardware_type = nozzle hardware_type = nozzle
setting_version = 22 setting_version = 22
type = variant type = variant

View file

@ -4,7 +4,7 @@ name = 1C
version = 4 version = 4
[metadata] [metadata]
bot_id = mk14_c bot_extruder_id = mk14_c
hardware_type = nozzle hardware_type = nozzle
setting_version = 22 setting_version = 22
type = variant type = variant

View file

@ -4,7 +4,7 @@ name = 1XA
version = 4 version = 4
[metadata] [metadata]
bot_id = mk14_hot bot_extruder_id = mk14_hot
hardware_type = nozzle hardware_type = nozzle
setting_version = 22 setting_version = 22
type = variant type = variant

View file

@ -4,7 +4,7 @@ name = 2XA
version = 4 version = 4
[metadata] [metadata]
bot_id = mk14_hot_s bot_extruder_id = mk14_hot_s
hardware_type = nozzle hardware_type = nozzle
setting_version = 22 setting_version = 22
type = variant type = variant

View file

@ -4,7 +4,7 @@ name = LABS
version = 4 version = 4
[metadata] [metadata]
bot_id = mk14_e bot_extruder_id = mk14_e
hardware_type = nozzle hardware_type = nozzle
setting_version = 22 setting_version = 22
type = variant type = variant