Merge branch 'fix-custom-names' into 'master'

Fix issues when the qspace was renamed in the tree

Closes #62

See merge request !91

xsocs/gui/XsocsGui.py

@@ -227,7 +227,7 @@ class XsocsGui(Qt.QMainWindow):
         fitGroup = item.fitGroup()
         fitItem = fitGroup.addFitFile(fitFile)
         self.model().refresh()
-        index = self.tree.pathToIndex(fitItem.path)
+        index = self.tree.pathToIndex(fitItem.customPath)
         if index.isValid():
             self.tree.setCurrentIndex(index)
             self.__showFit(index.data(ModelRoles.InternalDataRole))
@@ -251,7 +251,7 @@ class XsocsGui(Qt.QMainWindow):
         if qspaceItem is None:
             raise ValueError('This fitItem doesnt have a parent.')
 
-        index = self.centralWidget().pathToIndex(qspaceItem.path)
+        index = self.centralWidget().pathToIndex(qspaceItem.customPath)
         node = index.data(ModelRoles.InternalDataRole)
         qspaceView = self.__showQSpace(node, bringToFront=False)
         qspaceView.selectPoint(point.x, point.y)

xsocs/gui/project/ProjectItem.py

@@ -287,6 +287,21 @@ class ProjectItem(XsocsH5Base):
         else:
             return ''
 
+    @property
+    def customPath(self):
+        """Path with custom item names if defined"""
+        parent = self.parent()
+        if parent is not None:
+            path = parent.customPath
+        else:
+            path = ''
+
+        customName = self.getItemName()
+        if not customName:
+            customName = self.path.split('/')[-1]
+
+        return '/'.join((path, customName))
+
     def _createItem(self):
         """
         Called when the xsocsh5 file is succesfuly called. This should be used