Improve Delete Command

zmoth · paceholder · commit 2bb8330d5c8d · 2023-01-03T20:47:40.000+01:00
diff --git a/src/UndoCommands.cpp b/src/UndoCommands.cpp
@@ -234,6 +234,10 @@ DeleteCommand(BasicGraphicsScene* scene)
     }
   }
 
+  // If nothing is deleted, cancel this operation
+  if(connJsonArray.isEmpty() && nodesJsonArray.isEmpty())
+    setObsolete(true);
+
   _sceneJson["nodes"] = nodesJsonArray;
   _sceneJson["connections"] = connJsonArray;
 }
@@ -251,9 +255,7 @@ void
 DeleteCommand::
 redo()
 {
-  auto & graphModel = _scene->graphModel();
-
-  deleteSerializedItems(_sceneJson, graphModel);
+  deleteSerializedItems(_sceneJson, _scene->graphModel());
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -234,6 +234,10 @@ DeleteCommand(BasicGraphicsScene* scene)`
`234`	`234`	`}`
`235`	`235`	`}`
`236`	`236`
	`237`	`+ // If nothing is deleted, cancel this operation`
	`238`	`+ if(connJsonArray.isEmpty() && nodesJsonArray.isEmpty())`
	`239`	`+ setObsolete(true);`
	`240`	`+`
`237`	`241`	`_sceneJson["nodes"] = nodesJsonArray;`
`238`	`242`	`_sceneJson["connections"] = connJsonArray;`
`239`	`243`	`}`
`@@ -251,9 +255,7 @@ void`
`251`	`255`	`DeleteCommand::`
`252`	`256`	`redo()`
`253`	`257`	`{`
`254`		`- auto & graphModel = _scene->graphModel();`
`255`		`-`
`256`		`- deleteSerializedItems(_sceneJson, graphModel);`
	`258`	`+ deleteSerializedItems(_sceneJson, _scene->graphModel());`
`257`	`259`	`}`
`258`	`260`
`259`	`261`