From: cervenansky <frederic.cervenansky@creatis.insa-lyon.fr>
Date: Fri, 5 Jul 2013 15:20:49 +0000 (+0200)
Subject: pacs only if clitk_use_system_gdcm is defined
X-Git-Tag: v1.4.0~2^2~25
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=0a5abf9398aa0c578f014b52ca992943ca653f72;p=clitk.git

pacs only if clitk_use_system_gdcm is defined
---

0a5abf9398aa0c578f014b52ca992943ca653f72
diff --cc vv/CMakeLists.txt
index eac52df,025a6f4..acbc86c
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@@ -88,8 -86,7 +86,7 @@@ SET(vv_SRC
    vvSlicerManager.cxx
    vvSlicerManagerCommand.cxx
    vvUtils.cxx
- #  vvMaximumIntensityProjection.cxx
--  vvMesh.cxx
++#  vvMaximumIntensityProjection.cxx  vvMesh.cxx
    vvMeshActor.cxx
    vvMeshReader.cxx
    vvMidPosition.cxx
@@@ -126,14 -121,19 +121,23 @@@ QT4_WRAP_CPP(vv_SRC
  QT4_WRAP_UI(vv_UI_CXX 
    qt_ui/vvHelpDialog.ui 
    qt_ui/vvDocumentation.ui 
-   qt_ui/vvDicomSeriesSelector.ui 
-    qt_ui/vvPacsConnection.ui 
-    qt_ui/vvPacsSettingsDialog.ui
-   qt_ui/vvDummyWindow.ui #For testing
-   )
+   qt_ui/vvDicomSeriesSelector.ui
 -  )
++qt_ui/vvDummyWindow.ui #For testing  )
  
  QT4_ADD_RESOURCES(vv_SRCS vvIcons.qrc)
  
 -# Add DICOM gui selector if the adequate GDCM is available
 -IF(CLITK_USE_SYSTEM_GDCM)
++# Add DICOM SERVER gui selector if the adequate GDCM is available
++#IF(CLITK_USE_SYSTEM_GDCM)
++message("ololoa")
+   SET(vv_SRCS ${vv_SRCS}
 -      vvQPacsConnection.cxx)
 -  QT4_WRAP_CPP(vv_SRCS vvQPacsConnection.cxx)
 -  QT4_WRAP_UI(vv_UI_CXX qt_ui/vvPacsConnection.ui)
 -ENDIF(CLITK_USE_SYSTEM_GDCM)
++      vvQPacsConnection.cxx
++	  vvPacsSettingsDialog.cxx)
++  QT4_WRAP_CPP(vv_SRCS vvQPacsConnection.cxx
++     vvPacsSettingsDialog.cxx)
++  QT4_WRAP_UI(vv_UI_CXX qt_ui/vvPacsConnection.ui
++     qt_ui/vvPacsSettingsDialog.ui)
++#ENDIF(CLITK_USE_SYSTEM_GDCM)
+ 
  # Add the autotools in the header vvToolsList.h for initialization of the dummy
  # variables in vv.cxx for the tools contained in vvLib
  if(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt IS_NEWER_THAN ${CMAKE_CURRENT_BINARY_DIR}/vvToolsList.h)
diff --cc vv/vvIcons.qrc
index 15a8648,15a8648..dbc93e3
--- a/vv/vvIcons.qrc
+++ b/vv/vvIcons.qrc
@@@ -40,5 -40,5 +40,8 @@@
      <file>icons/standardbutton-apply-16.png</file>
      <file>icons/standardbutton-cancel-16.png</file>
      <file>icons/identity.png</file>
++	<file>icons/basket_download.png</file>
++	<file>icons/bullet_info.png</file>
++	<file>icons/bullet_info.png</file>
    </qresource>
  </RCC>
diff --cc vv/vvMainWindow.cxx
index 3509aae,8047b7d..3dc0829
--- a/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@@ -47,7 -47,6 +47,9 @@@ It is distributed under dual licenc
  #include "vvMeshReader.h"
  #include "vvSaveState.h"
  #include "vvReadState.h"
++#ifdef CLITK_USE_SYSTEM_GDCM
 +#include "vvQPacsConnection.h"
++#endif
  #include "clitkConfiguration.h"
  
  // ITK include
@@@ -236,7 -235,9 +238,9 @@@ vvMainWindow::vvMainWindow():vvMainWind
    documentation = new vvDocumentation();
    help_dialog = new vvHelpDialog();
    dicomSeriesSelector = new vvDicomSeriesSelector();
-   pacsconnect = new vvQPacsConnection(this);
 -#ifdef vvPacsConnection
 -  PacsConnection = new vvPacsConnection();
++#ifdef CLITK_USE_SYSTEM_GDCM
++     PacsConnection = new vvQPacsConnection();
+ #endif
  
    inverseButton->setEnabled(0);
    actionAdd_overlay_image_to_current_image->setEnabled(0);
@@@ -279,8 -280,6 +283,9 @@@
    connect(actionWarp_image_with_vector_field,SIGNAL(triggered()),this,SLOT(WarpImage()));
    connect(actionLoad_images,SIGNAL(triggered()),this,SLOT(OpenImages()));
    connect(actionOpen_Dicom,SIGNAL(triggered()),this,SLOT(OpenDicom()));
++  #ifdef CLITK_USE_SYSTEM_GDCM
 +connect(actionConnect_Pacs,SIGNAL(triggered()),this,SLOT(ConnectPacs()));
- 
++#endif
    //  connect(actionOpen_Dicom_Struct,SIGNAL(triggered()),this,SLOT(OpenDCStructContour()));
    connect(actionOpen_VTK_contour,SIGNAL(triggered()),this,SLOT(OpenVTKContour()));
    connect(actionOpen_Multiple_Images_As_One,SIGNAL(triggered()),this,SLOT(MergeImages()));
@@@ -748,19 -747,21 +753,20 @@@ void vvMainWindow::OpenDicom(
      files = *(dicomSeriesSelector->GetFilenames());
      LoadImages(files, vvImageReader::DICOM);
    }
--}
-   void vvMainWindow::ConnectPacs()
 -
 -#ifdef vvPacsConnection
++}  
++#ifdef CLITK_USE_SYSTEM_GDCM
+ void vvMainWindow::ConnectPacs()
  {
    std::vector<std::string> files;
  
    //std::cout << "dicomSeriesSelector " << std::endl;
- if (pacsconnect->exec() == QDialog::Accepted) {
 -  if (PacsConnection->exec() == QDialog::Accepted) {
 -    files = *(PacsConnection->GetFilenames());
 -    LoadImages(files, vvImageReader::DICOM);
++if (PacsConnection->exec() == QDialog::Accepted) {
 +//    files = *(pacsconnect->GetFilenames());
 +   // LoadImages(files, vvImageReader::DICOM);
 +  }
    }
  
- 
 -}
+ #endif
  //------------------------------------------------------------------------------
  
  //------------------------------------------------------------------------------
diff --cc vv/vvMainWindow.h
index 877470f,75d0497..92d7041
--- a/vv/vvMainWindow.h
+++ b/vv/vvMainWindow.h
@@@ -39,7 -39,6 +39,9 @@@ class vtkImageData
  class vtkRenderer;
  class vtkMatrix4x4;
  class vvDicomSeriesSelector;
++#ifdef CLITK_USE_SYSTEM_GDCM
 +class vvQPacsConnection;
++#endif
  class vvSlicer;
  class QTreeWidget;
  
@@@ -92,7 -91,9 +94,9 @@@ public slots
    void SliceImages();
    void MergeImagesWithTime();
    void OpenDicom();
 -#ifdef vvPacsConnection
 -  void PacsConnection();
++#ifdef CLITK_USE_SYSTEM_GDCM
 +  void ConnectPacs();
+ #endif
    ///Open a vtkPolyData surface mesh and display it over the current image
    void OpenVTKContour();
    void SaveAs();
@@@ -195,7 -196,9 +199,10 @@@ private
    vvHelpDialog *help_dialog;
    vvDocumentation *documentation;
    vvDicomSeriesSelector *dicomSeriesSelector;
-   vvQPacsConnection *pacsconnect;
 -#ifdef vvPacsConnection
 -  vvPacsConnection *PacsConnection;
++
++#ifdef CLITK_USE_SYSTEM_GDCM
++  vvQPacsConnection *PacsConnection;
+ #endif
  
    bool viewMode;
    bool playMode;