From e3a00d2551c99bf6fdfb22a9047a65a39ed4e4c5 Mon Sep 17 00:00:00 2001 From: Cagtay Fabry <43667554+CagtayFabry@users.noreply.github.com> Date: Tue, 7 Dec 2021 16:09:42 +0100 Subject: [PATCH 1/4] add multi_pass_weld-0.1.0.yaml --- .../datamodels/multi_pass_weld-0.1.0.yaml | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 weldx/schemas/weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.0.yaml diff --git a/weldx/schemas/weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.0.yaml b/weldx/schemas/weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.0.yaml new file mode 100644 index 000000000..88e179495 --- /dev/null +++ b/weldx/schemas/weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.0.yaml @@ -0,0 +1,94 @@ +%YAML 1.1 +--- +$schema: "http://stsci.edu/schemas/yaml-schema/draft-01" +id: "asdf://weldx.bam.de/weldx/schemas/datamodels/multi_pass_weld-0.1.0" + +title: | + A generic multi layer GMAW weldment. + +type: object +properties: + workpiece: + description: | + The workpiece to be welded defined by the base metal and the geometric description of the weld seam. + type: object + + weld_seam: + description: | + List of weld seams composing the final weldment. + type: array + items: + $ref: "#/definitions/weld_seam" + +definitions: + weld_seam: + description: | + A single weld seam consisting of one or more layers. + type: array + items: + $ref: "#/definitions/weld_layer" + + weld_layer: + description: | + A single weld layer consisting of one or more beads. + type: array + items: + $ref: "#/definitions/weld_bead" + + weld_bead: + description: | + A single weld bead consisting of one or more weldments. + weld_layers: + type: array + items: + $ref: "#/definitions/weldment" + + weldment: + description: | + Process metadata and measurements about a single weldment. + type: object + properties: + process: + $ref: "#/definitions/GMAW_process" + TCP: + description: | + Transformation describing the welding TCP movement in relation to the groove coordinates. + tag: "asdf://weldx.bam.de/weldx/tags/core/transformations/local_coordinate_system-0.1.*" + welding_current: + description: | + The signal representing the welding current measurement. + tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-0.1.*" + wx_unit: "A" + welding_voltage: + description: | + The signal representing the welding voltage measurement. + tag: "asdf://weldx.bam.de/weldx/tags/core/time_series-0.1.*" + wx_unit: "V" + + GMAW_process: + description: | + Metadata describing a generic GMAW process. + type: object + properties: + welding_process: + $ref: "asdf://weldx.bam.de/weldx/schemas/process/GMAW-0.1.0" + shielding_gas: + tag: "asdf://weldx.bam.de/weldx/tags/aws/process/shielding_gas_for_procedure-0.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/units/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] + required: [welding_process, shielding_gas, welding_wire] From a617d1cbd22696f40897cb4e6e60afaf0cf6f83d Mon Sep 17 00:00:00 2001 From: Volker Hirthammer Date: Wed, 26 Jan 2022 09:18:22 +0100 Subject: [PATCH 2/4] Update schema --- .../weldx/datamodels/multi_pass_weld-0.1.0.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/weldx/schemas/weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.0.yaml b/weldx/schemas/weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.0.yaml index 88e179495..8ee4315ae 100644 --- a/weldx/schemas/weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.0.yaml +++ b/weldx/schemas/weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.0.yaml @@ -38,10 +38,9 @@ definitions: weld_bead: description: | A single weld bead consisting of one or more weldments. - weld_layers: - type: array - items: - $ref: "#/definitions/weldment" + type: array + items: + $ref: "#/definitions/weldment" weldment: description: | From 407f0d7e09122cb6b45023c68023ed51d050cc32 Mon Sep 17 00:00:00 2001 From: vhirtham Date: Thu, 17 Feb 2022 11:14:24 +0100 Subject: [PATCH 3/4] Update changelog --- CHANGELOG.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 7c3af348b..fea05ef7c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,6 +9,8 @@ added ===== +- first draft of the ``multi_pass_weld`` schema for WelDX files + - add `GenericSeries` as base class supporting arrays and equations [:pull:`618`] - add experimental unit support for ``.weldx.interp_like`` accessor [:pull:`518`] From 77020a2a0d82b1f992c44eed0cef406a981bd95c Mon Sep 17 00:00:00 2001 From: vhirtham Date: Thu, 17 Feb 2022 11:17:14 +0100 Subject: [PATCH 4/4] Update changelog --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index fea05ef7c..8ce018ab9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -9,7 +9,7 @@ added ===== -- first draft of the ``multi_pass_weld`` schema for WelDX files +- first draft of the ``multi_pass_weld`` schema for WelDX files [:pull:`667`] - add `GenericSeries` as base class supporting arrays and equations [:pull:`618`]