#2451 creaImageIO Bug New Normal - not complete the Map with all DicomTags

diff --git a/bbtk/src/bbcreaImageIOGetDicomAttributesFromMaps.cxx b/bbtk/src/bbcreaImageIOGetDicomAttributesFromMaps.cxx
index bd451839c85536627b66387d5b37c8cee57bb680..1dd7d1b2b359d38190d51ec92c26c7803b4fc4dd 100644 (file)
--- a/bbtk/src/bbcreaImageIOGetDicomAttributesFromMaps.cxx
+++ b/bbtk/src/bbcreaImageIOGetDicomAttributesFromMaps.cxx
@@ -33,11 +33,9 @@ void GetDicomAttributesFromMaps::Process()
 
     for (i=0;i<size;i++)
     { 
-       tmpMap          = bbGetInputIn()[i];
-        printf("EED GetDicomAttributesFromMaps::Process %d", tmpMap.size() );
-
-       strElement      = tmpMap.find( bbGetInputKeyDicom() )->second;
-       lstResult.push_back( strElement );
+               tmpMap = bbGetInputIn()[i];
+               strElement      = tmpMap.find( bbGetInputKeyDicom() )->second;
+               lstResult.push_back( strElement );
     } // for i
     bbSetOutputOut( lstResult );
   

diff --git a/src/creaImageIOGimmickView.cpp b/src/creaImageIOGimmickView.cpp
index 245b0b563c829ad96d34abb6fd28bfce268a37d6..0a76936736294655e38f4d77fa54c0a5790b89f9 100644 (file)
--- a/src/creaImageIOGimmickView.cpp
+++ b/src/creaImageIOGimmickView.cpp
@@ -678,11 +678,8 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
                        else
                        {
                                readImages2(o_output,im, i_attr,i_zspc);
-                       }
-                       
-               }
-               else
-               {
+                       }                       
+               } else {
                        // multiple or single frame
                        if ( isSingle(im.front()) )
                        {

diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp
index 56a4f55aa1a8aff907fdef8160ff5f84583ccda8..0ee66e527742783db26a6974ce6f4980a4252c02 100644 (file)
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@ -358,7 +358,7 @@ namespace creaImageIO
                                        bool mult, const std::string out_model)
   {
        // First we select the files
-        std::vector<std::string> files;
+   std::vector<std::string> files;
        std::string db_name = crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()));
        GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->GetSelectedAsString(files);
 
@@ -369,6 +369,7 @@ namespace creaImageIO
        mGimmick->GetSetting(SETTINGS_OUTPUT_ASK, asking);
        mGimmick->GetSetting(SETTINGS_OUTPUT_DIM, dim);
 
+
        if (asking == "true")
        {
                // display the output dialog box
@@ -381,37 +382,35 @@ namespace creaImageIO
                        dim = dlg->getDim();
                        mGimmick->UpdateSetting(SETTINGS_OUTPUT_ASK, dlg->getAsking());
                        mGimmick->UpdateSetting(SETTINGS_OUTPUT_DIM, dim);
-               }
-               else
-               {
+               } else {
                        return;
                } 
-       }
-       else
-       {
+       } else {
        }
        sscanf(dim.c_str(),"%d",&i_dim_out);
 
-
        // Next we create the structure for dicom output infos
        OutputAttr Oattr;
+//EED 01/09/2014
+          if (i_dim_out==2)
+               {
+                       Oattr.mult=true;
+               } // i_dim_out
+
+
        Oattr.db = crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()));
        if(i_attr.empty())
        {
                // We don't send informations!
-       }
-       else if( i_attr.size() == 1 && i_attr.front() == "ALL")
+       } else if( i_attr.size() == 1 && i_attr.front() == "ALL")
        {
                // we send all database
                Oattr.inside.push_back("ALL");
-       }
-       else if( (i_attr.size() == 1 && i_attr.front() != "ALL") 
+       } else if( (i_attr.size() == 1 && i_attr.front() != "ALL") 
                || (i_attr.size() >1) )
        {
                mGimmick->fillVectInfos(i_attr, Oattr);
-       }
-       else
-       {
+       } else {
                // nothing
        }