X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvMainWindow.cxx;h=b102e6234c62fee01ba7f9c683bce3f07d9c998a;hb=5a7da4aedae5c204bc55c187717193e5950f9a44;hp=a7c61a997efa1a9b0527a56e3c73ed4b874855f4;hpb=01b30e7f03475e50c640ec4e44d557823d89202c;p=clitk.git

diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx
index a7c61a9..b102e62 100644
--- a/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@ -161,15 +161,12 @@ vvMainWindow::vvMainWindow():vvMainWindowBase()
   contextMenu.addAction(actionAdd_VF_to_current_Image);
   contextActions.push_back(actionAdd_VF_to_current_Image);
 
-  QAction* actionAdd_Overlay_to_current_Image = menuOverlay->addAction(QIcon(QString::fromUtf8(":/common/icons/GPSup.png")),
-      tr("Add overlay image to current image"));
-  contextMenu.addAction(actionAdd_Overlay_to_current_Image);
-  contextActions.push_back(actionAdd_Overlay_to_current_Image);
-
-  connect(actionAdd_Overlay_to_current_Image,SIGNAL(triggered()), this,SLOT(SelectOverlayImage()));
+  //QAction* actionAdd_Overlay_to_current_Image = menuOverlay->addAction(QIcon(QString::fromUtf8(":/common/icons/GPSup.png")),
+  //    tr("Add overlay image to current image"));
+  contextMenu.addAction(actionAdd_overlay_image_to_current_image);
+  contextActions.push_back(actionAdd_overlay_image_to_current_image);
 
   contextMenu.addAction(actionAdd_fusion_image);
-  connect(actionAdd_fusion_image,SIGNAL(triggered()),this,SLOT(SelectFusionImage()));
   contextActions.push_back(actionAdd_fusion_image);
 
   contextMenu.addSeparator();
@@ -221,7 +218,7 @@ vvMainWindow::vvMainWindow():vvMainWindowBase()
   dicomSeriesSelector = new vvDicomSeriesSelector();
 
   inverseButton->setEnabled(0);
-  actionAdd_Overlay_to_current_Image->setEnabled(0);
+  actionAdd_overlay_image_to_current_image->setEnabled(0);
   actionSave_As->setEnabled(0);
   actionAdd_VF_to_current_Image->setEnabled(0);
   actionAdd_fusion_image->setEnabled(0);
@@ -271,7 +268,8 @@ vvMainWindow::vvMainWindow():vvMainWindowBase()
   connect(actionRead_saved_state,SIGNAL(triggered()),this,SLOT(ReadSavedState()));
   connect(actionExit,SIGNAL(triggered()),this,SLOT(close()));
   connect(actionAdd_VF_to_current_Image,SIGNAL(triggered()),this,SLOT(OpenField()));
-  connect(actionNavigation_Help,SIGNAL(triggered()),this,SLOT(ShowHelpDialog()));
+  connect(actionAdd_fusion_image,SIGNAL(triggered()),this,SLOT(SelectFusionImage()));
+  connect(actionAdd_overlay_image_to_current_image,SIGNAL(triggered()), this,SLOT(SelectOverlayImage()));  connect(actionNavigation_Help,SIGNAL(triggered()),this,SLOT(ShowHelpDialog()));
   connect(actionDocumentation,SIGNAL(triggered()),this,SLOT(ShowDocumentation()));
   connect(actionRegister_vv,SIGNAL(triggered()),this,SLOT(PopupRegisterForm()));
 
@@ -306,7 +304,6 @@ vvMainWindow::vvMainWindow():vvMainWindowBase()
 
   connect(this,SIGNAL(customContextMenuRequested(QPoint)),this,SLOT(ShowContextMenu(QPoint)));
 
-#include "vvSaveState.h"
   connect(linkPanel,SIGNAL(addLink(QString,QString)),this,SLOT(AddLink(QString,QString)));
   connect(linkPanel,SIGNAL(removeLink(QString,QString)),this,SLOT(RemoveLink(QString,QString)));
   connect(overlayPanel,SIGNAL(VFPropertyUpdated(int,int,int,int,double,double,double)),this,SLOT(SetVFProperty(int,int,int,int,double,double,double)));
@@ -494,15 +491,8 @@ void vvMainWindow::OpenVTKContour()
 
 
 //------------------------------------------------------------------------------
-void vvMainWindow::OpenDCStructContour()
+void vvMainWindow::AddDCStructContour(int index, QString file)
 {
-  if (mSlicerManagers.size() > 0) {
-    QString Extensions = "Dicom Files ( *.dcm RS*)";
-    Extensions += ";;All Files (*)";
-    QString file = QFileDialog::getOpenFileName(this,tr("Merge Images"),mInputPathName,Extensions);
-    if (file.isNull())
-      return;
-    int index = GetSlicerIndexFromItem(DataTree->selectedItems()[0]);
     vvMeshReader reader;
     reader.SetFilename(file.toStdString());
     vvStructSelector selector;
@@ -522,6 +512,19 @@ void vvMainWindow::OpenDCStructContour()
         AddContour(index,*i,selector.PropagationEnabled());
       QApplication::restoreOverrideCursor();
     }
+}
+
+//------------------------------------------------------------------------------
+void vvMainWindow::OpenDCStructContour()
+{
+  if (mSlicerManagers.size() > 0) {
+    QString Extensions = "Dicom Files ( *.dcm RS*)";
+    Extensions += ";;All Files (*)";
+    QString file = QFileDialog::getOpenFileName(this,tr("Merge Images"),mInputPathName,Extensions);
+    if (file.isNull())
+      return;
+    int index = GetSlicerIndexFromItem(DataTree->selectedItems()[0]);
+    AddDCStructContour(index, file);
   }
 }
 //------------------------------------------------------------------------------
@@ -1038,6 +1041,7 @@ void vvMainWindow::ImageInfoChanged()
   actionSave_As->setEnabled(1);
   actionAdd_VF_to_current_Image->setEnabled(1);
   actionAdd_fusion_image->setEnabled(1);
+  actionAdd_overlay_image_to_current_image->setEnabled(1);
   actionNorth_East_Window->setEnabled(1);
   actionNorth_West_Window->setEnabled(1);
   actionSouth_East_Window->setEnabled(1);
@@ -1830,70 +1834,74 @@ void vvMainWindow::SelectOverlayImage()
 //------------------------------------------------------------------------------
 void vvMainWindow::AddOverlayImage(int index, QString file)
 {
-
-  mInputPathName = itksys::SystemTools::GetFilenamePath(file.toStdString()).c_str();
-  itk::ImageIOBase::Pointer reader = itk::ImageIOFactory::CreateImageIO(
-                                       file.toStdString().c_str(), itk::ImageIOFactory::ReadMode);
-  reader->SetFileName(file.toStdString().c_str());
-  reader->ReadImageInformation();
-  std::string component = reader->GetComponentTypeAsString(reader->GetComponentType());
-  int dimension = reader->GetNumberOfDimensions();
-  QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
-  vvProgressDialog progress("Opening " + file.toStdString());
-  qApp->processEvents();
-
-  std::string filename = itksys::SystemTools::GetFilenameWithoutExtension(file.toStdString()).c_str();
-  if (mSlicerManagers[index]->SetOverlay(file.toStdString(),dimension, component)) {
-    //create an item in the tree with good settings
-    QTreeWidgetItem *item = new QTreeWidgetItem();
-    item->setData(0,Qt::UserRole,file.toStdString().c_str());
-    item->setData(1,Qt::UserRole,tr("overlay"));
-    QFileInfo fileinfo(file); //Do not show the path
-    item->setData(COLUMN_IMAGE_NAME,Qt::DisplayRole,fileinfo.fileName());
-    item->setToolTip(COLUMN_IMAGE_NAME, mSlicerManagers[index]->GetListOfAbsoluteFilePathInOneString("overlay").c_str());
+  if (QFile::exists(file))
+  {
+    mInputPathName = itksys::SystemTools::GetFilenamePath(file.toStdString()).c_str();
+    itk::ImageIOBase::Pointer reader = itk::ImageIOFactory::CreateImageIO(
+        file.toStdString().c_str(), itk::ImageIOFactory::ReadMode);
+    reader->SetFileName(file.toStdString().c_str());
+    reader->ReadImageInformation();
+    std::string component = reader->GetComponentTypeAsString(reader->GetComponentType());
+    int dimension = reader->GetNumberOfDimensions();
+    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+    vvProgressDialog progress("Opening " + file.toStdString());
     qApp->processEvents();
 
-    for (int j = 1; j <= 4; j++) {
-      item->setData(j,Qt::CheckStateRole,DataTree->topLevelItem(index)->data(j,Qt::CheckStateRole));
-    }
+    std::string filename = itksys::SystemTools::GetFilenameWithoutExtension(file.toStdString()).c_str();
+    if (mSlicerManagers[index]->SetOverlay(file.toStdString(),dimension, component)) {
+      //create an item in the tree with good settings
+      QTreeWidgetItem *item = new QTreeWidgetItem();
+      item->setData(0,Qt::UserRole,file.toStdString().c_str());
+      item->setData(1,Qt::UserRole,tr("overlay"));
+      QFileInfo fileinfo(file); //Do not show the path
+      item->setData(COLUMN_IMAGE_NAME,Qt::DisplayRole,fileinfo.fileName());
+      item->setToolTip(COLUMN_IMAGE_NAME, mSlicerManagers[index]->GetListOfAbsoluteFilePathInOneString("overlay").c_str());
+      qApp->processEvents();
 
-    //Create the buttons for reload and close
-    qApp->processEvents();
-    QTreePushButton* cButton = new QTreePushButton;
-    cButton->setItem(item);
-    cButton->setColumn(COLUMN_CLOSE_IMAGE);
-    cButton->setToolTip(tr("close image"));
-    cButton->setIcon(QIcon(QString::fromUtf8(":/common/icons/exit.png")));
-    connect(cButton,SIGNAL(clickedInto(QTreeWidgetItem*, int)),
-            this,SLOT(CloseImage(QTreeWidgetItem*, int)));
+      for (int j = 1; j <= 4; j++) {
+        item->setData(j,Qt::CheckStateRole,DataTree->topLevelItem(index)->data(j,Qt::CheckStateRole));
+      }
 
-    QTreePushButton* rButton = new QTreePushButton;
-    rButton->setItem(item);
-    rButton->setColumn(COLUMN_RELOAD_IMAGE);
-    rButton->setToolTip(tr("reload image"));
-    rButton->setIcon(QIcon(QString::fromUtf8(":/common/icons/rotateright.png")));
-    connect(rButton,SIGNAL(clickedInto(QTreeWidgetItem*, int)),
-            this,SLOT(ReloadImage(QTreeWidgetItem*, int)));
+      //Create the buttons for reload and close
+      qApp->processEvents();
+      QTreePushButton* cButton = new QTreePushButton;
+      cButton->setItem(item);
+      cButton->setColumn(COLUMN_CLOSE_IMAGE);
+      cButton->setToolTip(tr("close image"));
+      cButton->setIcon(QIcon(QString::fromUtf8(":/common/icons/exit.png")));
+      connect(cButton,SIGNAL(clickedInto(QTreeWidgetItem*, int)),
+          this,SLOT(CloseImage(QTreeWidgetItem*, int)));
 
-    DataTree->topLevelItem(index)->setExpanded(1);
-    DataTree->topLevelItem(index)->addChild(item);
-    DataTree->setItemWidget(item, COLUMN_CLOSE_IMAGE, cButton);
-    DataTree->setItemWidget(item, COLUMN_RELOAD_IMAGE, rButton);
+      QTreePushButton* rButton = new QTreePushButton;
+      rButton->setItem(item);
+      rButton->setColumn(COLUMN_RELOAD_IMAGE);
+      rButton->setToolTip(tr("reload image"));
+      rButton->setIcon(QIcon(QString::fromUtf8(":/common/icons/rotateright.png")));
+      connect(rButton,SIGNAL(clickedInto(QTreeWidgetItem*, int)),
+          this,SLOT(ReloadImage(QTreeWidgetItem*, int)));
 
-    //set the id of the image
-    QString id = DataTree->topLevelItem(index)->data(COLUMN_IMAGE_NAME,Qt::UserRole).toString();
-    item->setData(COLUMN_IMAGE_NAME,Qt::UserRole,id.toStdString().c_str());
-    UpdateTree();
-    qApp->processEvents();
-    ImageInfoChanged();
-    QApplication::restoreOverrideCursor();
-  } else {
-    QApplication::restoreOverrideCursor();
-    QString error = "Cannot import the new image.\n";
-    error += mSlicerManagers[index]->GetLastError().c_str();
-    QMessageBox::information(this,tr("Problem reading image !"),error);
+      DataTree->topLevelItem(index)->setExpanded(1);
+      DataTree->topLevelItem(index)->addChild(item);
+      DataTree->setItemWidget(item, COLUMN_CLOSE_IMAGE, cButton);
+      DataTree->setItemWidget(item, COLUMN_RELOAD_IMAGE, rButton);
+
+      //set the id of the image
+      QString id = DataTree->topLevelItem(index)->data(COLUMN_IMAGE_NAME,Qt::UserRole).toString();
+      item->setData(COLUMN_IMAGE_NAME,Qt::UserRole,id.toStdString().c_str());
+      UpdateTree();
+      qApp->processEvents();
+      ImageInfoChanged();
+      QApplication::restoreOverrideCursor();
+    } else {
+      QApplication::restoreOverrideCursor();
+      QString error = "Cannot import the new image.\n";
+      error += mSlicerManagers[index]->GetLastError().c_str();
+      QMessageBox::information(this,tr("Problem reading image !"),error);
+    }
+    WindowLevelChanged();
   }
-  WindowLevelChanged();
+  else
+    QMessageBox::information(this,tr("Problem reading Overlay !"),"File doesn't exist!");
 }
 //------------------------------------------------------------------------------
 
@@ -1961,73 +1969,78 @@ void vvMainWindow::ResetTransformationToIdentity()
 //------------------------------------------------------------------------------
 void vvMainWindow::AddFusionImage(int index, QString file)
 {
-  mInputPathName = itksys::SystemTools::GetFilenamePath(file.toStdString()).c_str();
-  itk::ImageIOBase::Pointer reader = itk::ImageIOFactory::CreateImageIO(
-                                       file.toStdString().c_str(), itk::ImageIOFactory::ReadMode);
-  reader->SetFileName(file.toStdString().c_str());
-  reader->ReadImageInformation();
-  std::string component = reader->GetComponentTypeAsString(reader->GetComponentType());
-  if (reader) {
-    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
-    vvProgressDialog progress("Opening fusion");
-    qApp->processEvents();
-
-    std::string filename = itksys::SystemTools::GetFilenameWithoutExtension(file.toStdString()).c_str();
-    if (mSlicerManagers[index]->SetFusion(file.toStdString(),
-                                          reader->GetNumberOfDimensions(), component)) {
-      //create an item in the tree with good settings
-      QTreeWidgetItem *item = new QTreeWidgetItem();
-      item->setData(0,Qt::UserRole,file.toStdString().c_str());
-      item->setData(1,Qt::UserRole,tr("fusion"));
-      QFileInfo fileinfo(filename.c_str()); //Do not show the path
-      item->setData(COLUMN_IMAGE_NAME,Qt::DisplayRole,fileinfo.fileName());
-      item->setToolTip(COLUMN_IMAGE_NAME, mSlicerManagers[index]->GetListOfAbsoluteFilePathInOneString("fusion").c_str());
+  if (QFile::exists(file))
+  {
+    mInputPathName = itksys::SystemTools::GetFilenamePath(file.toStdString()).c_str();
+    itk::ImageIOBase::Pointer reader = itk::ImageIOFactory::CreateImageIO(
+        file.toStdString().c_str(), itk::ImageIOFactory::ReadMode);
+    reader->SetFileName(file.toStdString().c_str());
+    reader->ReadImageInformation();
+    std::string component = reader->GetComponentTypeAsString(reader->GetComponentType());
+    if (reader) {
+      QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+      vvProgressDialog progress("Opening fusion");
       qApp->processEvents();
 
-      for (int j = 1; j <= 4; j++) {
-        item->setData(j,Qt::CheckStateRole,DataTree->topLevelItem(index)->data(j,Qt::CheckStateRole));
-      }
+      std::string filename = itksys::SystemTools::GetFilenameWithoutExtension(file.toStdString()).c_str();
+      if (mSlicerManagers[index]->SetFusion(file.toStdString(),
+            reader->GetNumberOfDimensions(), component)) {
+        //create an item in the tree with good settings
+        QTreeWidgetItem *item = new QTreeWidgetItem();
+        item->setData(0,Qt::UserRole,file.toStdString().c_str());
+        item->setData(1,Qt::UserRole,tr("fusion"));
+        QFileInfo fileinfo(filename.c_str()); //Do not show the path
+        item->setData(COLUMN_IMAGE_NAME,Qt::DisplayRole,fileinfo.fileName());
+        item->setToolTip(COLUMN_IMAGE_NAME, mSlicerManagers[index]->GetListOfAbsoluteFilePathInOneString("fusion").c_str());
+        qApp->processEvents();
 
-      //Create the buttons for reload and close
-      qApp->processEvents();
-      QTreePushButton* cButton = new QTreePushButton;
-      cButton->setItem(item);
-      cButton->setColumn(COLUMN_CLOSE_IMAGE);
-      cButton->setToolTip(tr("close image"));
-      cButton->setIcon(QIcon(QString::fromUtf8(":/common/icons/exit.png")));
-      connect(cButton,SIGNAL(clickedInto(QTreeWidgetItem*, int)),
-              this,SLOT(CloseImage(QTreeWidgetItem*, int)));
+        for (int j = 1; j <= 4; j++) {
+          item->setData(j,Qt::CheckStateRole,DataTree->topLevelItem(index)->data(j,Qt::CheckStateRole));
+        }
 
-      QTreePushButton* rButton = new QTreePushButton;
-      rButton->setItem(item);
-      rButton->setColumn(COLUMN_RELOAD_IMAGE);
-      rButton->setToolTip(tr("reload image"));
-      rButton->setIcon(QIcon(QString::fromUtf8(":/common/icons/rotateright.png")));
-      connect(rButton,SIGNAL(clickedInto(QTreeWidgetItem*, int)),
-              this,SLOT(ReloadImage(QTreeWidgetItem*, int)));
+        //Create the buttons for reload and close
+        qApp->processEvents();
+        QTreePushButton* cButton = new QTreePushButton;
+        cButton->setItem(item);
+        cButton->setColumn(COLUMN_CLOSE_IMAGE);
+        cButton->setToolTip(tr("close image"));
+        cButton->setIcon(QIcon(QString::fromUtf8(":/common/icons/exit.png")));
+        connect(cButton,SIGNAL(clickedInto(QTreeWidgetItem*, int)),
+            this,SLOT(CloseImage(QTreeWidgetItem*, int)));
 
-      DataTree->topLevelItem(index)->setExpanded(1);
-      DataTree->topLevelItem(index)->addChild(item);
-      DataTree->setItemWidget(item, COLUMN_CLOSE_IMAGE, cButton);
-      DataTree->setItemWidget(item, COLUMN_RELOAD_IMAGE, rButton);
+        QTreePushButton* rButton = new QTreePushButton;
+        rButton->setItem(item);
+        rButton->setColumn(COLUMN_RELOAD_IMAGE);
+        rButton->setToolTip(tr("reload image"));
+        rButton->setIcon(QIcon(QString::fromUtf8(":/common/icons/rotateright.png")));
+        connect(rButton,SIGNAL(clickedInto(QTreeWidgetItem*, int)),
+            this,SLOT(ReloadImage(QTreeWidgetItem*, int)));
 
-      //set the id of the image
-      QString id = DataTree->topLevelItem(index)->data(COLUMN_IMAGE_NAME,Qt::UserRole).toString();
-      item->setData(COLUMN_IMAGE_NAME,Qt::UserRole,id.toStdString().c_str());
-      UpdateTree();
-      qApp->processEvents();
-      ImageInfoChanged();
-      QApplication::restoreOverrideCursor();
+        DataTree->topLevelItem(index)->setExpanded(1);
+        DataTree->topLevelItem(index)->addChild(item);
+        DataTree->setItemWidget(item, COLUMN_CLOSE_IMAGE, cButton);
+        DataTree->setItemWidget(item, COLUMN_RELOAD_IMAGE, rButton);
+
+        //set the id of the image
+        QString id = DataTree->topLevelItem(index)->data(COLUMN_IMAGE_NAME,Qt::UserRole).toString();
+        item->setData(COLUMN_IMAGE_NAME,Qt::UserRole,id.toStdString().c_str());
+        UpdateTree();
+        qApp->processEvents();
+        ImageInfoChanged();
+        QApplication::restoreOverrideCursor();
+      } else {
+        QApplication::restoreOverrideCursor();
+        QString error = "Cannot import the new image.\n";
+        error += mSlicerManagers[index]->GetLastError().c_str();
+        QMessageBox::information(this,tr("Problem reading image !"),error);
+      }
     } else {
-      QApplication::restoreOverrideCursor();
       QString error = "Cannot import the new image.\n";
-      error += mSlicerManagers[index]->GetLastError().c_str();
       QMessageBox::information(this,tr("Problem reading image !"),error);
     }
-  } else {
-    QString error = "Cannot import the new image.\n";
-    QMessageBox::information(this,tr("Problem reading image !"),error);
   }
+  else
+    QMessageBox::information(this,tr("Problem reading Fusion !"),"File doesn't exist!");
 }
 //------------------------------------------------------------------------------