Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add datamodels/terms-0.1.0 schema #587

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions weldx/manifests/weldx-0.1.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ tags:
schema_uri: http://weldx.bam.de/schemas/weldx/core/graph/di_node-1.0.0
- tag_uri: tag:weldx.bam.de:weldx/core/transformations/coordinate_system_hierarchy-1.0.0
schema_uri: http://weldx.bam.de/schemas/weldx/core/transformations/coordinate_system_hierarchy-1.0.0
- tag_uri: tag:weldx.bam.de:weldx/core/transformations/local_coordinate_system-1.0.0
schema_uri: http://weldx.bam.de/schemas/weldx/core/transformations/local_coordinate_system-1.0.0
- tag_uri: tag:weldx.bam.de:weldx/core/transformations/rotation-1.0.0
schema_uri: http://weldx.bam.de/schemas/weldx/core/transformations/rotation-1.0.0
- tag_uri: tag:weldx.bam.de:weldx/core/transformations/coordinate_system_hierarchy_subsystem-1.0.0
schema_uri: http://weldx.bam.de/schemas/weldx/core/transformations/coordinate_system_hierarchy_subsystem-1.0.0
- tag_uri: tag:weldx.bam.de:weldx/core/transformations/coordinate_transformation-1.0.0
schema_uri: http://weldx.bam.de/schemas/weldx/core/transformations/coordinate_transformation-1.0.0
- tag_uri: tag:weldx.bam.de:weldx/core/transformations/local_coordinate_system-1.0.0
schema_uri: http://weldx.bam.de/schemas/weldx/core/transformations/local_coordinate_system-1.0.0
- tag_uri: tag:weldx.bam.de:weldx/core/transformations/rotation-1.0.0
schema_uri: http://weldx.bam.de/schemas/weldx/core/transformations/rotation-1.0.0
- tag_uri: tag:weldx.bam.de:weldx/debug/test_property_tag-1.0.0
schema_uri: http://weldx.bam.de/schemas/weldx/debug/test_property_tag-1.0.0
- tag_uri: tag:weldx.bam.de:weldx/debug/test_shape_validator-1.0.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,22 +62,7 @@ properties:
wx_unit: "m/s"
wx_shape: [1]
welding_wire:
description: |
Object describing the welding wire used.
type: object
properties:
diameter:
description: |
The diameter of the welding wire.
tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*"
wx_unit: "m"
wx_shape: [1]
class:
description: |
The wire classification according to DIN EN ISO 14341, DIN EN 12072 or similar standards.
Addition standard details should be stored in the wx_user property.
type: string
required: [diameter]
$ref: "./terms-0.1.0#/definitions/welding_wire"
required: [welding_process, shielding_gas, weld_speed, welding_wire]
welding_current:
description: |
Expand Down Expand Up @@ -119,34 +104,9 @@ properties:
type: object
properties:
base_metal:
description: |
The base metal composition of the workpiece.
type: object
properties:
common_name:
description: |
The common description of the base metal composition or classification as listed in the standard.
type: string
standard:
description: |
The standard listing and describing the base metal compositions.
type: string
required: [common_name, standard]
$ref: "./terms-0.1.0#/definitions/base_metal"
geometry:
description: |
Description of the workpiece geometry consisting of the groove shape and the total seam length.
type: object
properties:
groove_shape:
description: |
Constant groove shape of the weld seam.
tag: "asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/*-0.1.*"
seam_length:
description: |
Length of the linear weld seam.
tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*"
wx_unit: "m"
required: [groove_shape, seam_length]
$ref: "./terms-0.1.0#/definitions/linear_weld_seam"
required: [base_metal, geometry]
reference_timestamp:
description: |
Expand Down
58 changes: 58 additions & 0 deletions weldx/schemas/weldx.bam.de/weldx/datamodels/terms-0.1.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
%YAML 1.1
---
$schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
id: "asdf://weldx.bam.de/weldx/schemas/datamodels/terms-0.1.0"

title: |
General welding related schema definitions to describe welding application datamodels.

definitions:
welding_wire:
description: |
Description of a simple GMAW welding wire.
type: object
properties:
diameter:
description: |
The diameter of the welding wire.
tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*"
wx_unit: "m"
wx_shape: [1]
class:
description: |
The wire classification according to DIN EN ISO 14341, DIN EN 12072 or similar standards.
Addition standard details should be stored in the wx_user property.
type: string
required: [diameter]

base_metal:
description: |
The base metal composition of a workpiece.
type: object
properties:
common_name:
description: |
The common description of the base metal composition or classification as listed in the standard.
type: string
standard:
description: |
The standard listing and describing the base metal compositions.
type: string
required: [common_name, standard]

linear_weld_seam:
description: |
Description of a linear weld seam with constant groove shape.
type: object
properties:
groove_shape:
description: |
Constant groove shape of the weld seam.
tag: "asdf://weldx.bam.de/weldx/tags/groove/iso_9692_1_2013_12/*-0.1.*"
seam_length:
description: |
Length of the linear weld seam.
tag: "asdf://weldx.bam.de/weldx/tags/unit/quantity-0.1.*"
wx_unit: "m"
required: [groove_shape, seam_length]
...