X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvMainWindow.h;h=c21939754107158077001f72023ccea754fc53a8;hb=dad240d633996ba10087d96ece317415086f5a59;hp=6426dfdd14c5edb2dc1aa7adc2392c70b1cb6034;hpb=a2d7d0fe5356215b7de062e5bb6f40753e0bfbc6;p=clitk.git

diff --git a/vv/vvMainWindow.h b/vv/vvMainWindow.h
index 6426dfd..c219397 100644
--- a/vv/vvMainWindow.h
+++ b/vv/vvMainWindow.h
@@ -45,15 +45,18 @@ 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
   void ShowLastImage();
 
   virtual void UpdateCurrentSlicer();
+  virtual QTabWidget * GetTab();
   //vvMainWindowToolInfo * GetInfoForTool();
 //   void AddRunningTool(vvToolCreatorBase * tool);
 
@@ -69,6 +72,7 @@ public slots:
   void OpenRecentImage();
   void OpenImageWithTime();
   void MergeImages();
+  void SliceImages();
   void MergeImagesWithTime();
   void OpenDicom();
   ///Open a vtkPolyData surface mesh and display it over the current image
@@ -101,6 +105,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);
@@ -123,13 +128,11 @@ public slots:
   void SaveSOScreenshot();
 
   void ShowContextMenu(QPoint point);
-  //  void CropImage();
-  void SplitImage();
   void CloseImage();
   void ReloadImage();
   void OpenField();
   void SelectOverlayImage();
-  void AddFusionImage();
+  void SelectFusionImage();
 
   void SetVFProperty(int subsampling,int scale,int lut, int width);
   void SetOverlayProperty(int color);
@@ -170,6 +173,7 @@ private:
   int GetSlicerIndexFromItem(QTreeWidgetItem* item);
   QTreeWidgetItem* GetItemFromSlicerManager(vvSlicerManager* sm);
   void SaveScreenshot(vtkImageData* image);
+  int GetImageDuplicateFilenameNumber(std::string filename);
 
   QMenu contextMenu;
   //QMenu *AddSubImageMenu;
@@ -177,6 +181,8 @@ private:
   std::vector<QSlider*> horizontalSliders;
   std::vector<QSlider*> verticalSliders;
   int mFrameRate;
+  
+  std::string mCurrentSelectedImageId;
 
   // vvMainWindowToolInfo * mCurrentToolInfo;
   // std::vector<vvToolCreatorBase*> mListOfRunningTool;