diff --git a/README.md b/README.md index 1400942..fed1121 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![](https://img.shields.io/badge/SDK-v13.0.0-blue) +![](https://img.shields.io/badge/SDK-v14.0.0-blue) # PLAXIS embankment evaluator This sample app shows how to integrate PLAXIS into a VIKTOR application. In this application the following tutorial is diff --git a/app/__init__.py b/app/__init__.py index 4086c93..5a5f8c6 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -16,7 +16,21 @@ SOFTWARE. """ -from app.embankment.controller import EmbankmentController -from app.embankment_folder.controller import EmbankmentFolderController -from app.material.controller import MaterialController -from app.material_folder.controller import MaterialFolderController +from app.embankment.controller import EmbankmentController as Embankment +from app.embankment_folder.controller import EmbankmentFolderController as EmbankmentFolder +from app.material.controller import MaterialController as Material +from app.material_folder.controller import MaterialFolderController as MaterialFolder + +from viktor import InitialEntity + +initial_entities = [ + InitialEntity('EmbankmentFolder', name='Embankments', children=[ + InitialEntity('Embankment', name='sample embankment', params='../manifest/Embankment/sample-embankment.json') + ]), + InitialEntity('MaterialFolder', name='Materials', children=[ + InitialEntity('Material', name='Embankment', params='../manifest/Material/embankment.json'), + InitialEntity('Material', name='Peat', params='../manifest/Material/peat.json'), + InitialEntity('Material', name='Clay', params='../manifest/Material/clay.json'), + InitialEntity('Material', name='Sand', params='../manifest/Material/sand.json') + ]) +] diff --git a/app/embankment/visualisation.py b/app/embankment/visualisation.py index 3c49f0a..fa11e5d 100644 --- a/app/embankment/visualisation.py +++ b/app/embankment/visualisation.py @@ -18,7 +18,7 @@ import numpy as np from munch import Munch from viktor import Color -from viktor import UserException +from viktor import UserError from viktor.geometry import Group from viktor.geometry import Material from viktor.geometry import Point @@ -37,7 +37,7 @@ def _check_params(params: Munch) -> None: ): err_list.append("Please make sure materials are defined for the embankment and soil layers") if err_list: - raise UserException(". ".join(err_list)) + raise UserError(". ".join(err_list)) def _get_rgb(value: int): @@ -98,7 +98,7 @@ def get_embankment_geometry_group(params: Munch) -> Group: try: drain_depth = layers[params.geometry_tab.drain.depth - 1].points[-1].y except IndexError as err: - raise UserException("This drain depth is deeper than the amount of layers available") from err + raise UserError("This drain depth is deeper than the amount of layers available") from err drains = [ Polygon( points=[ diff --git a/manifest/Embankment/sample-embankment.json b/manifest/Embankment/sample-embankment.json index 13ecfa2..2d00b50 100644 --- a/manifest/Embankment/sample-embankment.json +++ b/manifest/Embankment/sample-embankment.json @@ -1,5 +1,4 @@ { - "name": "sample embankment", "geometry_tab": { "soil": { "width": 60, diff --git a/manifest/Material/clay.json b/manifest/Material/clay.json index 1c57896..2d06b86 100644 --- a/manifest/Material/clay.json +++ b/manifest/Material/clay.json @@ -1,5 +1,4 @@ { - "name": "Clay", "param": { "phi": 25, "psi": 0, diff --git a/manifest/Material/embankment.json b/manifest/Material/embankment.json index 78c4a82..9648686 100644 --- a/manifest/Material/embankment.json +++ b/manifest/Material/embankment.json @@ -1,5 +1,4 @@ { - "name": "Embankment", "param": { "phi": 30, "psi": 0, diff --git a/manifest/Material/peat.json b/manifest/Material/peat.json index 742b9a4..9b95900 100644 --- a/manifest/Material/peat.json +++ b/manifest/Material/peat.json @@ -1,5 +1,4 @@ { - "name": "Peat", "param": { "phi": 23, "psi": 0, diff --git a/manifest/Material/sand.json b/manifest/Material/sand.json index 4ecc72a..fe346df 100644 --- a/manifest/Material/sand.json +++ b/manifest/Material/sand.json @@ -1,5 +1,4 @@ { - "name": "Sand", "param": { "phi": 33, "psi": 3, diff --git a/manifest/manifest.yml b/manifest/manifest.yml deleted file mode 100644 index 08ce560..0000000 --- a/manifest/manifest.yml +++ /dev/null @@ -1,33 +0,0 @@ -version: '1' -entity_types: - EmbankmentFolder: - has_designer: false - show_properties: false - Embankment: - has_designer: true - show_properties: false - MaterialFolder: - has_designer: false - show_properties: false - Material: - has_designer: true - show_properties: false -entities: -- entity_type: EmbankmentFolder - properties: - name: Embankments - children: - - entity_type: Embankment - properties: Embankment/sample-embankment.json -- entity_type: MaterialFolder - properties: - name: Materials - children: - - entity_type: Material - properties: Material/embankment.json - - entity_type: Material - properties: Material/peat.json - - entity_type: Material - properties: Material/clay.json - - entity_type: Material - properties: Material/sand.json diff --git a/requirements.txt b/requirements.txt index 35985e2..a99c847 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,3 @@ -# viktor==13.0.0 +viktor==14.0.0 plotly==5.5.0 -numpy==1.21.5 -pandas==1.3.* munch==2.5.0 diff --git a/viktor.config.toml b/viktor.config.toml new file mode 100644 index 0000000..522bbfb --- /dev/null +++ b/viktor.config.toml @@ -0,0 +1 @@ +app_type = 'tree' \ No newline at end of file