Feature #1711

[crea.git] / lib / creaDevManagerLib / modelCDMProjectsTree.cpp

diff --git a/lib/creaDevManagerLib/modelCDMProjectsTree.cpp b/lib/creaDevManagerLib/modelCDMProjectsTree.cpp
index 338c90cca069c07234cefe7a9680f73286bd3050..7e00d95f991f1af25fe3df8f39f13fbed1dcbe50 100755 (executable)
--- a/lib/creaDevManagerLib/modelCDMProjectsTree.cpp
+++ b/lib/creaDevManagerLib/modelCDMProjectsTree.cpp
@@ -2,8 +2,10 @@
 # ---------------------------------------------------------------------
 #
 # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-#                        pour la Santé)
+#                        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, 
@@ -20,14 +22,15 @@
 #
 #  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"
@@ -83,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;
@@ -106,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] + "/";
   }
@@ -118,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 ";
   }
@@ -133,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;