X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2Fvv.cxx;h=141b915d76a9d5c156f571f9ef33cd9618e6ebaf;hb=3008a38da6740858582a298adeebef88e03cde04;hp=7d4097219def136d98eab79d950c87489a98871f;hpb=48d8569538b93bf923de2f8d5c4b9db51640978f;p=clitk.git diff --git a/vv/vv.cxx b/vv/vv.cxx index 7d40972..141b915 100644 --- a/vv/vv.cxx +++ b/vv/vv.cxx @@ -1,7 +1,7 @@ /*========================================================================= Program: vv http://www.creatis.insa-lyon.fr/rio/vv - Authors belong to: + 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 @@ -31,65 +31,59 @@ int main( int argc, char** argv ) { #ifdef _WIN32 - HWND hWnd = GetConsoleWindow(); - ShowWindow( hWnd, SW_HIDE ); + HWND hWnd = GetConsoleWindow(); + ShowWindow( hWnd, SW_HIDE ); #endif - CLITK_INIT; + 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 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; + 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 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); - } - 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); - + 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); } + 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); - return app.exec(); + } + + return app.exec(); }