Closes #1411

Author: dcwhite

src/Interface/Application/NetworkEditor.cc

@@ -667,6 +667,13 @@ void NetworkEditor::mouseMoveEvent(QMouseEvent *event)
   QGraphicsView::mouseMoveEvent(event);
 }
 
+void NetworkEditor::mousePressEvent(QMouseEvent *event)
+{
+  if (event->button() == Qt::MiddleButton)
+    Q_EMIT middleMouseClicked();
+  QGraphicsView::mousePressEvent(event);
+}
+
 void NetworkEditor::mouseReleaseEvent(QMouseEvent *event)
 {
   if (modulesSelectedByCL_)

src/Interface/Application/NetworkEditor.h

@@ -215,6 +215,7 @@ namespace Gui {
     virtual void mouseReleaseEvent(QMouseEvent *event) override;
     virtual void wheelEvent(QWheelEvent* event) override;
     virtual void contextMenuEvent(QContextMenuEvent *event) override;
+    virtual void mousePressEvent(QMouseEvent *event) override;
 
   public Q_SLOTS:
     void addModuleWidget(const std::string& name, SCIRun::Dataflow::Networks::ModuleHandle module, const SCIRun::Dataflow::Engine::ModuleCounter& count);
@@ -256,6 +257,7 @@ namespace Gui {
     void networkExecuted();
     void networkExecutionFinished();
     void networkEditorMouseButtonPressed();
+    void middleMouseClicked();
     void moduleMoved(const SCIRun::Dataflow::Networks::ModuleId& id, double newX, double newY);
     void defaultNotePositionChanged(NotePosition position);
     void sceneChanged(const QList<QRectF>& region);

src/Interface/Application/SCIRunMainWindow.cc

@@ -273,7 +273,6 @@ SCIRunMainWindow::SCIRunMainWindow() : shortcuts_(nullptr), firstTimePythonShown
   makePipesEuclidean();
 
   connect(this, SIGNAL(moduleItemDoubleClicked()), networkEditor_, SLOT(addModuleViaDoubleClickedTreeItem()));
-  connect(moduleSelectorTreeWidget_, SIGNAL(itemChanged(QTreeWidgetItem*, int)), this, SLOT(updateSavedSubnetworks()));
   connect(moduleFilterLineEdit_, SIGNAL(textChanged(const QString&)), this, SLOT(filterModuleNamesInTreeView(const QString&)));
 
 #if 0 //TODO: decide on modifiable background color
@@ -351,6 +350,7 @@ SCIRunMainWindow::SCIRunMainWindow() : shortcuts_(nullptr), firstTimePythonShown
   adjustExecuteButtonAppearance();
 
   connect(networkEditor_, SIGNAL(newSubnetworkCopied(const QString&)), this, SLOT(updateClipboardHistory(const QString&)));
+  connect(networkEditor_, SIGNAL(middleMouseClicked()), this, SLOT(switchMouseMode()));
 
   connect(openLogFolderButton_, SIGNAL(clicked()), this, SLOT(openLogFolder()));
 
@@ -877,14 +877,7 @@ void SCIRunMainWindow::setDragMode(bool toggle)
     networkEditor_->setMouseAsDragMode();
     statusBar()->showMessage("Mouse in drag mode", 2000);
   }
-  if (actionDragMode_->isChecked())
-  {
-    actionSelectMode_->setChecked(false);
-  }
-  else
-  {
-    actionSelectMode_->setChecked(true);
-  }
+  actionSelectMode_->setChecked(!actionDragMode_->isChecked());
 }
 
 void SCIRunMainWindow::setSelectMode(bool toggle)
@@ -894,12 +887,19 @@ void SCIRunMainWindow::setSelectMode(bool toggle)
     networkEditor_->setMouseAsSelectMode();
     statusBar()->showMessage("Mouse in select mode", 2000);
   }
-  if (actionSelectMode_->isChecked())
+  actionDragMode_->setChecked(!actionSelectMode_->isChecked());
+}
+
+void SCIRunMainWindow::switchMouseMode()
+{
+  if (actionDragMode_->isChecked())
   {
-    actionDragMode_->setChecked(false);
+    setSelectMode(true);
+    actionSelectMode_->setChecked(true);
   }
-  else
+  else // select->drag
   {
+    setDragMode(true);
     actionDragMode_->setChecked(true);
   }
 }
@@ -1418,10 +1418,8 @@ void SCIRunMainWindow::handleCheckedModuleEntry(QTreeWidgetItem* item, int colum
 void SCIRunMainWindow::removeSavedSubnetwork()
 {
 	auto toDelete = sender()->property("ID").toString();
-  //qDebug() << "removing from subnet maps: " << toDelete << savedSubnetworksNames_.size() << savedSubnetworksXml_.size();
   savedSubnetworksNames_.remove(toDelete);
   savedSubnetworksXml_.remove(toDelete);
-  //qDebug() << "done removing from subnet maps: " << toDelete << savedSubnetworksNames_.size() << savedSubnetworksXml_.size();
 	auto tree = getSavedSubnetworksMenu(moduleSelectorTreeWidget_);
 	for (int i = 0; i < tree->childCount(); ++i)
 	{
@@ -1437,13 +1435,10 @@ void SCIRunMainWindow::removeSavedSubnetwork()
 void SCIRunMainWindow::renameSavedSubnetwork()
 {
   auto toRename = sender()->property("ID").toString();
-  qDebug() << "renaming subnet : " << toRename << savedSubnetworksNames_;
-
   bool ok;
   auto text = QInputDialog::getText(this, tr("Rename subnet"), tr("Enter new subnet name:"), QLineEdit::Normal, savedSubnetworksNames_[toRename].toString(), &ok);
   if (ok && !text.isEmpty())
   {
-    qDebug() << "new name:" << text;
     savedSubnetworksNames_[toRename] = text;
     auto tree = getSavedSubnetworksMenu(moduleSelectorTreeWidget_);
     for (int i = 0; i < tree->childCount(); ++i)
@@ -1452,8 +1447,7 @@ void SCIRunMainWindow::renameSavedSubnetwork()
       if (toRename == subnet->data(0, Qt::UserRole).toString())
       {
         auto widget = moduleSelectorTreeWidget_->itemWidget(subnet, 0);
-        qDebug() << widget;
-        //qobject_cast<QLabel*>(widget->layout()->children()[0])->setText(text);
+        qobject_cast<QLabel*>(widget->layout()->itemAt(0)->widget())->setText(text);
         break;
       }
     }
@@ -1896,18 +1890,6 @@ void SCIRunMainWindow::updateClipboardHistory(const QString& xml)
   clips->addChild(clip);
 }
 
-void SCIRunMainWindow::updateSavedSubnetworks()
-{
-  //qDebug() << "TODO rewrite: updateSavedSubnetworks";
-  //savedSubnetworks_.clear();
-  //auto menu = getSavedSubnetworksMenu(moduleSelectorTreeWidget_);
-  //for (auto i = 0; i < menu->childCount(); ++i)
-  //{
-  //  auto item = menu->child(i);
-  //  savedSubnetworks_[item->text(0)] = item->toolTip(0);
-  //}
-}
-
 void SCIRunMainWindow::showSnippetHelp()
 {
   QMessageBox::information(this, "Snippets",

src/Interface/Application/SCIRunMainWindow.h

@@ -177,6 +177,7 @@ private Q_SLOTS:
   void runScript();
   void importLegacyNetwork();
   void networkModified();
+  void switchMouseMode();
   void filterModuleNamesInTreeView(const QString& start);
   void makePipesEuclidean();
   void makePipesCubicBezier();
@@ -216,7 +217,6 @@ private Q_SLOTS:
   void showClipboardHelp();
   void copyVersionToClipboard();
   void updateClipboardHistory(const QString& xml);
-  void updateSavedSubnetworks();
   void changeExecuteActionIconToStop();
   void changeExecuteActionIconToPlay();
   void adjustExecuteButtonAppearance();