X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FmodelCDMLib.cpp;h=8ebd9ae100555df4211fdc2149729e3b7081062e;hb=7a33a157d7372e4d507cd4a8ec0ae9a1f92d986e;hp=11b5f370252efdb83e624303fc86286af871afb9;hpb=df27aee30377cefdc3e33b4001b5afca1798b309;p=crea.git

diff --git a/lib/creaDevManagerLib/modelCDMLib.cpp b/lib/creaDevManagerLib/modelCDMLib.cpp
index 11b5f37..8ebd9ae 100644
--- a/lib/creaDevManagerLib/modelCDMLib.cpp
+++ b/lib/creaDevManagerLib/modelCDMLib.cpp
@@ -45,10 +45,11 @@ modelCDMLib::modelCDMLib()
 {
 }
 
-modelCDMLib::modelCDMLib(const std::string& path, const int& level)
+modelCDMLib::modelCDMLib(const std::string& path, const std::string& name, const int& level)
 {
+  std::cout << "creating lib\n";
   this->type = wxDIR_DIRS;
-  this->name = "lib";
+  this->name = name;
   this->level = level;
   this->path = path;
 
@@ -69,7 +70,7 @@ modelCDMLib::modelCDMLib(const std::string& path, const int& level)
         {
           std::string stdfileName = crea::wx2std(fileName);
 
-          modelCDMLibrary* library = new modelCDMLibrary(pathFixed + "/" + stdfileName, this->level + 1);
+          modelCDMLibrary* library = new modelCDMLibrary(pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
           this->libraries.push_back(library);
           this->children.push_back(library);
 
@@ -84,19 +85,20 @@ modelCDMLib::modelCDMLib(const std::string& path, const int& level)
           //if CMakeLists, create CMakeLists
           if(stdfileName == "CMakeLists.txt")
             {
-              this->CMakeLists = new modelCDMCMakeListsFile(pathFixed + "/" + stdfileName, this->level + 1);
+              this->CMakeLists = new modelCDMCMakeListsFile(pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
               this->children.push_back(this->CMakeLists);
             }
           //if is an unknown file, create file
           else
             {
-              this->children.push_back(new modelCDMFile(pathFixed + "/" + stdfileName, this->level + 1));
+              this->children.push_back(new modelCDMFile(pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1));
             }
 
           cont = dir.GetNext(&fileName);
         }
     }
   this->SortChildren();
+  std::sort(this->libraries.begin(), this->libraries.end(), CompareNodeItem);
 }
 
 modelCDMLib::~modelCDMLib()
@@ -110,13 +112,11 @@ const std::vector<modelCDMLibrary*>& modelCDMLib::GetLibraries() const
 
 modelCDMLibrary* modelCDMLib::CreateLibrary(
     const std::string& name,
-    std::string*& result,
-    const std::string& path
+    std::string*& result
 )
 {
   //copy template library folder with new name
-  //TODO: fix for windows
-  std::string copyCommand = "cp -r " + this->path + "/template_lib " + this->path + "/" + name;
+  std::string copyCommand = "cp -r \"" + this->path + CDMUtilities::SLASH + "template_lib\" \"" + this->path + CDMUtilities::SLASH + name + "\"";
   if(system(copyCommand.c_str()))
     {
       result = new std::string("An error occurred while running '" + copyCommand + "'.");
@@ -124,13 +124,13 @@ modelCDMLibrary* modelCDMLib::CreateLibrary(
     }
   //set name of library in CMakeLists inside copied folder
   std::string line;
-  std::ifstream in((this->path + "/" + name + "/CMakeLists.txt").c_str());
+  std::ifstream in((this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt").c_str());
   if( !in.is_open())
     {
       result = new std::string("CMakeLists.txt file failed to open.");
       return NULL;
     }
-  std::ofstream out((this->path + "/" + name + "/CMakeLists.txt.tmp").c_str());
+  std::ofstream out((this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt.tmp").c_str());
   while (getline(in, line))
     {
       if(line == "SET ( LIBRARY_NAME   MyLib  )")
@@ -140,7 +140,7 @@ modelCDMLibrary* modelCDMLib::CreateLibrary(
   in.close();
   out.close();
   //delete old file and rename new file
-  std::string renameCommand = "mv " + this->path + "/" + name + "/CMakeLists.txt.tmp " + this->path + "/" + name + "/CMakeLists.txt";
+  std::string renameCommand = "mv \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt\"";
   if(system(renameCommand.c_str()))
     {
       result = new std::string("An error occurred while running '" + renameCommand + "'.");
@@ -148,23 +148,20 @@ modelCDMLibrary* modelCDMLib::CreateLibrary(
     }
 
   //add library to model
-  //TODO: fix for windows
-  modelCDMLibrary* library = new modelCDMLibrary(this->path + "/" + name, this->level + 1);
+  modelCDMLibrary* library = new modelCDMLibrary(this->path + CDMUtilities::SLASH + name, name, this->level + 1);
   this->libraries.push_back(library);
   this->children.push_back(library);
 
   this->SortChildren();
 
-  result = new std::string(this->path + "/" + name);
+  result = new std::string(this->path + CDMUtilities::SLASH + name);
   return library;
 }
 
 const bool modelCDMLib::Refresh(std::string*& result)
 {
+  std::cout << "refreshing lib" << std::endl;
   this->type = wxDIR_DIRS;
-  this->name = "lib";
-  this->level = level;
-  this->path = path;
 
 
 
@@ -183,7 +180,7 @@ const bool modelCDMLib::Refresh(std::string*& result)
           std::string libraryName = stdfileName;
           //check if they already exist
           bool found = false;
-          for (int i = 0;!found && i < this->libraries.size(); i++)
+          for (int i = 0; !found && i < this->libraries.size(); i++)
             {
               if (this->libraries[i]->GetName() == libraryName)
                 {
@@ -197,7 +194,7 @@ const bool modelCDMLib::Refresh(std::string*& result)
             }
           if(!found)
             {
-              modelCDMLibrary* library = new modelCDMLibrary(this->path + "/" + stdfileName, this->level + 1);
+              modelCDMLibrary* library = new modelCDMLibrary(this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
               this->libraries.push_back(library);
               this->children.push_back(library);
             }
@@ -214,7 +211,7 @@ const bool modelCDMLib::Refresh(std::string*& result)
             {
               if (this->CMakeLists == NULL)
                 {
-                  this->CMakeLists = new modelCDMCMakeListsFile(this->path + "/" + stdfileName, this->level + 1);
+                  this->CMakeLists = new modelCDMCMakeListsFile(this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
                   this->children.push_back(this->CMakeLists);
                 }
               else
@@ -229,7 +226,7 @@ const bool modelCDMLib::Refresh(std::string*& result)
           else
             {
               bool found = false;
-              for (int i = 0; i <!found && this->children.size(); i++)
+              for (int i = 0; !found && i < this->children.size(); i++)
                 {
                   if (this->children[i]->GetName() == stdfileName)
                     {
@@ -242,7 +239,7 @@ const bool modelCDMLib::Refresh(std::string*& result)
 
               if(!found)
                 {
-                  modelCDMFile* file = new modelCDMFile(this->path + "/" + stdfileName, this->level + 1);
+                  modelCDMFile* file = new modelCDMFile(this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
                   this->children.push_back(file);
                 }
             }
@@ -271,5 +268,6 @@ const bool modelCDMLib::Refresh(std::string*& result)
         }
     }
   this->SortChildren();
+  std::sort(this->libraries.begin(), this->libraries.end(), CompareNodeItem);
   return true;
 }