Merge pull request #1475 from NREL/PATErrors

Pat errors
NREL · Feb 19, 2015 · a7f0f74 · a7f0f74 · nrel-bot · Feb 19, 2015
2 parents 5dca1eb + 53bd09c
commit a7f0f74
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/openstudiocore/src/openstudio_lib/ApplyMeasureNowDialog.cpp b/openstudiocore/src/openstudio_lib/ApplyMeasureNowDialog.cpp
@@ -456,10 +456,17 @@ void ApplyMeasureNowDialog::displayResults()
     try{
       runmanager::Files files(m_job->outputFiles());
       openstudio::path stdErrPath = files.getLastByFilename("stderr").fullPath;
-      std::ifstream ifs(toString(stdErrPath).c_str());
-      std::string stdMessage((std::istreambuf_iterator<char>(ifs)), std::istreambuf_iterator<char>());
-      ifs.close();
-      m_advancedOutput = toQString(stdMessage);
+
+      m_advancedOutput = "";
+
+      QFile file(toQString(stdErrPath));
+      if (file.open(QFile::ReadOnly))
+      {
+        QTextStream docIn(&file);
+        m_advancedOutput = docIn.readAll();
+        file.close();
+      }
+
       m_advancedOutput += QString("\n");
     }catch(std::exception&){
     }

diff --git a/openstudiocore/src/pat_app/RunView.cpp b/openstudiocore/src/pat_app/RunView.cpp
@@ -56,8 +56,6 @@
 #include <QMessageBox>
 #include <QRadioButton>
 
-#include <fstream>
-
 namespace openstudio {
 
 namespace pat {
@@ -1265,11 +1263,17 @@ void DataPointJobItemView::update()
     try{
       runmanager::Files files(m_workflowStepJob.outputFiles().get());
       openstudio::path stdErrPath = files.getLastByFilename("stderr").fullPath;
-      std::ifstream ifs(toString(stdErrPath).c_str());
-      std::string stdErrorMessage((std::istreambuf_iterator<char>(ifs)), std::istreambuf_iterator<char>());
-      ifs.close();
-      if (!stdErrorMessage.empty()){
-        dataPointJobContentView->addStdErrorMessage(stdErrorMessage);
+
+      QFile file(toQString(stdErrPath));
+      if (file.open(QFile::ReadOnly))
+      {
+        QTextStream docIn(&file);
+        QString stdErrorMessage = docIn.readAll();
+        file.close();
+
+        if (!stdErrorMessage.isEmpty()){
+          dataPointJobContentView->addStdErrorMessage(toString(stdErrorMessage));
+        }
       }
     }catch(std::exception&){