Note selection cleared on click

Author: dcwhite

src/Interface/Application/Connection.cc

@@ -279,7 +279,7 @@ ConnectionLine::ConnectionLine(PortWidget* fromPort, PortWidget* toPort, const C
   setFlags(ItemIsSelectable | ItemIsMovable | ItemSendsGeometryChanges | ItemIsFocusable);
 
   setZValue(defaultZValue());
-  setToolTip("<font color=\"#000000\" size=2>Left - Highlight\nDouble-Left - Menu\ni - Datatype info");
+  setToolTip("<font color=\"#EEEEEE\" size=2>Left - Highlight<br>Double-Left - Menu<br>i - Datatype info");
   setAcceptHoverEvents(true);
 
   menu_ = new ConnectionMenu(this);

src/Interface/Application/ModuleProxyWidget.cc

@@ -243,6 +243,7 @@ void ModuleProxyWidget::disableModuleGUI(bool disabled)
 
 void ModuleProxyWidget::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
+  clearNoteCursor();
   auto taggingOn = data(TagLayerKey).toBool();
   auto currentTag = data(CurrentTagKey).toInt();
   if (taggingOn && currentTag > NoTag)

src/Interface/Application/NetworkEditor.cc

@@ -739,6 +739,7 @@ SearchResultItem::SearchResultItem(const QString& text, const QColor& color, std
   : FloatingTextItem(text, action, parent)
 {
   setDefaultTextColor(color);
+  setHtml("<div style='background:rgba(150, 150, 150, 30%);'>" + toPlainText() + "</div>");
   items_.insert(this);
 }
 
@@ -805,10 +806,11 @@ class NetworkSearchEngine
     auto id = mod->getModuleWidget()->getModuleId();
     if (boost::ifind_first(id, text.toStdString()))
     {
+      auto tag = mod->data(TagDataKey).toInt();
       results.emplace_back("Module",
         QString::fromStdString(id),
         [mod]() { mod->showAndColor(Qt::green); },
-        tagColor_(mod->data(TagDataKey).toInt()));
+        tag != NoTag ? tagColor_(tag) : Qt::white);
     }
 
     auto metadata = mod->getModuleWidget()->metadataToString();
@@ -855,7 +857,6 @@ class NetworkSearchEngine
     auto doc = note->document();
     QTextCursor cur(doc->find(text));
     note->setTextCursor(cur);
-    //QTimer::singleShot(4000, &cur, SLOT(networkTimedOut()));
   }
 
   QGraphicsScene* scene_;
@@ -875,18 +876,21 @@ void NetworkEditor::searchTextChanged(const QString& text)
 
     NetworkSearchEngine engine(scene(), tagColor_);
     auto results = engine.search(text);
+    auto textScale = 1.0 / currentScale_;
     if (!results.empty())
     {
       auto title = new SearchResultItem("Search results:", Qt::green, {});
-      title->setPos(positionOfFloatingText(title->num(), true, 20, 30));
+      title->setPos(positionOfFloatingText(title->num(), true, 20, textScale * 20));
       scene()->addItem(title);
+      title->scale(textScale, textScale);
     }
     for (const auto& result : results)
     {
       auto searchItem = new SearchResultItem(std::get<ItemType>(result) + ": " + std::get<ItemName>(result),
         std::get<ItemColor>(result), std::get<ItemAction>(result));
-      searchItem->setPos(positionOfFloatingText(searchItem->num(), true, 50, 30));
+      searchItem->setPos(positionOfFloatingText(searchItem->num(), true, 50, textScale * 20));
       scene()->addItem(searchItem);
+      searchItem->scale(textScale, textScale);
     }
   }
 }

src/Interface/Application/Note.cc

@@ -38,7 +38,7 @@
 using namespace SCIRun::Gui;
 using namespace SCIRun::Core::Logging;
 
-HasNotes::HasNotes(const std::string& name, bool positionAdjustable) : 
+HasNotes::HasNotes(const std::string& name, bool positionAdjustable) :
   noteEditor_(QString::fromStdString(name), positionAdjustable, 0),
   destroyed_(false)
 {
@@ -80,8 +80,8 @@ void HasNotes::setCurrentNote(const Note& note, bool updateEditor)
   }
 }
 
-NoteDisplayHelper::NoteDisplayHelper(NoteDisplayStrategyPtr display) : 
-  item_(0), scene_(0), note_(0), 
+NoteDisplayHelper::NoteDisplayHelper(NoteDisplayStrategyPtr display) :
+  item_(0), scene_(0), note_(0),
   notePosition_(Default),
   defaultNotePosition_(Top), //TODO
   displayStrategy_(display),
@@ -124,6 +124,16 @@ void NoteDisplayHelper::updateNoteImpl(const Note& note)
   note_->setZValue(item_->zValue() - 1);
 }
 
+void NoteDisplayHelper::clearNoteCursor()
+{
+  if (note_)
+  {
+    auto cur = note_->textCursor();
+    cur.clearSelection();
+    note_->setTextCursor(cur);
+  }
+}
+
 QPointF NoteDisplayHelper::relativeNotePosition()
 {
   if (note_ && item_)
@@ -157,4 +167,4 @@ Note NoteDisplayHelper::currentNote() const
   if (note_)
     return Note(note_->toHtml(), note_->toPlainText(), note_->font().pointSizeF(), notePosition_);
   return Note();
-}
+}

src/Interface/Application/Note.h

@@ -51,13 +51,13 @@ namespace Gui {
     None,
     Tooltip,
     Top,
-    Left, 
-    Right, 
+    Left,
+    Right,
     Bottom
   };
 
   // TODO: refactor. Combine with ModuleNoteXML, and bring together various Note-related classes to support consistent read/write.
-  // IDEA: subclass QGraphicsTextItem properly and add a way to associate with a HasNotes object (either module or connection). 
+  // IDEA: subclass QGraphicsTextItem properly and add a way to associate with a HasNotes object (either module or connection).
   // Then serialization will be uniform for all notes.
 
   struct Note
@@ -92,6 +92,7 @@ namespace Gui {
     void updateNoteImpl(const Note& note);
     void updateNotePosition();
     void setDefaultNotePositionImpl(NotePosition position);
+    void clearNoteCursor();
     QGraphicsItem* item_;
     QGraphicsScene* scene_;
     PositionProviderPtr positioner_;