X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvMainWindow.h;h=27c0861d2958b635e7f2e483eb2ec42ca454b2fe;hb=097d5fd525a35dd8fa4b847ca4f6e1c6541c122c;hp=54cb659a42e301e715a3fada450261542aa6c351;hpb=0b7c9b1e1215634b02cbd38d4e4ba101d6111ba8;p=clitk.git

diff --git a/vv/vvMainWindow.h b/vv/vvMainWindow.h
index 54cb659..27c0861 100644
--- a/vv/vvMainWindow.h
+++ b/vv/vvMainWindow.h
@@ -15,11 +15,12 @@
   - BSD        See included LICENSE.txt file
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
 ======================================================================-====*/
-#ifndef vvMainWindow_h
-#define vvMainWindow_h
+
+#ifndef VVMAINWINDOW_H
+#define VVMAINWINDOW_H
+
 #include <iostream>
 #include <vector>
-
 #include "ui_vvMainWindow.h"
 #include "vvMainWindowBase.h"
 #include "vvToolManager.h"
@@ -44,16 +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);
-  void AddImage(vvSlicerManager * m);
+  vvSlicerManager * AddImage(vvImage::Pointer image,std::string filename);
   void AddField(QString file,int index);
   void AddOverlayImage(int index, QString filename);
+  void AddFusionImage(int index=-1, 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);
 
@@ -88,7 +91,6 @@ public slots:
   void VectorChanged(int visibility, double x, double y, double z, double value);
   void OverlayChanged(int visibility, double valueOver, double valueRef);
   void FusionChanged(int visibility, double value);
-  void ResampleCurrentImage();
   void SegmentationOnCurrentImage();
   void SurfaceViewerLaunch();
 
@@ -102,8 +104,10 @@ 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);
 
   ///Generic method called when any one of the horizontal sliders is moved
   void HorizontalSliderMoved(int value,int column, int slicer_index);
@@ -129,9 +133,8 @@ public slots:
   void ReloadImage();
   void OpenField();
   void SelectOverlayImage();
-  void AddFusionImage();
 
-  void SetVFProperty(int subsampling,int scale,int lut);
+  void SetVFProperty(int subsampling,int scale,int lut, int width);
   void SetOverlayProperty(int color);
   void SetFusionProperty(int opacity,int colormap,double window,double level);
 
@@ -143,9 +146,6 @@ public slots:
   }
   void UpdateRenderWindows();
 
-// signals:
-//   void SlicerManagersHasChanged();
-
 private:
 
   //variables
@@ -154,7 +154,6 @@ private:
   vvDocumentation *documentation;
   vvDicomSeriesSelector *dicomSeriesSelector;
 
-  QString mInputPathName;
   bool viewMode;
   bool playMode;
 
@@ -172,7 +171,9 @@ private:
   QString GetVectorDoubleAsString(std::vector<double> vectorDouble);
   QString GetVectorIntAsString(std::vector<int> vectorInt);
   int GetSlicerIndexFromItem(QTreeWidgetItem* item);
+  QTreeWidgetItem* GetItemFromSlicerManager(vvSlicerManager* sm);
   void SaveScreenshot(vtkImageData* image);
+  int GetImageDuplicateFilenameNumber(std::string filename);
 
   QMenu contextMenu;
   //QMenu *AddSubImageMenu;
@@ -180,11 +181,16 @@ private:
   std::vector<QSlider*> horizontalSliders;
   std::vector<QSlider*> verticalSliders;
   int mFrameRate;
+  
+  std::string mCurrentSelectedImageId;
 
   // vvMainWindowToolInfo * mCurrentToolInfo;
   // std::vector<vvToolCreatorBase*> mListOfRunningTool;
 
   static vvMainWindow * mSingleton;
+
+  int mCurrentTime;
+
 };
 
 #include "vvMainWindow.txx"