X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvMainWindow.h;h=23cded487b3ee98eceaafe5ea9fab1fad26dfd95;hb=20e242ec655cae0c3f6c2a0bc03362fb2faf9e48;hp=be50cb74dee6a2b61c897b28c71711befba74f42;hpb=97ff83e02ea212ec4a20c1794f75eed2576fffc7;p=clitk.git

diff --git a/vv/vvMainWindow.h b/vv/vvMainWindow.h
index be50cb7..23cded4 100644
--- a/vv/vvMainWindow.h
+++ b/vv/vvMainWindow.h
@@ -45,9 +45,11 @@ class vvMainWindow: public vvMainWindowBase,
   vvMainWindow();
   ~vvMainWindow();
   void LoadImages(std::vector<std::string> filenames, LoadedImageType type);
-  void AddImage(vvImage::Pointer image,std::string filename);
+  vvSlicerManager * AddImage(vvImage::Pointer image,std::string filename);
   void AddField(QString file,int index);
   void AddOverlayImage(int index, QString filename);
+  void AddFusionImage(int index, QString filename);
+  void AddROI(int index, QString filename);
   ///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
@@ -102,6 +104,7 @@ public slots:
   void UpdateWindowLevel();
   void SwitchWindowLevel();
   void UpdateLinkManager(std::string id, int slicer, double x, double y, double z, int temps);
+  void UpdateLinkedNavigation(std::string id, vvSlicerManager *sm);
   void AddLink(QString image1,QString image2);
   void RemoveLink(QString image1,QString image2);
   void ChangeImageWithIndexOffset(vvSlicerManager *sm, int slicer, int offset);
@@ -130,7 +133,7 @@ public slots:
   void ReloadImage();
   void OpenField();
   void SelectOverlayImage();
-  void AddFusionImage();
+  void SelectFusionImage();
 
   void SetVFProperty(int subsampling,int scale,int lut, int width);
   void SetOverlayProperty(int color);
@@ -171,6 +174,7 @@ private:
   int GetSlicerIndexFromItem(QTreeWidgetItem* item);
   QTreeWidgetItem* GetItemFromSlicerManager(vvSlicerManager* sm);
   void SaveScreenshot(vtkImageData* image);
+  int GetImageDuplicateFilenameNumber(std::string filename);
 
   QMenu contextMenu;
   //QMenu *AddSubImageMenu;
@@ -178,6 +182,8 @@ private:
   std::vector<QSlider*> horizontalSliders;
   std::vector<QSlider*> verticalSliders;
   int mFrameRate;
+  
+  std::string mCurrentSelectedImageId;
 
   // vvMainWindowToolInfo * mCurrentToolInfo;
   // std::vector<vvToolCreatorBase*> mListOfRunningTool;