Merge pull request #1622 from SCIInstitute/showstring-positioning

Showstring positioning

Author: dcwhite

src/Core/Datatypes/Color.h

@@ -82,6 +82,7 @@ namespace Datatypes {
   {
     Geometry::Transform transform;
     std::string selectionName;
+    std::tuple<int,int> windowSize;
   };
 
 }}}

src/Dataflow/Network/Module.cc

@@ -576,11 +576,11 @@ std::vector<DatatypeHandleOption> Module::get_dynamic_input_handles(const PortId
   }
 
   {
-    LOG_DEBUG(id_ << " :: inputsChanged is " << inputsChanged_ << ", querying port for value.");
+    LOG_DEBUG(get_id() << " :: inputsChanged is " << impl_->inputsChanged_ << ", querying port for value.");
     // NOTE: don't use short-circuited boolean OR here, we need to call hasChanged each time since it updates the port's cache flag.
     bool startingVal = impl_->inputsChanged_;
     impl_->inputsChanged_ = std::accumulate(portsWithName.begin(), portsWithName.end(), startingVal, [](bool acc, InputPortHandle input) { return input->hasChanged() || acc; });
-    LOG_DEBUG(get_id() << ":: inputsChanged is now " << inputsChanged_);
+    LOG_DEBUG(get_id() << ":: inputsChanged is now " << impl_->inputsChanged_);
   }
 
   std::vector<DatatypeHandleOption> options;

src/Interface/Modules/Render/ViewScene.cc

@@ -39,6 +39,7 @@ DEALINGS IN THE SOFTWARE.
 #include <Graphics/Glyphs/GlyphGeom.h>
 #include <Graphics/Datatypes/GeometryImpl.h>
 #include <Core/GeometryPrimitives/Transform.h>
+#include <boost/timer.hpp>
 
 using namespace SCIRun::Gui;
 using namespace SCIRun::Dataflow::Networks;
@@ -144,6 +145,9 @@ ViewSceneDialog::ViewSceneDialog(const std::string& name, ModuleStateHandle stat
   std::string sep;
   sep += boost::filesystem::path::preferred_separator;
   Modules::Visualization::TextBuilder::setFSStrings(filesystemRoot, sep);
+
+  resizeTimer_.setSingleShot(true);
+  connect(&resizeTimer_, SIGNAL(timeout()), this, SLOT(resizingDone()));
 }
 
 void ViewSceneDialog::pullSpecial()
@@ -211,6 +215,19 @@ void ViewSceneDialog::mousePressEvent(QMouseEvent* event)
   }
 }
 
+void ViewSceneDialog::resizeEvent(QResizeEvent *event)
+{
+  resizeTimer_.start(400);
+  ModuleDialogGeneric::resizeEvent(event);
+}
+
+void ViewSceneDialog::resizingDone()
+{
+  ViewSceneFeedback vsf;
+  vsf.windowSize = std::make_tuple(size().width(), size().height());
+  state_->setTransientValue(Parameters::GeometryFeedbackInfo, vsf);
+}
+
 std::string ViewSceneDialog::restoreObjColor()
 {
   LOG_DEBUG("ViewSceneDialog::asyncExecute before locking");
@@ -1031,7 +1048,7 @@ GeometryHandle ViewSceneDialog::buildGeometryScaleBar()
   oneline = ss.str();
   double text_len = 0.0;
   if (textBuilder_.isReady())
-    text_len = textBuilder_.getStringLen(oneline);
+    text_len = std::get<0>(textBuilder_.getStringDims(oneline));
   text_len += 5;//add a 5-pixel gap
 
   std::vector<Vector> points;
@@ -1670,8 +1687,8 @@ namespace //TODO: move to appropriate location
 
 void ViewSceneDialog::sendGeometryFeedbackToState(int x, int y, const std::string& selName)
 {
-  std::shared_ptr<SRInterface> spire = mSpire.lock();
-  glm::mat4 trans = spire->getWidgetTransform().transform;
+  auto spire = mSpire.lock();
+  auto trans = spire->getWidgetTransform().transform;
 
   ViewSceneFeedback vsf;
   vsf.transform = toSciTransform(trans);

src/Interface/Modules/Render/ViewScene.h

@@ -70,7 +70,7 @@ namespace SCIRun {
       void newGeometryValueForwarder();
       void mousePressSignalForTestingGeometryObjectFeedback(int x, int y, const std::string& selName);
 
-      protected Q_SLOTS:
+    protected Q_SLOTS:
       void menuMouseControlChanged(int index);
       void autoViewClicked();
       void newGeometryValue();
@@ -139,6 +139,7 @@ namespace SCIRun {
       void toggleLight1(bool value);
       void toggleLight2(bool value);
       void toggleLight3(bool value);
+      void resizingDone();
 
     protected:
       void mousePressEvent(QMouseEvent* event) override;
@@ -151,6 +152,7 @@ namespace SCIRun {
       void showEvent(QShowEvent* evt) override;
       void hideEvent(QHideEvent* evt) override;
       void contextMenuEvent(QContextMenuEvent* evt) override {}
+      void resizeEvent(QResizeEvent *event) override;
 
       void pullSpecial() override;
 
@@ -231,6 +233,7 @@ namespace SCIRun {
       class Screenshot* screenshotTaker_;
       bool saveScreenshotOnNewGeometry_;
       bool pulledSavedVisibility_ {false};
+      QTimer resizeTimer_;
 
       //geometries
       Modules::Visualization::TextBuilder textBuilder_;

src/Modules/Visualization/ShowColorMapModule.cc

@@ -114,9 +114,9 @@ GeometryBaseHandle ShowColorMap::buildGeometryObject(ColorMapHandle cm, ModuleSt
   uint32_t vboSize = sizeof(float) * 7 * static_cast<uint32_t>(points.size());
 
   std::shared_ptr<CPM_VAR_BUFFER_NS::VarBuffer> iboBufferSPtr(
-    new CPM_VAR_BUFFER_NS::VarBuffer(vboSize));
-  std::shared_ptr<CPM_VAR_BUFFER_NS::VarBuffer> vboBufferSPtr(
     new CPM_VAR_BUFFER_NS::VarBuffer(iboSize));
+  std::shared_ptr<CPM_VAR_BUFFER_NS::VarBuffer> vboBufferSPtr(
+    new CPM_VAR_BUFFER_NS::VarBuffer(vboSize));
 
   CPM_VAR_BUFFER_NS::VarBuffer* iboBuffer = iboBufferSPtr.get();
   CPM_VAR_BUFFER_NS::VarBuffer* vboBuffer = vboBufferSPtr.get();
@@ -205,7 +205,7 @@ GeometryBaseHandle ShowColorMap::buildGeometryObject(ColorMapHandle cm, ModuleSt
   double dash_size = 18.;
   double pipe_size = 18.;
   size_t text_size = static_cast<size_t>(textSize);
-  
+
   if (!textBuilder_.initialize(text_size))
     return geom;
 

src/Modules/Visualization/ShowString.cc

@@ -76,16 +76,30 @@ void ShowString::setStateDefaults()
   state->setValue(Parameters::FixedVertical, std::string("Top"));
   state->setValue(Parameters::CoordinateHorizontal, 0.5);
   state->setValue(Parameters::CoordinateVertical, 0.5);
+
+  getOutputPort(RenderedString)->connectConnectionFeedbackListener([this](const ModuleFeedback& var) { processWindowResizeFeedback(var); });
+}
+
+void ShowString::processWindowResizeFeedback(const ModuleFeedback& var)
+{
+  auto vsf = static_cast<const ViewSceneFeedback&>(var);
+  if (lastWindowSize_ != vsf.windowSize)
+  {
+    lastWindowSize_ = vsf.windowSize;
+    needReexecute_ = true;
+    enqueueExecuteAgain(false);
+  }
 }
 
 void ShowString::execute()
 {
   auto str = getRequiredInput(String);
 
-  if (needToExecute())
+  if (needToExecute() || needReexecute_)
   {
     auto geom = buildGeometryObject(str->value());
     sendOutput(RenderedString, geom);
+    needReexecute_ = false;
   }
 }
 
@@ -112,6 +126,8 @@ std::tuple<double, double> ShowString::getTextPosition()
     else // "Bottom"
       y = 0.3;
 
+    state->setValue(Parameters::CoordinateHorizontal, x / 2.0);
+    state->setValue(Parameters::CoordinateVertical, y / 2.0);
     return std::make_tuple(x, y);
   }
   else if ("Coordinates" == positionChoice)
@@ -128,33 +144,8 @@ std::tuple<double, double> ShowString::getTextPosition()
 // TODO: clean up duplication here and in ShowColorMap
 GeometryBaseHandle ShowString::buildGeometryObject(const std::string& text)
 {
-  std::vector<Vector> points;
-  std::vector<ColorRGB> colors;
-  std::vector<uint32_t> indices;
-  auto numVBOElements = 0;
-
-  // IBO/VBOs and sizes
-  uint32_t iboSize = sizeof(uint32_t) * static_cast<uint32_t>(indices.size());
-  uint32_t vboSize = sizeof(float) * 7 * static_cast<uint32_t>(points.size());
-
-  std::shared_ptr<CPM_VAR_BUFFER_NS::VarBuffer> iboBufferSPtr(new CPM_VAR_BUFFER_NS::VarBuffer(vboSize));
-  std::shared_ptr<CPM_VAR_BUFFER_NS::VarBuffer> vboBufferSPtr(new CPM_VAR_BUFFER_NS::VarBuffer(iboSize));
-
-  CPM_VAR_BUFFER_NS::VarBuffer* iboBuffer = iboBufferSPtr.get();
-  CPM_VAR_BUFFER_NS::VarBuffer* vboBuffer = vboBufferSPtr.get();
-
-  for (auto a : indices) iboBuffer->write(a);
-
-  for (size_t i = 0; i < points.size(); i++)
-  {
-    vboBuffer->write(static_cast<float>(points[i].x()));
-    vboBuffer->write(static_cast<float>(points[i].y()));
-    vboBuffer->write(static_cast<float>(points[i].z()));
-    vboBuffer->write(static_cast<float>(colors[i].r()));
-    vboBuffer->write(static_cast<float>(colors[i].g()));
-    vboBuffer->write(static_cast<float>(colors[i].b()));
-    vboBuffer->write(static_cast<float>(1.f));
-  }
+  std::shared_ptr<CPM_VAR_BUFFER_NS::VarBuffer> iboBufferSPtr(new CPM_VAR_BUFFER_NS::VarBuffer(0));
+  std::shared_ptr<CPM_VAR_BUFFER_NS::VarBuffer> vboBufferSPtr(new CPM_VAR_BUFFER_NS::VarBuffer(0));
 
   auto uniqueNodeID = get_id().id_ + "_showString_" + text;
   auto vboName = uniqueNodeID + "VBO";
@@ -168,14 +159,13 @@ GeometryBaseHandle ShowString::buildGeometryObject(const std::string& text)
   attribs.push_back(SpireVBO::AttributeData("aColor", 4 * sizeof(float)));
   std::vector<SpireSubPass::Uniform> uniforms;
 
-  auto position = getTextPosition();
-  auto xTrans = std::get<0>(position);
-  auto yTrans = std::get<1>(position);
+  double xTrans, yTrans;
+  std::tie(xTrans, yTrans) = getTextPosition();
 
   uniforms.push_back(SpireSubPass::Uniform("uXTranslate", xTrans));
   uniforms.push_back(SpireSubPass::Uniform("uYTranslate", yTrans));
 
-  SpireVBO geomVBO(vboName, attribs, vboBufferSPtr, numVBOElements, BBox(), true);
+  SpireVBO geomVBO(vboName, attribs, vboBufferSPtr, 0, BBox(), true);
   SpireIBO geomIBO(iboName, SpireIBO::PRIMITIVE::TRIANGLES, sizeof(uint32_t), iboBufferSPtr);
 
   RenderState renState;
@@ -220,6 +210,12 @@ GeometryBaseHandle ShowString::buildGeometryObject(const std::string& text)
     textBuilder_->setColor(r, g, b, a);
   }
 
+  auto dims = textBuilder_->getStringDims(text);
+  auto length = std::get<0>(dims) + 20;
+  auto width = std::get<1>(dims) + 10;
+  xTrans *= 1 - length / std::get<0>(lastWindowSize_);
+  yTrans *= 1 - width / std::get<1>(lastWindowSize_);
+
   Vector trans(xTrans, yTrans, 0.0);
   textBuilder_->printString(text, trans, Vector(), text, *geom);
 

src/Modules/Visualization/ShowString.h

@@ -72,6 +72,9 @@ namespace Visualization {
     boost::shared_ptr<class TextBuilder> textBuilder_;
     Core::Datatypes::GeometryBaseHandle buildGeometryObject(const std::string& text);
     std::tuple<double, double> getTextPosition();
+    void processWindowResizeFeedback(const Core::Datatypes::ModuleFeedback& var);
+    std::tuple<int,int> lastWindowSize_ { 450, 1000 };
+    bool needReexecute_ {true};
   };
 }}}
 

src/Modules/Visualization/TextBuilder.cc

@@ -260,10 +260,10 @@ void TextBuilder::printString(const std::string& oneline,
   }
 }
 
-double TextBuilder::getStringLen(const std::string& oneline) const
+std::tuple<double, double> TextBuilder::getStringDims(const std::string& oneline) const
 {
   if (!ftValid_)
-    return 0.0;
+    return {};
 
   auto len = 0.0;
   auto rows = 0;
@@ -275,7 +275,7 @@ double TextBuilder::getStringLen(const std::string& oneline) const
     len += g->bitmap.width;
     rows = g->bitmap.rows;
   }
-  return len;
+  return std::make_tuple(len, rows);
 }
 
 bool TextBuilder::initialize(size_t textSize)

src/Modules/Visualization/TextBuilder.h

@@ -67,7 +67,7 @@ namespace SCIRun {
 
         //get string length based on current settings
         //return value in pixels
-        double getStringLen(const std::string& oneline) const;
+        std::tuple<double,double> getStringDims(const std::string& oneline) const;
 
       private:
         std::string getUniqueFontString(char p, double x, double y, double z, double w, double h) const;