Merge branch 'master' into download_file_in_tutorial

CHANGELOG.rst

@@ -9,6 +9,8 @@
 added
 =====
 
+-  first draft of the ``multi_pass_weld`` schema for WelDX files [:pull:`667`]
+
 -  add `GenericSeries` as base class supporting arrays and equations [:pull:`618`]
 
 -  add experimental unit support for ``.weldx.interp_like`` accessor [:pull:`518`]

devtools/conda.recipe/meta.yaml

@@ -34,6 +34,7 @@ test:
     - pytest-xdist
     # Remove once this is fixed: https://github.com/K3D-tools/K3D-jupyter/issues/312
     - jupyterlab
+    - black
   files:
     - conftest.py
   imports:

weldx/schemas/weldx.bam.de/weldx/datamodels/multi_pass_weld-0.1.0.yaml

@@ -0,0 +1,93 @@
+%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.
+    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]