From: tbaudier Date: Mon, 17 Oct 2016 08:07:33 +0000 (+0200) Subject: Ensure compilation when CLITK_USE_PACS_CONNECTION is OFF X-Git-Tag: v1.4.0~1 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=1b76473a92cb470240527e6495b4adcca5bc3bdb;p=clitk.git Ensure compilation when CLITK_USE_PACS_CONNECTION is OFF --- diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx index 958cf5c..b8447c5 100644 --- a/vv/vvMainWindow.cxx +++ b/vv/vvMainWindow.cxx @@ -48,7 +48,7 @@ It is distributed under dual licence #include "vvMeshReader.h" #include "vvSaveState.h" #include "vvReadState.h" -#ifdef CLITK_USE_PACS_CONNECTION +#if CLITK_USE_PACS_CONNECTION #include "vvQPacsConnection.h" #endif #include "clitkConfiguration.h" @@ -235,7 +235,7 @@ vvMainWindow::vvMainWindow():vvMainWindowBase() documentation = new vvDocumentation(); help_dialog = new vvHelpDialog(); dicomSeriesSelector = new vvDicomSeriesSelector(); -#ifdef CLITK_USE_PACS_CONNECTION +#if CLITK_USE_PACS_CONNECTION PacsConnection = new vvQPacsConnection(); #endif @@ -280,8 +280,8 @@ vvMainWindow::vvMainWindow():vvMainWindowBase() 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_PACS_CONNECTION -connect(actionConnect_Pacs,SIGNAL(triggered()),this,SLOT(ConnectPacs())); +#if CLITK_USE_PACS_CONNECTION + 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())); @@ -397,6 +397,10 @@ connect(actionConnect_Pacs,SIGNAL(triggered()),this,SLOT(ConnectPacs())); menuExperimental->menuAction()->setVisible(false); #endif +#if !CLITK_USE_PACS_CONNECTION + actionConnect_Pacs->setVisible(false); +#endif + QTimer * timerMemory = new QTimer(this); //timerMemory->setInterval(5); connect(timerMemory, SIGNAL(timeout()), this, SLOT(UpdateMemoryUsage())); @@ -770,7 +774,7 @@ void vvMainWindow::OpenDicom() LoadImages(files, vvImageReader::DICOM); } } -#ifdef CLITK_USE_PACS_CONNECTION +#if CLITK_USE_PACS_CONNECTION void vvMainWindow::ConnectPacs() { std::vector files; diff --git a/vv/vvMainWindow.h b/vv/vvMainWindow.h index 8f5b41c..8908b24 100644 --- a/vv/vvMainWindow.h +++ b/vv/vvMainWindow.h @@ -39,7 +39,7 @@ class vtkImageData; class vtkRenderer; class vtkMatrix4x4; class vvDicomSeriesSelector; -#ifdef CLITK_USE_PACS_CONNECTION +#if CLITK_USE_PACS_CONNECTION class vvQPacsConnection; #endif class vvSlicer; @@ -94,7 +94,7 @@ public slots: void SliceImages(); void MergeImagesWithTime(); void OpenDicom(); -#ifdef CLITK_USE_PACS_CONNECTION +#if CLITK_USE_PACS_CONNECTION void ConnectPacs(); #endif ///Open a vtkPolyData surface mesh and display it over the current image @@ -200,7 +200,7 @@ private: vvDocumentation *documentation; vvDicomSeriesSelector *dicomSeriesSelector; -#ifdef CLITK_USE_PACS_CONNECTION +#if CLITK_USE_PACS_CONNECTION vvQPacsConnection *PacsConnection; #endif