vvSlicerManager.cxx
vvSlicerManagerCommand.cxx
vvUtils.cxx
- # vvMaximumIntensityProjection.cxx
-- vvMesh.cxx
++# vvMaximumIntensityProjection.cxx vvMesh.cxx
vvMeshActor.cxx
vvMeshReader.cxx
vvMidPosition.cxx
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)
#include "vvMeshReader.h"
#include "vvSaveState.h"
#include "vvReadState.h"
++#ifdef CLITK_USE_SYSTEM_GDCM
+#include "vvQPacsConnection.h"
++#endif
#include "clitkConfiguration.h"
// ITK include
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);
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()));
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
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
class vtkRenderer;
class vtkMatrix4x4;
class vvDicomSeriesSelector;
++#ifdef CLITK_USE_SYSTEM_GDCM
+class vvQPacsConnection;
++#endif
class vvSlicer;
class QTreeWidget;
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();
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;