Skip to content

Commit

Permalink
Third tutorial: geometry (#681)
Browse files Browse the repository at this point in the history
  • Loading branch information
vhirtham committed Jan 27, 2022
1 parent 6bbbd2a commit fe21561
Show file tree
Hide file tree
Showing 7 changed files with 418 additions and 40 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ added
- new tutorial series that introduces the most important WelDX features
step by step based on a full example file [:pull:`555`]

- add ``path`` option to `WeldxFile.info` and `WeldxFile.show_asdf_header` [:pull:`555`]

removed
=======

Expand All @@ -35,6 +37,8 @@ documentation

- update PR link format in the changelog [:pull:`658`]

- new tutorial that describes how to work with workpiece data from a WelDX file [:pull:`681`]

ASDF
====

Expand Down
2 changes: 1 addition & 1 deletion doc/tutorials.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ data processing and visualization.

tutorials/01_01_introduction
tutorials/01_02_time_dependent_data

tutorials/01_03_geometry

******************
Welding Examples
Expand Down
14 changes: 1 addition & 13 deletions tutorials/01_01_introduction.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"cells": [
{
"cell_type": "markdown",
"id": "ccc0d43e",
"metadata": {},
"source": [
"# Introduction / Opening WelDX Files\n",
Expand Down Expand Up @@ -44,8 +43,8 @@
{
"cell_type": "code",
"execution_count": null,
"id": "cef1473c",
"metadata": {
"collapsed": false,
"jupyter": {
"outputs_hidden": false
},
Expand All @@ -66,7 +65,6 @@
{
"cell_type": "code",
"execution_count": null,
"id": "1998289e",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -75,7 +73,6 @@
},
{
"cell_type": "markdown",
"id": "4d2512d5",
"metadata": {},
"source": [
"WelDX files usually have the extension `.weldx` or `.wx`, but any other is also possible as long as the content is valid.\n",
Expand All @@ -86,7 +83,6 @@
{
"cell_type": "code",
"execution_count": null,
"id": "d5d15d00",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -95,7 +91,6 @@
},
{
"cell_type": "markdown",
"id": "e2149464",
"metadata": {},
"source": [
"### Inspecting the file content in a Jupyter session\n",
Expand All @@ -111,7 +106,6 @@
{
"cell_type": "code",
"execution_count": null,
"id": "02fd01f3",
"metadata": {
"tags": []
},
Expand All @@ -122,7 +116,6 @@
},
{
"cell_type": "markdown",
"id": "eb01080d",
"metadata": {},
"source": [
"### Inspecting the File content with pure Python\n",
Expand All @@ -138,7 +131,6 @@
{
"cell_type": "code",
"execution_count": null,
"id": "aea068a2",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -147,7 +139,6 @@
},
{
"cell_type": "markdown",
"id": "7d67f644",
"metadata": {},
"source": [
"The `info` method lists the internal file structure converted to python objects.\n",
Expand All @@ -158,7 +149,6 @@
{
"cell_type": "code",
"execution_count": null,
"id": "203c0c09",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -168,7 +158,6 @@
},
{
"cell_type": "markdown",
"id": "1f46a1f4",
"metadata": {},
"source": [
"The output confirms that the object we got is truly of type `VGroove`.\n",
Expand All @@ -177,7 +166,6 @@
},
{
"cell_type": "markdown",
"id": "1ad993d7",
"metadata": {},
"source": [
"## Conclusion\n",
Expand Down
4 changes: 2 additions & 2 deletions tutorials/01_02_time_dependent_data.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"source": [
"# Time dependent data / Welding current and voltage\n",
"\n",
"[<< PREVIOUS TUTORIAL](01_01_introduction.ipynb) | [NEXT TUTORIAL >>](01_01_introduction.ipynb)\n",
"[<< PREVIOUS TUTORIAL](01_01_introduction.ipynb) | [NEXT TUTORIAL >>](01_03_geometry.ipynb)\n",
"\n",
"## Overview\n",
"\n",
Expand Down Expand Up @@ -410,7 +410,7 @@
"\n",
"- [API tutorial: <code>TimeSeries</code>](timeseries_01.ipynb)\n",
"\n",
"[<< PREVIOUS TUTORIAL](01_01_introduction.ipynb) | [NEXT TUTORIAL >>](01_01_introduction.ipynb)"
"[<< PREVIOUS TUTORIAL](01_01_introduction.ipynb) | [NEXT TUTORIAL >>](01_03_geometry.ipynb)"
]
}
],
Expand Down

0 comments on commit fe21561

Please sign in to comment.