Working on move/unmove

Author: dcwhite

src/Dataflow/Engine/Controller/NetworkEditorController.cc

@@ -935,6 +935,15 @@ void NetworkEditorController::updateModulePositions(const ModulePositions& modul
   }
 }
 
+bool NetworkEditorController::moveModule(const std::string& id, double x, double y)
+{
+  if (collabs_.serializationManager_)
+  {
+    return collabs_.serializationManager_->updateModulePosition(id, x, y);
+  }
+  return false;
+}
+
 void NetworkEditorController::cleanUpNetwork()
 {
   auto all = [](ModuleHandle) { return true; };

src/Dataflow/Engine/Controller/NetworkEditorController.h

@@ -112,6 +112,7 @@ namespace Engine {
     Networks::ModuleHandle addModule(const Networks::ModuleLookupInfo& info) override;
     Networks::ModuleHandle addModule(const std::string& name);
     bool removeModule(const Networks::ModuleId& id);
+    bool moveModule(const std::string& id, double x, double y);
 
     Networks::ModuleHandle duplicateModule(const Networks::ModuleHandle& module);
     Networks::ModuleHandle connectNewModule(const Networks::PortDescriptionInterface* portToConnect, const std::string& newModuleName);

src/Dataflow/Engine/Controller/ProvenanceItemImpl.cc

@@ -120,8 +120,9 @@ std::string ConnectionRemovedProvenanceItem::name() const
   return "Connection Removed: " + id_.id_;
 }
 
-ModuleMovedProvenanceItem::ModuleMovedProvenanceItem(const SCIRun::Dataflow::Networks::ModuleId& moduleId, double newX, double newY, NetworkFileHandle state, SharedPointer<NetworkEditorPythonInterface> nedPy)
-  : ProvenanceItemBase(state, nedPy), moduleId_(moduleId), newX_(newX), newY_(newY)
+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)
 {
 }
 
@@ -131,3 +132,13 @@ std::string ModuleMovedProvenanceItem::name() const
   ostr << "Module " << moduleId_.id_ << " moved to (" << newX_ << "," << newY_ << ")";
   return ostr.str();
 }
+
+std::string ModuleMovedProvenanceItem::undoCode() const
+{
+  return fmt::format("scirun_move_module(\"{}\", {}, {})", moduleId_.id_, oldX_, oldY_);
+}
+
+std::string ModuleMovedProvenanceItem::redoCode() const
+{
+  return fmt::format("scirun_move_module(\"{}\", {}, {})", moduleId_.id_, newX_, newY_);
+}

src/Dataflow/Engine/Controller/ProvenanceItemImpl.h

@@ -101,13 +101,15 @@ namespace Engine {
   class SCISHARE ModuleMovedProvenanceItem : public ProvenanceItemBase
   {
   public:
-    ModuleMovedProvenanceItem(const SCIRun::Dataflow::Networks::ModuleId& moduleId, double newX, double newY, Networks::NetworkFileHandle state, SharedPointer<NetworkEditorPythonInterface> nedPy);
+    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;
-    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::ModuleId moduleId_;
-    double newX_, newY_;
+    double newX_, newY_, oldX_, oldY_;
   };
 }
 }

src/Dataflow/Engine/Controller/PythonImpl.cc

@@ -662,4 +662,9 @@ std::string PythonImpl::quit(bool force)
   return "Quit after execute enabled.";
 }
 
+std::string PythonImpl::moveModule(const std::string& id, double x, double y)
+{
+  return nec_.moveModule(id, x, y) ? "Module moved." : "Module not found.";
+}
+
 #endif

src/Dataflow/Engine/Controller/PythonImpl.h

@@ -69,6 +69,7 @@ namespace Engine {
     void setModuleContext(bool inModule) override { inModule_ = inModule; }
     bool isModuleContext() const override { return inModule_; }
     std::string mostRecentAddModuleId() const override { return mostRecentAddModuleId_; }
+    std::string moveModule(const std::string& id, double x, double y) override;
   private:
     void pythonModuleAddedSlot(const std::string&, Networks::ModuleHandle, ModuleCounter);
     void pythonModuleRemovedSlot(const Networks::ModuleId&);

src/Dataflow/Engine/Controller/Tests/ProvenanceItemTests.cc

@@ -62,7 +62,7 @@ class ProvenanceItemTests : public ::testing::Test
 TEST_F(ProvenanceItemTests, CanCreateAddModule)
 {
   const std::string name = "ComputeSVD";
-  ModuleAddedProvenanceItem item(name, name + ":0", NetworkFileHandle());
+  ModuleAddedProvenanceItem item(name, name + ":0", nullptr, nullptr);
 
   EXPECT_EQ("Module Added: " + name, item.name());
   EXPECT_EQ("scirun_add_module(\"ComputeSVD\")", item.redoCode());
@@ -72,7 +72,7 @@ TEST_F(ProvenanceItemTests, CanCreateAddModule)
 TEST_F(ProvenanceItemTests, CanCreateRemoveModule)
 {
   const std::string id = "ComputeSVD1";
-  ModuleRemovedProvenanceItem item((ModuleId(id)), NetworkFileHandle());
+  ModuleRemovedProvenanceItem item((ModuleId(id)), nullptr, nullptr);
 
   EXPECT_EQ("Module Removed: " + id, item.name());
 }

src/Dataflow/Engine/Python/NetworkEditorPythonAPI.cc

@@ -130,6 +130,12 @@ std::string NetworkEditorPythonAPI::removeModule(const std::string& id)
   }
 }
 
+std::string NetworkEditorPythonAPI::moveModule(const std::string& id, double x, double y)
+{
+  std::cout << "TODO: move module " << id << " " << x << " " << y << std::endl;
+  return "move";
+}
+
 std::vector<SharedPointer<PyModule>> NetworkEditorPythonAPI::modules()
 {
   Guard g(pythonLock_);

src/Dataflow/Engine/Python/NetworkEditorPythonAPI.h

@@ -51,6 +51,7 @@ namespace SCIRun {
     static PyModulePtr addModule(const std::string& name);
     static std::vector<PyModulePtr> modules();
     static std::string removeModule(const std::string& id);
+    static std::string moveModule(const std::string& id, double x, double y);
     static std::string connect(const std::string& moduleIdFrom, int fromIndex, const std::string& moduleIdTo, int toIndex);
     static std::string disconnect(const std::string& moduleIdFrom, int fromIndex, const std::string& moduleIdTo, int toIndex);
     static boost::python::object scirun_get_module_state(const std::string& moduleId, const std::string& stateVariable);

src/Dataflow/Engine/Python/NetworkEditorPythonInterface.h

@@ -143,6 +143,7 @@ namespace SCIRun
     virtual void setModuleContext(bool inModule) = 0;
     virtual bool isModuleContext() const = 0;
     virtual std::string mostRecentAddModuleId() const = 0;
+    virtual std::string moveModule(const std::string& id, double x, double y) = 0;
   };
 }