diff --git a/src/src/IO/DICOM/DicomLoader.h b/src/src/IO/DICOM/DicomLoader.h index 8b92fb9..84861b7 100644 --- a/src/src/IO/DICOM/DicomLoader.h +++ b/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> OrientationMapType; diff --git a/src/src/base/SeriesImageSet.h b/src/src/base/SeriesImageSet.h index db8e0d6..5f60d65 100644 --- a/src/src/base/SeriesImageSet.h +++ b/src/src/base/SeriesImageSet.h @@ -1,6 +1,8 @@ #pragma once -#include "global/include_vitk.h" +#include "global/QGlobals.h" #include +#include +#include class ExtendMedicalImageProperties; diff --git a/src/src/export/dicomexporter.cpp b/src/src/export/dicomexporter.cpp index 4736170..f0411d9 100644 --- a/src/src/export/dicomexporter.cpp +++ b/src/src/export/dicomexporter.cpp @@ -1,6 +1,4 @@ #include "export/dicomexporter.h" -#include "include_vitk.h" -#include "vtkErrorCode.h" #include "SeriesImageSet.h" diff --git a/src/src/global/QGlobals.cpp b/src/src/global/QGlobals.cpp index d8f8d6e..f5d89e8 100644 --- a/src/src/global/QGlobals.cpp +++ b/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; diff --git a/src/src/global/include_vitk.h b/src/src/global/include_vitk.h deleted file mode 100644 index 141068a..0000000 --- a/src/src/global/include_vitk.h +++ /dev/null @@ -1,95 +0,0 @@ -#pragma once - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "Rendering/infinitiViewer.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -//screenshot -#include -#include -#include - -//for blending -#include -#include -#include - -#include -//#include -// -//#include "itkCommand.h" -// -//#include -//#include -// -//#include - -//#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 -#include -#include -#include -#include "QVTKInteractorAdapter.h" -//max version:vtk 8.2.0 -//#include - -//min version: vtk 8.2.0 -#include - -//ITK headers -//#include -//#include -//#include - - - - -//newly added0 -#include -#include - -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; - - - diff --git a/src/src/measure/pqFontPropertyWidget.cpp b/src/src/measure/pqFontPropertyWidget.cpp index a925399..8c35211 100644 --- a/src/src/measure/pqFontPropertyWidget.cpp +++ b/src/src/measure/pqFontPropertyWidget.cpp @@ -1,5 +1,6 @@ #include "pqFontPropertyWidget.h" #include "dicomimageview.h" +#include #include "QColorDialog.h" //#include "QFontDialog.h" diff --git a/src/src/view/dicomimageview.cpp b/src/src/view/dicomimageview.cpp index 8203937..cf714c9 100644 --- a/src/src/view/dicomimageview.cpp +++ b/src/src/view/dicomimageview.cpp @@ -2,7 +2,11 @@ #include #include #include "view/thumbnailImage.h" +#include +#include #include +#include +#include #include "vtkImageProperty.h" #include "view/subview/mytitlebar.h" diff --git a/src/src/view/dicomimageview.h b/src/src/view/dicomimageview.h index 6db0db9..0780573 100644 --- a/src/src/view/dicomimageview.h +++ b/src/src/view/dicomimageview.h @@ -4,15 +4,16 @@ #include "ClickableScrollBar.h" #include #include "base/SeriesImageSet.h" - #include -class infinitiViewer; +#include "Rendering/infinitiViewer.h" + class vtkCornerAnnotation; class vtkGenericOpenGLRenderWindow; class MyTitleBar; class pqVCRController; class pqVCRToolbar; - +class QVTKOpenGLNativeWidget; +class Measure; namespace scrollScope { enum TriggerType diff --git a/src/src/view/viewcontainerwidget.cpp b/src/src/view/viewcontainerwidget.cpp index f7bb2c6..dafeb4d 100644 --- a/src/src/view/viewcontainerwidget.cpp +++ b/src/src/view/viewcontainerwidget.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include "QGlobals.h" #include #include "qstyleoption.h"