X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2Fvv.cxx;h=b30e97c47148fb0904f83e4c8f8f185869a18206;hb=84aa70d26f13d3a436a241c1ce1ac554c25f3146;hp=141b915d76a9d5c156f571f9ef33cd9618e6ebaf;hpb=1e034c70105f0926939acaaa27ddb46e904ae8bf;p=clitk.git

diff --git a/vv/vv.cxx b/vv/vv.cxx
index 141b915..b30e97c 100644
--- a/vv/vv.cxx
+++ b/vv/vv.cxx
@@ -30,11 +30,6 @@
 //------------------------------------------------------------------------------
 int main( int argc, char** argv )
 {
-#ifdef _WIN32
-  HWND hWnd = GetConsoleWindow();
-  ShowWindow( hWnd, SW_HIDE );
-#endif
-
   CLITK_INIT;
 
   QApplication app( argc, argv );
@@ -60,6 +55,7 @@ int main( int argc, char** argv )
 
   std::vector<std::string> filenames;
   std::vector<std::pair<int ,std::string> > overlays;
+  std::vector<std::pair<int ,std::string> > rois;
   std::vector<std::pair<int ,std::string> > vector_fields;
   if (argc >1) {
     for (int i = 1; i < argc; i++) {
@@ -68,12 +64,24 @@ int main( int argc, char** argv )
         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);
+      } 
+      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 {
+	  if (temp=="--roi") {
+	    assert(filenames.size()>=1);
+	    rois.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<std::pair<int ,std::string> >::iterator i=overlays.begin();
@@ -82,6 +90,12 @@ int main( int argc, char** argv )
     for (std::vector<std::pair<int ,std::string> >::iterator i=vector_fields.begin();
          i!=vector_fields.end(); i++)
       window.AddField((*i).second.c_str(), (*i).first);
+    for (std::vector<std::pair<int ,std::string> >::iterator i=rois.begin();
+         i!=rois.end(); i++) {
+      DD((*i).second.c_str());
+      DD((*i).first);
+      // window.AddROI((*i).second.c_str(), (*i).first);
+    }
 
   }