X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvMainWindow.h;h=fa61855e1fc99b331b9a39444c51421fd562419a;hb=ff1d5b8af965e75ecdbc1b0cbff0dad6f3b3c511;hp=300d758463ac0ae38628092273e05ddeaa4038ab;hpb=e49162511fd226bd3b5299e472dbd4db803cd01a;p=clitk.git

diff --git a/vv/vvMainWindow.h b/vv/vvMainWindow.h
index 300d758..fa61855 100644
--- a/vv/vvMainWindow.h
+++ b/vv/vvMainWindow.h
@@ -28,12 +28,16 @@
 #include "vvMesh.h"
 #include "clitkMemoryUsage.h"
 
+#include "vtkSmartPointer.h"
+
+
 class vvSlicerManager;
 class vvHelpDialog;
 class vvDocumentation;
 class vtkRenderWindowInteractor;
 class vtkImageData;
 class vtkRenderer;
+class vtkMatrix4x4;
 class vvDicomSeriesSelector;
 
 //------------------------------------------------------------------------------
@@ -64,8 +68,6 @@ class vvMainWindow: public vvMainWindowBase,
 public slots:
   ///Allows the user to open and select various surfaces contained in a dicom-struct file
   void OpenDCStructContour();
-  ///Computes the MIP of the currently selected image and displays it
-  void ComputeMIP();
   ///Computes the midposition image of a 4D sequence with a VF and displays it
   void ComputeMidPosition();
   void OpenImages();
@@ -80,6 +82,7 @@ public slots:
   void OpenVTKContour();
   void SaveAs();
   void CurrentImageChanged(std::string id);
+  void CurrentPickedImageChanged(std::string id);
   void ImageInfoChanged();
   void ShowHelpDialog();
   void ShowDocumentation();
@@ -136,7 +139,7 @@ public slots:
   void SelectOverlayImage();
   void SelectFusionImage();
 
-  void SetVFProperty(int subsampling,int scale,int lut, int width);
+  void SetVFProperty(int subsampling,int scale,int lut, int width, double r, double g, double b);
   void SetOverlayProperty(int color);
   void SetFusionProperty(int opacity,int colormap,double window,double level);
 
@@ -173,6 +176,7 @@ private:
   QString GetSizeInBytes(unsigned long size);
   QString GetVectorDoubleAsString(std::vector<double> vectorDouble);
   QString GetVectorIntAsString(std::vector<int> vectorInt);
+  QString Get4x4MatrixDoubleAsString(vtkSmartPointer<vtkMatrix4x4> matrix);
   int GetSlicerIndexFromItem(QTreeWidgetItem* item);
   QTreeWidgetItem* GetItemFromSlicerManager(vvSlicerManager* sm);
   void SaveScreenshot(vtkImageData* image);
@@ -186,6 +190,8 @@ private:
   int mFrameRate;
   
   std::string mCurrentSelectedImageId;
+  std::string mCurrentPickedImageId;
+  unsigned int mCurrentPickedImageIndex;
 
   // vvMainWindowToolInfo * mCurrentToolInfo;
   // std::vector<vvToolCreatorBase*> mListOfRunningTool;
@@ -193,7 +199,7 @@ private:
   static vvMainWindow * mSingleton;
 
   int mCurrentTime;
-
+  
 };
 
 #include "vvMainWindow.txx"