Merge pull request #1628 from SCIInstitute/bugs

Last two small issues for milestone

Author: dcwhite

src/Core/Python/PythonInterpreter.cc

@@ -439,6 +439,34 @@ namespace
     std::transform(wideArgv.begin(), wideArgv.end(), wideArgvPtrs.begin(), [](std::vector<wchar_t>& wide) { return &wide[0]; });
     return wideArgvPtrs;
   }
+
+  std::vector<wchar_t> getProgramName(const std::vector<std::string>& argv)
+  {
+    size_t name_len = argv[0].size();
+    std::vector<wchar_t> program_name(name_len + 1);
+    mbstowcs(&program_name[0], argv[0].c_str(), name_len + 1);
+    return program_name;
+  }
+
+  void setPythonArgv(const std::vector<std::string>& argv)
+  {
+    auto wideArgv = wideArgvFromArgv(argv);
+    auto wideArgvPtrs = wideArgvPtrsFromWideArgv(wideArgv);
+
+    int argsOffset = 0;
+    auto scriptFlag1 = std::find(argv.begin(), argv.end(), "-s");
+    auto scriptFlag2 = std::find(argv.begin(), argv.end(), "--script");
+    if (scriptFlag1 != argv.end())
+    {
+      argsOffset = scriptFlag1 - argv.begin() + 1;
+    }
+    else if (scriptFlag2 != argv.end())
+    {
+      argsOffset = scriptFlag2 - argv.begin() + 1;
+    }
+
+    PySys_SetArgv(wideArgvPtrs.size() - argsOffset, &wideArgvPtrs[argsOffset]);
+  }
 }
 
 void PythonInterpreter::initialize(bool needProgramName, const std::string& commandLine, const boost::filesystem::path& libPath)
@@ -447,22 +475,14 @@ void PythonInterpreter::initialize(bool needProgramName, const std::string& comm
 
   if (needProgramName)
   {
-    size_t name_len = argv[0].size();
-    std::vector<wchar_t> program_name(name_len + 1);
-    mbstowcs(&program_name[0], argv[0].c_str(), name_len + 1);
-
-    //std::cerr << "Initializing Python ..." << std::endl;
-    this->private_->setProgramName(program_name);
+    this->private_->setProgramName(getProgramName(argv));
     // TODO: remove debug print when confident python initialization is stable
     //std::wcerr << "initialize program name=" << this->private_->programName() << std::endl;
   }
 
   initialize_eventhandler(needsSpecialPythonPathTreatment(commandLine), libPath);
 
-  auto wideArgv = wideArgvFromArgv(argv);
-  auto wideArgvPtrs = wideArgvPtrsFromWideArgv(wideArgv);
-  
-  PySys_SetArgv(argv.size(), &wideArgvPtrs[0]);
+  setPythonArgv(argv);
 
   {
     auto out = [](const std::string& s)

src/Modules/Visualization/ShowString.cc

@@ -212,12 +212,25 @@ GeometryBaseHandle ShowString::buildGeometryObject(const std::string& text)
 
   auto dims = textBuilder_->getStringDims(text);
   auto length = std::get<0>(dims) + 20;
-  auto width = std::get<1>(dims) + 10;
+  auto width = std::get<1>(dims) + 20;
+
   xTrans *= 1 - length / std::get<0>(lastWindowSize_);
   yTrans *= 1 - width / std::get<1>(lastWindowSize_);
 
+  if (containsDescenderLetter(text))
+  {
+    yTrans += 0.02;
+  }
+
   Vector trans(xTrans, yTrans, 0.0);
   textBuilder_->printString(text, trans, Vector(), text, *geom);
 
   return geom;
 }
+
+bool ShowString::containsDescenderLetter(const std::string& text)
+{
+  static const std::string descenders("qpygj");
+  return std::any_of(descenders.begin(), descenders.end(),
+    [&text](char c) { return text.find(c) != std::string::npos; });
+}

src/Modules/Visualization/ShowString.h

@@ -69,10 +69,11 @@ namespace Visualization {
     OUTPUT_PORT(0, RenderedString, GeometryObject);
     MODULE_TRAITS_AND_INFO(ModuleHasUI)
   private:
-    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);
+    static bool containsDescenderLetter(const std::string& text);
+    boost::shared_ptr<class TextBuilder> textBuilder_;
     std::tuple<int,int> lastWindowSize_ { 450, 1000 };
     bool needReexecute_ {true};
   };