Merge branch 'hotfix'

pyceps/cli.py

@@ -423,7 +423,7 @@ def execute_commands(args):
         if args.pkl_file and not study.is_root_valid():
             logger.warning('a valid study root is necessary to import maps!')
         else:
-            study.import_maps(study.mapNames,
+            study.import_maps(import_maps,
                               egm_names_from_pos=args.egm_from_pos)
             # import lesion data for all loaded maps
             for map_name in study.maps.keys():

pyceps/datatypes/study.py

@@ -213,7 +213,7 @@ def export_additional_meshes(self, *args, **kwargs):
     def is_root_valid(self, root_dir=None):
         raise NotImplementedError
 
-    def set_root(self, root_dir):
+    def set_repository(self, root_dir):
         raise NotImplementedError
 
     @classmethod

pyceps/fileio/cartoio.py

@@ -656,7 +656,7 @@ def load(cls, filename, root=None):
 
         # try to set root if explicitly given
         if root:
-            if obj.set_root(os.path.abspath(root)):
+            if obj.set_repository(os.path.abspath(root)):
                 log.info('setting study root to {}'.format(root))
                 return obj
             else:
@@ -665,14 +665,15 @@ def load(cls, filename, root=None):
                          .format(root))
 
         # try to re-set previous study root
-        if obj.set_root(obj.repository.base):
+        if obj.set_repository(obj.repository.base):
             log.info('previous study root is still valid ({})'
                      .format(obj.repository.root))
             return obj
 
         # no valid root found so far, set to pkl directory
         log.warning('no valid study root found. Using .pkl location!'.upper())
-        obj.repository.update_root(os.path.dirname(os.path.abspath(filename)))
+        obj.repository.base = os.path.abspath(filename)
+        obj.repository.root = os.path.dirname(os.path.abspath(filename))
         return obj
 
     def export_additional_meshes(self, filename=''):
@@ -832,7 +833,7 @@ def is_root_valid(self, root_dir=None, pwd=''):
 
         return False
 
-    def set_root(self, root_dir):
+    def set_repository(self, root_dir):
         """
         Change path to root directory. Overrides BaseClass method.
         If new root directory is invalid, it is not changed.

pyceps/fileio/precisionio.py

@@ -120,7 +120,7 @@ def is_root_valid(self, root_dir=None):
         # specified root directory is valid
         return True
 
-    def set_root(self, root_dir):
+    def set_repository(self, root_dir):
         """
         Change path to root directory.
 
@@ -179,7 +179,7 @@ def load(cls, filename, root=None):
 
         # try to set root if explicitly given
         if root:
-            if obj.set_root(os.path.abspath(root)):
+            if obj.set_repository(os.path.abspath(root)):
                 log.info('setting study root to {}'.format(root))
                 return obj
             else:
@@ -191,7 +191,7 @@ def load(cls, filename, root=None):
         if obj.is_root_valid():
             log.info('previous study root is still valid ({})'
                      .format(obj.studyRoot))
-            obj.set_root(os.path.abspath(obj.studyRoot))
+            obj.set_repository(os.path.abspath(obj.studyRoot))
             return obj
 
         # no valid root found so far, set to pkl directory