Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

Conflicts:
	vv/vvMainWindow.cxx
	vv/vvMainWindow.h

diff --cc vv/vv.cxx
Simple merge

diff --cc vv/vvMainWindow.cxx
index 113be150ee0f2f491d8a9d9b1a96f4d8cae38d44,a44aadfb956311329c5b79e17d5c0076526efe73..eb5fe7ec96b6ffaee4501de96ffdb27438e63925
--- 1/vv/vvMainWindow.cxx
--- 2/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@@ -332,15 -320,12 +332,16 @@@ vvMainWindow::vvMainWindow():vvMainWind
    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)));
    connect(overlayPanel,SIGNAL(OverlayPropertyUpdated(int,int,double,double)),
 -          this,SLOT(SetOverlayProperty(int,int,double,double)));
 +    this,SLOT(SetOverlayProperty(int,int,double,double)));
    connect(overlayPanel,SIGNAL(FusionPropertyUpdated(int,int,int,double,double, bool)),
 -          this,SLOT(SetFusionProperty(int,int,int,double,double, bool)));
 +    this,SLOT(SetFusionProperty(int,int,int,double,double, bool)));
    connect(landmarksPanel,SIGNAL(UpdateRenderWindows()),this,SLOT(UpdateRenderWindows()));
+   connect(landmarksPanel,SIGNAL(SelectedPointChanged()),this,SLOT(GoToLandmark()));
  
 +  connect(overlayPanel,SIGNAL(FusionSequencePropertyUpdated(int, bool, unsigned int, bool)),
 +    this,SLOT(SetFusionSequenceProperty(int, bool,unsigned int, bool)));
 +
 +
    playMode = 0;//pause
    mFrameRate = 10;
    playButton->setEnabled(0);
@@@ -1149,28 -1130,27 +1156,28 @@@ void vvMainWindow::ImageInfoChanged(
        }
      }
  
-     infoPanel->setFileName(image);
-     infoPanel->setDimension(dim);
-     infoPanel->setSizePixel(GetVectorIntAsString(inputSize));
-     infoPanel->setSizeMM(GetVectorDoubleAsString(sizeMM));
-     infoPanel->setOrigin(GetVectorDoubleAsString(origin));
-     infoPanel->setSpacing(GetVectorDoubleAsString(inputSpacing));
-     infoPanel->setNPixel(QString::number(NPixel)+" ("+inputSizeInBytes+")");
- 
-     landmarksPanel->SetCurrentLandmarks(mSlicerManagers[index]->GetLandmarks(),
-       mSlicerManagers[index]->GetSlicer(0)->GetImage()->GetVTKImages().size());
-     landmarksPanel->SetCurrentPath(mInputPathName.toStdString());
-     landmarksPanel->SetCurrentImage(mSlicerManagers[index]->GetFileName().c_str());
- 
-     overlayPanel->getCurrentImageName(mSlicerManagers[index]->GetFileName().c_str());
-     for (int i = 0; i < 4; i++) {
-       if (DataTree->selectedItems()[0]->data(i+1,Qt::CheckStateRole).toInt() > 0 || i == 3) {
-         mSlicerManagers[index]->UpdateInfoOnCursorPosition(i);
-         break;
-       }
-     }
+ //     infoPanel->setFileName(image);
+ //     infoPanel->setDimension(dim);
+ //     infoPanel->setSizePixel(GetVectorIntAsString(inputSize));
+ //     infoPanel->setSizeMM(GetVectorDoubleAsString(sizeMM));
+ //     infoPanel->setOrigin(GetVectorDoubleAsString(origin));
+ //     infoPanel->setSpacing(GetVectorDoubleAsString(inputSpacing));
+ //     infoPanel->setNPixel(QString::number(NPixel)+" ("+inputSizeInBytes+")");
+ // 
+ //     landmarksPanel->SetCurrentLandmarks(mSlicerManagers[index]->GetLandmarks(),
+ //                                         mSlicerManagers[index]->GetTSlice());
+ //     landmarksPanel->SetCurrentPath(mInputPathName.toStdString());
+ //     landmarksPanel->SetCurrentImage(mSlicerManagers[index]->GetFileName().c_str());
+ // 
+ //     overlayPanel->getCurrentImageName(mSlicerManagers[index]->GetFileName().c_str());
+ //     for (int i = 0; i < 4; i++) {
+ //       if (DataTree->selectedItems()[0]->data(i+1,Qt::CheckStateRole).toInt() > 0 || i == 3) {
+ //         mSlicerManagers[index]->UpdateInfoOnCursorPosition(i);
+ //         break;
+ //       }
+ //     }
      WindowLevelChanged();
 +
      slicingPresetComboBox->setCurrentIndex(mSlicerManagers[index]->GetSlicingPreset());
  
      if (mSlicerManagers[index]->GetSlicer(0)->GetVF()) {

diff --cc vv/vvMainWindow.h
index 7911a757a7afee5645797edf64e297a031e69710,a15ff8b1bb6e26817d2e7a1abe45704bc0299cdf..15ec68779abf129e1e2f39f987a2d242f275f33e
--- 1/vv/vvMainWindow.h
--- 2/vv/vvMainWindow.h
+++ b/vv/vvMainWindow.h
@@@ -57,10 -57,8 +57,12 @@@ class vvMainWindow: public vvMainWindow
    void AddOverlayImage(int index, std::vector<std::string> fileNames, vvImageReader::LoadedImageType type);
    void AddFusionImage(int index, QString filename);
    void AddROI(int index, QString filename);
-   ///Adds a mesh to a SlicerManager, with optional warping by vector field
++
 +  //Process the sequence for fusion:
 +  void AddFusionSequence(int index, std::vector<std::string> fileNames, vvImageReader::LoadedImageType type);
 +
+   void AddLandmarks(int index, std::vector<std::string>);
+ ///Adds a mesh to a SlicerManager, with optional warping by vector field
    void AddContour(int image_index, vvMesh::Pointer contour, bool propagation);
    ///This is used to show an image when opened or computed
    void ShowLastImage();
@@@ -166,9 -159,9 +168,10 @@@ public slots
    void SetVFProperty(int subsampling,int scale,int lut, int width, double r, double g, double b);
    void SetOverlayProperty(int color, int linked, double window, double level);
    void SetFusionProperty(int opacity, int tresOpacity, int colormap,double window,double level, bool showLegend);
 +  void SetFusionSequenceProperty(int fusionSequenceFrameIndex, bool spatialSyncFlag, unsigned int fusionSequenceNbFrames, bool temporalSyncFlag);
  
    void GoToCursor();
+   void GoToLandmark();
    void PlayPause();
    void PlayNext();
    void ChangeFrameRate(int rate) {

diff --cc vv/vvSlicer.cxx
Simple merge