X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2Fvv.cxx;h=f3011e687e4e1fd32d77ac89de32ae8fb278cb03;hb=3c2462eafabcf428b4d2775c414a7b5f62511d3f;hp=59cacb58911b5bb3ba8d51c18a49d46ae0840fee;hpb=2462405ada0fb899d56bf6d4fc9f2e0c15935cb9;p=clitk.git diff --git a/vv/vv.cxx b/vv/vv.cxx index 59cacb5..f3011e6 100644 --- a/vv/vv.cxx +++ b/vv/vv.cxx @@ -3,7 +3,7 @@ Authors belong to: - University of LYON http://www.universite-lyon.fr/ - - Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr + - Léon Bérard cancer center http://www.centreleonberard.fr - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr This software is distributed WITHOUT ANY WARRANTY; without even @@ -14,7 +14,7 @@ - BSD See included LICENSE.txt file - CeCILL-B http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -======================================================================-====*/ +===========================================================================**/ #include #include #include @@ -30,8 +30,8 @@ #include "clitkIO.h" #include "vvMainWindow.h" -#include "vvConstants.h" - +#include "vvReadState.h" +#include "vvToolsList.h" #include #include #include @@ -40,7 +40,7 @@ #include #include -#include +#include void load_image_first_error() { @@ -63,19 +63,37 @@ std::string create_timed_string() } //------------------------------------------------------------------------------ +#ifdef _WIN32 +int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE prevInstance, LPSTR lpCmdLine, int nShowCmd) +{ + int argc = __argc; + char **argv = __argv; +#else int main( int argc, char** argv ) { +#endif + 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(); + + // + // ATTENTION: Rômulo Pinho - 05/08/2011 + // Forcing the locale of the application is necessary + // because QT initialization changes it to the locale + // of the language of the system. This can cause + // inconsistencies when, e.g., reading float values + // from DICOM fields with gdcm, since the decimal + // point may be changed for a comma (as in French). + // In practice, functions such as scanf and its + // variations are directly affected. + // https://bugreports.qt.nokia.com//browse/QTBUG-15247?page=com.atlassian.jira.plugin.system.issuetabpanels%253Achangehistory-tabpanel + // +#ifndef _WIN32 + std::string old_locale = setlocale(LC_NUMERIC, NULL); + setlocale(LC_NUMERIC, "POSIX"); +#endif vvMainWindow window; @@ -94,12 +112,13 @@ int main( int argc, char** argv ) int n_image_loaded=0; std::string win(""), lev(""); + bool link_images = false; 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); + window.LoadImages(sequence_filenames, vvImageReader::MERGEDWITHTIME); sequence_filenames.clear(); parse_mode=P_NORMAL; } @@ -115,6 +134,10 @@ int main( int argc, char** argv ) if (!n_image_loaded) load_image_first_error(); window.AddROI(n_image_loaded-1,argv[i+1]); i++; //skip roi name + } else if (current=="--contour") { + if (!n_image_loaded) load_image_first_error(); + window.AddDCStructContour(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]); @@ -126,14 +149,19 @@ int main( int argc, char** argv ) parse_mode=P_WINDOW; } else if (current == "--level") { parse_mode=P_LEVEL; - } else if (current == "--log") { + } else if (current == "--linkall") { + link_images = true; + } + else if (current == "--log") { std::string log_dir = QDir::tempPath().toStdString() + std::string("/vv-log"); if(itksys::SystemTools::FileExists(log_dir.c_str()) && !itksys::SystemTools::FileIsDirectory(log_dir.c_str())) { - itkGenericExceptionMacro(<< "Error creating log directory, file exists and is not a directory."); + std::cerr << "Error creating log directory, file exists and is not a directory." << std::endl; + exit(1); } else if(!itksys::SystemTools::MakeDirectory(log_dir.c_str())) { - itkGenericExceptionMacro(<< "Error creating log directory."); + std::cerr << "Error creating log directory." << std::endl; + exit(1); } std::string log_file = log_dir + "/" + create_timed_string() + ".log"; @@ -149,7 +177,14 @@ int main( int argc, char** argv ) vtk_log->FlushOn(); vtk_log->AppendOn(); vtkOutputWindow::SetInstance(vtk_log); + } else if (current == "--state") { + //window.ReadSavedStateFile(argv[i+1]); + vvReadState read_state; + read_state.Run(&window, argv[i+1]); + n_image_loaded += read_state.GetNumberOfImages(); + i++; } + } else if (parse_mode == P_SEQUENCE) { sequence_filenames.push_back(current); } else if (parse_mode == P_WINDOW) { @@ -161,21 +196,31 @@ int main( int argc, char** argv ) } else { std::vector image; image.push_back(current); - window.LoadImages(image,IMAGE); + window.LoadImages(image, vvImageReader::IMAGE); n_image_loaded++; } } if (parse_mode == P_SEQUENCE) { //Finish any current sequence - window.LoadImages(sequence_filenames,MERGEDWITHTIME); + window.LoadImages(sequence_filenames, vvImageReader::MERGEDWITHTIME); sequence_filenames.clear(); parse_mode=P_NORMAL; } } if(win!="" && lev!="") { - window.WindowLevelChanged(atof(win.c_str()), atof(lev.c_str()), 6, 0); + window.SetWindowLevel(atof(win.c_str()), atof(lev.c_str())); window.ApplyWindowLevelToAllImages(); } - return app.exec(); + if (link_images) + window.LinkAllImages(); + + int ret = app.exec(); + +#ifndef _WIN32 + // restoring the locale, just to be clean... + setlocale(LC_NUMERIC, old_locale.c_str()); +#endif + + return ret; }