Merge branch 'master' into wipe

[clitk.git] / vv / vvMainWindow.h

diff --git a/vv/vvMainWindow.h b/vv/vvMainWindow.h
index 75d04976538a769ca679a17157b1d83c5a5e9479..81bc7c42705fa310d5ec72425c9e6c6e5ea5be3e 100644 (file)
--- a/vv/vvMainWindow.h
+++ b/vv/vvMainWindow.h
@@ -26,6 +26,7 @@
 #include "vvToolManager.h"
 #include "vvImageReader.h"
 #include "vvMesh.h"
+#include "vvWipeImage.h"
 #include "clitkMemoryUsage.h"
 
 #include "vtkSmartPointer.h"
@@ -39,6 +40,9 @@ class vtkImageData;
 class vtkRenderer;
 class vtkMatrix4x4;
 class vvDicomSeriesSelector;
+#if CLITK_USE_PACS_CONNECTION
+class vvQPacsConnection;
+#endif
 class vvSlicer;
 class QTreeWidget;
 
@@ -54,6 +58,7 @@ class vvMainWindow: public vvMainWindowBase,
   void LoadImages(std::vector<std::string> filenames, vvImageReader::LoadedImageType type);
   vvSlicerManager * AddImage(vvImage::Pointer image,std::string filename);
   void AddField(QString file,int index);
+  bool CheckAddedImage(int index, QString imageType);
   void AddOverlayImage(int index, std::vector<std::string> fileNames, vvImageReader::LoadedImageType type);
   void AddFusionImage(int index, std::vector<std::string> fileNames, vvImageReader::LoadedImageType type);
   void AddROI(int index, QString filename);
@@ -69,7 +74,6 @@ class vvMainWindow: public vvMainWindowBase,
   void SaveCurrentStateAs(const std::string& stateFile);
   void ReadSavedStateFile(const std::string& stateFile);
        void LinkAllImages();
-  QString Get4x4MatrixDoubleAsString(vtkSmartPointer<vtkMatrix4x4> matrix, const int precision=3);
 
   virtual void UpdateCurrentSlicer();
   virtual QTabWidget * GetTab();
@@ -91,8 +95,8 @@ public slots:
   void SliceImages();
   void MergeImagesWithTime();
   void OpenDicom();
-#ifdef vvPacsConnection
-  void PacsConnection();
+#if CLITK_USE_PACS_CONNECTION
+  void ConnectPacs();
 #endif
   ///Open a vtkPolyData surface mesh and display it over the current image
   void OpenVTKContour();
@@ -161,6 +165,7 @@ public slots:
   void ReloadImage();
   void OpenField();
   void SelectOverlayImage();
+  void SelectWipeImage();
   void SelectFusionImage();
   //select the file(s) from the disk containing the image sequence to fuse
   void SelectFusionSequence();
@@ -184,6 +189,8 @@ public slots:
   void UpdateMemoryUsage();
   void show();
   
+  static vvMainWindow* Instance(){return mSingleton;}
+  
 protected:
   
   void createRecentlyOpenedFilesMenu();
@@ -196,8 +203,11 @@ private:
   vvHelpDialog *help_dialog;
   vvDocumentation *documentation;
   vvDicomSeriesSelector *dicomSeriesSelector;
-#ifdef vvPacsConnection
-  vvPacsConnection *PacsConnection;
+  
+  vvWipeImage::Pointer mWipeImage;
+
+#if CLITK_USE_PACS_CONNECTION
+  vvQPacsConnection *PacsConnection;
 #endif
 
   bool viewMode;
@@ -236,7 +246,7 @@ private:
   // vvMainWindowToolInfo * mCurrentToolInfo;
   // std::vector<vvToolCreatorBase*> mListOfRunningTool;
 
-  static vvMainWindow * mSingleton;
+  static vvMainWindow* mSingleton;
 
   int mCurrentTime;