X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2Fvv.cxx;h=2a04dc0d396f3765155fadeb098eac8c29c06360;hb=f57924a2649534451ac1ae5a2bdc63e0b6a0092d;hp=8fcc382cf7d1709683691b1c8ae085d842d9f034;hpb=36ecf84296d088426ecf27717c27625f6fd6ce18;p=clitk.git

diff --git a/vv/vv.cxx b/vv/vv.cxx
index 8fcc382..2a04dc0 100644
--- a/vv/vv.cxx
+++ b/vv/vv.cxx
@@ -20,24 +20,25 @@
 #include <ctime>
 #include <string>
 #include <ostream>
+#include <sstream>
 #include <QApplication>
 #include <QPixmap>
 #include <QSplashScreen>
 #include <QTimer>
 #include <QDesktopWidget>
+#include <QDir>
 
 #include "clitkIO.h"
 #include "vvMainWindow.h"
-#include "vvConstants.h"
-
 #include <vtkFileOutputWindow.h>
 #include <vtkSmartPointer.h>
 #include <itkFileOutputWindow.h>
 #include <itkSmartPointer.h>
+#include <itksys/SystemTools.hxx>
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include  <errno.h> 
+#include  <errno.h>
 
 void load_image_first_error()
 {
@@ -49,13 +50,13 @@ std::string create_timed_string()
 {
   time_t t;
   time(&t);
-  
+
   struct tm* pt = localtime(&t);
-  
+
   const int size = 64;
   char st[size];
   strftime(st, size, "%Y%m%d-%H%M%S", pt);
-  
+
   return st;
 }
 
@@ -96,7 +97,7 @@ int main( int argc, char** argv )
       std::string current = argv[i];
       if (!current.compare(0,2,"--")) { //We are parsing an option
         if (parse_mode == P_SEQUENCE) {//First finish the current sequence
-          window.LoadImages(sequence_filenames,MERGEDWITHTIME);
+          window.LoadImages(sequence_filenames, vvImageReader::MERGEDWITHTIME);
           sequence_filenames.clear();
           parse_mode=P_NORMAL;
         }
@@ -124,22 +125,29 @@ int main( int argc, char** argv )
         } else if (current == "--level") {
           parse_mode=P_LEVEL;
         } else if (current == "--log") {
-	  std::string log_dir = "/tmp/vv-log";
-	  int err = mkdir(log_dir.c_str(), S_IRWXU | S_IRUSR | S_IWUSR | S_IRWXG | S_IRGRP | S_IWGRP | S_IRWXO | S_IROTH | S_IWOTH); 
-	  if (err && errno != EEXIST)
-	    std::cout << "Error creating log directory with errno " << errno << std::endl;
-
-	  std::string log_file = log_dir + "/" + create_timed_string() + ".log";
-	  vtkSmartPointer<vtkFileOutputWindow> vtk_log = vtkFileOutputWindow::New();
-	  vtk_log->SetFileName(log_file.c_str());
-	  vtk_log->FlushOn();
-	  vtkOutputWindow::SetInstance(vtk_log);
-	  
-	  itk::SmartPointer<itk::FileOutputWindow> itk_log = itk::FileOutputWindow::New();
-	  itk_log->SetFileName(log_file.c_str());
-	  itk_log->FlushOn();
-	  itk::OutputWindow::SetInstance(itk_log);
-	}
+          std::string log_dir = QDir::tempPath().toStdString() + std::string("/vv-log");
+
+          if(itksys::SystemTools::FileExists(log_dir.c_str()) &&
+              !itksys::SystemTools::FileIsDirectory(log_dir.c_str())) {
+            itkGenericExceptionMacro(<< "Error creating log directory, file exists and is not a directory.");
+          } else if(!itksys::SystemTools::MakeDirectory(log_dir.c_str())) {
+            itkGenericExceptionMacro(<< "Error creating log directory.");
+          }
+
+          std::string log_file = log_dir + "/" + create_timed_string() + ".log";
+
+          itk::SmartPointer<itk::FileOutputWindow> itk_log = itk::FileOutputWindow::New();
+          itk_log->SetFileName(log_file.c_str());
+          itk_log->FlushOn();
+          itk_log->AppendOn();
+          itk::OutputWindow::SetInstance(itk_log);
+
+          vtkSmartPointer<vtkFileOutputWindow> vtk_log = vtkFileOutputWindow::New();
+          vtk_log->SetFileName(log_file.c_str());
+          vtk_log->FlushOn();
+          vtk_log->AppendOn();
+          vtkOutputWindow::SetInstance(vtk_log);
+        }
       } else if (parse_mode == P_SEQUENCE) {
         sequence_filenames.push_back(current);
       } else if (parse_mode == P_WINDOW) {
@@ -151,12 +159,12 @@ int main( int argc, char** argv )
       } else {
         std::vector<std::string> image;
         image.push_back(current);
-        window.LoadImages(image,IMAGE);
+        window.LoadImages(image, vvImageReader::IMAGE);
         n_image_loaded++;
       }
     }
     if (parse_mode == P_SEQUENCE) { //Finish any current sequence
-      window.LoadImages(sequence_filenames,MERGEDWITHTIME);
+      window.LoadImages(sequence_filenames, vvImageReader::MERGEDWITHTIME);
       sequence_filenames.clear();
       parse_mode=P_NORMAL;
     }