X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fappli%2FbbStudio%2FbbStudio.cxx;h=26163a83eab127c1d401996589a449e88ae935aa;hb=72100b5cd3240189ea096777f4088e49c2120ca8;hp=541d24a171de07b8082381362b25d9c19c570ee2;hpb=d4eee42d2a2b5cc416a30deb49bf07aa76b7b3b1;p=bbtk.git

diff --git a/kernel/appli/bbStudio/bbStudio.cxx b/kernel/appli/bbStudio/bbStudio.cxx
index 541d24a..26163a8 100644
--- a/kernel/appli/bbStudio/bbStudio.cxx
+++ b/kernel/appli/bbStudio/bbStudio.cxx
@@ -1,3 +1,30 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
 #ifdef _USE_WXWIDGETS_
 
 //==========================================================================
@@ -8,13 +35,25 @@
 #include <wx/cmdline.h> 
 #include <vector>
 
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
+	static const wxCmdLineEntryDesc cmdLineDesc[] =
+	{
+	  { wxCMD_LINE_PARAM,  NULL, NULL, _T("file1 [file2 [...]]"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, 
+	  { wxCMD_LINE_SWITCH, _T("h"), _T("help"),   _T("Prints this help") },
+	  { wxCMD_LINE_SWITCH, _T("d"), _T("debug"),   _T("Message all 9") },
+	  { wxCMD_LINE_NONE }
+	};
+#else
+	static const wxCmdLineEntryDesc cmdLineDesc[] =
+	{
+	  { wxCMD_LINE_PARAM,  NULL, NULL, "file1 [file2 [...]]", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, 
+	  { wxCMD_LINE_SWITCH, "h", "help",   "Prints this help" },
+	  { wxCMD_LINE_SWITCH, "d", "debug",   "Message all 9" },
+	  { wxCMD_LINE_NONE }
+	};
+#endif
 
-static const wxCmdLineEntryDesc cmdLineDesc[] =
-{
-  { wxCMD_LINE_PARAM,  NULL, NULL, _T("file1 [file2 [...]]"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, 
-  { wxCMD_LINE_SWITCH, _T("h"), _T("help"),   _T("Prints this help") },
-  { wxCMD_LINE_NONE }
-};
 
 
 
@@ -55,6 +94,14 @@ bool wxBBIApp::OnCmdLineParsed(wxCmdLineParser& parser)
 	      << std::endl;
     parser.Usage();
   }
+  else 
+  {
+	if ( parser.Found(_T("d")) )
+	{
+		bbtk::MessageManager::SetMessageLevel("all",9);
+	}
+  }
+
 
   return true;
 }
@@ -96,7 +143,11 @@ bool wxBBIApp::OnInit( )
 //  you need to use the linker option "/subsystem:console" and the following code:
 int main(int argc, char* argv[])
 {
-	return WinMain(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), SW_SHOWNORMAL);
+		// EED 2018-07-16
+	char buffer[1500];
+	wcstombs(buffer , ::GetCommandLine() , 1500 );
+    return WinMain(::GetModuleHandle(NULL), NULL, buffer , SW_SHOWNORMAL);
+//    return WinMain(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), SW_SHOWNORMAL);
 }
 
 #endif // defined(_WIN32) 
@@ -106,6 +157,7 @@ int main(int argc, char* argv[])
 //==========================================================================
 // WITHOUT WX
 //==========================================================================
+#include <iostream>
 int main(int argc, char* argv[])
 {  
   std::cout << "bbStudio was not compiled with wxWidgets : ciao !" <<std::endl;