X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOGimmickView.cpp;fp=src%2FcreaImageIOGimmickView.cpp;h=0a0dd0c13c18a557ff2cacf2c336472476f3e19b;hb=5ce273b1e5a79911e2582e16adc02f0c9505d5d2;hp=c9965637106f259cf1e00d943f5508248b711077;hpb=c18c193c249e190ca24a3c8b41c99ca0f4e0b7e4;p=creaImageIO.git diff --git a/src/creaImageIOGimmickView.cpp b/src/creaImageIOGimmickView.cpp index c996563..0a0dd0c 100644 --- a/src/creaImageIOGimmickView.cpp +++ b/src/creaImageIOGimmickView.cpp @@ -36,8 +36,11 @@ #include #include #include + #endif +#include + /*#if defined(USE_GDCM2) #include #include "gdcmSystem.h" @@ -496,29 +499,16 @@ void GimmickView::ReadImagesNotThreaded(std::vector& s, std::vect void GimmickView::readImages1(std::vector& o_output, std::vector im, OutputAttr i_attr) { - i_attr.outside.push_back("D0019_100a"); // simens Number Of Images In Mosaic - -//EED Borrame - int i,isize=i_attr.outside.size(); - for (i=0;i::iterator it; for (it=im.begin(); it!=im.end(); ++it) { OutStrGimmick out; out.img = vtkImageData::New(); out.img->ShallowCopy(mReader.GetImage(*it)); -printf("EED GimmickView::readImages1 A\n "); if(i_attr.mult) { getAttributes((*it),out.infos,i_attr); -printf("EED GimmickView::readImages1 B %s \n ", out.infos.find("D0019_100a")->second.c_str() ); } o_output.push_back(out); } @@ -526,7 +516,6 @@ printf("EED GimmickView::readImages1 B %s \n ", out.infos.find("D0019_100a")-> if(!i_attr.mult) { getAttributes(im.front(), o_output.front().infos, i_attr); -printf("EED GimmickView::readImages1 C %s \n ", o_output.front().infos.find("D0019_100a")->second.c_str() ); } } @@ -589,6 +578,7 @@ printf("EED GimmickView::readImages1 C %s \n ", o_output.front().infos.find("D memcpy(out.img->GetScalarPointer(0,0,slice), cur->GetScalarPointer(0,0,0), imsize); slice++; } + getAttributes(im.front(),out.infos, i_attr); o_output.push_back(out); }