]> Creatis software - clitk.git/commitdiff
remove references to BDCM
authorschaerer <schaerer>
Thu, 10 Jun 2010 08:21:05 +0000 (08:21 +0000)
committerschaerer <schaerer>
Thu, 10 Jun 2010 08:21:05 +0000 (08:21 +0000)
vv/CMakeLists.txt
vv/vvMainWindow.cxx
vv/vvSegmentationDialog.cxx

index 237b86bdb534284a6c75229d10a465c3c85b4bf0..f034cff3032ca41d43402c8270c71a375dcb944b 100644 (file)
@@ -190,9 +190,6 @@ LINK_DIRECTORIES(${QT_INCLUDES})
 ADD_EXECUTABLE(vv ${vv_SRCS} vv.cxx ${vv_UI_CXX} ${EXE_ICON})
 TARGET_LINK_LIBRARIES(vv clitkCommon clitkDicomRTStruct clitkFilters ${ITK_LIBRARIES} QVTK vtkHybrid)
 
-IF (CLITK_VV_USE_BDCM)
-  TARGET_LINK_LIBRARIES(vv bdcm)
-ENDIF (CLITK_VV_USE_BDCM)
 #=========================================================
 
 #=========================================================
index 8225ece82813bc69d8d440f45660362f154f23c0..b6e52ebe239d14fd3cc2d98b92b0e9bfbace9b6b 100644 (file)
 #include "vvMeshReader.h"
 #include "vvConstants.h"
 
-#ifdef CLITK_VV_USE_BDCM
-#include <bdcmDicomFilesSelectorDialog.h>
-#endif
-
 // ITK include
 #include "itkImage.h"
 #include "itkImageFileReader.h"
@@ -678,32 +674,11 @@ void vvMainWindow::OpenDicom()
 {
   std::vector<std::string> files;
 
-#ifdef CLITK_VV_USE_BDCM
-  bool r = bdcm::OpenDicomFilesSelectorDialog(files,
-           "DicomFilesSelectorDialog test",
-           0,0,800,800,1);
-
-  if (r) {
-    std::cout << "$$$$ main : user clicked 'OK' $$$$"<<std::endl;
-    std::cout << "$$$$ selected files : "<<std::endl;
-    std::vector<std::string>::iterator i;
-    for (i=files.begin(); i!=files.end(); ++i) {
-      std::cout << *i << std::endl;
-    }
-    std::cout << "$$$$ "<<std::endl;
-
-    LoadImages(files,DICOM);
-  } else {
-    std::cout << "$$$$ main : user clicked 'CANCEL' $$$$"<<std::endl;
-  }
-#else
   std::cout << "dicomSeriesSelector " << std::endl;
   if (dicomSeriesSelector->exec() == QDialog::Accepted) {
     files = *(dicomSeriesSelector->GetFilenames());
     LoadImages(files,DICOM);
   }
-#endif
-
 }
 //------------------------------------------------------------------------------
 
index 915a281354355cb50be6150349c40e50a637b8ff..e1f0ffd7395d107654abbceaf6c48f7a55c14055 100644 (file)
@@ -78,6 +78,7 @@ vvSegmentationDialog::vvSegmentationDialog(QWidget * parent, Qt::WindowFlags f)
   //m3DMapper = vtkPolyDataMapper::New();
   //m3DActor = vtkActor::New();
   m3DExtractor = vtkMarchingCubes::New();
+  m3DExtractor->ComputeScalarsOff();
   m3DMappers.clear();
   m3DActors.clear();