Working on connection undo

Author: dcwhite

src/Dataflow/Engine/Controller/ProvenanceItemImpl.cc

@@ -103,24 +103,49 @@ std::string ModuleRemovedProvenanceItem::redoCode() const
 ConnectionAddedProvenanceItem::ConnectionAddedProvenanceItem(const SCIRun::Dataflow::Networks::ConnectionDescription& cd, NetworkFileHandle state, SharedPointer<NetworkEditorPythonInterface> nedPy)
   : ProvenanceItemBase(state, nedPy), desc_(cd)
 {
+  auto outIndex = module_->getOutputPort(desc_.out_.portId_)->getIndex();
+  logCritical("REDO CODE: scirun_connect_modules(\"{}\", {}, \"{}\", {})", desc_.out_.moduleId_.id_, outIndex, desc_.in_.moduleId_.id_, "INDEX_NEEDED");
+  logCritical("REDO CODE: scirun_disconnect_modules(\"{}\", {}, \"{}\", {})", desc_.out_.moduleId_.id_, "INDEX_NEEDED", desc_.in_.moduleId_.id_, "INDEX_NEEDED");
 }
 
 std::string ConnectionAddedProvenanceItem::name() const
 {
   return "Connection added: " + ConnectionId::create(desc_).id_;
 }
 
+std::string ConnectionAddedProvenanceItem::undoCode() const
+{
+  return fmt::format("scirun_remove_connection(\"{}\")", ConnectionId::create(desc_).id_);
+}
+
+std::string ConnectionAddedProvenanceItem::redoCode() const
+{
+  return fmt::format("scirun_connect_modules(\"{}\")", ConnectionId::create(desc_).id_);
+}
+
 ConnectionRemovedProvenanceItem::ConnectionRemovedProvenanceItem(const SCIRun::Dataflow::Networks::ConnectionId& id, NetworkFileHandle state, SharedPointer<NetworkEditorPythonInterface> nedPy)
   : ProvenanceItemBase(state, nedPy), id_(id)
 {
+  //logCritical("REDO CODE: scirun_remove_connection(\"{}\")", id.id_);
+  //logCritical("UNDO CODE: scirun_add_connection(\"{}\")", id.id_);
 }
 
 std::string ConnectionRemovedProvenanceItem::name() const
 {
   return "Connection Removed: " + id_.id_;
 }
 
-ModuleMovedProvenanceItem::ModuleMovedProvenanceItem(const SCIRun::Dataflow::Networks::ModuleId& moduleId, double newX, double newY, double oldX, double oldY, 
+std::string ConnectionRemovedProvenanceItem::undoCode() const
+{
+  return fmt::format("scirun_connect_modules(\"{}\")", id_.id_);
+}
+
+std::string ConnectionRemovedProvenanceItem::redoCode() const
+{
+  return fmt::format("scirun_remove_connection(\"{}\")", id_.id_);
+}
+
+ModuleMovedProvenanceItem::ModuleMovedProvenanceItem(const SCIRun::Dataflow::Networks::ModuleId& moduleId, double newX, double newY, double oldX, double oldY,
   NetworkFileHandle state, SharedPointer<NetworkEditorPythonInterface> nedPy)
   : ProvenanceItemBase(state, nedPy), moduleId_(moduleId), newX_(newX), newY_(newY), oldX_(oldX), oldY_(oldY)
 {

src/Dataflow/Engine/Controller/ProvenanceItemImpl.h

@@ -81,8 +81,8 @@ namespace Engine {
   public:
     ConnectionAddedProvenanceItem(const SCIRun::Dataflow::Networks::ConnectionDescription& cd, Networks::NetworkFileHandle state, SharedPointer<NetworkEditorPythonInterface> nedPy);
     std::string name() const override;
-    std::string undoCode() const override { throw "not implemented"; }
-    std::string redoCode() const override { throw "not implemented"; }
+    std::string undoCode() const override;
+    std::string redoCode() const override;
   private:
     SCIRun::Dataflow::Networks::ConnectionDescription desc_;
   };
@@ -92,16 +92,16 @@ namespace Engine {
   public:
     ConnectionRemovedProvenanceItem(const SCIRun::Dataflow::Networks::ConnectionId& id, Networks::NetworkFileHandle state, SharedPointer<NetworkEditorPythonInterface> nedPy);
     std::string name() const override;
-    std::string undoCode() const override { throw "not implemented"; }
-    std::string redoCode() const override { throw "not implemented"; }
+    std::string undoCode() const override;
+    std::string redoCode() const override;
   private:
     SCIRun::Dataflow::Networks::ConnectionId id_;
   };
 
   class SCISHARE ModuleMovedProvenanceItem : public ProvenanceItemBase
   {
   public:
-    ModuleMovedProvenanceItem(const SCIRun::Dataflow::Networks::ModuleId& moduleId, double newX, double newY, 
+    ModuleMovedProvenanceItem(const SCIRun::Dataflow::Networks::ModuleId& moduleId, double newX, double newY,
       double oldX, double oldY,
       Networks::NetworkFileHandle state, SharedPointer<NetworkEditorPythonInterface> nedPy);
     std::string name() const override;

src/Interface/Application/ProvenanceWindow.cc

@@ -328,8 +328,6 @@ void GuiActionProvenanceConverter::connectionAdded(const SCIRun::Dataflow::Netwo
   if (!provenanceManagerModifyingNetwork_)
   {
     ProvenanceItemHandle item(makeShared<ConnectionAddedProvenanceItem>(cd, editor_->saveNetwork(), NetworkEditorPythonAPI::getImpl()));
-    LOG_TRACE("REDO CODE: scirun_add_connection(\"{}\")", ConnectionId::create(cd).id_);
-    LOG_TRACE("UNDO CODE: scirun_remove_connection(\"{}\")", ConnectionId::create(cd).id_);
     Q_EMIT provenanceItemCreated(item);
   }
 }
@@ -339,8 +337,6 @@ void GuiActionProvenanceConverter::connectionRemoved(const SCIRun::Dataflow::Net
   if (!provenanceManagerModifyingNetwork_)
   {
     ProvenanceItemHandle item(makeShared<ConnectionRemovedProvenanceItem>(id, editor_->saveNetwork(), NetworkEditorPythonAPI::getImpl()));
-    logCritical("REDO CODE: scirun_remove_connection(\"{}\")", id.id_);
-    logCritical("UNDO CODE: scirun_add_connection(\"{}\")", id.id_);
     Q_EMIT provenanceItemCreated(item);
   }
 }