Merge remote-tracking branch 'upstream/master'

Author: jessdtate

src/Interface/Application/MainWindowCollaborators.cc

@@ -269,9 +269,9 @@ class ConnectionStyleWizardPage : public QWizardPage, public Ui::ConnectionStyle
   ConnectionStyleWizardPage()
   {
     setupUi(this);
-    manhattanLabel_->setPixmap(QPixmap(":/general/Resources/manhattan.png"));
-    euclideanLabel_->setPixmap(QPixmap(":/general/Resources/euclidean.png"));
-    cubicLabel_->setPixmap(QPixmap(":/general/Resources/cubic.png"));
+    manhattanLabel_->setPixmap(QPixmap(":/general/Resources/manhattanPipe.png"));
+    euclideanLabel_->setPixmap(QPixmap(":/general/Resources/euclideanPipe.png"));
+    cubicLabel_->setPixmap(QPixmap(":/general/Resources/cubicPipe.png"));
     registerField("connectionChoice*", connectionComboBox_);
     connect(connectionComboBox_, SIGNAL(currentIndexChanged(int)), SCIRunMainWindow::Instance(), SLOT(setConnectionPipelineType(int)));
   }

src/Interface/Application/NetworkEditor.cc

@@ -87,7 +87,7 @@ NetworkEditor::NetworkEditor(boost::shared_ptr<CurrentModuleSelection> moduleSel
   scene_->setBackgroundBrush(Qt::darkGray);
   ModuleWidget::connectionFactory_.reset(new ConnectionFactory(scene_));
   ModuleWidget::closestPortFinder_.reset(new ClosestPortFinder(scene_));
-  ModuleWidget::highResolutionExpandFactor_ = highResolutionExpandFactor_; 
+  ModuleWidget::highResolutionExpandFactor_ = highResolutionExpandFactor_;
 
   setScene(scene_);
   setDragMode(RubberBandDrag);
@@ -716,20 +716,6 @@ void NetworkEditor::mouseReleaseEvent(QMouseEvent *event)
   QGraphicsView::mouseReleaseEvent(event);
 }
 
-void NetworkEditor::mouseDoubleClickEvent(QMouseEvent* event)
-{
-#if 0
-  if (!search_)
-  {
-    search_ = scene_->addWidget(new NetworkSearchWidget(this));
-    search_->setOpacity(0.9);
-  }
-  search_->setPos(mapToScene(event->pos()));
-  search_->setVisible(true);
-#endif
-  QGraphicsView::mouseDoubleClickEvent(event);
-}
-
 NetworkSearchWidget::NetworkSearchWidget(NetworkEditor* ned)
 {
   setupUi(this);
@@ -787,6 +773,10 @@ class NetworkSearchEngine
       {
         subresults = searchItem(w, text);
       }
+      else if (dynamic_cast<FloatingTextItem*>(item))
+      {
+        // skip--don't search errors or search results
+      }
       else if (auto t = dynamic_cast<QGraphicsTextItem*>(item))
       {
         subresults = searchItem(t, text);

src/Interface/Application/NetworkEditor.h

@@ -174,7 +174,7 @@ namespace Gui {
 	  Q_OBJECT
 
   public:
-    explicit NetworkEditor(boost::shared_ptr<CurrentModuleSelection> moduleSelectionGetter, 
+    explicit NetworkEditor(boost::shared_ptr<CurrentModuleSelection> moduleSelectionGetter,
         boost::shared_ptr<DefaultNotePositionGetter> dnpg,
 				boost::shared_ptr<DialogErrorControl> dialogErrorControl,
         PreexecuteFunc preexecuteFunc,
@@ -249,7 +249,6 @@ namespace Gui {
     virtual void wheelEvent(QWheelEvent* event) override;
     virtual void contextMenuEvent(QContextMenuEvent *event) override;
     virtual void mousePressEvent(QMouseEvent *event) override;
-    virtual void mouseDoubleClickEvent(QMouseEvent* event) override;
 
   public Q_SLOTS:
     void addModuleWidget(const std::string& name, SCIRun::Dataflow::Networks::ModuleHandle module, const SCIRun::Dataflow::Engine::ModuleCounter& count);

…nterface/Application/Resources/cubic.PNG …face/Application/Resources/cubicPipe.pngsrc/Interface/Application/Resources/cubic.PNG renamed to src/Interface/Application/Resources/cubicPipe.png src/Interface/Application/Resources/cubic.PNG renamed to src/Interface/Application/Resources/cubicPipe.png

@@ -32,9 +32,9 @@
     <file>Resources/copy.png</file>
     <file>Resources/paste.png</file>
     <file>Resources/download.png</file>
-    <file>Resources/cubic.PNG</file>
-    <file>Resources/euclidean.PNG</file>
-    <file>Resources/manhattan.PNG</file>
+    <file>Resources/cubicPipe.png</file>
+    <file>Resources/euclideanPipe.png</file>
+    <file>Resources/manhattanPipe.png</file>
     <file>Resources/timepiece-512.png</file>
     <file>Resources/new/general/folder.png</file>
     <file>Resources/new/general/header-divider.png</file>