diff --git a/kadmos/graph/mixin_vistoms.py b/kadmos/graph/mixin_vistoms.py
index 2c48c19d3b28af45ac02ea5a050431bdaec5ae7c..8e21a81751a9a4b8311b122abcedbe9be97a24f3 100644
--- a/kadmos/graph/mixin_vistoms.py
+++ b/kadmos/graph/mixin_vistoms.py
@@ -11,7 +11,7 @@ import tempfile
import progressbar
from kadmos.cmdows import CMDOWS
-import kadmos.vispack as vispack
+import kadmos.vistoms as vispack
from lxml import etree
@@ -78,7 +78,7 @@ class VistomsMixin(object):
vistoms_dir = os.path.abspath(vistoms_dir)
# Initiate VISTOMS instance
- vispack.copy(temp_dir, vispack_version=vistoms_version)
+ vistoms.copy(temp_dir, vispack_version=vistoms_version)
# Create dictionary for the data.json file
data = dict(graphs=[], categories=[])
@@ -1043,7 +1043,7 @@ def get_vistoms_tree_viewer(xml_file, vistoms_dir, use_png_figs=False, file_refs
vistoms_dir = os.path.abspath(vistoms_dir)
# Initiate VISTOMS instance
- vispack.copy(temp_dir, vispack_version="TreeViewer")
+ vistoms.copy(temp_dir, vispack_version="TreeViewer")
# Settings
dummy_tool_name = '__dummy__'
diff --git a/kadmos/vispack/VISTOMS/VISTOMS_Static.html b/kadmos/vistoms/VISTOMS_Static.html
similarity index 100%
rename from kadmos/vispack/VISTOMS/VISTOMS_Static.html
rename to kadmos/vistoms/VISTOMS_Static.html
diff --git a/kadmos/vispack/VISTOMS/VISTOMS_TreeViewer.html b/kadmos/vistoms/VISTOMS_TreeViewer.html
similarity index 100%
rename from kadmos/vispack/VISTOMS/VISTOMS_TreeViewer.html
rename to kadmos/vistoms/VISTOMS_TreeViewer.html
diff --git a/kadmos/vispack/__init__.py b/kadmos/vistoms/__init__.py
similarity index 100%
rename from kadmos/vispack/__init__.py
rename to kadmos/vistoms/__init__.py
diff --git a/kadmos/vispack/VISTOMS/static/lib/bowser/bowser.js b/kadmos/vistoms/static/lib/bowser/bowser.js
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/bowser/bowser.js
rename to kadmos/vistoms/static/lib/bowser/bowser.js
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/css/bootstrap-theme.css.map b/kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/css/bootstrap-theme.css.map
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/css/bootstrap-theme.css.map
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/css/bootstrap-theme.css.map
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/css/bootstrap-theme.min.css b/kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/css/bootstrap-theme.min.css
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/css/bootstrap-theme.min.css
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/css/bootstrap-theme.min.css
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/css/bootstrap.css.map b/kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/css/bootstrap.css.map
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/css/bootstrap.css.map
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/css/bootstrap.css.map
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/css/bootstrap.min.css b/kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/css/bootstrap.min.css
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/css/bootstrap.min.css
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/css/bootstrap.min.css
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.eot b/kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.svg b/kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf b/kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.woff b/kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 b/kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/js/bootbox.min.js b/kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/js/bootbox.min.js
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/js/bootbox.min.js
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/js/bootbox.min.js
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/js/bootstrap.min.js b/kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/js/bootstrap.min.js
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/js/bootstrap.min.js
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/js/bootstrap.min.js
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/js/npm.js b/kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/js/npm.js
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/dist/js/npm.js
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/dist/js/npm.js
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/.csscomb.json b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/.csscomb.json
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/.csscomb.json
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/.csscomb.json
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/.csslintrc b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/.csslintrc
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/.csslintrc
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/.csslintrc
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/alerts.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/alerts.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/alerts.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/alerts.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/badges.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/badges.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/badges.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/badges.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/bootstrap.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/bootstrap.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/bootstrap.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/bootstrap.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/breadcrumbs.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/breadcrumbs.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/breadcrumbs.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/breadcrumbs.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/button-groups.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/button-groups.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/button-groups.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/button-groups.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/buttons.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/buttons.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/buttons.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/buttons.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/carousel.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/carousel.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/carousel.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/carousel.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/close.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/close.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/close.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/close.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/code.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/code.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/code.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/code.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/component-animations.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/component-animations.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/component-animations.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/component-animations.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/dropdowns.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/dropdowns.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/dropdowns.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/dropdowns.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/forms.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/forms.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/forms.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/forms.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/glyphicons.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/glyphicons.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/glyphicons.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/glyphicons.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/grid.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/grid.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/grid.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/grid.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/input-groups.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/input-groups.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/input-groups.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/input-groups.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/jumbotron.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/jumbotron.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/jumbotron.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/jumbotron.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/labels.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/labels.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/labels.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/labels.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/list-group.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/list-group.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/list-group.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/list-group.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/media.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/media.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/media.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/media.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/alerts.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/alerts.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/alerts.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/alerts.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/background-variant.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/background-variant.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/background-variant.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/background-variant.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/border-radius.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/border-radius.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/border-radius.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/border-radius.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/buttons.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/buttons.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/buttons.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/buttons.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/center-block.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/center-block.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/center-block.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/center-block.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/clearfix.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/clearfix.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/clearfix.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/clearfix.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/forms.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/forms.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/forms.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/forms.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/gradients.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/gradients.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/gradients.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/gradients.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/grid-framework.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/grid-framework.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/grid-framework.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/grid-framework.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/grid.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/grid.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/grid.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/grid.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/hide-text.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/hide-text.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/hide-text.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/hide-text.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/image.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/image.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/image.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/image.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/labels.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/labels.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/labels.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/labels.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/list-group.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/list-group.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/list-group.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/list-group.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/nav-divider.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/nav-divider.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/nav-divider.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/nav-divider.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/nav-vertical-align.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/nav-vertical-align.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/nav-vertical-align.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/nav-vertical-align.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/opacity.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/opacity.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/opacity.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/opacity.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/pagination.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/pagination.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/pagination.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/pagination.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/panels.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/panels.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/panels.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/panels.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/progress-bar.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/progress-bar.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/progress-bar.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/progress-bar.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/reset-filter.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/reset-filter.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/reset-filter.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/reset-filter.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/reset-text.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/reset-text.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/reset-text.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/reset-text.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/resize.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/resize.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/resize.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/resize.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/responsive-visibility.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/responsive-visibility.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/responsive-visibility.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/responsive-visibility.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/size.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/size.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/size.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/size.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/tab-focus.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/tab-focus.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/tab-focus.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/tab-focus.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/table-row.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/table-row.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/table-row.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/table-row.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/text-emphasis.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/text-emphasis.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/text-emphasis.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/text-emphasis.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/text-overflow.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/text-overflow.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/text-overflow.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/text-overflow.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/vendor-prefixes.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/vendor-prefixes.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/mixins/vendor-prefixes.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/mixins/vendor-prefixes.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/modals.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/modals.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/modals.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/modals.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/navbar.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/navbar.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/navbar.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/navbar.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/navs.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/navs.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/navs.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/navs.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/normalize.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/normalize.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/normalize.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/normalize.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/pager.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/pager.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/pager.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/pager.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/pagination.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/pagination.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/pagination.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/pagination.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/panels.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/panels.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/panels.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/panels.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/popovers.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/popovers.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/popovers.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/popovers.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/print.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/print.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/print.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/print.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/progress-bars.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/progress-bars.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/progress-bars.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/progress-bars.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/responsive-embed.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/responsive-embed.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/responsive-embed.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/responsive-embed.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/responsive-utilities.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/responsive-utilities.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/responsive-utilities.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/responsive-utilities.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/scaffolding.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/scaffolding.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/scaffolding.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/scaffolding.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/tables.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/tables.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/tables.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/tables.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/theme.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/theme.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/theme.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/theme.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/thumbnails.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/thumbnails.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/thumbnails.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/thumbnails.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/tooltip.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/tooltip.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/tooltip.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/tooltip.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/type.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/type.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/type.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/type.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/utilities.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/utilities.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/utilities.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/utilities.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/variables.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/variables.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/variables.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/variables.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/wells.less b/kadmos/vistoms/static/lib/lobipanel/bootstrap/less/wells.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/bootstrap/less/wells.less
rename to kadmos/vistoms/static/lib/lobipanel/bootstrap/less/wells.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/css/lobipanel.css b/kadmos/vistoms/static/lib/lobipanel/css/lobipanel.css
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/css/lobipanel.css
rename to kadmos/vistoms/static/lib/lobipanel/css/lobipanel.css
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/demo/demo.css b/kadmos/vistoms/static/lib/lobipanel/demo/demo.css
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/demo/demo.css
rename to kadmos/vistoms/static/lib/lobipanel/demo/demo.css
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/demo/documentation.css b/kadmos/vistoms/static/lib/lobipanel/demo/documentation.css
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/demo/documentation.css
rename to kadmos/vistoms/static/lib/lobipanel/demo/documentation.css
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/dist/css/lobipanel.css b/kadmos/vistoms/static/lib/lobipanel/dist/css/lobipanel.css
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/dist/css/lobipanel.css
rename to kadmos/vistoms/static/lib/lobipanel/dist/css/lobipanel.css
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/dist/css/lobipanel.min.css b/kadmos/vistoms/static/lib/lobipanel/dist/css/lobipanel.min.css
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/dist/css/lobipanel.min.css
rename to kadmos/vistoms/static/lib/lobipanel/dist/css/lobipanel.min.css
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/dist/js/lobipanel.js b/kadmos/vistoms/static/lib/lobipanel/dist/js/lobipanel.js
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/dist/js/lobipanel.js
rename to kadmos/vistoms/static/lib/lobipanel/dist/js/lobipanel.js
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/dist/js/lobipanel.min.js b/kadmos/vistoms/static/lib/lobipanel/dist/js/lobipanel.min.js
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/dist/js/lobipanel.min.js
rename to kadmos/vistoms/static/lib/lobipanel/dist/js/lobipanel.min.js
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/js/lobipanel.js b/kadmos/vistoms/static/lib/lobipanel/js/lobipanel.js
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/js/lobipanel.js
rename to kadmos/vistoms/static/lib/lobipanel/js/lobipanel.js
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/less/loading-animation.less b/kadmos/vistoms/static/lib/lobipanel/less/loading-animation.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/less/loading-animation.less
rename to kadmos/vistoms/static/lib/lobipanel/less/loading-animation.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/less/lobipanel.less b/kadmos/vistoms/static/lib/lobipanel/less/lobipanel.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/less/lobipanel.less
rename to kadmos/vistoms/static/lib/lobipanel/less/lobipanel.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/less/main.less b/kadmos/vistoms/static/lib/lobipanel/less/main.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/less/main.less
rename to kadmos/vistoms/static/lib/lobipanel/less/main.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/less/variables.less b/kadmos/vistoms/static/lib/lobipanel/less/variables.less
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/less/variables.less
rename to kadmos/vistoms/static/lib/lobipanel/less/variables.less
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/font-awesome/css/font-awesome.css b/kadmos/vistoms/static/lib/lobipanel/lib/font-awesome/css/font-awesome.css
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/font-awesome/css/font-awesome.css
rename to kadmos/vistoms/static/lib/lobipanel/lib/font-awesome/css/font-awesome.css
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/font-awesome/css/font-awesome.css.map b/kadmos/vistoms/static/lib/lobipanel/lib/font-awesome/css/font-awesome.css.map
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/font-awesome/css/font-awesome.css.map
rename to kadmos/vistoms/static/lib/lobipanel/lib/font-awesome/css/font-awesome.css.map
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/font-awesome/css/font-awesome.min.css b/kadmos/vistoms/static/lib/lobipanel/lib/font-awesome/css/font-awesome.min.css
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/font-awesome/css/font-awesome.min.css
rename to kadmos/vistoms/static/lib/lobipanel/lib/font-awesome/css/font-awesome.min.css
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/font-awesome/fonts/FontAwesome.otf b/kadmos/vistoms/static/lib/lobipanel/lib/font-awesome/fonts/FontAwesome.otf
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/font-awesome/fonts/FontAwesome.otf
rename to kadmos/vistoms/static/lib/lobipanel/lib/font-awesome/fonts/FontAwesome.otf
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.eot b/kadmos/vistoms/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.eot
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.eot
rename to kadmos/vistoms/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.eot
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.svg b/kadmos/vistoms/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.svg
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.svg
rename to kadmos/vistoms/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.svg
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.ttf b/kadmos/vistoms/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.ttf
rename to kadmos/vistoms/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.ttf
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.woff b/kadmos/vistoms/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.woff
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.woff
rename to kadmos/vistoms/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.woff
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.woff2 b/kadmos/vistoms/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.woff2
rename to kadmos/vistoms/static/lib/lobipanel/lib/font-awesome/fonts/fontawesome-webfont.woff2
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/highlight/github.css b/kadmos/vistoms/static/lib/lobipanel/lib/highlight/github.css
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/highlight/github.css
rename to kadmos/vistoms/static/lib/lobipanel/lib/highlight/github.css
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/highlight/highlight.pack.js b/kadmos/vistoms/static/lib/lobipanel/lib/highlight/highlight.pack.js
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/highlight/highlight.pack.js
rename to kadmos/vistoms/static/lib/lobipanel/lib/highlight/highlight.pack.js
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/images/ui-icons_444444_256x240.png b/kadmos/vistoms/static/lib/lobipanel/lib/images/ui-icons_444444_256x240.png
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/images/ui-icons_444444_256x240.png
rename to kadmos/vistoms/static/lib/lobipanel/lib/images/ui-icons_444444_256x240.png
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/images/ui-icons_555555_256x240.png b/kadmos/vistoms/static/lib/lobipanel/lib/images/ui-icons_555555_256x240.png
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/images/ui-icons_555555_256x240.png
rename to kadmos/vistoms/static/lib/lobipanel/lib/images/ui-icons_555555_256x240.png
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/images/ui-icons_777620_256x240.png b/kadmos/vistoms/static/lib/lobipanel/lib/images/ui-icons_777620_256x240.png
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/images/ui-icons_777620_256x240.png
rename to kadmos/vistoms/static/lib/lobipanel/lib/images/ui-icons_777620_256x240.png
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/images/ui-icons_777777_256x240.png b/kadmos/vistoms/static/lib/lobipanel/lib/images/ui-icons_777777_256x240.png
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/images/ui-icons_777777_256x240.png
rename to kadmos/vistoms/static/lib/lobipanel/lib/images/ui-icons_777777_256x240.png
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/images/ui-icons_cc0000_256x240.png b/kadmos/vistoms/static/lib/lobipanel/lib/images/ui-icons_cc0000_256x240.png
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/images/ui-icons_cc0000_256x240.png
rename to kadmos/vistoms/static/lib/lobipanel/lib/images/ui-icons_cc0000_256x240.png
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/images/ui-icons_ffffff_256x240.png b/kadmos/vistoms/static/lib/lobipanel/lib/images/ui-icons_ffffff_256x240.png
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/images/ui-icons_ffffff_256x240.png
rename to kadmos/vistoms/static/lib/lobipanel/lib/images/ui-icons_ffffff_256x240.png
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/jquery-ui.min.css b/kadmos/vistoms/static/lib/lobipanel/lib/jquery-ui.min.css
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/jquery-ui.min.css
rename to kadmos/vistoms/static/lib/lobipanel/lib/jquery-ui.min.css
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/jquery-ui.min.js b/kadmos/vistoms/static/lib/lobipanel/lib/jquery-ui.min.js
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/jquery-ui.min.js
rename to kadmos/vistoms/static/lib/lobipanel/lib/jquery-ui.min.js
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/jquery-ui.theme.min.css b/kadmos/vistoms/static/lib/lobipanel/lib/jquery-ui.theme.min.css
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/jquery-ui.theme.min.css
rename to kadmos/vistoms/static/lib/lobipanel/lib/jquery-ui.theme.min.css
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/jquery.1.11.min.js b/kadmos/vistoms/static/lib/lobipanel/lib/jquery.1.11.min.js
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/jquery.1.11.min.js
rename to kadmos/vistoms/static/lib/lobipanel/lib/jquery.1.11.min.js
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/jquery.3.20.min.js b/kadmos/vistoms/static/lib/lobipanel/lib/jquery.3.20.min.js
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/jquery.3.20.min.js
rename to kadmos/vistoms/static/lib/lobipanel/lib/jquery.3.20.min.js
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/jquery.ui.touch-punch.js b/kadmos/vistoms/static/lib/lobipanel/lib/jquery.ui.touch-punch.js
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/jquery.ui.touch-punch.js
rename to kadmos/vistoms/static/lib/lobipanel/lib/jquery.ui.touch-punch.js
diff --git a/kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/jquery.ui.touch-punch.min.js b/kadmos/vistoms/static/lib/lobipanel/lib/jquery.ui.touch-punch.min.js
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/lobipanel/lib/jquery.ui.touch-punch.min.js
rename to kadmos/vistoms/static/lib/lobipanel/lib/jquery.ui.touch-punch.min.js
diff --git a/kadmos/vispack/VISTOMS/static/lib/style.css b/kadmos/vistoms/static/lib/style.css
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/style.css
rename to kadmos/vistoms/static/lib/style.css
diff --git a/kadmos/vispack/VISTOMS/static/lib/vkbeautify/vkbeautify.js b/kadmos/vistoms/static/lib/vkbeautify/vkbeautify.js
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/lib/vkbeautify/vkbeautify.js
rename to kadmos/vistoms/static/lib/vkbeautify/vkbeautify.js
diff --git a/kadmos/vispack/VISTOMS/static/pictures/AGILE_Icon.png b/kadmos/vistoms/static/pictures/AGILE_Icon.png
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/pictures/AGILE_Icon.png
rename to kadmos/vistoms/static/pictures/AGILE_Icon.png
diff --git a/kadmos/vispack/VISTOMS/static/pictures/AGILE_Logo.png b/kadmos/vistoms/static/pictures/AGILE_Logo.png
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/pictures/AGILE_Logo.png
rename to kadmos/vistoms/static/pictures/AGILE_Logo.png
diff --git a/kadmos/vispack/VISTOMS/static/pictures/Acknowledgements.png b/kadmos/vistoms/static/pictures/Acknowledgements.png
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/pictures/Acknowledgements.png
rename to kadmos/vistoms/static/pictures/Acknowledgements.png
diff --git a/kadmos/vispack/VISTOMS/static/pictures/Acknowledgements.svg b/kadmos/vistoms/static/pictures/Acknowledgements.svg
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/pictures/Acknowledgements.svg
rename to kadmos/vistoms/static/pictures/Acknowledgements.svg
diff --git a/kadmos/vispack/VISTOMS/static/pictures/Contact.png b/kadmos/vistoms/static/pictures/Contact.png
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/pictures/Contact.png
rename to kadmos/vistoms/static/pictures/Contact.png
diff --git a/kadmos/vispack/VISTOMS/static/pictures/Contact.svg b/kadmos/vistoms/static/pictures/Contact.svg
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/pictures/Contact.svg
rename to kadmos/vistoms/static/pictures/Contact.svg
diff --git a/kadmos/vispack/VISTOMS/static/pictures/Home.png b/kadmos/vistoms/static/pictures/Home.png
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/pictures/Home.png
rename to kadmos/vistoms/static/pictures/Home.png
diff --git a/kadmos/vispack/VISTOMS/static/pictures/Home.svg b/kadmos/vistoms/static/pictures/Home.svg
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/pictures/Home.svg
rename to kadmos/vistoms/static/pictures/Home.svg
diff --git a/kadmos/vispack/VISTOMS/static/pictures/RWTH_Logo.png b/kadmos/vistoms/static/pictures/RWTH_Logo.png
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/pictures/RWTH_Logo.png
rename to kadmos/vistoms/static/pictures/RWTH_Logo.png
diff --git a/kadmos/vispack/VISTOMS/static/pictures/RWTH_Logo.svg b/kadmos/vistoms/static/pictures/RWTH_Logo.svg
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/pictures/RWTH_Logo.svg
rename to kadmos/vistoms/static/pictures/RWTH_Logo.svg
diff --git a/kadmos/vispack/VISTOMS/static/pictures/TUDelft_Logo.png b/kadmos/vistoms/static/pictures/TUDelft_Logo.png
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/pictures/TUDelft_Logo.png
rename to kadmos/vistoms/static/pictures/TUDelft_Logo.png
diff --git a/kadmos/vispack/VISTOMS/static/pictures/TUDelft_Logo.svg b/kadmos/vistoms/static/pictures/TUDelft_Logo.svg
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/pictures/TUDelft_Logo.svg
rename to kadmos/vistoms/static/pictures/TUDelft_Logo.svg
diff --git a/kadmos/vispack/VISTOMS/static/pictures/Tutorial.png b/kadmos/vistoms/static/pictures/Tutorial.png
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/pictures/Tutorial.png
rename to kadmos/vistoms/static/pictures/Tutorial.png
diff --git a/kadmos/vispack/VISTOMS/static/pictures/Tutorial.svg b/kadmos/vistoms/static/pictures/Tutorial.svg
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/pictures/Tutorial.svg
rename to kadmos/vistoms/static/pictures/Tutorial.svg
diff --git a/kadmos/vispack/VISTOMS/static/pictures/VISTOMS_Label.png b/kadmos/vistoms/static/pictures/VISTOMS_Label.png
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/pictures/VISTOMS_Label.png
rename to kadmos/vistoms/static/pictures/VISTOMS_Label.png
diff --git a/kadmos/vispack/VISTOMS/static/pictures/VISTOMS_Label.svg b/kadmos/vistoms/static/pictures/VISTOMS_Label.svg
similarity index 100%
rename from kadmos/vispack/VISTOMS/static/pictures/VISTOMS_Label.svg
rename to kadmos/vistoms/static/pictures/VISTOMS_Label.svg
diff --git a/kadmos/vispack/VISTOMS/templates/VISTOMS.html b/kadmos/vistoms/templates/VISTOMS.html
similarity index 100%
rename from kadmos/vispack/VISTOMS/templates/VISTOMS.html
rename to kadmos/vistoms/templates/VISTOMS.html
diff --git a/kadmos/vispack/VISTOMS/vistoms.py b/kadmos/vistoms/vistoms.py
similarity index 82%
rename from kadmos/vispack/VISTOMS/vistoms.py
rename to kadmos/vistoms/vistoms.py
index 8bc9f86ad55012db6f1f15405bba8cdc16c80b5d..df2f77b13e6d8fbcc5047a4946090cdbf0c12e8f 100644
--- a/kadmos/vispack/VISTOMS/vistoms.py
+++ b/kadmos/vistoms/vistoms.py
@@ -9,10 +9,10 @@ import zipfile
import tempfile
import sys
from copy import deepcopy
-from os.path import expanduser
+
from shutil import copyfile
-from flask import Flask, render_template, request, jsonify, send_from_directory
+from flask import Flask, render_template, request, jsonify
from kadmos.cmdows.cmdows import find_cmdows_file
from kadmos.graph import load, FundamentalProblemGraph
@@ -22,9 +22,9 @@ app = Flask(__name__)
logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
# Folder and file settings
-UPLOAD_FOLDER = expanduser("~")+'/VISTOMS/temp/'
+UPLOAD_FOLDER = ''
TEMP_FILE = 'tmp'
-VISTOMS_FOLDER = 'templates/'
+VISTOMS_FOLDER = 'templates'
# Open VISTOMS when running the app.py in the beginning
webbrowser.open_new('http://127.0.0.1:5000/VISTOMS')
@@ -36,7 +36,7 @@ def VISTOMS():
"""
Function opens VISTOMS when it is called from the browser
"""
- return render_template('VISTOMS.html',new=0)
+ return render_template('VISTOMS.html', new=0)
@app.route('/kadmosUploadFile', methods=['GET', 'POST'])
@@ -87,17 +87,17 @@ def kadmosUploadFile():
database_dir = ""
if fileType == 'Database':
- database_dir = UPLOAD_FOLDER+'database_tmp/'
+ database_dir = os.path.join(UPLOAD_FOLDER, 'database_tmp')
zip_ref = zipfile.ZipFile(file, 'r')
zip_ref.extractall(database_dir)
zip_ref.close()
file_list = []
for file in os.listdir(database_dir):
- file_list.append(database_dir+file)
+ file_list.append(os.path.join(database_dir, file))
cmdows_file = find_cmdows_file(file_list)
graphFileName = cmdows_file
else:
- graphFileName = UPLOAD_FOLDER+dgFile.filename
+ graphFileName = os.path.join(UPLOAD_FOLDER, dgFile.filename)
dgFile.save(os.path.join(UPLOAD_FOLDER, dgFile.filename))
loaded_graph = load(graphFileName, file_check_critical=True)
@@ -116,16 +116,16 @@ def kadmosUploadFile():
graph = loaded_graph
mpgFileName = mpgFile.filename
mpgFile.save(os.path.join(UPLOAD_FOLDER, mpgFileName))
- mpg = load(UPLOAD_FOLDER + mpgFileName, file_check_critical=True)
+ mpg = load(os.path.join(UPLOAD_FOLDER, mpgFileName), file_check_critical=True)
# Remove the uploaded file from the temp folder
- os.remove(UPLOAD_FOLDER + mpgFileName)
+ os.remove(os.path.join(UPLOAD_FOLDER, mpgFileName))
else:
graph = loaded_graph
mpg = None
#save the graph as kdms file in temp folder
- graph.save(UPLOAD_FOLDER+TEMP_FILE+'_'+newGraphID+'.kdms',file_type='kdms', graph_check_critical=False,
- mpg=mpg)
+ graph.save(os.path.join(UPLOAD_FOLDER, TEMP_FILE+'_'+newGraphID+'.kdms'),file_type='kdms',
+ graph_check_critical=False, mpg=mpg)
# Add the graph with the updated function order to VISTOMS
newVistomsData = graph.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER, graph_id=newGraphID, mpg=mpg)
@@ -148,7 +148,7 @@ def kadmosExportAllGraphs():
"""
try:
# Get request form
- path = os.path.join(request.form['path'], '')
+ path = request.form['path']
fileType = request.form['fileType']
if not os.path.isdir(path):
@@ -162,11 +162,11 @@ def kadmosExportAllGraphs():
if "mpg" not in fileName_split: # Do not loop through mpg files
graphFileName = fileName + ".kdms"
mpgFileName = fileName + "_mpg.kdms"
- if os.path.exists(UPLOAD_FOLDER + mpgFileName):
- graph = load(UPLOAD_FOLDER + graphFileName, file_check_critical=False)
- mpg = load(UPLOAD_FOLDER + mpgFileName, file_check_critical=False)
+ if os.path.exists(os.path.join(UPLOAD_FOLDER, mpgFileName)):
+ graph = load(os.path.join(UPLOAD_FOLDER, graphFileName), file_check_critical=False)
+ mpg = load(os.path.join(UPLOAD_FOLDER, mpgFileName), file_check_critical=False)
else:
- graph = load(UPLOAD_FOLDER + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(UPLOAD_FOLDER, graphFileName), file_check_critical=False)
mpg = None
# Add problem function roles if they are not already existing
@@ -184,24 +184,24 @@ def kadmosExportAllGraphs():
file_type = "cmdows"
file = graph_name + ".xml"
# Save as CMDOWS file
- graph.save(UPLOAD_FOLDER + graph_name, file_type=file_type, graph_check_critical=False, mpg=mpg)
+ graph.save(os.path.join(UPLOAD_FOLDER, graph_name), file_type=file_type, graph_check_critical=False, mpg=mpg)
# Copy CMDOWS file from temporary folder to user's download folder
- copyfile(UPLOAD_FOLDER + file, path + file)
+ copyfile(os.path.join(UPLOAD_FOLDER, file), os.path.join(path, file))
# remove temporary CMDOWS file
- os.remove(UPLOAD_FOLDER + file)
+ os.remove(os.path.join(UPLOAD_FOLDER, file))
elif fileType == "KDMS files":
file_type = "kdms"
# Save as kdms file
- graph.save(UPLOAD_FOLDER + graph_name, file_type=file_type, graph_check_critical=False,mpg=mpg)
+ graph.save(os.path.join(UPLOAD_FOLDER, graph_name), file_type=file_type, graph_check_critical=False,mpg=mpg)
file = graph_name + ".kdms"
mpgfile = graph_name + "_mpg.kdms"
# Copy kdms file from temporary folder to user's download folder
- copyfile(UPLOAD_FOLDER + file, path + file)
+ copyfile(os.path.join(UPLOAD_FOLDER, file), os.path.join(path, file))
# remove temporary kdms file
- os.remove(UPLOAD_FOLDER + file)
- if os.path.exists(UPLOAD_FOLDER + mpgfile):
- copyfile(UPLOAD_FOLDER + mpgfile, path + mpgfile)
- os.remove(UPLOAD_FOLDER + mpgfile)
+ os.remove(os.path.join(UPLOAD_FOLDER, file))
+ if os.path.exists(os.path.join(UPLOAD_FOLDER, mpgfile)):
+ copyfile(os.path.join(UPLOAD_FOLDER, mpgfile), os.path.join(path, mpgfile))
+ os.remove(os.path.join(UPLOAD_FOLDER, mpgfile))
return path
except Exception as e:
@@ -227,11 +227,11 @@ def kadmosExportGraph():
graphFileName = TEMP_FILE+'_'+graphID+'.kdms'
mpgFileName = TEMP_FILE+'_'+graphID+'_mpg.kdms'
- if os.path.exists(UPLOAD_FOLDER + mpgFileName):
- graph = load(UPLOAD_FOLDER + graphFileName, file_check_critical=False)
- mpg = load(UPLOAD_FOLDER + mpgFileName, file_check_critical=False)
+ if os.path.exists(os.path.join(UPLOAD_FOLDER, mpgFileName)):
+ graph = load(os.path.join(UPLOAD_FOLDER, graphFileName), file_check_critical=False)
+ mpg = load(os.path.join(UPLOAD_FOLDER, mpgFileName), file_check_critical=False)
else:
- graph = load(UPLOAD_FOLDER + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(UPLOAD_FOLDER, graphFileName), file_check_critical=False)
mpg = None
# Add problem function roles if they are not already existing
@@ -243,17 +243,17 @@ def kadmosExportGraph():
graph.add_function_problem_roles()
if fileType == "kdms":
- copyfile(UPLOAD_FOLDER+graphFileName, path+fileName+".kdms")
- if os.path.exists(UPLOAD_FOLDER + mpgFileName):
- copyfile(UPLOAD_FOLDER+mpgFileName, path+fileName+'_mpg'+".kdms")
+ copyfile(os.path.join(UPLOAD_FOLDER, graphFileName), os.path.join(path, fileName+".kdms"))
+ if os.path.exists(os.path.join(UPLOAD_FOLDER, mpgFileName)):
+ copyfile(os.path.join(UPLOAD_FOLDER, mpgFileName), os.path.join(path, fileName+'_mpg'+".kdms"))
elif fileType == "cmdows":
file = fileName + ".xml"
# Save as CMDOWS file
- graph.save(UPLOAD_FOLDER + fileName, file_type=fileType, graph_check_critical=False, mpg=mpg)
+ graph.save(os.path.join(UPLOAD_FOLDER, fileName), file_type=fileType, graph_check_critical=False, mpg=mpg)
# Copy CMDOWS file from temporary folder to user's download folder
- copyfile(UPLOAD_FOLDER + file, path + file)
+ copyfile(os.path.join(UPLOAD_FOLDER, file), os.path.join(path, file))
# remove temporary CMDOWS file
- os.remove(UPLOAD_FOLDER + file)
+ os.remove(os.path.join(UPLOAD_FOLDER, file))
else:
return ("ERROR: Wrong file type!!!")
@@ -281,16 +281,16 @@ def kadmosSaveGraphTmp():
tmpDir = UPLOAD_FOLDER
graphFileName = TEMP_FILE + '_' + graphID + '.kdms'
mpgFileName = TEMP_FILE + '_' + graphID + '_mpg.kdms'
- if os.path.exists(tmpDir + mpgFileName):
- graph = load(tmpDir + graphFileName, file_check_critical=False)
- mpg = load(tmpDir + mpgFileName, file_check_critical=False)
+ if os.path.exists(os.path.join(tmpDir, mpgFileName)):
+ graph = load(os.path.join(tmpDir, graphFileName), file_check_critical=False)
+ mpg = load(os.path.join(tmpDir, mpgFileName), file_check_critical=False)
else:
- graph = load(tmpDir + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(tmpDir, graphFileName), file_check_critical=False)
mpg = None
newFileName = TEMP_FILE + '_' + newGraphID + '.kdms'
graph.graph['name'] = newGraphName
- graph.save(UPLOAD_FOLDER + newFileName, file_type="kdms", graph_check_critical=False, mpg=mpg)
+ graph.save(os.path.join(UPLOAD_FOLDER, newFileName), file_type="kdms", graph_check_critical=False, mpg=mpg)
newVistomsData = graph.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER, function_order=function_order,mpg=mpg, graph_id=newGraphID)
@@ -318,14 +318,14 @@ def kadmosDeleteGraph():
backupGraphFileName = TEMP_FILE + '_' + graphID + '_backup.kdms'
mpgFileName = TEMP_FILE + '_' + graphID + '_mpg.kdms'
backupMpgFileName = TEMP_FILE + '_' + graphID + '_mpg_backup.kdms'
- if os.path.exists(tmpDir + graphFileName):
- os.remove(tmpDir + graphFileName)
- if os.path.exists(tmpDir + backupGraphFileName):
- os.remove(tmpDir + backupGraphFileName)
- if os.path.exists(tmpDir + mpgFileName):
- os.remove(tmpDir + mpgFileName)
- if os.path.exists(tmpDir + backupMpgFileName):
- os.remove(tmpDir + backupMpgFileName)
+ if os.path.exists(os.path.join(tmpDir, graphFileName)):
+ os.remove(os.path.join(tmpDir, graphFileName))
+ if os.path.exists(os.path.join(tmpDir, backupGraphFileName)):
+ os.remove(os.path.join(tmpDir, backupGraphFileName))
+ if os.path.exists(os.path.join(tmpDir, mpgFileName)):
+ os.remove(os.path.join(tmpDir, mpgFileName))
+ if os.path.exists(os.path.join(tmpDir, backupMpgFileName)):
+ os.remove(os.path.join(tmpDir, backupMpgFileName))
return kadmosFindTempGraphs()
@@ -355,14 +355,15 @@ def kadmosFindTempGraphs():
if "mpg" not in fileName: # Do not loop through mpg files
graphFileName = fileName[0] + "_" + graphID + ".kdms"
mpgFileName = fileName[0] + "_" + graphID + "_mpg.kdms"
- if os.path.exists(tmpDir + mpgFileName):
- graph = load(tmpDir + graphFileName, file_check_critical=False)
- mpg = load(tmpDir + mpgFileName, file_check_critical=False)
+ if os.path.exists(os.path.join(tmpDir, mpgFileName)):
+ graph = load(os.path.join(tmpDir, graphFileName), file_check_critical=False)
+ mpg = load(os.path.join(tmpDir, mpgFileName), file_check_critical=False)
else:
- graph = load(tmpDir + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(tmpDir, graphFileName), file_check_critical=False)
mpg = None
- graph.save(UPLOAD_FOLDER + graphFileName, file_type="kdms", graph_check_critical=False,mpg=mpg)
+ graph.save(os.path.join(UPLOAD_FOLDER, graphFileName), file_type="kdms",
+ graph_check_critical=False, mpg=mpg)
newVIstomsDataArray.append(graph.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER, graph_id=graphID,mpg=mpg))
@@ -389,18 +390,20 @@ def kadmosRevertLastStep():
backupGraphFileName = TEMP_FILE + '_' + graphID + '_backup.kdms'
backupMpgFileName = TEMP_FILE + '_' + graphID + '_backup_mpg.kdms'
- graph = load(tmpDir + graphFileName, file_check_critical=False)
- backupGraph = load(tmpDir + backupGraphFileName, file_check_critical=False)
- if os.path.exists(tmpDir + mpgFileName):
- mpg = load(tmpDir + mpgFileName, file_check_critical=False)
- backupMpg = load(tmpDir + backupMpgFileName, file_check_critical=False)
+ graph = load(os.path.join(tmpDir, graphFileName), file_check_critical=False)
+ backupGraph = load(os.path.join(tmpDir, backupGraphFileName), file_check_critical=False)
+ if os.path.exists(os.path.join(tmpDir, mpgFileName)):
+ mpg = load(os.path.join(tmpDir, mpgFileName), file_check_critical=False)
+ backupMpg = load(os.path.join(tmpDir, backupMpgFileName), file_check_critical=False)
else:
mpg = None
backupMpg = None
# Switch graph and backup graph (What used to be the backup graph is now the new graph and vice versa)
- graph.save(UPLOAD_FOLDER + backupGraphFileName, file_type="kdms", graph_check_critical=False, mpg=backupMpg)
- backupGraph.save(UPLOAD_FOLDER + graphFileName, file_type="kdms", graph_check_critical=False, mpg=mpg)
+ graph.save(os.path.join(UPLOAD_FOLDER, backupGraphFileName), file_type="kdms", graph_check_critical=False,
+ mpg=backupMpg)
+ backupGraph.save(os.path.join(UPLOAD_FOLDER, graphFileName), file_type="kdms", graph_check_critical=False,
+ mpg=mpg)
# Get function_oder of the backup graph
function_order = None
@@ -431,11 +434,11 @@ def savePreviousGraph(graph_id):
# Save graph as backup file
backupGraphFileName = TEMP_FILE + '_' + graph_id + '_backup.kdms'
- copyfile(path + graphFileName, path + backupGraphFileName)
- if os.path.exists(path + mpgFileName):
+ copyfile(os.path.join(path, graphFileName), os.path.join(path, backupGraphFileName))
+ if os.path.exists(os.path.join(path, mpgFileName)):
# If mpg exists, save it as well
backupMpgFileName = TEMP_FILE + '_' + graph_id + '_mpg_backup.kdms'
- copyfile(path + mpgFileName, path + backupMpgFileName)
+ copyfile(os.path.join(path, mpgFileName), os.path.join(path, backupMpgFileName))
def deleteBackupGraphs():
"""
@@ -443,7 +446,7 @@ def deleteBackupGraphs():
"""
for file in os.listdir(UPLOAD_FOLDER):
if file.endswith("_backup.kdms"):
- os.remove(UPLOAD_FOLDER+file)
+ os.remove(os.path.join(UPLOAD_FOLDER, file))
########################################################################################################################
@@ -471,11 +474,11 @@ def kadmosFindAllNodes():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE + '_' + graphID + '.kdms'
mpgFileName = TEMP_FILE + '_' + graphID + '_mpg.kdms'
- if os.path.exists(path + mpgFileName):
- graph = load(path + graphFileName, file_check_critical=False)
- mpg = load(path + mpgFileName, file_check_critical=False)
+ if os.path.exists(os.path.join(path, mpgFileName)):
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
+ mpg = load(os.path.join(path, mpgFileName), file_check_critical=False)
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
if attr_cond == []:
@@ -515,11 +518,11 @@ def kadmosL1Check():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE + '_' + graphID + '.kdms'
mpgFileName = TEMP_FILE + '_' + graphID + '_mpg.kdms'
- if os.path.exists(path + mpgFileName):
- graph = load(path + graphFileName, file_check_critical=False)
- mpg = load(path + mpgFileName, file_check_critical=False)
+ if os.path.exists(os.path.join(path, mpgFileName)):
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
+ mpg = load(os.path.join(path, mpgFileName), file_check_critical=False)
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
check_result = graph._check_category_a()
@@ -548,11 +551,11 @@ def kadmosL2Check():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE + '_' + graphID + '.kdms'
mpgFileName = TEMP_FILE + '_' + graphID + '_mpg.kdms'
- if os.path.exists(path + mpgFileName):
- graph = load(path + graphFileName, file_check_critical=False)
- mpg = load(path + mpgFileName, file_check_critical=False)
+ if os.path.exists(os.path.join(path, mpgFileName)):
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
+ mpg = load(os.path.join(path, mpgFileName), file_check_critical=False)
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
check_result = graph._check_category_b()
@@ -580,11 +583,11 @@ def kadmosL3Check():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE + '_' + graphID + '.kdms'
mpgFileName = TEMP_FILE + '_' + graphID + '_mpg.kdms'
- if os.path.exists(path + mpgFileName):
- graph = load(path + graphFileName, file_check_critical=False)
- mpg = load(path + mpgFileName, file_check_critical=False)
+ if os.path.exists(os.path.join(path, mpgFileName)):
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
+ mpg = load(os.path.join(path, mpgFileName), file_check_critical=False)
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
check_result = graph._check_category_c()
@@ -622,12 +625,12 @@ def kadmosStartDefiningMDOProblem():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE+'_'+graphID+'.kdms'
mpgFileName = TEMP_FILE+'_'+graphID+'_mpg.kdms'
- if os.path.exists(path + mpgFileName):
+ if os.path.exists(os.path.join(path, mpgFileName)):
return ("ERROR: Graph is already an MDPG! FPG Cannot be initialized again!")
else:
mpg = None
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
if isinstance(graph, FundamentalProblemGraph):
return("ERROR: Graph is already an FPG and cannot be initialized again!")
@@ -642,7 +645,7 @@ def kadmosStartDefiningMDOProblem():
# Add the graph with the updated function order to VISTOMS
newVistomsData = fpg_initial.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER, graph_id=newGraphID,mpg=mpg)
# Save the graph in temp/tmp.kdms
- fpg_initial.save(UPLOAD_FOLDER + newFileName, file_type="kdms", graph_check_critical=False, mpg=mpg)
+ fpg_initial.save(os.path.join(UPLOAD_FOLDER, newFileName), file_type="kdms", graph_check_critical=False, mpg=mpg)
return newVistomsData
@@ -672,10 +675,10 @@ def kadmosChangeNodePos():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE+'_'+graphID+'.kdms'
mpgFileName = TEMP_FILE+'_'+graphID+'_mpg.kdms'
- if os.path.exists(path + mpgFileName):
+ if os.path.exists(os.path.join(path, mpgFileName)):
return ("ERROR: You cannot change a competence's position on an existing MPG! Please go back to the FPG or RCG to do so.")
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
# Change position of a node in th XDSM
@@ -687,9 +690,11 @@ def kadmosChangeNodePos():
graph.graph['problem_formulation']['function_order'] = function_order
# Add the graph with the updated function order to VISTOMS
- newVistomsData = graph.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER, function_order=function_order, graph_id=graphID, mpg=mpg)
+ newVistomsData = graph.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER, function_order=function_order,
+ graph_id=graphID, mpg=mpg)
# Save the graph in temp/tmp.kdms
- graph.save(UPLOAD_FOLDER+TEMP_FILE+'_'+graphID+'.kdms', file_type='kdms', graph_check_critical=False, mpg=mpg)
+ graph.save(os.path.join(UPLOAD_FOLDER, TEMP_FILE+'_'+graphID+'.kdms'), file_type='kdms',
+ graph_check_critical=False, mpg=mpg)
return newVistomsData
except Exception as e:
@@ -715,10 +720,10 @@ def kadmosDeleteNode():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE+'_'+graphID+'.kdms'
mpgFileName = TEMP_FILE+'_'+graphID+'_mpg.kdms'
- if os.path.exists(path + mpgFileName):
+ if os.path.exists(os.path.join(path, mpgFileName)):
return ("ERROR: You cannot remove a competence from an existing MPG! Please go back to the FPG or RCG to do so.")
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
# remove the node from the graph
@@ -730,7 +735,7 @@ def kadmosDeleteNode():
# Add the graph with the updated function order to VISTOMS
newVistomsData = graph.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER, function_order=function_order, graph_id=graphID, mpg=mpg)
# Save the graph in temp/tmp.kdms
- graph.save(UPLOAD_FOLDER + TEMP_FILE+'_'+graphID+'.kdms', file_type='kdms', graph_check_critical=False, mpg=mpg)
+ graph.save(os.path.join(UPLOAD_FOLDER, TEMP_FILE+'_'+graphID+'.kdms'), file_type='kdms', graph_check_critical=False, mpg=mpg)
return newVistomsData
@@ -759,11 +764,11 @@ def kadmosDeleteEdge():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE+'_'+graphID+'.kdms'
mpgFileName = TEMP_FILE+'_'+graphID+'_mpg.kdms'
- if os.path.exists(path + mpgFileName):
- graph = load(path + graphFileName, file_check_critical=False)
- mpg = load(path + mpgFileName, file_check_critical=False)
+ if os.path.exists(os.path.join(path, mpgFileName)):
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
+ mpg = load(os.path.join(path, mpgFileName), file_check_critical=False)
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
# remove the edge
@@ -771,7 +776,7 @@ def kadmosDeleteEdge():
# Add the graph with the updated function order to VISTOMS
newVistomsData = graph.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER, function_order=function_order, graph_id=graphID, mpg=mpg)
# Save the graph in temp/tmp.kdms
- graph.save(UPLOAD_FOLDER + TEMP_FILE+'_'+graphID+'.kdms', file_type='kdms', graph_check_critical=False, mpg=mpg)
+ graph.save(os.path.join(UPLOAD_FOLDER, TEMP_FILE+'_'+graphID+'.kdms'), file_type='kdms', graph_check_critical=False, mpg=mpg)
return newVistomsData
@@ -800,10 +805,10 @@ def kadmosExcludeDesignCompetences():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE + '_' + graphID + '.kdms'
mpgFileName = TEMP_FILE + '_' + graphID + '_mpg.kdms'
- if os.path.exists(path + mpgFileName):
+ if os.path.exists(os.path.join(path, mpgFileName)):
return ("ERROR: You cannot remove a competence from an existing MPG! Please go back to the FPG or RCG to do so.")
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
fpg = FundamentalProblemGraph(graph)
@@ -818,7 +823,7 @@ def kadmosExcludeDesignCompetences():
# Add the graph with the updated function order to VISTOMS
newVistomsData = fpg.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER, function_order=function_order, graph_id=graphID, mpg=mpg)
# Save the graph in temp/tmp.kdms
- fpg.save(UPLOAD_FOLDER + TEMP_FILE + '_' + graphID + '.kdms',
+ fpg.save(os.path.join(UPLOAD_FOLDER, TEMP_FILE+'_'+graphID+'.kdms'),
file_type='kdms', graph_check_critical=False, mpg=mpg)
return newVistomsData
@@ -847,10 +852,10 @@ def kadmosMergeSeqDesignCompetences():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE + '_' + graphID + '.kdms'
mpgFileName = TEMP_FILE + '_' + graphID + '_mpg.kdms'
- if os.path.exists(path + mpgFileName):
+ if os.path.exists(os.path.join(path, mpgFileName)):
return ("ERROR: You cannot merge comeptences on an existing MPG! Please go back to the FPG or RCG to do so.")
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
@@ -869,7 +874,7 @@ def kadmosMergeSeqDesignCompetences():
# Add the graph with the updated function order to VISTOMS
newVistomsData = fpg.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER,function_order=function_order, graph_id=graphID, mpg=mpg)
# Save the graph in temp/tmp.kdms
- fpg.save(UPLOAD_FOLDER + TEMP_FILE + '_' + graphID + '.kdms',
+ fpg.save(os.path.join(UPLOAD_FOLDER, TEMP_FILE+'_'+graphID+'.kdms'),
file_type='kdms', graph_check_critical=False, mpg=mpg)
return newVistomsData
@@ -898,10 +903,10 @@ def kadmosMergeParDesignCompetences():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE + '_' + graphID + '.kdms'
mpgFileName = TEMP_FILE + '_' + graphID + '_mpg.kdms'
- if os.path.exists(path + mpgFileName):
+ if os.path.exists(os.path.join(path, mpgFileName)):
return ("ERROR: You cannot merge comeptences on an existing MPG! Please go back to the FPG or RCG to do so.")
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
new_node = '-'.join(nodeList) + '--par'
@@ -921,7 +926,7 @@ def kadmosMergeParDesignCompetences():
newVistomsData = fpg.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER,
function_order=function_order, graph_id=graphID, mpg=mpg)
# Save the graph in temp/tmp.kdms
- fpg.save(UPLOAD_FOLDER + TEMP_FILE + '_' + graphID + '.kdms',
+ fpg.save(os.path.join(UPLOAD_FOLDER, TEMP_FILE+'_'+graphID+'.kdms'),
file_type='kdms', graph_check_critical=False, mpg=mpg)
return newVistomsData
@@ -950,10 +955,10 @@ def kadmosMergeFuncModDesignCompetences():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE + '_' + graphID + '.kdms'
mpgFileName = TEMP_FILE + '_' + graphID + '_mpg.kdms'
- if os.path.exists(path + mpgFileName):
+ if os.path.exists(os.path.join(path, mpgFileName)):
return ("ERROR: You cannot merge comeptences on an existing MPG! Please go back to the FPG or RCG to do so.")
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
if isinstance(graph, FundamentalProblemGraph):
@@ -977,7 +982,7 @@ def kadmosMergeFuncModDesignCompetences():
newVistomsData = fpg.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER,
function_order=function_order, graph_id=graphID, mpg=mpg)
# Save the graph in temp/tmp.kdms
- fpg.save(UPLOAD_FOLDER + TEMP_FILE + '_' + graphID + '.kdms',
+ fpg.save(os.path.join(UPLOAD_FOLDER, TEMP_FILE+'_'+graphID+'.kdms'),
file_type='kdms', graph_check_critical=False, mpg=mpg)
return newVistomsData
@@ -1006,10 +1011,10 @@ def kadmosRemoveCollision():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE + '_' + graphID + '.kdms'
mpgFileName = TEMP_FILE + '_' + graphID + '_mpg.kdms'
- if os.path.exists(path + mpgFileName):
+ if os.path.exists(os.path.join(path, mpgFileName)):
return ("ERROR: You cannot merge comeptences on an existing MPG! Please go back to the FPG or RCG to do so.")
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
@@ -1026,7 +1031,7 @@ def kadmosRemoveCollision():
# Add the graph with the updated function order to VISTOMS
newVistomsData = fpg.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER, function_order=function_order, graph_id=graphID, mpg=mpg)
# Save the graph in temp/tmp.kdms
- fpg.save(UPLOAD_FOLDER + TEMP_FILE + '_' + graphID + '.kdms',
+ fpg.save(os.path.join(UPLOAD_FOLDER, TEMP_FILE+'_'+graphID+'.kdms'),
file_type='kdms', graph_check_critical=False, mpg=mpg)
return newVistomsData
@@ -1054,10 +1059,10 @@ def kadmosGetPossibleFunctionOrder():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE + '_' + graphID + '.kdms'
mpgFileName = TEMP_FILE + '_' + graphID + '_mpg.kdms'
- if os.path.exists(path + mpgFileName):
+ if os.path.exists(os.path.join(path, mpgFileName)):
return ("ERROR: You cannot merge comeptences on an existing MPG! Please go back to the FPG or RCG to do so.")
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
@@ -1074,7 +1079,7 @@ def kadmosGetPossibleFunctionOrder():
# Add the graph with the updated function order to VISTOMS
newVistomsData = fpg.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER, function_order=function_order, graph_id=graphID, mpg=mpg)
# Save the graph in temp/tmp.kdms
- fpg.save(UPLOAD_FOLDER + TEMP_FILE + '_' + graphID + '.kdms',
+ fpg.save(os.path.join(UPLOAD_FOLDER, TEMP_FILE+'_'+graphID+'.kdms'),
file_type='kdms', graph_check_critical=False, mpg=mpg)
return newVistomsData
@@ -1101,10 +1106,10 @@ def kadmosMakeAllVariablesValid():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE + '_' + graphID + '.kdms'
mpgFileName = TEMP_FILE + '_' + graphID + '_mpg.kdms'
- if os.path.exists(path + mpgFileName):
+ if os.path.exists(os.path.join(path, mpgFileName)):
return ("ERROR: You cannot do that on an existing MPG! Please go back to the FPG or RCG to do so.")
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
if isinstance(graph, FundamentalProblemGraph):
@@ -1122,7 +1127,7 @@ def kadmosMakeAllVariablesValid():
# Add the graph with the updated function order to VISTOMS
newVistomsData = fpg.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER, function_order=function_order, graph_id=graphID, mpg=mpg)
# Save the graph in temp/tmp.kdms
- fpg.save(UPLOAD_FOLDER + TEMP_FILE + '_' + graphID + '.kdms',
+ fpg.save(os.path.join(UPLOAD_FOLDER, TEMP_FILE+'_'+graphID+'.kdms'),
file_type='kdms', graph_check_critical=False, mpg=mpg)
return newVistomsData
@@ -1149,10 +1154,10 @@ def kadmosAddProblemFunctionRoles():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE + '_' + graphID + '.kdms'
mpgFileName = TEMP_FILE + '_' + graphID + '_mpg.kdms'
- if os.path.exists(path + mpgFileName):
+ if os.path.exists(os.path.join(path, mpgFileName)):
return ("ERROR: You cannot do that on an existing MPG! Please go back to the FPG or RCG to do so.")
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
if isinstance(graph, FundamentalProblemGraph):
@@ -1168,7 +1173,7 @@ def kadmosAddProblemFunctionRoles():
# Add the graph with the updated function order to VISTOMS
newVistomsData = fpg.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER, function_order=function_order, graph_id=graphID, mpg=mpg)
# Save the graph in temp/tmp.kdms
- fpg.save(UPLOAD_FOLDER + TEMP_FILE + '_' + graphID + '.kdms',
+ fpg.save(os.path.join(UPLOAD_FOLDER, TEMP_FILE+'_'+graphID+'.kdms'),
file_type='kdms', graph_check_critical=False, mpg=mpg)
return newVistomsData
@@ -1201,10 +1206,10 @@ def kadmosMarkVariable():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE+'_'+graphID+'.kdms'
mpgFileName = TEMP_FILE+'_'+graphID+'_mpg.kdms'
- if os.path.exists(path + mpgFileName):
+ if os.path.exists(os.path.join(path, mpgFileName)):
return ('ERROR: This function can only be performed on an FPG!')
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
if isinstance(graph, FundamentalProblemGraph):
@@ -1228,7 +1233,7 @@ def kadmosMarkVariable():
# Add the graph with the updated function order to VISTOMS
newVistomsData = fpg.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER,function_order=function_order, graph_id=graphID, mpg=mpg)
# Save the graph in temp/tmp.kdms
- fpg.save(UPLOAD_FOLDER + TEMP_FILE+'_'+graphID+'.kdms', file_type='kdms', graph_check_critical=False,mpg=mpg)
+ fpg.save(os.path.join(UPLOAD_FOLDER, TEMP_FILE+'_'+graphID+'.kdms'), file_type='kdms', graph_check_critical=False,mpg=mpg)
return newVistomsData
@@ -1256,10 +1261,10 @@ def kadmosUnmarkVariable():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE+'_'+graphID+'.kdms'
mpgFileName = TEMP_FILE+'_'+graphID+'_mpg.kdms'
- if os.path.exists(path + mpgFileName):
+ if os.path.exists(os.path.join(path, mpgFileName)):
return ('ERROR: This function can only be performed on an FPG!')
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
if isinstance(graph, FundamentalProblemGraph):
@@ -1272,7 +1277,7 @@ def kadmosUnmarkVariable():
# Add the graph with the updated function order to VISTOMS
newVistomsData = fpg.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER,function_order=function_order, graph_id=graphID, mpg=mpg)
# Save the graph in temp/tmp.kdms
- fpg.save(UPLOAD_FOLDER + TEMP_FILE+'_'+graphID+'.kdms', file_type='kdms', graph_check_critical=False,mpg=mpg)
+ fpg.save(os.path.join(UPLOAD_FOLDER, TEMP_FILE+'_'+graphID+'.kdms'), file_type='kdms', graph_check_critical=False,mpg=mpg)
return newVistomsData
@@ -1299,10 +1304,10 @@ def kadmosRemoveUnusedOutputs():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE + '_' + graphID + '.kdms'
mpgFileName = TEMP_FILE + '_' + graphID + '_mpg.kdms'
- if os.path.exists(path + mpgFileName):
+ if os.path.exists(os.path.join(path, mpgFileName)):
return ("ERROR: You cannot do that on an existing MPG! Please go back to the FPG or RCG to do so.")
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
if isinstance(graph, FundamentalProblemGraph):
@@ -1322,9 +1327,10 @@ def kadmosRemoveUnusedOutputs():
fpg.add_function_problem_roles()
# Add the graph with the updated function order to VISTOMS
- newVistomsData = fpg.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER, function_order=function_order, graph_id=graphID, mpg=mpg)
+ newVistomsData = fpg.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER, function_order=function_order,
+ graph_id=graphID, mpg=mpg)
# Save the graph in temp/tmp.kdms
- fpg.save(UPLOAD_FOLDER + TEMP_FILE + '_' + graphID + '.kdms',
+ fpg.save(os.path.join(UPLOAD_FOLDER, TEMP_FILE+'_'+graphID+'.kdms'),
file_type='kdms', graph_check_critical=False, mpg=mpg)
return newVistomsData
@@ -1360,12 +1366,12 @@ def kadmosStartDefiningMDAOArchitecture():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE+'_'+graphID+'.kdms'
mpgFileName = TEMP_FILE+'_'+graphID+'_mpg.kdms'
- if os.path.exists(path + mpgFileName):
+ if os.path.exists(os.path.join(path, mpgFileName)):
return ("ERROR: Graph is already an MDPG! FPG Cannot be initialized again!")
else:
mpg = None
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
if not isinstance(graph, FundamentalProblemGraph):
return("ERROR: Graph is not an FPG yet. Please perform the FPG Manipulation steps first!")
@@ -1384,9 +1390,10 @@ def kadmosStartDefiningMDAOArchitecture():
mdg.graph['problem_formulation']['mdao_architecture'] = "None"
# Add the graph with the updated function order to VISTOMS
- newVistomsData = mdg.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER, function_order=functionOrder, graph_id=newGraphID,mpg=mpg)
+ newVistomsData = mdg.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER, function_order=functionOrder,
+ graph_id=newGraphID,mpg=mpg)
# Save the graph in temp/tmp.kdms
- mdg.save(UPLOAD_FOLDER + newFileName, file_type="kdms", graph_check_critical=False, mpg=mpg)
+ mdg.save(os.path.join(UPLOAD_FOLDER, newFileName), file_type="kdms", graph_check_critical=False, mpg=mpg)
return newVistomsData
@@ -1418,10 +1425,10 @@ def kadmosImposeMDAOArchitecture():
path = UPLOAD_FOLDER
graphFileName = TEMP_FILE + '_' + graphID + '.kdms'
mpgFileName = TEMP_FILE + '_' + graphID + '_mpg.kdms'
- if os.path.exists(path + mpgFileName):
+ if os.path.exists(os.path.join(path, mpgFileName)):
return ("ERROR: You cannot perform this on an existing MPG! Please go back to the FPG to do so.")
else:
- graph = load(path + graphFileName, file_check_critical=False)
+ graph = load(os.path.join(path, graphFileName), file_check_critical=False)
mpg = None
mdao_definition = mdao_architecture
@@ -1476,7 +1483,7 @@ def kadmosImposeMDAOArchitecture():
# Add the graph with the updated function order to VISTOMS
newVistomsData = mdg.vistoms_add_json(vistoms_dir=VISTOMS_FOLDER, graph_id=graphID, mpg=mpg)
# Save the graph in temp/tmp.kdms
- mdg.save(UPLOAD_FOLDER + TEMP_FILE + '_' + graphID + '.kdms',
+ mdg.save(os.path.join(UPLOAD_FOLDER, TEMP_FILE+'_'+graphID+'.kdms'),
file_type='kdms', graph_check_critical=False, mpg=mpg)
return newVistomsData
@@ -1501,7 +1508,6 @@ def run_vistoms(folder=None, open_vistoms=True):
if not os.path.isdir(UPLOAD_FOLDER):
os.makedirs(os.path.dirname(UPLOAD_FOLDER))
# Run the app
- UPLOAD_FOLDER += "/"
app.run()