Fix for app path on windows.

Works for double-click, bash shell, cmd shell, from current and other
directory. Need to test on Mac.

Author: dcwhite

src/Core/Application/Application.cc

@@ -121,8 +121,13 @@ void Application::readCommandLine(int argc, const char* argv[])
 {
   ENSURE_NOT_NULL(private_, "Application internals are uninitialized!");
 
-  private_->app_filename_ = boost::filesystem::path( argv[0] );
-  private_->app_filepath_ = private_->app_filename_.parent_path();
+  private_->app_filename_ = boost::filesystem::path(argv[0]);
+
+  if (!private_->app_filename_.parent_path().empty())
+  {
+    private_->app_filepath_ = boost::filesystem::system_complete(private_->app_filename_.parent_path());
+  }
+
   private_->parameters_ = private_->parser.parse(argc, argv);
 
   Logging::Log::get().setVerbose(parameters()->verboseMode());
@@ -160,7 +165,6 @@ void Application::executeCommandLineRequests(Commands::GlobalCommandFactoryHandl
 boost::filesystem::path Application::executablePath() const
 {
   ENSURE_NOT_NULL(private_, "Application internals are uninitialized!");
-
   return private_->app_filepath_;
 }
 

src/Interface/Modules/Render/ES/SRInterface.cc

@@ -1069,7 +1069,8 @@ namespace SCIRun {
             //font texture
             //read in the font data
             bool success = true;
-            std::ifstream in("Assets/times_new_roman.font");
+            auto fontPath = SCIRun::Core::Application::Instance().executablePath() / "Assets" / "times_new_roman.font";
+            std::ifstream in(fontPath.string());
             if (in.fail()) {
                 //try the MAC App location if the UNIX/Windows location didn't work.
                 in.open("SCIRun.app/Contents/MacOS/Assets/times_new_roman.font");

src/Main/scirunMain.cc

@@ -55,6 +55,16 @@ int mainImpl(int argc, const char* argv[])
 #include <vector>
 #include <boost/algorithm/string.hpp>
 
+static std::string&& stripQuotes(std::string& s)
+{
+  if (s.front() == '"' && s.back() == '"')
+  {
+    s.erase(0, 1); // erase the first character
+    s.erase(s.size() - 1); // erase the last character
+  }
+  return std::move(s);
+}
+
 int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
 #ifdef SCIRUN_SHOW_CONSOLE 
@@ -75,7 +85,7 @@ int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
 
   // Put the individual arguments into the argv that will be passed.
   for(int i = 0; i < argc; i++) 
-	  argv[i] = getArgv[i].c_str();  
+    argv[i] = stripQuotes(getArgv[i]).c_str();
 
   return mainImpl(argc, argv);
 }