X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvMainWindow.cxx;h=10dc42d012885709d621a0ded415d650d6122c10;hb=2368cbc03789119dd0b3ed2ab17e56e464ee0100;hp=abdbd1ae45393729c662180780208c0373505500;hpb=0b04af7278ad344a167c4e8d99e6e67c535f0d95;p=clitk.git

diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx
index abdbd1a..10dc42d 100644
--- a/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@ -98,10 +98,12 @@ vvMainWindow::vvMainWindow():vvMainWindowBase()
 
   mInputPathName = "";
   mMenuTools = menuTools;
+  //  mMenuSegmentation = menuSegmentation;
   mContextMenu = &contextMenu;
   mMenuExperimentalTools = menuExperimental;
   mMainWidget = this;
   mCurrentTime = -1;
+  mCurrentSelectedImageId = "";
 
   //Init the contextMenu
   this->setContextMenuPolicy(Qt::CustomContextMenu);
@@ -753,7 +755,7 @@ void vvMainWindow::LoadImages(std::vector<std::string> files, LoadedImageType fi
   //open images as 1 or multiples
   for (int i = 0; i < fileSize; i++) {
 
-    progress.Update("Opening " + files[i]);
+    progress.SetText("Opening " + files[i]);
     progress.SetProgress(i,fileSize);
     qApp->processEvents();
 
@@ -764,18 +766,7 @@ void vvMainWindow::LoadImages(std::vector<std::string> files, LoadedImageType fi
     bool SetImageSucceed=false;
 
     // Change filename if an image with the same already exist
-    //    DD(files[i]);
-    int number=0;
-    for(unsigned int l=0; l<mSlicerManagers.size(); l++) {
-      vvSlicerManager * v = mSlicerManagers[l];
-      //      DD(v->GetBaseFileName());
-      // DD(v->GetFileName());
-      if (v->GetBaseFileName() ==
-          vtksys::SystemTools::GetFilenameName(vtksys::SystemTools::GetFilenameWithoutLastExtension(files[i]))) {
-        number = std::max(number, v->GetBaseFileNameNumber()+1);
-      }
-    }
-
+    int number = GetImageDuplicateFilenameNumber(files[i]);
 
     if (filetype == IMAGE || filetype == IMAGEWITHTIME)
       SetImageSucceed = imageManager->SetImage(files[i],filetype, number);
@@ -899,7 +890,10 @@ void vvMainWindow::UpdateTree()
 //------------------------------------------------------------------------------
 void vvMainWindow::CurrentImageChanged(std::string id)
 {
-  //  DD("CurrentImageChanged");
+  // DD("CurrentImageChanged");
+//   DD(id);
+//   DD(mCurrentSelectedImageId);
+  if (id == mCurrentSelectedImageId) return; // Do nothing
   int selected = 0;
   for (int i = 0; i < DataTree->topLevelItemCount(); i++) {
     if (DataTree->topLevelItem(i)->data(COLUMN_IMAGE_NAME,Qt::UserRole).toString().toStdString() == id) {
@@ -912,7 +906,8 @@ void vvMainWindow::CurrentImageChanged(std::string id)
 
   }
   DataTree->topLevelItem(selected)->setSelected(1);
-  //  DD(mSlicerManagers[selected]->GetFileName());
+  // DD(mSlicerManagers[selected]->GetFileName());
+  mCurrentSelectedImageId = id;
   emit SelectedImageHasChanged(mSlicerManagers[selected]);
 }
 //------------------------------------------------------------------------------
@@ -974,7 +969,7 @@ void vvMainWindow::ImageInfoChanged()
       inputSpacing.resize(dimension);
       inputSize.resize(dimension);
       sizeMM.resize(dimension);
-      pixelType = mSlicerManagers[index]->GetImage()->GetScalarTypeAsString().c_str();
+      pixelType = mSlicerManagers[index]->GetImage()->GetScalarTypeAsITKString().c_str();
       for (int i = 0; i < dimension; i++) {
         origin[i] = imageSelected->GetOrigin()[i];
         inputSpacing[i] = imageSelected->GetSpacing()[i];
@@ -990,7 +985,7 @@ void vvMainWindow::ImageInfoChanged()
       inputSpacing.resize(dimension);
       inputSize.resize(dimension);
       sizeMM.resize(dimension);
-      pixelType = mSlicerManagers[index]->GetVF()->GetScalarTypeAsString().c_str();
+      pixelType = mSlicerManagers[index]->GetVF()->GetScalarTypeAsITKString().c_str();
       for (int i = 0; i < dimension; i++) {
         origin[i] = imageSelected->GetOrigin()[i];
         inputSpacing[i] = imageSelected->GetSpacing()[i];
@@ -1006,7 +1001,7 @@ void vvMainWindow::ImageInfoChanged()
       inputSpacing.resize(dimension);
       inputSize.resize(dimension);
       sizeMM.resize(dimension);
-      pixelType = mSlicerManagers[index]->GetImage()->GetScalarTypeAsString().c_str();
+      pixelType = mSlicerManagers[index]->GetImage()->GetScalarTypeAsITKString().c_str();
       for (int i = 0; i < dimension; i++) {
         origin[i] = imageSelected->GetOrigin()[i];
         inputSpacing[i] = imageSelected->GetSpacing()[i];
@@ -1022,7 +1017,7 @@ void vvMainWindow::ImageInfoChanged()
       inputSpacing.resize(dimension);
       inputSize.resize(dimension);
       sizeMM.resize(dimension);
-      pixelType = mSlicerManagers[index]->GetImage()->GetScalarTypeAsString().c_str();
+      pixelType = mSlicerManagers[index]->GetImage()->GetScalarTypeAsITKString().c_str();
       for (int i = 0; i < dimension; i++) {
         origin[i] = imageSelected->GetOrigin()[i];
         inputSpacing[i] = imageSelected->GetSpacing()[i];
@@ -1875,7 +1870,38 @@ void vvMainWindow::AddOverlayImage(int index, QString file)
     QMessageBox::information(this,tr("Problem reading image !"),error);
   }
 }
+//------------------------------------------------------------------------------
+
+
+//------------------------------------------------------------------------------
+void vvMainWindow::AddROI(int index, QString file)
+{
+  DD("AddImageAndROI");
+  /*
+  // Get slice manager
+
+  // Load image
+
+  vvImageReader * mReader = new vvImageReader;
+  mReader->SetInputFilename(filename.toStdString());
+  mReader->Update(IMAGE);
+  if (mReader->GetLastError().size() != 0) {
+    std::cerr << "Error while reading " << filename.toStdString() << std::endl;
+    QString error = "Cannot open file \n";
+    error += mReader->GetLastError().c_str();
+    QMessageBox::information(this,tr("Reading problem"),error);
+    delete mReader;
+    return;
+  }
+  vvImage::Pointer roi = mReader->GetOutput();
+
+  // Create roi in new tool
+  vvToolStructureSetManager::AddImage(mCurrentSlicerManager, roi);
+*/
+}
+//------------------------------------------------------------------------------
 
+//------------------------------------------------------------------------------
 void vvMainWindow::AddFusionImage()
 {
   int index = GetSlicerIndexFromItem(DataTree->selectedItems()[0]);
@@ -2360,7 +2386,6 @@ void vvMainWindow::NEVerticalSliderChanged()
 //------------------------------------------------------------------------------
 void vvMainWindow::SOVerticalSliderChanged()
 {
-  // DD("SOVerticalSliderChanged");
   static int value=-1;
   // DD(value);
 //   DD(SOVerticalSlider->value());
@@ -2680,13 +2705,36 @@ void vvMainWindow::SurfaceViewerLaunch()
   vvSurfaceViewerDialog surfaceViewer;
   surfaceViewer.exec();
 }
+//------------------------------------------------------------------------------
+
 
 //------------------------------------------------------------------------------
-void vvMainWindow::AddImage(vvImage::Pointer image,std::string filename)
+int vvMainWindow::GetImageDuplicateFilenameNumber(std::string filename)
 {
+  int number=0;
+  for(unsigned int l=0; l<mSlicerManagers.size(); l++) {
+    vvSlicerManager * v = mSlicerManagers[l];
+    if (v->GetBaseFileName() ==
+	vtksys::SystemTools::GetFilenameName(vtksys::SystemTools::GetFilenameWithoutLastExtension(filename))) {
+      number = std::max(number, v->GetBaseFileNameNumber()+1);
+    }
+  }
+  return number;
+}
+//------------------------------------------------------------------------------
+
+
+//------------------------------------------------------------------------------
+vvSlicerManager* vvMainWindow::AddImage(vvImage::Pointer image,std::string filename)
+{
+  // Change filename if another image exist with the same name
+  int number = GetImageDuplicateFilenameNumber(filename);
+
+  // Create new SliceManager
   vvSlicerManager* slicer_manager = new vvSlicerManager(4);
-  slicer_manager->SetImage(image);
-  slicer_manager->SetFilename(filename);
+  slicer_manager->SetImage(image);//, IMAGE, number);
+  //  filename = filename+"_"+clitk::toString(number);
+  slicer_manager->SetFilename(filename, number);
   mSlicerManagers.push_back(slicer_manager);
 
   //create an item in the tree with good settings
@@ -2758,6 +2806,9 @@ void vvMainWindow::AddImage(vvImage::Pointer image,std::string filename)
   ShowLastImage();
   InitDisplay();
   qApp->processEvents();
+  
+  // End
+  return slicer_manager;
 }
 //------------------------------------------------------------------------------