Check in resizeEvent

Author: dcwhite

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;
@@ -213,9 +214,19 @@ void ViewSceneDialog::mousePressEvent(QMouseEvent* event)
 
 void ViewSceneDialog::resizeEvent(QResizeEvent *event)
 {
-  ViewSceneFeedback vsf;
-  vsf.windowSize = std::make_tuple(event->size().width(), event->size().height());
-  state_->setTransientValue(Parameters::GeometryFeedbackInfo, vsf);
+  static boost::timer timer;
+  static Mutex lock("VS::resize");
+  
+  {
+    Guard g(lock.get());
+    if (timer.elapsed() > 1)
+    {
+      timer.restart();
+      ViewSceneFeedback vsf;
+      vsf.windowSize = std::make_tuple(event->size().width(), event->size().height());
+      state_->setTransientValue(Parameters::GeometryFeedbackInfo, vsf);
+    }
+  }
 
   ModuleDialogGeneric::resizeEvent(event);
 }
@@ -1040,7 +1051,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;
@@ -1679,8 +1690,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/Modules/Visualization/ShowString.cc

@@ -80,13 +80,12 @@ void ShowString::setStateDefaults()
   getOutputPort(RenderedString)->connectConnectionFeedbackListener([this](const ModuleFeedback& var) { processWindowResizeFeedback(var); });
 }
 
-void ShowString::processWindowResizeFeedback(const Core::Datatypes::ModuleFeedback& var)
+void ShowString::processWindowResizeFeedback(const ModuleFeedback& var)
 {
   auto vsf = static_cast<const ViewSceneFeedback&>(var);
-  auto width = std::get<0>(vsf.windowSize);
-  if (lastWindowSize_ != width)
+  if (lastWindowSize_ != vsf.windowSize)
   {
-    lastWindowSize_ = width;
+    lastWindowSize_ = vsf.windowSize;
     needReexecute_ = true;
     enqueueExecuteAgain(false);
   }
@@ -211,12 +210,12 @@ GeometryBaseHandle ShowString::buildGeometryObject(const std::string& text)
     textBuilder_->setColor(r, g, b, a);
   }
 
-  auto length = textBuilder_->getStringLen(text) + 20;
-  // std::cout << "xTrans before " << xTrans <<
-  //   " lastWindowSize_ " << lastWindowSize_ <<
-  //   " multiplier " << (1 - length / lastWindowSize_) <<
-  //   " xTrans after " << (xTrans * (1 - length / lastWindowSize_)) << std::endl;
-  xTrans *= 1 - length / lastWindowSize_;
+  auto dims = textBuilder_->getStringDims(text);
+  auto length = std::get<0>(dims) + 20;
+  xTrans *= 1 - length / std::get<0>(lastWindowSize_);
+
+  std::cout << "Rows from string dims: " << std::get<1>(dims) << " yTrans: " << yTrans << std::endl;
+
   Vector trans(xTrans, yTrans, 0.0);
   textBuilder_->printString(text, trans, Vector(), text, *geom);
 

src/Modules/Visualization/ShowString.h

@@ -73,7 +73,7 @@ namespace Visualization {
     Core::Datatypes::GeometryBaseHandle buildGeometryObject(const std::string& text);
     std::tuple<double, double> getTextPosition();
     void processWindowResizeFeedback(const Core::Datatypes::ModuleFeedback& var);
-    int lastWindowSize_ {450};
+    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;