X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2Fvv.cxx;h=f9c9d2abf110756df5efa84b2f6ba075374f5ec5;hb=e010c6b6b2fd67f3301e64219aa90bae34d4d251;hp=0896eae4aee395b89800bc2b1c44d2ddde702d39;hpb=931a42358442f4ee4f314613c991c838d4b4e3b7;p=clitk.git
diff --git a/vv/vv.cxx b/vv/vv.cxx
index 0896eae..f9c9d2a 100644
--- a/vv/vv.cxx
+++ b/vv/vv.cxx
@@ -1,29 +1,20 @@
/*=========================================================================
+ Program: vv http://www.creatis.insa-lyon.fr/rio/vv
- Program: vv
- Module: $RCSfile: vv.cxx,v $
- Language: C++
- Date: $Date: 2010/01/06 13:31:57 $
- Version: $Revision: 1.1 $
- 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 .
-
-=========================================================================*/
+ - BSD See included LICENSE.txt file
+ - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+======================================================================-====*/
#include
#include
#include
@@ -32,69 +23,95 @@ along with this program. If not, see .
#include
#include
-#include "clitkCommon.h"
+#include "clitkIO.h"
#include "vvMainWindow.h"
-#include "vvInit.h"
-
#include "vvConstants.h"
+void load_image_first_error()
+{
+ std::cerr << "You need to load an image before adding an overlay!" << std::endl;
+ exit(1);
+}
+
+//------------------------------------------------------------------------------
int main( int argc, char** argv )
{
- initialize_IO();
+ 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();
- 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();
+ vvMainWindow window;
- vvMainWindow window;
+ //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);
- //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);
+ window.show();
- window.show();
+ std::vector sequence_filenames;
+ enum {P_NORMAL,P_SEQUENCE};
+ int parse_mode=P_NORMAL;
+ int n_image_loaded=0;
- std::vector filenames;
- std::vector > overlays;
- std::vector > 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);
+ if (argc >1) {
+ for (int i = 1; i < argc; i++) {
+ 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);
+ sequence_filenames.clear();
+ parse_mode=P_NORMAL;
}
- window.LoadImages(filenames,IMAGE);
- for (std::vector >::iterator i=overlays.begin();
- i!=overlays.end();i++)
- window.AddOverlayImage((*i).first,(*i).second.c_str());
- for (std::vector >::iterator i=vector_fields.begin();
- i!=vector_fields.end();i++)
- window.AddField((*i).second.c_str(), (*i).first);
-
+ if (current=="--vf") {
+ if (!n_image_loaded) load_image_first_error();
+ window.AddField(argv[i+1],n_image_loaded-1);
+ i++; //skip vf name
+ }
+ else if (current=="--overlay") {
+ if (!n_image_loaded) load_image_first_error();
+ window.AddOverlayImage(n_image_loaded-1,argv[i+1]);
+ i++; //skip overlay name
+ }
+ else if (current=="--roi") {
+ if (!n_image_loaded) load_image_first_error();
+ window.AddROI(n_image_loaded-1,argv[i+1]);
+ i++; //skip roi name
+ }
+ else if (current=="--fusion") {
+ if (!n_image_loaded) load_image_first_error();
+ window.AddFusionImage(n_image_loaded-1,argv[i+1]);
+ i++; //skip fusion name
+ }
+ else if (current == "--sequence") {
+ n_image_loaded++; //count only one for the sequence
+ parse_mode=P_SEQUENCE; }
+ }
+ else if (parse_mode == P_SEQUENCE)
+ sequence_filenames.push_back(current);
+ else {
+ std::vector image; image.push_back(current);
+ window.LoadImages(image,IMAGE);
+ n_image_loaded++;
+ }
}
+ if (parse_mode == P_SEQUENCE) {//Finish any current sequence
+ window.LoadImages(sequence_filenames,MERGEDWITHTIME);
+ sequence_filenames.clear();
+ parse_mode=P_NORMAL;
+ }
+
+ }
- return app.exec();
+ return app.exec();
}