Fixes complex import issue

Fixes issue #17.

core/state.py

@@ -43,11 +43,14 @@ def setID(self, id):
 
     def getID(self):
         return self.id
-      
+
     def setPos(self, x, y):
         self.x = x
         self.y = y
 
+    def setParent(self, parent):
+        self.parent = parent
+
     def addChild(self, child):
         if child not in self.children:
             self.children.append(child)
@@ -110,7 +113,7 @@ def parseElement(self, elementName, parentElement):
             if len(elements[0].childNodes) > 0:
                 return elements[0].childNodes[0].nodeValue
         return ''
-      
+
     def parse(self, stateElement):
         # parse attributes of the state
         for (name, value) in stateElement.attributes.items():

gui/automata/automatascene.py

@@ -196,6 +196,7 @@ def removeStateItem(self, stateItem):
 
         self.stateRemoved.emit(stateItem)
 
+    """
     def importItems(self, stateItem):
         transitions = []
         for child in stateItem.getChildren():
@@ -204,6 +205,7 @@ def importItems(self, stateItem):
 
         for tran in transitions:
             self.addTransitionItem(tran.getGraphicsItem(),False)
+    """
 
     def mouseReleaseEvent(self, qGraphicsSceneMouseEvent):
         # if we were editing the state text next mouse release should disable text editing
@@ -243,11 +245,10 @@ def mouseReleaseEvent(self, qGraphicsSceneMouseEvent):
             else:
                 self.origin = None
 
+        # Feature to add? While clicking on the active state paste all the states
         elif self.operationType == OpType.IMPORTSTATE and qGraphicsSceneMouseEvent.button() == Qt.LeftButton and self.operationData != None:
             selectedItems = self.items(qGraphicsSceneMouseEvent.scenePos())
             if len(selectedItems) == 0:
-                self.operationData.setPos(qGraphicsSceneMouseEvent.scenePos().x(),
-                             qGraphicsSceneMouseEvent.scenePos().y())
                 self.importItems(self.operationData)
                 self.setLastIndexes(self.activeState)
             self.operationData = None

gui/tree/treemodel.py

@@ -153,9 +153,12 @@ def removeAll(self):
         self.rootNode.removeChildren()
         self.layoutChanged.emit()
 
-    def loadFromRoot(self, rootState):
+    def loadFromRoot(self, rootState, parentState=None):
         for child in rootState.getChildren():
-            self.insertStateData(child, QColor(Qt.white), self.getByDataId(rootState.id))
+            if parentState:
+                self.insertStateData(child, QColor(Qt.white), self.getByDataId(parentState.id))
+            else:
+                self.insertStateData(child, QColor(Qt.white), self.getByDataId(rootState.id))
             self.loadFromRoot(child)
 
     def setAllBackgroundByParentId(self, color, parentId):

gui/visualstates.py

@@ -249,6 +249,13 @@ def transitionAction(self):
         self.automataScene.setOperationType(OpType.ADDTRANSITION)
 
     def importAction(self):
+        """
+        Step 1 - Get Updated IDs
+        Step 2 - Add imported root state as children of the activeState
+        Step 3 - Set parent of imported root states as activeState
+        Step 4 - Load Complex States into tree model to display all in tree model.
+        Step 5 - Update Indexs.
+        """
         fileDialog = QFileDialog(self)
         fileDialog.setWindowTitle("Import VisualStates File")
         fileDialog.setViewMode(QFileDialog.Detail)
@@ -258,8 +265,14 @@ def importAction(self):
         if fileDialog.exec_():
             file = self.fileManager.open(fileDialog.selectedFiles()[0])
             #Verify Here configs and functions and aux vars
-            state = self.importManager.updateIDs(file[0], self.automataScene.getStateIndex())
-            self.automataScene.setOperationType(OpType.IMPORTSTATE, state)
+            importedState = self.importManager.updateIDs(file[0], self.automataScene.getStateIndex())
+            for state in importedState.getChildren():
+                self.activeState.addChild(state)
+                state.setParent(self.activeState)
+            self.treeModel.loadFromRoot(importedState, self.activeState)
+            self.automataScene.setActiveState(self.rootState)
+            self.automataScene.setLastIndexes(self.rootState)
+
 
     def timerAction(self):
         if self.activeState is not None:
@@ -409,7 +422,7 @@ def activeStateChanged(self):
     def upButtonClicked(self):
         if self.activeState != None:
             if self.activeState.parent != None:
-                # print('parent name:' + self.activeState.parent.name)
+                #print(self.activeState.parent.id)
                 self.automataScene.setActiveState(self.activeState.parent)
 
     def getStateById(self,state, id):