X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FQtVTKViewer%2Fqtvtkviewer.cxx;h=90e17064a323a857717c7020bfd09385f3317564;hb=4ecb6789d069c8dcd40724f03d8225c25629cd52;hp=76778d49b1f9ff32253aa41941de821fba1a601e;hpb=649fc25e246b85f708b3e2ae8bb99ebc4941bf62;p=creaMaracasVisu.git

diff --git a/appli/QtVTKViewer/qtvtkviewer.cxx b/appli/QtVTKViewer/qtvtkviewer.cxx
index 76778d4..90e1706 100644
--- a/appli/QtVTKViewer/qtvtkviewer.cxx
+++ b/appli/QtVTKViewer/qtvtkviewer.cxx
@@ -1,22 +1,34 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
 
 //----------------------------------------------------------------------
-//		File:			ann_sample.cpp
-//		Programmer:		Sunil Arya and David Mount
-//		Last modified:	03/04/98 (Release 0.1)
-//		Description:	Sample program for ANN
-//----------------------------------------------------------------------
-// Copyright (c) 1997-2005 University of Maryland and Sunil Arya and
-// David Mount.  All Rights Reserved.
-//
-// This software and related documentation is part of the Approximate
-// Nearest Neighbor Library (ANN).  This software is provided under
-// the provisions of the Lesser GNU Public License (LGPL).  See the
-// file ../ReadMe.txt for further information.
-//
-// The University of Maryland (U.M.) and the authors make no
-// representations about the suitability or fitness of this software for
-// any purpose.  It is provided "as is" without express or implied
-// warranty.
+//		File:               qtvtkviewer.cxx
+//		Programmer:         Prieto
+//		Last modified:	25/08/11 (Release 0.1)
+//		Description:	Sample program fro qtvtkviewer
 //----------------------------------------------------------------------
 
 #include "qtvtkviewerwidget.h"
@@ -28,12 +40,11 @@
 
 #include "iostream"
 
-
-#include "OpenImageDialog.h"
+#include "vtkMetaImageReader.h"
+//#include "OpenImageDialog.h"
 
 using namespace std;
-using namespace creaMaracasVisuKernel;
-
+//using namespace creaMaracasVisuKernel;
 
 int main(int argc, char **argv)
 {
@@ -46,7 +57,7 @@ int main(int argc, char **argv)
 
     vtkImageData* img = 0;
 
-    if (argc < 2){
+    /*if (argc < 2){
 
         OpenImageDialog open(true);
         img = open.getImageData();
@@ -56,14 +67,14 @@ int main(int argc, char **argv)
                       << std::endl ;
             return EXIT_FAILURE;
          }
-    }else{
+    }else*/
+    if(argc==2){
         std::string inputFilename = argv[1];
 
         vtkMetaImageReader* reader = vtkMetaImageReader::New();
         reader->SetFileName(inputFilename.c_str());
         reader->Update();
         img = reader->GetOutput();
-
     }
 
 
@@ -75,16 +86,14 @@ int main(int argc, char **argv)
     QtVTKViewerWidget *viewer = new QtVTKViewerWidget(mainwindow);
 
     mainwindow-> setCentralWidget(viewer);
+    mainwindow->setMinimumSize(1024, 768);
 
+    mainwindow->showMaximized();
 
-    mainwindow->show();
-
-    viewer->setImage(img);
+    if(img)
+        viewer->setImage(img);
     //viewer->SetLookupTable((vtkLookupTable*)colortransfer);
 
-
-
-
     return app.exec();
 }