Merge branch 'master' into wipe

diff --combined vv/vvMainWindow.cxx
index 335177a5327969bf87d6f0de12d20056330a25d2,a3d2000cbd9da993edcd9adccbd3b1130eaf9358..f3b36e36ac6166b0d4968524c0586ab0cf1dba61
--- 1/vv/vvMainWindow.cxx
--- 2/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@@ -110,7 -110,11 +110,7 @@@ It is distributed under dual licenc
  #define COLUMN_RELOAD_IMAGE 6
  #define COLUMN_IMAGE_NAME 7
  
 -#ifdef CLITK_PRIVATE_FEATURES
 -#define EXTENSIONS "Images ( *.bmp *.dcm *.png *.jpeg *.jpg *.tif *.mhd *.mha *.hdr *.vox *.his *.xdr *.SCAN *.nii *.nrrd *.nhdr *.refscan *.nii.gz *.usf *.svl)"
 -#else
 -#define EXTENSIONS "Images ( *.bmp *.dcm *.png *.jpeg *.jpg *.tif *.mhd *.mha *.hdr *.vox *.his *.xdr *.SCAN *.nii *.nrrd *.nhdr *.refscan *.nii.gz)"
 -#endif
 +#include <extensions.h>
  
  
  /*Data Tree values
@@@ -196,9 -200,6 +196,9 @@@ vvMainWindow::vvMainWindow():vvMainWind
    contextActions.push_back(actionAdd_USSequence_toCT);
  #endif
  
 +  contextMenu.addAction(actionAdd_wipe_image);
 +  contextActions.push_back(actionAdd_wipe_image);
 +
  
    contextMenu.addSeparator();
    QAction* actionResetMatrix = contextMenu.addAction(QIcon(QString::fromUtf8(":/common/icons/identity.png")),
@@@ -242,7 -243,6 +242,7 @@@
    actionAdd_VF_to_current_Image->setEnabled(0);
    actionAdd_fusion_image->setEnabled(0);
    actionAdd_USSequence_toCT->setEnabled(0);
 +  actionAdd_wipe_image->setEnabled(0);
  
    //init the sliders
    verticalSliders.push_back(NOVerticalSlider);
@@@ -292,7 -292,6 +292,7 @@@
    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(actionAdd_wipe_image,SIGNAL(triggered()),this,SLOT(SelectWipeImage()));
    connect(actionAdd_fusion_image,SIGNAL(triggered()),this,SLOT(SelectFusionImage()));
    connect(actionAdd_overlay_image_to_current_image,SIGNAL(triggered()), this,SLOT(SelectOverlayImage()));
    connect(actionAdd_USSequence_toCT,SIGNAL(triggered()), this,SLOT(SelectFusionSequence()));
@@@ -985,6 -984,7 +985,7 @@@ void vvMainWindow::LoadImages(std::vect
          connect(mSlicerManagers.back(), SIGNAL(ChangeImageWithIndexOffset(vvSlicerManager*,int,int)),
            this,SLOT(ChangeImageWithIndexOffset(vvSlicerManager*,int,int)));
          connect(mSlicerManagers.back(),SIGNAL(LandmarkAdded()),landmarksPanel,SLOT(AddPoint()));
+         connect(landmarksPanel,SIGNAL(UpdateLandmarkTransform()), mSlicerManagers.back(), SLOT(UpdateLandmark()));
          InitSlicers();
          numberofsuccesulreads++;
        }
@@@ -1083,7 -1083,6 +1084,7 @@@ void vvMainWindow::ImageInfoChanged(
    actionSave_As->setEnabled(1);
    actionAdd_VF_to_current_Image->setEnabled(1);
    actionAdd_fusion_image->setEnabled(1);
 +  actionAdd_wipe_image->setEnabled(1);
    actionAdd_overlay_image_to_current_image->setEnabled(1);
    actionAdd_USSequence_toCT->setEnabled(1);
    actionNorth_East_Window->setEnabled(1);
@@@ -2170,42 -2169,6 +2171,42 @@@ void vvMainWindow::AddROI(int index, QS
  }
  //------------------------------------------------------------------------------
  
 +//------------------------------------------------------------------------------
 +void vvMainWindow::SelectWipeImage()
 +{ 
 +  int index = GetSlicerIndexFromItem(DataTree->selectedItems()[0]);
 +  
 +
 +  if (!(CheckAddedImage(index, "wipe")))
 +    return;
 +
 +  vvWipeImage::Pointer wipeImage = vvWipeImage::New();
 +  wipeImage->Initialize(mInputPathName, mSlicerManagers);
 +  wipeImage->selectWipeImage(index, GetTree());
 +  QTreeWidgetItem *item = DataTree->itemAt(index, COLUMN_CLOSE_IMAGE);
 +  //connect(item,SIGNAL(clickedInto(QTreeWidgetItem*, int)), this,SLOT(CloseImage(QTreeWidgetItem*, int)));
 +  UpdateTree();
 +  ImageInfoChanged();
 +  for(int i=0; i<4; i++)
 +        DisplaySliders(index, i);
 +  WindowLevelChanged();
 +
 +  /*QString Extensions = EXTENSIONS;
 +  Extensions += ";;All Files (*)";
 +  QStringList files = QFileDialog::getOpenFileNames(this,tr("Load Wipe image"),mInputPathName,Extensions);
 +  if (files.isEmpty())
 +    return;
 +
 +  std::vector<std::string> vecFileNames;
 +  for (int i = 0; i < files.size(); i++) {
 +    vecFileNames.push_back(files[i].toStdString());
 +  }*/
 +
 +  //AddWipeImage(index,vecFileNames,vvImageReader::IMAGE);
 +}
 +//------------------------------------------------------------------------------
 +
 +
  //------------------------------------------------------------------------------
  void vvMainWindow::SelectFusionImage()
  { 
@@@ -3735,6 -3698,7 +3736,7 @@@ vvSlicerManager* vvMainWindow::AddImage
    connect(mSlicerManagers.back(), SIGNAL(ChangeImageWithIndexOffset(vvSlicerManager*,int,int)),
      this,SLOT(ChangeImageWithIndexOffset(vvSlicerManager*,int,int)));
    connect(mSlicerManagers.back(), SIGNAL(LandmarkAdded()),landmarksPanel,SLOT(AddPoint()));
+   connect(landmarksPanel,SIGNAL(UpdateLandmarkTransform()), mSlicerManagers.back(), SLOT(UpdateLandmark()));