浏览代码

dont use evolution code for instance modeling when deleting a node

Lucas Heer 7 年之前
父节点
当前提交
504681787e
共有 3 个文件被更改,包括 6 次插入4 次删除
  1. 2 3
      sketchUI/im_scene.py
  2. 3 0
      sketchUI/mvops.py
  3. 1 1
      wrappers/modelverse_SCCD.py

+ 2 - 3
sketchUI/im_scene.py

@@ -4,7 +4,7 @@ from PyQt5.Qt import Qt, QTransform
 from sketchUI.graphics_edge_item import GraphicsEdgeItem
 from sketchUI.graphics_node_item import GraphicsNodeItem
 from sketchUI import mvops
-from evolution import node_ops
+
 
 class Mode(Enum):
     SELECT = 0
@@ -86,12 +86,11 @@ class CustomScene(QGraphicsScene):
             self._parent.plainTextEdit.appendPlainText("Added edge between {} and {} to model".format(from_type, to_type))
 
     def _handle_keypress_delete(self, selected):
-        del_hander = node_ops.NodeDelete()
         for item in selected:
             # delete node in model (also deletes edges in model)
             if isinstance(item, GraphicsNodeItem):
                 self._parent.plainTextEdit.appendPlainText("Deleting node of type {}".format(item.get_type()))
-                del_hander.execute(self._cur_model, item.node_id, local=True, check_if_last=False)
+                mvops.delete_node(self._cur_model, item.node_id)
 
                 # in view, delete edges that were connected to this node as well
                 # modelverse does this on its own so do not delete edges explicitly here

+ 3 - 0
sketchUI/mvops.py

@@ -47,6 +47,9 @@ def add_edge(model, from_id, to_id, directed=False):
     mv.attr_assign(model, edge_id, "directed", directed)
     return edge_id
 
+def delete_node(model, node_id):
+    mv.delete_element(model, node_id)
+
 def get_consyn_of(node_type):
     """
     Queries the modelverse for a concrete syntax of elements of type "node_type".

+ 1 - 1
wrappers/modelverse_SCCD.py

@@ -1,7 +1,7 @@
 """
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
-Date:   Mon Apr 23 19:00:40 2018
+Date:   Mon Apr 23 19:39:02 2018
 
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server