#3208 creaImageIO Feature New Normal - branch mingw64

[creaImageIO.git] / src / creaImageIOWxGimmickView.cpp

diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp
index c1b7acb8fc5e68aab4efdffb84f9e41c6878171c..46e2507c5e5ce23992ebbd14f521ea7e9125119f 100644 (file)
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@ -26,11 +26,9 @@
 */
 
 
-#include <creaImageIOPACSConnection.h>
+
 #include <creaImageIOWxPACSConnectionPanel.h>
-#include <creaImageIOWxGimmickView.h>
 #include <creaImageIOWxTreeView.h>
-#include <creaImageIOSystem.h>
 #include <creaImageIOWxCustomizeConfigPanel.h>
 #include <creaImageIOWxListenerPanel.h>
 #include <creaImageIOWxEditFieldsPanel.h>
@@ -41,6 +39,10 @@
 #include <creaImageIOWxOutputDlg.h>
 #include <creaImageIOOutputModel.h>
 
+#if defined(_WIN32)
+#pragma warning(disable: 4996)
+#endif
+
 using namespace crea;
 // Icons
 #include "icons/accept.xpm"
@@ -356,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);
 
@@ -367,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
@@ -379,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
        }
 
@@ -503,7 +504,15 @@ namespace creaImageIO
   void WxGimmickView::OnAddFiles(wxCommandEvent& event)
   {
     mViewer->StopPlayer();
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
     long style = wxOPEN | wxFILE_MUST_EXIST | wxFD_MULTIPLE;
+#else
+    long style = wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_MULTIPLE;
+#endif
+
+
     std::string wc("*");
     wxFileDialog* FD = new wxFileDialog( 0, 
                                         _T("Select file"),
@@ -699,7 +708,11 @@ namespace creaImageIO
       {
                  ClearSelection();
       }*/
-       ReadImageThreaded(sel);
+         
+  printf("EED Warnning WxGimmickView::OnSelectionChange ....... To avoid threads conflicts//ReadImageThreaded(sel)\n ");
+//EED1 ReadImageThreaded(sel);
+
+
    }
 
   //==================================================