X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=appli%2FQtVTKViewer%2Fqtvtkviewer.cxx;h=63becde95e41f8160319da3219f291f7b7ce8a61;hb=30b7a0a5d40cb89fc765a4e7af305962dcebf75c;hp=76778d49b1f9ff32253aa41941de821fba1a601e;hpb=649fc25e246b85f708b3e2ae8bb99ebc4941bf62;p=creaMaracasVisu.git

diff --git a/appli/QtVTKViewer/qtvtkviewer.cxx b/appli/QtVTKViewer/qtvtkviewer.cxx
index 76778d4..63becde 100644
--- a/appli/QtVTKViewer/qtvtkviewer.cxx
+++ b/appli/QtVTKViewer/qtvtkviewer.cxx
@@ -1,22 +1,9 @@
 
 //----------------------------------------------------------------------
-//		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 +15,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 +32,7 @@ int main(int argc, char **argv)
 
     vtkImageData* img = 0;
 
-    if (argc < 2){
+    /*if (argc < 2){
 
         OpenImageDialog open(true);
         img = open.getImageData();
@@ -56,14 +42,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 +61,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();
 }