X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2Fvv.cxx;h=93b708e753b40aad059ce6ac8d5481ce3c2b5b7d;hb=a471980c0f56054516c65a3d3de76c6ae99dea0e;hp=fb0871c6501aacd04fde2f623c02968cb2e59f1e;hpb=50e49f4ddfe19aceb7131d768983d7c8a22bab67;p=clitk.git

diff --git a/vv/vv.cxx b/vv/vv.cxx
index fb0871c..93b708e 100644
--- a/vv/vv.cxx
+++ b/vv/vv.cxx
@@ -3,7 +3,7 @@
 
   Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
-  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
   This software is distributed WITHOUT ANY WARRANTY; without even
@@ -14,12 +14,13 @@
 
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
-======================================================================-====*/
+===========================================================================**/
 #include <utility>
 #include <cassert>
 #include <ctime>
 #include <string>
 #include <ostream>
+#include <sstream>
 #include <QApplication>
 #include <QPixmap>
 #include <QSplashScreen>
@@ -29,8 +30,7 @@
 
 #include "clitkIO.h"
 #include "vvMainWindow.h"
-#include "vvConstants.h"
-
+#include "vvToolsList.h"
 #include <vtkFileOutputWindow.h>
 #include <vtkSmartPointer.h>
 #include <itkFileOutputWindow.h>
@@ -39,7 +39,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include  <errno.h> 
+#include <errno.h>
 
 void load_image_first_error()
 {
@@ -51,30 +51,31 @@ 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;
 }
 
 //------------------------------------------------------------------------------
+#ifdef _WIN32
+int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE prevInstance, LPSTR lpCmdLine, int nShowCmd)
+{
+  int argc = __argc;
+  char **argv = __argv;
+#else
 int main( int argc, char** argv )
 {
+#endif
+
   CLITK_INIT;
 
   QApplication app( argc, argv );
   Q_INIT_RESOURCE(vvIcons);
-  //QPixmap pixmap(":/splashscreen.PNG");
-  QSplashScreen *splash = new QSplashScreen(QPixmap(QString::fromUtf8(":/new/prefix1/splashscreen.PNG")));
-  /*splash->showMessage("VV 1.0 developped by Léon Bérard c`ancer center http://oncora1.lyon.fnclcc.fr and CREATIS-LRMN http://www.creatis.insa-lyon.fr",(Qt::AlignRight | Qt::AlignBottom));*/
-  //  splash->show();
-  QTimer::singleShot(2000, splash, SLOT(close()));
-  while (!splash->isHidden())
-    app.processEvents();
 
   vvMainWindow window;
 
@@ -98,7 +99,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;
         }
@@ -129,23 +130,27 @@ int main( int argc, char** argv )
           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.");
+              !itksys::SystemTools::FileIsDirectory(log_dir.c_str())) {
+            std::cerr << "Error creating log directory, file exists and is not a directory." << std::endl;
+            exit(1);
+          } else if(!itksys::SystemTools::MakeDirectory(log_dir.c_str())) {
+            std::cerr << "Error creating log directory." << std::endl;
+            exit(1);
           }
 
-	  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_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);
@@ -158,12 +163,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;
     }