Merge branch 'ScoutRTUIDevel' of https://git.psi.ch/cpt_bioeng/drt into ScoutRTUIDevel
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
|
||||
|
||||
|
||||
/*
|
||||
|
||||
@ -2466,13 +2466,7 @@ itkImageProcessor::GetUserIsocentricTransform(){
|
||||
|
||||
|
||||
TransformType::Pointer
|
||||
itkImageProcessor::GetCompleteIsocentricTransform
|
||||
(/*ImageType3D::PointType TransformCenter*/){
|
||||
|
||||
TransformType::Pointer
|
||||
regTransform = TransformType::New();
|
||||
regTransform->SetComputeZYX(true);
|
||||
regTransform->SetIdentity();
|
||||
itkImageProcessor::GetCompleteIsocentricTransform(){
|
||||
|
||||
if(m_TransformMetaInfo == nullptr ||
|
||||
m_CTMetaInfo == nullptr){
|
||||
|
@ -148,19 +148,20 @@ public:
|
||||
case eOptimizerType::AMOEBA:
|
||||
optAm = dynamic_cast<AmoebaOptimizerPointer>(object);
|
||||
iAmoebaIterations ++;
|
||||
if(iAmoebaIterations == 100){
|
||||
iAmoebaIterations = 100;
|
||||
}
|
||||
// if(iAmoebaIterations == 100){
|
||||
// iAmoebaIterations = 100;
|
||||
// }
|
||||
|
||||
objIterUpdate->onIteration(
|
||||
eOptimType,
|
||||
optAm->GetCachedValue(),
|
||||
iAmoebaIterations, //optAm->GetCachedValue(),
|
||||
optAm->GetCachedCurrentPosition()[0],
|
||||
optAm->GetCachedCurrentPosition()[1],
|
||||
optAm->GetCachedCurrentPosition()[2]
|
||||
);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
return;
|
||||
|
Reference in New Issue
Block a user