Remove include_vitk.h

src/src/IO/DICOM/DicomLoader.h

@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "global/include_vitk.h"
+#include "global/QGlobals.h"
 
 using namespace std;
 typedef std::map<std::string,std::vector<std::string>> OrientationMapType;

src/src/base/SeriesImageSet.h

@@ -1,6 +1,8 @@
 #pragma once
-#include "global/include_vitk.h"
+#include "global/QGlobals.h"
 #include <memory>
+#include <vtkImageData.h>
+#include <vtkSmartPointer.h>
 
 class ExtendMedicalImageProperties;
 

src/src/export/dicomexporter.cpp

@@ -1,6 +1,4 @@
 #include "export/dicomexporter.h"
-#include "include_vitk.h"
-#include "vtkErrorCode.h"
 #include "SeriesImageSet.h"
 
 

src/src/global/QGlobals.cpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "include_vitk.h"
+#include "QGlobals.h"
 
 int VCRHelper:: toolbar_coeff_inv =0;
 int VCRHelper:: thumbnailbar_coeff_inv =0;

src/src/global/include_vitk.h

@@ -1,95 +0,0 @@
-#pragma once
-
-#include <vtkSmartPointer.h>
-#include <vtkImageReader2Factory.h>
-#include <vtkImageReader2.h>
-#include <vtkAssemblyPath.h>
-#include <vtkCell.h>
-#include <vtkCommand.h>
-#include <vtkCornerAnnotation.h>
-#include <vtkDataArray.h>
-#include <vtkDICOMImageReader.h>
-#include <vtkImageActor.h>
-#include <vtkImageData.h>
-
-#include "Rendering/infinitiViewer.h"
-#include <vtkImageChangeInformation.h>
-#include <vtkInteractorStyleImage.h>
-#include <vtkPointData.h>
-#include <vtkPropPicker.h>
-#include <vtkRenderer.h>
-#include <vtkRenderWindow.h>
-#include <vtkRenderWindowInteractor.h>
-#include <vtkTextProperty.h>
-#include <vtkNamedColors.h>
-
-//screenshot
-#include <vtkWindowToImageFilter.h>
-#include <vtkImageCast.h>
-#include <vtkPNGWriter.h>
-
-//for blending
-#include <vtkImageBlend.h>
-#include <vtkImageMapToColors.h>
-#include <vtkLookupTable.h>
-
-#include <vtkCallbackCommand.h>
-//#include <itkImageToVTKImageFilter.h>
-//
-//#include "itkCommand.h"
-//
-//#include <itkImage.h>
-//#include <itkImageFileReader.h>
-//
-//#include <itkImageToVTKImageFilter.h>
-
-//#include "vtkVersion.h"
-//#include "vtkImageViewer.h"
-//#include "vtkImageMapper3D.h"
-//#include "vtkRenderWindowInteractor.h"
-//#include "vtkSmartPointer.h"
-//#include "vtkImageActor.h"
-//#include "vtkInteractorStyleImage.h"
-//#include "vtkRenderer.h"
-//#include "itkRGBPixel.h"
-
-//#define   NUM_CLASSES         3
-//#define   MAX_NUM_ITER        1
-
-//#include "itkImageFileReader.h"
-//#include "itkImageFileWriter.h"
-
-//newly added
-#include <vtkCamera.h>
-#include <vtkOpenGLRenderWindow.h>
-#include <QSurfaceFormat>
-#include <vtkGenericOpenGLRenderWindow.h>
-#include "QVTKInteractorAdapter.h"
-//max version:vtk 8.2.0
-//#include <QVTKWidget.h>
-
-//min version: vtk 8.2.0
-#include <QVTKOpenGLNativeWidget.h>
-
-//ITK headers
-//#include <vnl/vnl_vector.hxx>
-//#include <vnl/algo/vnl_svd.hxx>
-//#include <vnl/algo/vnl_qr.hxx>
-
-
-
-
-//newly added0
-#include <vtkOBJReader.h>
-#include <vtkMetaImageReader.h>
-
-static const unsigned int	 InputDimension = 3;
-static const unsigned int    OutputDimension = 2;
-
-typedef signed short PixelType;
-
-typedef std::vector< std::string > FilenamesContainer;
-typedef FilenamesContainer FileNamesContainerType;
-
-
-

src/src/measure/pqFontPropertyWidget.cpp

@@ -1,5 +1,6 @@
 #include "pqFontPropertyWidget.h"
 #include "dicomimageview.h"
+#include <vtkRenderWindowInteractor.h>
 #include "QColorDialog.h"
 //#include "QFontDialog.h"
 

src/src/view/dicomimageview.cpp

@@ -2,7 +2,11 @@
 #include <QMessageBox>
 #include <QDebug>
 #include "view/thumbnailImage.h"
+#include <vtkRenderer.h>
+#include <vtkCamera.h>
 #include <vtkInteractorStyleImage.h>
+#include <QVTKOpenGLNativeWidget.h>
+#include <vtkGenericOpenGLRenderWindow.h>
 #include "vtkImageProperty.h"
 #include "view/subview/mytitlebar.h"
 

src/src/view/dicomimageview.h

@@ -4,15 +4,16 @@
 #include "ClickableScrollBar.h"
 #include <QGridLayout>
 #include "base/SeriesImageSet.h"
-
 #include <QThread>
-class infinitiViewer;
+#include "Rendering/infinitiViewer.h"
+
 class vtkCornerAnnotation;
 class vtkGenericOpenGLRenderWindow;
 class MyTitleBar;
 class pqVCRController;
 class pqVCRToolbar;
-
+class QVTKOpenGLNativeWidget;
+class Measure;
 
 namespace scrollScope {
 	enum TriggerType

src/src/view/viewcontainerwidget.cpp

@@ -5,6 +5,7 @@
 #include <QGridLayout>
 #include <QSettings>
 #include <QFontDialog>
+#include <QVTKOpenGLNativeWidget.h>
 #include "QGlobals.h"
 #include <QDebug>
 #include "qstyleoption.h"