#3185 creaImageIO Feature New Normal - Clean code

[creaImageIO.git] / src / creaImageIOWxSimpleDlg.cpp

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index e750b912c185811e58608c261985f64daf97fee4..1c076b0d4a0d0bc4fd733543fd22f1e8f6ea3a3a 100644 (file)
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -79,7 +79,8 @@ namespace creaImageIO
                                if(wxArray.size() >0)
                                {
                                        m_results.clear();
-                                       infoimage=_T("FILE(s):")+wxArray[0];
+                                       infoimage               =       wxArray[0];
+                                       infoimageSource =       _T("FILE(s)");
                                        std::vector<std::string> files;
                                        for( int i = 0; i < wxArray.GetCount(); i++)
                                        {
@@ -112,7 +113,8 @@ namespace creaImageIO
                 if ( resultShowModal==wxID_OK )
                 {  
                         m_results.clear();
-                       infoimage=_T("DIRECTORY:")+dirDlg->GetPath();
+                       infoimage               =       dirDlg->GetPath();
+                       infoimageSource =       _T("DIRECTORY");
                        if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()) , m_attrDicomTags , m_resultsDicomAtr , m_results))
                        {
                                //TO DO WARNING MESSAGE;
@@ -133,7 +135,7 @@ namespace creaImageIO
                   WxGimmickReaderDialog dlg(0,-1, 
                                   namedescp,
                                   namedb, 
-                                  _T("Select image(s)        - Gimmick! (c) CREATIS-LRMN 2008"),
+                                  _T("Select image(s)        - Gimmick! (c)"),
                    wxDefaultPosition,
                    wxSize(810,750),
                    GIMMICK_2D_IMAGE_SELECTION,
@@ -143,11 +145,9 @@ namespace creaImageIO
                 dlg.ShowModal();
                 if (dlg.GetReturnCode() == wxID_OK)
             {
-                               dlg.stopReading();
-
-                               std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
-                               dlg.getSelected(outStrGimmick, m_attrDicomTags,true,"");
-
+                       dlg.stopReading();
+                       std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
+                       dlg.getSelected(outStrGimmick, m_attrDicomTags,true,"");
                        m_results.clear();
                        int size=(int)outStrGimmick.size();
                        int ii;
@@ -155,6 +155,8 @@ namespace creaImageIO
 //                     {
                                for (ii=0;ii<size;ii++)
                                {
+                                       outStrGimmick[ii].img->Modified();
+                                       outStrGimmick[ii].img->Update();
                                        m_results.push_back(outStrGimmick[ii].img);
                                        m_resultsDicomAtr.push_back( outStrGimmick[ii].infos );
                                }
@@ -165,6 +167,8 @@ namespace creaImageIO
 //                             }
 //                     }
 
+                       infoimage               =       _T("EED Missing info <void> ???");
+                       infoimageSource =       _T("GIMMICK");
                        dlg.OnExit();
                 }
                 SetReturnCode( dlg.GetReturnCode() );
@@ -177,6 +181,12 @@ namespace creaImageIO
                return infoimage;
        }
 
+//-----------------------------------------------------------------------------   
+       wxString WxSimpleDlg::getInfoImageSource()
+       {
+               return infoimageSource;
+       }
+
  //////////////////////////////////////////////////////////////////////
 // Return the results vector                                                                           //
 //////////////////////////////////////////////////////////////////////
@@ -257,7 +267,8 @@ namespace creaImageIO
                                                memcpy(out->GetScalarPointer(0,0,slice), img->GetScalarPointer(0,0,0), imsize);
                                                //img->Delete();
                                        } // for slice  
-
+                                       out->Modified();
+                                       out->Update();
 //EED This is NOT working. The iteration over the pointer vtkImageData
 //                             int slice=0;
 //                             std::vector<vtkImageData*>::iterator it;
@@ -281,7 +292,8 @@ namespace creaImageIO
                result = NULL;  
                } // getImagesSelected().size()!=0
 
-
+                       result->Modified();
+                       result->Update();
                return result;
 
                }