X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2Fvv.cxx;h=9c3f666be3904a8de0350748bfd96c363917519b;hb=d47b233f76eb42cf2380f213154e2cf6e1fd656a;hp=93b708e753b40aad059ce6ac8d5481ce3c2b5b7d;hpb=c4c6df5851a369ed4a2c29703ce1a0768c2a7488;p=clitk.git diff --git a/vv/vv.cxx b/vv/vv.cxx index 93b708e..9c3f666 100644 --- a/vv/vv.cxx +++ b/vv/vv.cxx @@ -30,9 +30,13 @@ #include "clitkIO.h" #include "vvMainWindow.h" +#include "vvReadState.h" #include "vvToolsList.h" +#include "vvConfiguration.h" + #include #include + #include #include #include @@ -62,7 +66,7 @@ std::string create_timed_string() } //------------------------------------------------------------------------------ -#ifdef _WIN32 +#ifdef _WIN32 int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE prevInstance, LPSTR lpCmdLine, int nShowCmd) { int argc = __argc; @@ -76,6 +80,23 @@ int main( int argc, char** argv ) QApplication app( argc, argv ); Q_INIT_RESOURCE(vvIcons); + + // + // 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,6 +115,7 @@ 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]; @@ -103,6 +125,27 @@ int main( int argc, char** argv ) sequence_filenames.clear(); parse_mode=P_NORMAL; } + if ((current=="--help") || (current=="-h")) { + std::cout << "vv " << VV_VERSION << ", the 2D, 2D+t, 3D and 3D+t (or 4D) image viewer" << std::endl << std::endl + << "Synopsis: vv file(s) [OPTIONS] file(s)" << std::endl << std::endl + << "Open file(s) for visualization." << std::endl << std::endl + << "OPTIONS may be:" << std::endl + << "--help \t Print command line help and exit." << std::endl + << "--window number\t Gray scale window width for all images." << std::endl + << "--level number \t Gray scale window level for all images." << std::endl + << "--linkall \t Link pan, zoom and spatial position of crosshair in images." << std::endl + << "--log \t Log output messages in vv-log directory." << std::endl + << "--state file \t Read display parameters from file." << std::endl + << "--sequence file\t Read all file(s) until next option in a single temporal sequence." << std::endl + << std::endl + << "These last options must follow a file name since they overlay something on an image:" << std::endl + << "--vf file \t Overlay the vector field in file." << std::endl + << "--overlay file \t Overlay the image in file with complementary colors." << std::endl + << "--fusion file \t Overlay the image in file with alpha blending and colormap." << std::endl + //<< "--roi file \t Overlay binary mask images. Option may be repeated on a single base image." << std::endl + << "--contour file \t Overlay DICOM RT-STRUCT contours." << std::endl; + exit(0); + } if (current=="--vf") { if (!n_image_loaded) load_image_first_error(); window.AddField(argv[i+1],n_image_loaded-1); @@ -111,10 +154,14 @@ int main( int argc, char** argv ) 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") { + } /*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=="--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,7 +173,10 @@ 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()) && @@ -151,7 +201,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) { @@ -175,9 +232,19 @@ int main( int argc, char** argv ) } 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; }