X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FmodelCDMAppli.cpp;h=417392792399e8024b7eed70ae5b7101c762f655;hb=752294dd30e2ee94f38be513d441f4716509ce13;hp=e35a9c50126c7a47a0b76b23ff03ed10d94e136d;hpb=2c45094f8403883f8fb52c1801f1d96a35a471bf;p=crea.git

diff --git a/lib/creaDevManagerLib/modelCDMAppli.cpp b/lib/creaDevManagerLib/modelCDMAppli.cpp
index e35a9c5..4173927 100644
--- a/lib/creaDevManagerLib/modelCDMAppli.cpp
+++ b/lib/creaDevManagerLib/modelCDMAppli.cpp
@@ -46,10 +46,11 @@ modelCDMAppli::modelCDMAppli()
 {
 }
 
-modelCDMAppli::modelCDMAppli(const std::string& path, const int& level)
+modelCDMAppli::modelCDMAppli(const std::string& path, const std::string& name, const int& level)
 {
+  std::cout << "creating appli\n";
   this->type = wxDIR_DIRS;
-  this->name = "appli";
+  this->name = name;
   this->level = level;
   this->path = path;
 
@@ -68,9 +69,17 @@ modelCDMAppli::modelCDMAppli(const std::string& path, const int& level)
         {
           std::string stdfileName = crea::wx2std(fileName);
 
-          modelCDMApplication* application = new modelCDMApplication(pathFixed + "/" + stdfileName, this->level + 1);
-          this->applications.push_back(application);
-          this->children.push_back(application);
+          if(stdfileName != "template_appli" && stdfileName != "template_wx_appli")
+            {
+              modelCDMApplication* application = new modelCDMApplication(pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+              this->applications.push_back(application);
+              this->children.push_back(application);
+            }
+          else
+            {
+              modelCDMFolder* folder = new modelCDMFolder(pathFixed + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+              this->children.push_back(folder);
+            }
 
           cont = dir.GetNext(&fileName);
         }
@@ -83,13 +92,13 @@ modelCDMAppli::modelCDMAppli(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);
@@ -97,6 +106,7 @@ modelCDMAppli::modelCDMAppli(const std::string& path, const int& level)
 
     }
   this->SortChildren();
+  std::sort(this->applications.begin(), this->applications.end(), CompareNodeItem);
 }
 
 modelCDMAppli::~modelCDMAppli()
@@ -110,13 +120,11 @@ const std::vector<modelCDMApplication*>& modelCDMAppli::GetApplications() const
 
 modelCDMApplication* modelCDMAppli::CreateApplication(
     const std::string& name,
-    std::string*& result,
-    const std::string& path
+    std::string*& result
 )
 {
   //copy template application folder with new name
-  //TODO: fix for windows
-  std::string copyCommand = "cp -r " + this->path + "/template_appli " + this->path + "/" + name;
+  std::string copyCommand = "cp -r \"" + this->path + CDMUtilities::SLASH + "template_appli\" \"" + this->path + CDMUtilities::SLASH + name + "\"";
   if(system(copyCommand.c_str()))
     {
       result = new std::string("An error occurred while running '" + copyCommand + "'.");
@@ -124,13 +132,13 @@ modelCDMApplication* modelCDMAppli::CreateApplication(
     }
   //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 ( EXE_NAME   MyExe  )")
@@ -140,7 +148,7 @@ modelCDMApplication* modelCDMAppli::CreateApplication(
   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,14 +156,13 @@ modelCDMApplication* modelCDMAppli::CreateApplication(
     }
 
   //add application to model
-  //TODO: fix for windows
-  modelCDMApplication* application = new modelCDMApplication(this->path + "/" + name, this->level + 1);
+  modelCDMApplication* application = new modelCDMApplication(this->path + CDMUtilities::SLASH + name, name, this->level + 1);
   this->applications.push_back(application);
   this->children.push_back(application);
 
   this->SortChildren();
 
-  result = new std::string(this->path + "/" + name);
+  result = new std::string(this->path + CDMUtilities::SLASH + name);
   return application;
 }
 
@@ -163,11 +170,6 @@ const bool modelCDMAppli::Refresh(std::string*& result)
 {
   std::cout << "refreshing appli" << std::endl;
   this->type = wxDIR_DIRS;
-  this->name = "appli";
-  this->level = level;
-  this->path = path;
-
-
 
   std::vector<bool> checked(this->children.size(), false);
   std::vector<bool> checkedApplications(this->applications.size(), false);
@@ -181,26 +183,51 @@ const bool modelCDMAppli::Refresh(std::string*& result)
       while (cont)
         {
           std::string stdfileName = crea::wx2std(fileName);
-          std::string applicationName = stdfileName;
-          //check if they already exist
-          bool found = false;
-          for (int i = 0;!found && i < this->applications.size(); i++)
+
+          if(stdfileName != "template_appli" && stdfileName != "template_wx_appli")
             {
-              if (this->applications[i]->GetName() == applicationName)
+              std::string applicationName = stdfileName;
+              //check if application already exist
+              bool found = false;
+              for (int i = 0; !found && i < this->applications.size(); i++)
                 {
-                  found = true;
-                  int pos = std::find(this->children.begin(), this->children.end(), this->applications[i]) - this->children.begin();
-                  checked[pos] = true;
-                  checkedApplications[i] = true;
-                  if(!this->applications[i]->Refresh(result))
-                    return false;
+                  if (this->applications[i]->GetName() == applicationName)
+                    {
+                      found = true;
+                      int pos = std::find(this->children.begin(), this->children.end(), this->applications[i]) - this->children.begin();
+                      checked[pos] = true;
+                      checkedApplications[i] = true;
+                      if(!this->applications[i]->Refresh(result))
+                        return false;
+                    }
+                }
+              if(!found)
+                {
+                  modelCDMApplication* application= new modelCDMApplication(this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+                  this->applications.push_back(application);
+                  this->children.push_back(application);
                 }
             }
-          if(!found)
+          else
             {
-              modelCDMApplication* application= new modelCDMApplication(this->path + "/" + stdfileName, this->level + 1);
-              this->applications.push_back(application);
-              this->children.push_back(application);
+              //check if folder already exist
+              bool found = false;
+              for (int i = 0; !found && i < this->children.size(); i++)
+                {
+                  if (this->children[i]->GetName() == stdfileName)
+                    {
+                      found = true;
+                      checked[i] = true;
+
+                      if(!this->children[i]->Refresh(result))
+                        return false;
+                    }
+                }
+              if(!found)
+                {
+                  modelCDMFolder* folder= new modelCDMFolder(this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+                  this->children.push_back(folder);
+                }
             }
           cont = dir.GetNext(&fileName);
         }
@@ -215,7 +242,7 @@ const bool modelCDMAppli::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
@@ -230,7 +257,7 @@ const bool modelCDMAppli::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)
                     {
@@ -243,7 +270,7 @@ const bool modelCDMAppli::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);
                 }
             }
@@ -272,5 +299,6 @@ const bool modelCDMAppli::Refresh(std::string*& result)
         }
     }
   this->SortChildren();
+  std::sort(this->applications.begin(), this->applications.end(), CompareNodeItem);
   return true;
 }