Closes #1465

dcwhite · dcwhite · commit e890301564ac · 2016-06-21T16:35:49.000-06:00
diff --git a/src/Dataflow/Engine/Controller/NetworkEditorController.cc b/src/Dataflow/Engine/Controller/NetworkEditorController.cc
@@ -147,7 +147,7 @@ namespace
           nec_.requestConnection(c.first, c.second);
       }
 
-      nec_.updateModulePositions(positions);
+      nec_.updateModulePositions(positions, true);
 
       return mods_.back();
     }
@@ -170,7 +170,6 @@ namespace
       if (!isSnippetName(label))
         return {};
 
-      //TODO: need a way to specify more than just linear connections.
       parseModules(label);
 
       if (mods_.size() < 2)
@@ -483,7 +482,7 @@ void NetworkEditorController::loadNetwork(const NetworkFileHandle& xml)
       }
       if (serializationManager_)
       {
-        serializationManager_->updateModulePositions(xml->modulePositions);
+        serializationManager_->updateModulePositions(xml->modulePositions, false);
         serializationManager_->updateModuleNotes(xml->moduleNotes);
         serializationManager_->updateConnectionNotes(xml->connectionNotes);
         serializationManager_->updateModuleTags(xml->moduleTags);
@@ -560,7 +559,7 @@ void NetworkEditorController::appendToNetwork(const NetworkFileHandle& xml)
       {
         xml->modulePositions.modulePositions = remapIdBasedContainer(xml->modulePositions.modulePositions, info.moduleIdMapping);
         shiftAppendedModules(xml->modulePositions.modulePositions);
-        serializationManager_->updateModulePositions(xml->modulePositions); // need to shift everything.
+        serializationManager_->updateModulePositions(xml->modulePositions, false); // need to shift everything.
         xml->moduleNotes.notes = remapIdBasedContainer(xml->moduleNotes.notes, info.moduleIdMapping);
         serializationManager_->updateModuleNotes(xml->moduleNotes);
         xml->connectionNotes.notes = remapIdBasedContainer(xml->connectionNotes.notes, info.moduleIdMapping);
@@ -688,11 +687,11 @@ const ModuleLookupInfoSet& NetworkEditorController::possibleReplacements(ModuleH
   return replacementFilter_->findReplacements(makeConnectedPortInfo(module));
 }
 
-void NetworkEditorController::updateModulePositions(const ModulePositions& modulePositions)
+void NetworkEditorController::updateModulePositions(const ModulePositions& modulePositions, bool selectAll)
 {
   if (serializationManager_)
   {
-    serializationManager_->updateModulePositions(modulePositions);
+    serializationManager_->updateModulePositions(modulePositions, selectAll);
   }
 }
 
@@ -726,5 +725,5 @@ void NetworkEditorController::cleanUpNetwork()
     }
   }
 
-  updateModulePositions(cleanedUp);
+  updateModulePositions(cleanedUp, false);
 }
diff --git a/src/Dataflow/Engine/Controller/NetworkEditorController.h b/src/Dataflow/Engine/Controller/NetworkEditorController.h
@@ -153,7 +153,7 @@ namespace Engine {
 
     const Networks::ReplacementImpl::ModuleLookupInfoSet& possibleReplacements(Networks::ModuleHandle module);
 
-    void updateModulePositions(const SCIRun::Dataflow::Networks::ModulePositions& modulePositions);
+    void updateModulePositions(const SCIRun::Dataflow::Networks::ModulePositions& modulePositions, bool selectAll);
 
     void cleanUpNetwork();
 
diff --git a/src/Dataflow/Serialization/Network/ModulePositionGetter.h b/src/Dataflow/Serialization/Network/ModulePositionGetter.h
@@ -48,7 +48,7 @@ namespace Networks {
   public:
     virtual ~NetworkEditorSerializationManager() {}
     virtual ModulePositionsHandle dumpModulePositions(ModuleFilter filter) const = 0;
-    virtual void updateModulePositions(const ModulePositions& modulePositions) = 0;
+    virtual void updateModulePositions(const ModulePositions& modulePositions, bool selectAll) = 0;
 
     //TODO: refactor into dump/updateNotes, shouldn't need to distinguish parent.
     virtual ModuleNotesHandle dumpModuleNotes(ModuleFilter filter) const = 0;
diff --git a/src/Interface/Application/NetworkEditor.cc b/src/Interface/Application/NetworkEditor.cc
@@ -144,10 +144,8 @@ boost::shared_ptr<NetworkEditorControllerGuiProxy> NetworkEditor::getNetworkEdit
 
 void NetworkEditor::addModuleWidget(const std::string& name, ModuleHandle module, const ModuleCounter& count)
 {
-  //qDebug() << "addModuleWidget " << module->get_id().id_.c_str();
   latestModuleId_ = module->get_id().id_;
-  //std::cout << "\tNE modules done (start): " << *count.count << std::endl;
-  ModuleWidget* moduleWidget = new ModuleWidget(this, QString::fromStdString(name), module, dialogErrorControl_);
+  auto moduleWidget = new ModuleWidget(this, QString::fromStdString(name), module, dialogErrorControl_);
   moduleEventProxy_->trackModule(module);
 
   setupModuleWidget(moduleWidget);
@@ -156,7 +154,6 @@ void NetworkEditor::addModuleWidget(const std::string& name, ModuleHandle module
     moduleWidget->postLoadAction();
   }
   count.increment();
-  //std::cout << "\tNE modules done (end): " << *count.count << std::endl;
   Q_EMIT modified();
   Q_EMIT newModule(QString::fromStdString(module->get_id()), module->has_ui());
 }
@@ -849,7 +846,7 @@ DisabledComponentsHandle NetworkEditor::dumpDisabledComponents(ModuleFilter modF
   return disabled;
 }
 
-void NetworkEditor::updateModulePositions(const ModulePositions& modulePositions)
+void NetworkEditor::updateModulePositions(const ModulePositions& modulePositions, bool selectAll)
 {
   Q_FOREACH(QGraphicsItem* item, scene_->items())
   {
@@ -860,6 +857,8 @@ void NetworkEditor::updateModulePositions(const ModulePositions& modulePositions
       {
         w->setPos(posIter->second.first, posIter->second.second);
         ensureVisible(w);
+        if (selectAll)
+          w->setSelected(true);
       }
     }
   }
@@ -1033,10 +1032,13 @@ void NetworkEditor::appendToNetwork(const NetworkFileHandle& xml)
   Q_FOREACH(QGraphicsItem* item, scene_->items())
   {
     if (!originalItems.contains(item))
+    {
       if (auto w = dynamic_cast<ModuleProxyWidget*>(item))
       {
         w->getModuleWidget()->postLoadAction();
+        w->setSelected(true);
       }
+    }
   }
 
   setSceneRect(QRectF());
@@ -1109,8 +1111,6 @@ void NetworkEditor::selectAll()
 {
   Q_FOREACH(QGraphicsItem* item, scene_->items())
   {
-    //if (ModuleProxyWidget* mpw = dynamic_cast<ModuleProxyWidget*>(item))
-    //mpw->setSelected(true);
     item->setSelected(true);
   }
 }
diff --git a/src/Interface/Application/NetworkEditor.h b/src/Interface/Application/NetworkEditor.h
@@ -165,7 +165,7 @@ namespace Gui {
     void appendToNetwork(const Dataflow::Networks::NetworkFileHandle& xml);
 
     virtual Dataflow::Networks::ModulePositionsHandle dumpModulePositions(Dataflow::Networks::ModuleFilter filter) const override;
-    virtual void updateModulePositions(const Dataflow::Networks::ModulePositions& modulePositions) override;
+    virtual void updateModulePositions(const Dataflow::Networks::ModulePositions& modulePositions, bool selectAll) override;
 
     virtual Dataflow::Networks::ModuleNotesHandle dumpModuleNotes(Dataflow::Networks::ModuleFilter filter) const override;
     virtual void updateModuleNotes(const Dataflow::Networks::ModuleNotes& moduleNotes) override;

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ namespace`
`147`	`147`	`nec_.requestConnection(c.first, c.second);`
`148`	`148`	`}`
`149`	`149`
`150`		`- nec_.updateModulePositions(positions);`
	`150`	`+ nec_.updateModulePositions(positions, true);`
`151`	`151`
`152`	`152`	`return mods_.back();`
`153`	`153`	`}`
`@@ -170,7 +170,6 @@ namespace`
`170`	`170`	`if (!isSnippetName(label))`
`171`	`171`	`return {};`
`172`	`172`
`173`		`- //TODO: need a way to specify more than just linear connections.`
`174`	`173`	`parseModules(label);`
`175`	`174`
`176`	`175`	`if (mods_.size() < 2)`
`@@ -483,7 +482,7 @@ void NetworkEditorController::loadNetwork(const NetworkFileHandle& xml)`
`483`	`482`	`}`
`484`	`483`	`if (serializationManager_)`
`485`	`484`	`{`
`486`		`- serializationManager_->updateModulePositions(xml->modulePositions);`
	`485`	`+ serializationManager_->updateModulePositions(xml->modulePositions, false);`
`487`	`486`	`serializationManager_->updateModuleNotes(xml->moduleNotes);`
`488`	`487`	`serializationManager_->updateConnectionNotes(xml->connectionNotes);`
`489`	`488`	`serializationManager_->updateModuleTags(xml->moduleTags);`
`@@ -560,7 +559,7 @@ void NetworkEditorController::appendToNetwork(const NetworkFileHandle& xml)`
`560`	`559`	`{`
`561`	`560`	`xml->modulePositions.modulePositions = remapIdBasedContainer(xml->modulePositions.modulePositions, info.moduleIdMapping);`
`562`	`561`	`shiftAppendedModules(xml->modulePositions.modulePositions);`
`563`		`- serializationManager_->updateModulePositions(xml->modulePositions); // need to shift everything.`
	`562`	`+ serializationManager_->updateModulePositions(xml->modulePositions, false); // need to shift everything.`
`564`	`563`	`xml->moduleNotes.notes = remapIdBasedContainer(xml->moduleNotes.notes, info.moduleIdMapping);`
`565`	`564`	`serializationManager_->updateModuleNotes(xml->moduleNotes);`
`566`	`565`	`xml->connectionNotes.notes = remapIdBasedContainer(xml->connectionNotes.notes, info.moduleIdMapping);`
`@@ -688,11 +687,11 @@ const ModuleLookupInfoSet& NetworkEditorController::possibleReplacements(ModuleH`
`688`	`687`	`return replacementFilter_->findReplacements(makeConnectedPortInfo(module));`
`689`	`688`	`}`
`690`	`689`
`691`		`-void NetworkEditorController::updateModulePositions(const ModulePositions& modulePositions)`
	`690`	`+void NetworkEditorController::updateModulePositions(const ModulePositions& modulePositions, bool selectAll)`
`692`	`691`	`{`
`693`	`692`	`if (serializationManager_)`
`694`	`693`	`{`
`695`		`- serializationManager_->updateModulePositions(modulePositions);`
	`694`	`+ serializationManager_->updateModulePositions(modulePositions, selectAll);`
`696`	`695`	`}`
`697`	`696`	`}`
`698`	`697`
`@@ -726,5 +725,5 @@ void NetworkEditorController::cleanUpNetwork()`
`726`	`725`	`}`
`727`	`726`	`}`
`728`	`727`
`729`		`- updateModulePositions(cleanedUp);`
	`728`	`+ updateModulePositions(cleanedUp, false);`
`730`	`729`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,10 +144,8 @@ boost::shared_ptr<NetworkEditorControllerGuiProxy> NetworkEditor::getNetworkEdit`
`144`	`144`
`145`	`145`	`void NetworkEditor::addModuleWidget(const std::string& name, ModuleHandle module, const ModuleCounter& count)`
`146`	`146`	`{`
`147`		`- //qDebug() << "addModuleWidget " << module->get_id().id_.c_str();`
`148`	`147`	`latestModuleId_ = module->get_id().id_;`
`149`		`- //std::cout << "\tNE modules done (start): " << *count.count << std::endl;`
`150`		`- ModuleWidget* moduleWidget = new ModuleWidget(this, QString::fromStdString(name), module, dialogErrorControl_);`
	`148`	`+ auto moduleWidget = new ModuleWidget(this, QString::fromStdString(name), module, dialogErrorControl_);`
`151`	`149`	`moduleEventProxy_->trackModule(module);`
`152`	`150`
`153`	`151`	`setupModuleWidget(moduleWidget);`
`@@ -156,7 +154,6 @@ void NetworkEditor::addModuleWidget(const std::string& name, ModuleHandle module`
`156`	`154`	`moduleWidget->postLoadAction();`
`157`	`155`	`}`
`158`	`156`	`count.increment();`
`159`		`- //std::cout << "\tNE modules done (end): " << *count.count << std::endl;`
`160`	`157`	`Q_EMIT modified();`
`161`	`158`	`Q_EMIT newModule(QString::fromStdString(module->get_id()), module->has_ui());`
`162`	`159`	`}`
`@@ -849,7 +846,7 @@ DisabledComponentsHandle NetworkEditor::dumpDisabledComponents(ModuleFilter modF`
`849`	`846`	`return disabled;`
`850`	`847`	`}`
`851`	`848`
`852`		`-void NetworkEditor::updateModulePositions(const ModulePositions& modulePositions)`
	`849`	`+void NetworkEditor::updateModulePositions(const ModulePositions& modulePositions, bool selectAll)`
`853`	`850`	`{`
`854`	`851`	`Q_FOREACH(QGraphicsItem* item, scene_->items())`
`855`	`852`	`{`
`@@ -860,6 +857,8 @@ void NetworkEditor::updateModulePositions(const ModulePositions& modulePositions`
`860`	`857`	`{`
`861`	`858`	`w->setPos(posIter->second.first, posIter->second.second);`
`862`	`859`	`ensureVisible(w);`
	`860`	`+ if (selectAll)`
	`861`	`+ w->setSelected(true);`
`863`	`862`	`}`
`864`	`863`	`}`
`865`	`864`	`}`
`@@ -1033,10 +1032,13 @@ void NetworkEditor::appendToNetwork(const NetworkFileHandle& xml)`
`1033`	`1032`	`Q_FOREACH(QGraphicsItem* item, scene_->items())`
`1034`	`1033`	`{`
`1035`	`1034`	`if (!originalItems.contains(item))`
	`1035`	`+ {`
`1036`	`1036`	`if (auto w = dynamic_cast<ModuleProxyWidget*>(item))`
`1037`	`1037`	`{`
`1038`	`1038`	`w->getModuleWidget()->postLoadAction();`
	`1039`	`+ w->setSelected(true);`
`1039`	`1040`	`}`
	`1041`	`+ }`
`1040`	`1042`	`}`
`1041`	`1043`
`1042`	`1044`	`setSceneRect(QRectF());`
`@@ -1109,8 +1111,6 @@ void NetworkEditor::selectAll()`
`1109`	`1111`	`{`
`1110`	`1112`	`Q_FOREACH(QGraphicsItem* item, scene_->items())`
`1111`	`1113`	`{`
`1112`		`- //if (ModuleProxyWidget* mpw = dynamic_cast<ModuleProxyWidget*>(item))`
`1113`		`- //mpw->setSelected(true);`
`1114`	`1114`	`item->setSelected(true);`
`1115`	`1115`	`}`
`1116`	`1116`	`}`