X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FcreaDevManager%2FcreaDevManager.cpp;h=a57d7b23ba822e5a053b8663574ab7d16b4280f9;hb=0cc6a7e002ad79de9453517108d7456fd44ddfdb;hp=a702bf756db2075ce706b30d4de498130d0da0ba;hpb=41f7684f91c2a21b9db09d53404acfea645875e4;p=crea.git

diff --git a/appli/creaDevManager/creaDevManager.cpp b/appli/creaDevManager/creaDevManager.cpp
index a702bf7..a57d7b2 100644
--- a/appli/creaDevManager/creaDevManager.cpp
+++ b/appli/creaDevManager/creaDevManager.cpp
@@ -1,24 +1,57 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Sant�)
+# # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  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 <creaWx.h>
+#include <wx/tooltip.h>
+#include <wx/config.h>
 #include <stdlib.h>
 #include <iostream> // for std::cout
 #include "creaDevManager.h"
-#include "wxCreaDevManagerMainFrame.h"
 
 IMPLEMENT_APP(wxCreaDevManagerApp)
+CREA_WXMAIN_WITH_CONSOLE
 
 wxCreaDevManagerApp::wxCreaDevManagerApp():wxApp()
 {
+  mainWindow = NULL;
 }
 
 bool wxCreaDevManagerApp::OnInit()
 {
   wxApp::OnInit();
-  
-  wxCreaDevManagerMainFrame* mainWindow = new wxCreaDevManagerMainFrame(NULL);
+  this->SetVendorName(wxT("Creatis"));
+  this->SetAppName(wxT("creaDevManager"));
+
+  wxConfigBase *pConfig = wxConfigBase::Get();
+
+  mainWindow = new wxCDMMainFrame(NULL);
   SetTopWindow(mainWindow);
-  mainWindow->SetSize(800, 600);
+  mainWindow->SetSize(850, 700);
+  wxToolTip::SetDelay(700);
   mainWindow->Show(true);
-  
   std::cout << "Crea DevManager opened." << std::endl;
   
   return true;
@@ -26,6 +59,7 @@ bool wxCreaDevManagerApp::OnInit()
 
 int wxCreaDevManagerApp::OnExit()
 {
+  delete wxConfigBase::Set((wxConfigBase *) NULL);
   wxApp::OnExit();
   std::cout << "Crea DevManager closed." << std::endl;
   return 0;