Merge branch 'master' into PacsConnection

[clitk.git] / vv / vvMainWindow.h

diff --git a/vv/vvMainWindow.h b/vv/vvMainWindow.h
index e5e315509b1924c2392358cc36c6fe80c4e14fa4..d7bf2ed2bbf09e367804201b041a2a437be28b3a 100644 (file)
--- a/vv/vvMainWindow.h
+++ b/vv/vvMainWindow.h
@@ -1,7 +1,7 @@
 /*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Authors belong to: 
+  Authors belong to:
   - University of LYON              http://www.universite-lyon.fr/
   - Léon Bérard cancer center       http://www.centreleonberard.fr
   - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
@@ -39,6 +39,9 @@ class vtkImageData;
 class vtkRenderer;
 class vtkMatrix4x4;
 class vvDicomSeriesSelector;
+#ifdef CLITK_USE_PACS_CONNECTION
+class vvQPacsConnection;
+#endif
 class vvSlicer;
 class QTreeWidget;
 
@@ -69,7 +72,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,6 +93,9 @@ public slots:
   void SliceImages();
   void MergeImagesWithTime();
   void OpenDicom();
+#ifdef CLITK_USE_PACS_CONNECTION
+  void ConnectPacs();
+#endif
   ///Open a vtkPolyData surface mesh and display it over the current image
   void OpenVTKContour();
   void SaveAs();
@@ -194,6 +199,10 @@ private:
   vvDocumentation *documentation;
   vvDicomSeriesSelector *dicomSeriesSelector;
 
+#ifdef CLITK_USE_PACS_CONNECTION
+  vvQPacsConnection *PacsConnection;
+#endif
+
   bool viewMode;
   bool playMode;