fattori_g/reg23Topograms
0
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed crashed when unloading Scout and fixed unloading of RTPlan

Browse Source
This commit is contained in:
viar
2022-09-13 17:04:13 +02:00
parent 9fc9290838
commit edf28c6a57
2 changed files with 106 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
reg23Topograms/itkDTRrecon/DRTMetaInformation.cpp
View File

@ -184,6 +184,7 @@ void DRTImageMetaInformation::SetSizeWithBounds(
if(dPixMaxOverlap > dNPixMax1){
dPixMaxOverlap = dNPixMax1;
}
if(floor(dPixMaxOverlap*2) > MaxSize[1]) {
m_Size[1] = MaxSize[1];
} else {
@ -194,12 +195,7 @@ void DRTImageMetaInformation::SetSizeWithBounds(
m_Spacing = Spacing;
return;
}

71
reg23Topograms/itkDTRrecon/itkImageProcessor.cpp
View File

@ -1692,16 +1692,17 @@ void itkImageProcessor::UpdateProjectionGeometryMeta(){
// This is based on the calibrated iso to be sure...
std::vector <double> vBounds = m_CTMetaInfo->CalculateRegions(
NominalIsocenter_wZcorrectionLPS//m_DRTImage1MetaInfo->GetProjectionOriginLPS()
NominalIsocenter_wZcorrectionLPS
// m_DRTImage1MetaInfo->GetProjectionOriginLPS()
);
// std::cout<<"Bounds1: "
// <<vBounds.data()[0]<<" "
// <<vBounds.data()[1]<<" "
// <<vBounds.data()[2]<<" "
// <<vBounds.data()[3]<<" "
// <<vBounds.data()[4]<<" "
// <<vBounds.data()[5]<<std::endl;
std::cout<<"Bounds1: "
<<vBounds.data()[0]<<" "
<<vBounds.data()[1]<<" "
<<vBounds.data()[2]<<" "
<<vBounds.data()[3]<<" "
<<vBounds.data()[4]<<" "
<<vBounds.data()[5]<<std::endl;
m_DRTImage1MetaInfo->SetSizeWithBounds(
vBounds.data(),
@ -1735,16 +1736,16 @@ void itkImageProcessor::UpdateProjectionGeometryMeta(){
Std_DRT2LPS)
);
// std::cout<<"IsocenterOffsetLPS"<< IsocenterOffsetLPS <<std::endl;
// std::cout<<"CalibratedIsocenterLPS"<< CalibratedIsocenterLPS <<std::endl;
// std::cout<<"CalibratedIsocenterZeroLPS"<< CalibratedIsocenterZeroLPS <<std::endl;
// std::cout<<"m_DRTImage1MetaInfo->GetSize()"<< m_DRTImage1MetaInfo->GetSize() <<std::endl;
// std::cout<<"m_DRTImage1MetaInfo->GetSpacing()"<< m_DRTImage1MetaInfo->GetSpacing() <<std::endl;
// std::cout<<"m_DRTImage1MetaInfo->GetOrigin()"<< m_DRTImage1MetaInfo->GetOrigin() <<std::endl;
// std::cout<<"m_DRTImage1MetaInfo->GetCOV()"<< m_DRTImage1MetaInfo->GetCOV() <<std::endl;
// std::cout<<"m_DRTImage1MetaInfo->GetOriginLPS()"<< m_DRTImage1MetaInfo->GetOriginLPS() <<std::endl;
// std::cout<<"m_DRTImage1MetaInfo->GetProjectionAngleLPS()"<<m_DRTImage1MetaInfo->GetProjectionAngleLPS()<<std::endl;
// std::cout<<"m_DRTImage1MetaInfo->GetImageDirectionsLPS()"<< m_DRTImage1MetaInfo->GetImageDirectionsLPS() <<std::endl;
std::cout<<"IsocenterOffsetLPS"<< IsocenterOffsetLPS <<std::endl;
std::cout<<"CalibratedIsocenterLPS"<< CalibratedIsocenterLPS <<std::endl;
std::cout<<"CalibratedIsocenterZeroLPS"<< CalibratedIsocenterZeroLPS <<std::endl;
std::cout<<"m_DRTImage1MetaInfo->GetSize()"<< m_DRTImage1MetaInfo->GetSize() <<std::endl;
std::cout<<"m_DRTImage1MetaInfo->GetSpacing()"<< m_DRTImage1MetaInfo->GetSpacing() <<std::endl;
std::cout<<"m_DRTImage1MetaInfo->GetOrigin()"<< m_DRTImage1MetaInfo->GetOrigin() <<std::endl;
std::cout<<"m_DRTImage1MetaInfo->GetCOV()"<< m_DRTImage1MetaInfo->GetCOV() <<std::endl;
std::cout<<"m_DRTImage1MetaInfo->GetOriginLPS()"<< m_DRTImage1MetaInfo->GetOriginLPS() <<std::endl;
std::cout<<"m_DRTImage1MetaInfo->GetProjectionAngleLPS()"<<m_DRTImage1MetaInfo->GetProjectionAngleLPS()<<std::endl;
std::cout<<"m_DRTImage1MetaInfo->GetImageDirectionsLPS()"<< m_DRTImage1MetaInfo->GetImageDirectionsLPS() <<std::endl;
// SECOND
@ -1787,13 +1788,13 @@ void itkImageProcessor::UpdateProjectionGeometryMeta(){
NominalIsocenter_wZcorrectionLPS//m_DRTImage2MetaInfo->GetProjectionOriginLPS()
);
// std::cout<<"Bounds2: "
// <<vBounds.data()[0]<<" "
// <<vBounds.data()[1]<<" "
// <<vBounds.data()[2]<<" "
// <<vBounds.data()[3]<<" "
// <<vBounds.data()[4]<<" "
// <<vBounds.data()[5]<<std::endl;
std::cout<<"Bounds2: "
<<vBounds.data()[0]<<" "
<<vBounds.data()[1]<<" "
<<vBounds.data()[2]<<" "
<<vBounds.data()[3]<<" "
<<vBounds.data()[4]<<" "
<<vBounds.data()[5]<<std::endl;
m_DRTImage2MetaInfo->SetSizeWithBounds(
vBounds.data(),
@ -1823,16 +1824,16 @@ void itkImageProcessor::UpdateProjectionGeometryMeta(){
Std_DRT2LPS)
);
// std::cout<<"IsocenterOffsetLPS"<< IsocenterOffsetLPS <<std::endl;
// std::cout<<"CalibratedIsocenterLPS"<< CalibratedIsocenterLPS <<std::endl;
// std::cout<<"CalibratedIsocenterZeroLPS"<< CalibratedIsocenterZeroLPS <<std::endl;
// std::cout<<"m_DRTImage2MetaInfo->GetSize()"<< m_DRTImage2MetaInfo->GetSize() <<std::endl;
// std::cout<<"m_DRTImage2MetaInfo->GetSpacing()"<< m_DRTImage2MetaInfo->GetSpacing() <<std::endl;
// std::cout<<"m_DRTImage2MetaInfo->GetOrigin()"<< m_DRTImage2MetaInfo->GetOrigin() <<std::endl;
// std::cout<<"m_DRTImage2MetaInfo->GetCOV()"<< m_DRTImage2MetaInfo->GetCOV() <<std::endl;
// std::cout<<"m_DRTImage2MetaInfo->GetOriginLPS()"<< m_DRTImage2MetaInfo->GetOriginLPS() <<std::endl;
// std::cout<<"m_DRTImage2MetaInfo->GetProjectionAngleLPS()"<<m_DRTImage2MetaInfo->GetProjectionAngleLPS()<<std::endl;
// std::cout<<"m_DRTImage2MetaInfo->GetImageDirectionsLPS()"<< m_DRTImage2MetaInfo->GetImageDirectionsLPS() <<std::endl;
std::cout<<"IsocenterOffsetLPS"<< IsocenterOffsetLPS <<std::endl;
std::cout<<"CalibratedIsocenterLPS"<< CalibratedIsocenterLPS <<std::endl;
std::cout<<"CalibratedIsocenterZeroLPS"<< CalibratedIsocenterZeroLPS <<std::endl;
std::cout<<"m_DRTImage2MetaInfo->GetSize()"<< m_DRTImage2MetaInfo->GetSize() <<std::endl;
std::cout<<"m_DRTImage2MetaInfo->GetSpacing()"<< m_DRTImage2MetaInfo->GetSpacing() <<std::endl;
std::cout<<"m_DRTImage2MetaInfo->GetOrigin()"<< m_DRTImage2MetaInfo->GetOrigin() <<std::endl;
std::cout<<"m_DRTImage2MetaInfo->GetCOV()"<< m_DRTImage2MetaInfo->GetCOV() <<std::endl;
std::cout<<"m_DRTImage2MetaInfo->GetOriginLPS()"<< m_DRTImage2MetaInfo->GetOriginLPS() <<std::endl;
std::cout<<"m_DRTImage2MetaInfo->GetProjectionAngleLPS()"<<m_DRTImage2MetaInfo->GetProjectionAngleLPS()<<std::endl;
std::cout<<"m_DRTImage2MetaInfo->GetImageDirectionsLPS()"<< m_DRTImage2MetaInfo->GetImageDirectionsLPS() <<std::endl;