X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxGimmickView.cpp;h=ef9ee5c956af0a4a31b86f6e2c2a28850e56caff;hb=f6c90a7f05ae0fd545dfdba5cd5a37d124bd8056;hp=e7dcfcf63918959ff5d1291ac5620a10b0477159;hpb=7dc3332abdb3f12ca8a5e9e5bd902bfbef7e44dc;p=creaImageIO.git

diff --git a/src/creaImageIOWxGimmickView.cpp b/src/creaImageIOWxGimmickView.cpp
index e7dcfcf..ef9ee5c 100644
--- a/src/creaImageIOWxGimmickView.cpp
+++ b/src/creaImageIOWxGimmickView.cpp
@@ -1,8 +1,34 @@
-#include <creaImageIOPACSConnection.h>
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------
+*/
+
+
+
 #include <creaImageIOWxPACSConnectionPanel.h>
-#include <creaImageIOWxGimmickView.h>
 #include <creaImageIOWxTreeView.h>
-#include <creaImageIOSystem.h>
 #include <creaImageIOWxCustomizeConfigPanel.h>
 #include <creaImageIOWxListenerPanel.h>
 #include <creaImageIOWxEditFieldsPanel.h>
@@ -13,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"
@@ -171,10 +201,11 @@ namespace creaImageIO
     mBottomPanel->SetSizer(mbottom_sizer);
 
     // Splitting
+    /// \TODO fix warning: unused variable hsize
     int hsize = size.GetHeight();
 
-    int top_minsize = 450;
-    int bottom_minsize = 50;
+    int top_minsize 	= 450;
+    int bottom_minsize 	= 50;
 
     mSplitter->SetMinimumPaneSize( bottom_minsize );
     mSplitter->SplitHorizontally( mNotebook, mBottomPanel, 
@@ -327,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);
 
@@ -338,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
@@ -350,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
 	}
 
@@ -590,7 +620,7 @@ namespace creaImageIO
 		{
 			if (recursive) 
 			{
-				nb += NumberFilesToAdd(itr->string(), recursive);
+				nb += NumberFilesToAdd(itr->path().string(), recursive);
 			}
 		}
 		else
@@ -606,7 +636,7 @@ namespace creaImageIO
   bool WxGimmickView::isNeedRecursive(std::string i_name)
   {
       boost::filesystem::directory_iterator iter(i_name), end_iter;
-	  bool bfindir = false;
+      //bool bfindir = false;
 		  for(; iter != end_iter; ++iter)
 		  {
 			  if(boost::filesystem::is_directory(*iter))
@@ -1145,9 +1175,9 @@ namespace creaImageIO
   //========================================================================
   void WxGimmickView::CreateEditFieldsDialog(tree::Node* node, std::vector<std::string> names, std::vector<std::string> keys)
   {
-    wxDialog* dial= new wxDialog (this,-1,crea::std2wx("Edit Fields for node "+node->GetLabel()),wxDefaultPosition, wxSize(350,155));
-    wxBoxSizer	*siz = new wxBoxSizer(wxVERTICAL);
-    WxEditFieldsPanel* ef = new WxEditFieldsPanel(dial, dial, this, node, names, keys);
+    wxDialog		*dial= new wxDialog (this,-1,crea::std2wx("Edit Fields for node "+node->GetLabel()),wxDefaultPosition, wxSize(350,155));
+    wxBoxSizer		*siz = new wxBoxSizer(wxVERTICAL);
+    WxEditFieldsPanel	*ef  = new WxEditFieldsPanel(dial, dial, this, node, names, keys);
 
     siz->Add( ef,1,wxGROW  ,0); 
     dial->SetSizer(siz);