Skip to content
Snippets Groups Projects
Commit 6086791d authored by Ansgar Philippsen's avatar Ansgar Philippsen
Browse files

fixed img.alg.FractionalShift ignoring absolute origin; some more img py exports

parent 4679d0f9
No related branches found
No related tags found
No related merge requests found
......@@ -56,7 +56,10 @@ Vec3 FractionalShift::GetShift() const
void FractionalShift::Visit(ImageHandle& ih)
{
Vec3 ao=ih.GetAbsoluteOrigin();
bool spatialflag=false;
if(ih.GetDomain()==SPATIAL){
spatialflag=true;
ih.ApplyIP(FFT());
......@@ -72,10 +75,12 @@ void FractionalShift::Visit(ImageHandle& ih)
for(ExtentIterator it=ih.GetIterator();!it.AtEnd();++it) {
ih.SetComplex(it,ih.GetComplex(it)*std::polar<Real>(1.0,-Dot(phaseshift,Point(it).ToVec3())));
}
if(spatialflag){
//back FFT
ih.ApplyIP(FFT());
}
// update spatial origin
ih.SetAbsoluteOrigin(ao-shift_);
}
}}}//ns
......@@ -205,9 +205,11 @@ void export_ImageHandle()
.def("SetComplex",&ImageHandle::SetComplex, args("point","value"))
.def("SetSpatialOrigin",&ImageHandle::SetSpatialOrigin)
.def("GetSpatialOrigin",&ImageHandle::GetSpatialOrigin)
.add_property("spatial_origin",&ImageHandle::GetSpatialOrigin,&ImageHandle::SetSpatialOrigin)
.def("CenterSpatialOrigin",&ImageHandle::CenterSpatialOrigin)
.def("SetAbsoluteOrigin",&ImageHandle::SetAbsoluteOrigin)
.def("GetAbsoluteOrigin",&ImageHandle::GetAbsoluteOrigin)
.add_property("absolute_origin",&ImageHandle::GetAbsoluteOrigin,&ImageHandle::SetAbsoluteOrigin)
.def("IndexToCoord",&ImageHandle::IndexToCoord)
.def("CoordToIndex",&ImageHandle::CoordToIndex)
.def("FractionalIndexToCoord",&ImageHandle::FractionalIndexToCoord)
......@@ -296,7 +298,9 @@ void export_ConstImageHandle()
.def("Apply",apply_cmodip)
.def("Apply",apply_cmodop)
.def("GetSpatialOrigin",&ConstImageHandle::GetSpatialOrigin)
.add_property("spatial_origin",&ImageHandle::GetSpatialOrigin)
.def("GetAbsoluteOrigin",&ConstImageHandle::GetAbsoluteOrigin)
.add_property("absolute_origin",&ImageHandle::GetAbsoluteOrigin)
.def("IndexToCoord",&ConstImageHandle::IndexToCoord)
.def("CoordToIndex",&ConstImageHandle::CoordToIndex)
.def("FractionalIndexToCoord",&ConstImageHandle::FractionalIndexToCoord)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment