X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=lib%2FcreaDevManagerLib%2FmodelCDMProjectsTree.cpp;h=7e00d95f991f1af25fe3df8f39f13fbed1dcbe50;hb=76962b2ed3513cee0f6afd83b9d93e2b43bdefc5;hp=cc09a9fb147336c241821ee097d96e46771fb976;hpb=f887a0013d53146a6a280a0f88514df95ea6bfda;p=crea.git

diff --git a/lib/creaDevManagerLib/modelCDMProjectsTree.cpp b/lib/creaDevManagerLib/modelCDMProjectsTree.cpp
index cc09a9f..7e00d95 100755
--- a/lib/creaDevManagerLib/modelCDMProjectsTree.cpp
+++ b/lib/creaDevManagerLib/modelCDMProjectsTree.cpp
@@ -1,8 +1,36 @@
+/*
+# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ 
+*/ 
+
+
 /*
  * ModelCreaDevManagerTree.cpp
  *
  *  Created on: 22/10/2012
- *      Author: daniel
+ *      Author: Daniel Felipe Gonzalez Obando
  */
 
 #include "modelCDMProjectsTree.h"
@@ -58,7 +86,7 @@ bool modelCDMProjectsTree::CompareNodeItem(modelCDMProjectsTreeNode x, modelCDMP
 
   if(xType != yType)
   {
-    if(xType == DT_DIR)
+    if(xType == wxDIR_DIRS)
       returnValue = true;
     else
       returnValue = false;
@@ -81,7 +109,7 @@ void modelCDMProjectsTree::SetRoot(std::string path)
   }
 
   path = "/";
-  for (int i = 0; i < breadcrumbs.size()-1; i++)
+  for (int i = 0; i < (int)(breadcrumbs.size())-1; i++)
   {
     path += breadcrumbs[i] + "/";
   }
@@ -93,7 +121,7 @@ void modelCDMProjectsTree::SetRoot(std::string path)
 
   if(!projectFound)
   {
-    this->projectRoot = modelCDMProjectsTreeNode(path,name,DT_DIR,0);
+    this->projectRoot = modelCDMProjectsTreeNode(path,name,wxDIR_DIRS ,0);
   }else{
     std::cout << "already existing ";
   }
@@ -108,7 +136,7 @@ void modelCDMProjectsTree::populateNode(modelCDMProjectsTreeNode& node)
 
   std::string path = node.GetPath()+node.GetName()+"/";
 
-  wxDir dir(wxString(path.c_str()));
+  wxDir dir(crea::std2wx(path.c_str()));
   if (!dir.IsOpened())
   {
     std::cerr << "Couldn't open the directory" << std::endl;