X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2Fvv.cxx;h=141b915d76a9d5c156f571f9ef33cd9618e6ebaf;hb=6789a2e30f7c951de93ebd0c0596e7168ec6e061;hp=908429574b8ee4e05123a1b41179153aaa9d32c0;hpb=0350f04002063f12dcf10ee765f5389590f352e7;p=clitk.git

diff --git a/vv/vv.cxx b/vv/vv.cxx
index 9084295..141b915 100644
--- a/vv/vv.cxx
+++ b/vv/vv.cxx
@@ -1,26 +1,20 @@
 /*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
- Program:   vv
- Language:  C++
- Author :   Pierre Seroul (pierre.seroul@gmail.com)
+  Authors belong to:
+  - University of LYON              http://www.universite-lyon.fr/
+  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
-Copyright (C) 2008
-Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
-CREATIS-LRMN http://www.creatis.insa-lyon.fr
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 3 of the License.
+  It is distributed under dual licence
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-=========================================================================*/
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+======================================================================-====*/
 #include <utility>
 #include <cassert>
 #include <QApplication>
@@ -29,69 +23,67 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QTimer>
 #include <QDesktopWidget>
 
-#include "clitkCommon.h"
+#include "clitkIO.h"
 #include "vvMainWindow.h"
-#include "vvInit.h"
 #include "vvConstants.h"
 
 //------------------------------------------------------------------------------
 int main( int argc, char** argv )
 {
-    initialize_IO();
+#ifdef _WIN32
+  HWND hWnd = GetConsoleWindow();
+  ShowWindow( hWnd, SW_HIDE );
+#endif
 
-    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 cancer 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();
+  CLITK_INIT;
 
-    vvMainWindow window;
+  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();
 
-    //Try to give the window a sensible default size
-    int width=QApplication::desktop()->width()*0.8;
-    int height=QApplication::desktop()->height()*0.9;
-    if (width> 1.5*height)
-        width=1.5*height;
-    window.resize(width,height);
+  vvMainWindow window;
 
-    window.show();
+  //Try to give the window a sensible default size
+  int width=QApplication::desktop()->width()*0.8;
+  int height=QApplication::desktop()->height()*0.9;
+  if (width> 1.5*height)
+    width=1.5*height;
+  window.resize(width,height);
 
-    std::vector<std::string> filenames;
-    std::vector<std::pair<int ,std::string> > overlays;
-    std::vector<std::pair<int ,std::string> > vector_fields;
-    if (argc >1)
-    {
-        for (int i = 1; i < argc; i++)
-        {
-            std::string temp = argv[i];
-            if (temp=="--vf")
-            {
-                assert(filenames.size()>=1);
-                vector_fields.push_back(std::make_pair(filenames.size()-1,argv[i+1]));
-                i++; //skip vf name
-            }
-            else if (temp=="--overlay")
-            {
-                assert(filenames.size()>=1);
-                overlays.push_back(std::make_pair(filenames.size()-1,argv[i+1]));
-                i++; //skip overlay name
-            }
-            else
-                filenames.push_back(temp);
-        }
-        window.LoadImages(filenames,IMAGE);
-        for (std::vector<std::pair<int ,std::string> >::iterator i=overlays.begin();
-             i!=overlays.end();i++)
-          window.AddOverlayImage((*i).first,(*i).second.c_str());
-        for (std::vector<std::pair<int ,std::string> >::iterator i=vector_fields.begin();
-             i!=vector_fields.end();i++)
-          window.AddField((*i).second.c_str(), (*i).first);
-        
+  window.show();
+
+  std::vector<std::string> filenames;
+  std::vector<std::pair<int ,std::string> > overlays;
+  std::vector<std::pair<int ,std::string> > vector_fields;
+  if (argc >1) {
+    for (int i = 1; i < argc; i++) {
+      std::string temp = argv[i];
+      if (temp=="--vf") {
+        assert(filenames.size()>=1);
+        vector_fields.push_back(std::make_pair(filenames.size()-1,argv[i+1]));
+        i++; //skip vf name
+      } else if (temp=="--overlay") {
+        assert(filenames.size()>=1);
+        overlays.push_back(std::make_pair(filenames.size()-1,argv[i+1]));
+        i++; //skip overlay name
+      } else
+        filenames.push_back(temp);
     }
+    window.LoadImages(filenames,IMAGE);
+    for (std::vector<std::pair<int ,std::string> >::iterator i=overlays.begin();
+         i!=overlays.end(); i++)
+      window.AddOverlayImage((*i).first,(*i).second.c_str());
+    for (std::vector<std::pair<int ,std::string> >::iterator i=vector_fields.begin();
+         i!=vector_fields.end(); i++)
+      window.AddField((*i).second.c_str(), (*i).first);
+
+  }
 
-    return app.exec();
+  return app.exec();
 }