diff --git a/reg23Topograms/itkDTRrecon/itkImageProcessor.cpp b/reg23Topograms/itkDTRrecon/itkImageProcessor.cpp index 92e9645..36699a1 100644 --- a/reg23Topograms/itkDTRrecon/itkImageProcessor.cpp +++ b/reg23Topograms/itkDTRrecon/itkImageProcessor.cpp @@ -471,7 +471,7 @@ int itkImageProcessor::load3DSerieFromFiles( std::vector v_fnames){ imageSeriesReader3D->SetImageIO(dicomIO); imageSeriesReader3D->SetFileNames(v_sortedFnames); - //imageSeriesReader3D->SetNumberOfWorkUnits(8); + imageSeriesReader3D->SetNumberOfWorkUnits(8); imageSeriesReader3D->ForceOrthogonalDirectionOff(); // properly read CTs with gantry tilt //imageSeriesReader3D->SetSpacingWarningRelThreshold(); @@ -694,13 +694,13 @@ int itkImageProcessor::fill3DVolumeMeta( } if(m_DRTImage2MetaInfo != NULL){ - std::cout << "NEVER HERE m_DRTImage2MetaInfo" << std::endl; - m_DRTImage2MetaInfo = NULL; + std::cout << "NEVER HERE m_DRTImage2MetaInfo" << std::endl; + m_DRTImage2MetaInfo = NULL; } if(m_RTMetaInfo != NULL){ - std::cout << "NEVER HERE m_RTMetaInfo" << std::endl; - m_RTMetaInfo = NULL; + std::cout << "NEVER HERE m_RTMetaInfo" << std::endl; + m_RTMetaInfo = NULL; } @@ -1122,7 +1122,6 @@ int itkImageProcessor::load2D(const char * pcFName){ //double* m_ImageIntensity; DuplicatorType::Pointer m_Duplicator; - bool* m_ImLoaded; TopogramImageMetaInformation::Pointer m_TImageMeta; switch (currProjOrientation) { @@ -1785,6 +1784,7 @@ void itkImageProcessor::InitializeProjector() m_DRTImage2MetaInfo == NULL || m_DRTGeometryMetaInfo == NULL || m_TransformMetaInfo == NULL ){ + return; //TODO return; } @@ -2079,18 +2079,22 @@ void itkImageProcessor::loadRTPlanInfo( void itkImageProcessor::UpdateProjectionGeometryMeta(){ if(m_CTMetaInfo == NULL){ + return; //TODO. } if(m_DRTGeometryMetaInfo == NULL){ + return; //TODO. } if(m_DRTImage1MetaInfo == NULL){ + return; //TODO. } if(m_DRTImage2MetaInfo == NULL){ + return; //TODO. } @@ -2323,6 +2327,7 @@ void itkImageProcessor::GetProjectionImages(){ m_DRTImage2MetaInfo == NULL || m_DRTGeometryMetaInfo == NULL || m_TransformMetaInfo == NULL ){ + return; //TODO return; } @@ -2703,6 +2708,14 @@ vtkImageData* itkImageProcessor::GetLocalizer2VTK() vtkImageData* itkImageProcessor::GetProjection1VTK() { + + if(m_DRTImage1MetaInfo == NULL || + m_DRTGeometryMetaInfo == NULL || + m_TransformMetaInfo == NULL ){ + return NULL; + //TODO + } + // Rescale the intensity of the projection images to 0-32768 for output. using RescaleFilterType = itk::RescaleIntensityImageFilter; @@ -2832,6 +2845,13 @@ vtkMatrix4x4 * itkImageProcessor::GetProjection2VTKTransform() vtkImageData* itkImageProcessor::GetProjection2VTK() { + if(m_DRTImage2MetaInfo == NULL || + m_DRTGeometryMetaInfo == NULL || + m_TransformMetaInfo == NULL ){ + return NULL; + //TODO + } + // Rescale the intensity of the projection images to 0-32768 for output. using RescaleFilterType = itk::RescaleIntensityImageFilter; diff --git a/reg23Topograms/itkDTRrecon/itkImageProcessor.h b/reg23Topograms/itkDTRrecon/itkImageProcessor.h index c91f4b4..553212e 100644 --- a/reg23Topograms/itkDTRrecon/itkImageProcessor.h +++ b/reg23Topograms/itkDTRrecon/itkImageProcessor.h @@ -237,7 +237,6 @@ private: using ResampleFilterType = itk::ResampleImageFilter; /** Optimizer which tries to find the minimn (Powell Optimizer)*/ - // using OptimizerType = itk::PowellOptimizer; using AmoebaOptimizerType = itk::AmoebaOptimizer; /** Optimizer which samples the whol space */ using ExhaustiveOptimizerType = itk::ExhaustiveOptimizer; @@ -266,7 +265,9 @@ private: using ITKtoVTKFilterType = itk::ImageToVTKImageFilter; void - CalculateExternalUserTransform(TransformType::Pointer transform, DRTImageMetaInformation::Pointer imageMetaInfo); + CalculateExternalUserTransform( + TransformType::Pointer transform, + DRTImageMetaInformation::Pointer imageMetaInfo); // TransformType::Pointer // CalculateInternalTransform( @@ -294,6 +295,7 @@ private: ); + TransformType::Pointer transform1, transform2;