#3185 creaImageIO Feature New Normal - Clean code

[creaImageIO.git] / src / creaImageIOWxOutputDlg.cpp

diff --git a/src/creaImageIOWxOutputDlg.cpp b/src/creaImageIOWxOutputDlg.cpp
index a9271911cb9e075253d261e58919b528a3c970da..8ed5f282418a0f2ef5e19d12c0160968866167ab 100644 (file)
--- a/src/creaImageIOWxOutputDlg.cpp
+++ b/src/creaImageIOWxOutputDlg.cpp
@@ -1,3 +1,31 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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 <creaImageIOWxOutputDlg.h>
 
 namespace creaImageIO
@@ -7,14 +35,14 @@ namespace creaImageIO
     : wxDialog(parent, -1,_T("OUTPUT FORMAT"), wxDefaultPosition, wxSize(350,450))
    {
 
-               int size = filenames.size();
+               int size = (int)filenames.size();
                
                int deflt = 1;
 
                std::string sentence;
                sentence = "You select";
                std::string sentence2 = "You have the possibility to select output format :";
-               int nbsent= 0;
+               //int nbsent= 0;
                std::vector<std::string> outsentences;
                if (size == 1)
                {
@@ -71,12 +99,13 @@ namespace creaImageIO
 
 
          int start_point = 45;
-         wxStaticText * ExportText=new wxStaticText(this,-1,_T(sentence), wxPoint(5,10));
+         /// \TODO fix unused variable ExportText
+         wxStaticText * ExportText=new wxStaticText(this,-1,crea::std2wx(sentence), wxPoint(5,10));
          
          std::vector<std::string>::iterator it = outsentences.begin();
          for(int i = 0;it != outsentences.end(); it++, i++, start_point += 45)
          {
-                wxCheckBox *check = new wxCheckBox(this, -1, _T((*it)), wxPoint(5,start_point) );
+                wxCheckBox *check = new wxCheckBox(this, -1, crea::std2wx((*it)), wxPoint(5,start_point) );
                 if(i == deflt)
                         check->SetValue(true);
                 else
@@ -85,12 +114,14 @@ namespace creaImageIO
                  checkOut.push_back(check);
          }
          
-        checkAsking = new wxCheckBox(this, -1, _T(("Do you want to save this output and no more asking")), wxPoint(5,start_point) );
+        checkAsking = new wxCheckBox(this, -1, _T("Do you want to save this output and no more asking"), wxPoint(5,start_point) );
 
          // VALIDATION BUTTON
          wxButton *Ok = new wxButton(this, -1,_T("OK"), wxPoint(5,start_point+20) );
-         Connect( Ok->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxOutputDlg::OnOk ); 
-       
+         
+         Connect( Ok->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &WxOutputDlg::OnOk );
+         
+         /// \TODO fix unused variable Cancel
          wxButton *Cancel = new wxButton(this, wxID_CANCEL,_T("CANCEL"), wxPoint(100,start_point+20) );
          Layout();