Merge branch 'master' into tabwidget-tooltip

Author: dcwhite

src/Core/Algorithms/Math/AddKnownsToLinearSystem.cc

@@ -65,13 +65,6 @@ bool AddKnownsToLinearSystemAlgo::run(SparseRowMatrixHandle stiff,
 
   SparseRowMatrixFromMap::Values additionalData;
 
-  // Making sure the stiff matrix (left hand side) is symmetric
-  if (!isSymmetricMatrix(*stiff,bound_for_equality))
-  {
-    std::ostringstream ostr1;
-    ostr1 << "matrix A is not symmetrical due to a difference of " << bound_for_equality << std::endl;
-    THROW_ALGORITHM_INPUT_ERROR(ostr1.str());    
-  }
 
   // Storing the number of columns in m and rows in n from the stiff matrix, m == n
   const unsigned int numCols = static_cast<unsigned int>(stiff->ncols());

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);