X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FmodelCDMAppli.cpp;h=c66cbb871beb6deabfe5d74d36f31cbf7ee1d203;hb=38fb78e3930c8ba01021536630624e4b0b03dd87;hp=586c550dcf01e0e1263297853403956d31839671;hpb=2fb5dd9262993efaf56bfc731f4297fdb96bf63e;p=crea.git

diff --git a/lib/creaDevManagerLib/modelCDMAppli.cpp b/lib/creaDevManagerLib/modelCDMAppli.cpp
index 586c550..c66cbb8 100644
--- a/lib/creaDevManagerLib/modelCDMAppli.cpp
+++ b/lib/creaDevManagerLib/modelCDMAppli.cpp
@@ -121,51 +121,157 @@ const std::vector<modelCDMApplication*>& modelCDMAppli::GetApplications() const
 }
 
 modelCDMApplication* modelCDMAppli::CreateApplication(
-    const std::string& name,
+    const std::string& namein,
+    const int& type,
     std::string*& result
 )
 {
-  //copy template application folder with new name
-  std::string copyCommand = "cp -r \"" + this->path + CDMUtilities::SLASH + "template_appli\" \"" + this->path + CDMUtilities::SLASH + name + "\"";
-  if(system(copyCommand.c_str()))
+  std::vector<std::string> words;
+  CDMUtilities::splitter::split(words,namein," '/\\*\"%",CDMUtilities::splitter::no_empties);
+  std::string name;
+  for (int i = 0; i < (int)(words.size()); i++)
     {
-      result = new std::string("An error occurred while running '" + copyCommand + "'.");
-      return NULL;
+      name += words[i];
     }
-  //set name of library in CMakeLists inside copied folder
-  std::string line;
-  std::ifstream in((this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt").c_str());
-  if( !in.is_open())
+  if (name == "")
     {
-      result = new std::string("CMakeLists.txt file failed to open.");
+      result = new std::string("The given name is not valid:  '/\\*\"% are forbidden.");
       return NULL;
     }
-  std::ofstream out((this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt.tmp").c_str());
-  while (getline(in, line))
+
+  if (type == 0)
     {
-      if(line == "SET ( EXE_NAME   MyExe  )")
-        line = "SET ( EXE_NAME   " + name + "  )";
-      out << line << std::endl;
+      //copy template application folder with new name
+#ifdef _WIN32
+      std::string copyCommand = "xcopy \"" + this->path + CDMUtilities::SLASH + "template_appli\" \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "\" /Y";
+#else
+      std::string copyCommand = "cp -r \"" + this->path + CDMUtilities::SLASH + "template_appli\" \"" + this->path + CDMUtilities::SLASH + name + "\"";
+#endif
+
+      if(system(copyCommand.c_str()))
+        {
+          result = new std::string("An error occurred while running '" + copyCommand + "'.");
+          return NULL;
+        }
+      //set name of library in CMakeLists inside copied folder
+      std::string line;
+      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 + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt.tmp").c_str());
+      while (getline(in, line))
+        {
+          if(line == "SET ( EXE_NAME   MyExe  )")
+            line = "SET ( EXE_NAME   " + name + "  )";
+          out << line << std::endl;
+        }
+      in.close();
+      out.close();
+      //delete old file and rename new file
+#ifdef _WIN32
+      std::string renameCommand = "move /Y \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt\"";
+#else
+      std::string renameCommand = "mv \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt\"";
+#endif
+
+      if(system(renameCommand.c_str()))
+        {
+          result = new std::string("An error occurred while running '" + renameCommand + "'.");
+          return NULL;
+        }
+
+      //add application to appli CMakeLists
+      std::fstream out1((this->path + CDMUtilities::SLASH + "CMakeLists.txt").c_str(), std::fstream::in | std::fstream::out | std::fstream::app);
+      if (out1.is_open())
+        {
+          out1 << "ADD_SUBDIRECTORY(" << name << ")" << std::endl;
+          out1.close();
+        }
+
+      //add application to model
+      modelCDMApplication* application = new modelCDMApplication(this, 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 + CDMUtilities::SLASH + name);
+      return application;
     }
-  in.close();
-  out.close();
-  //delete old file and rename new file
-  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()))
+  else if(type == 1)
     {
-      result = new std::string("An error occurred while running '" + renameCommand + "'.");
-      return NULL;
-    }
+      //copy template application folder with new name
+#ifdef _WIN32
+      std::string copyCommand = "xcopy \"" + this->path + CDMUtilities::SLASH + "template_wx_appli\" \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "\" /Y";
+#else
+      std::string copyCommand = "cp -r \"" + this->path + CDMUtilities::SLASH + "template_wx_appli\" \"" + this->path + CDMUtilities::SLASH + name + "\"";
+#endif
+
+      if(system(copyCommand.c_str()))
+        {
+          result = new std::string("An error occurred while running '" + copyCommand + "'.");
+          return NULL;
+        }
+      //set name of library in CMakeLists inside copied folder
+      std::string line;
+      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 + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt.tmp").c_str());
+      while (getline(in, line))
+        {
+          if(line == "SET ( EXE_NAME   MyExeWx  )")
+            line = "SET ( EXE_NAME   " + name + "  )";
+          out << line << std::endl;
+        }
+      in.close();
+      out.close();
+      //delete old file and rename new file
+#ifdef _WIN32
+      std::string renameCommand = "move /Y \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt\"";
+#else
+      std::string renameCommand = "mv \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt.tmp\" \"" + this->path + CDMUtilities::SLASH + name + CDMUtilities::SLASH + "CMakeLists.txt\"";
+#endif
+
+      if(system(renameCommand.c_str()))
+        {
+          result = new std::string("An error occurred while running '" + renameCommand + "'.");
+          return NULL;
+        }
+
+      //add application to appli CMakeLists
+      std::fstream out1((this->path + CDMUtilities::SLASH + "CMakeLists.txt").c_str(), std::fstream::in | std::fstream::out | std::fstream::app);
+      if (out1.is_open())
+        {
+          out1 << "ADD_SUBDIRECTORY(" << name << ")" << std::endl;
+          out1.close();
+        }
 
-  //add application to model
-  modelCDMApplication* application = new modelCDMApplication(this, this->path + CDMUtilities::SLASH + name, name, this->level + 1);
-  this->applications.push_back(application);
-  this->children.push_back(application);
+      //add application to model
+      modelCDMApplication* application = new modelCDMApplication(this, this->path + CDMUtilities::SLASH + name, name, this->level + 1);
+      this->applications.push_back(application);
+      this->children.push_back(application);
 
-  this->SortChildren();
+      this->SortChildren();
+
+      result = new std::string(this->path + CDMUtilities::SLASH + name);
+      return application;
+    }
+  else
+    {
+      std::string res = "Invalid application type: ";
+      res += type;
+      res += std::string(".\n0:Console application.\n1:GUI Application (wxWidgets).");
+      result = new std::string(res);
 
-  result = new std::string(this->path + CDMUtilities::SLASH + name);
-  return application;
+      return NULL;
+    }
 }
 
 const bool modelCDMAppli::Refresh(std::string*& result)
@@ -191,7 +297,7 @@ const bool modelCDMAppli::Refresh(std::string*& result)
               std::string applicationName = stdfileName;
               //check if application already exist
               bool found = false;
-              for (int i = 0; !found && i < this->applications.size(); i++)
+              for (int i = 0; !found && i < (int)(this->applications.size()); i++)
                 {
                   if (this->applications[i]->GetName() == applicationName)
                     {
@@ -214,7 +320,7 @@ const bool modelCDMAppli::Refresh(std::string*& result)
             {
               //check if folder already exist
               bool found = false;
-              for (int i = 0; !found && i < this->children.size(); i++)
+              for (int i = 0; !found && i < (int)(this->children.size()); i++)
                 {
                   if (this->children[i]->GetName() == stdfileName)
                     {
@@ -259,7 +365,7 @@ const bool modelCDMAppli::Refresh(std::string*& result)
           else
             {
               bool found = false;
-              for (int i = 0; !found && i < this->children.size(); i++)
+              for (int i = 0; !found && i < (int)(this->children.size()); i++)
                 {
                   if (this->children[i]->GetName() == stdfileName)
                     {
@@ -281,7 +387,7 @@ const bool modelCDMAppli::Refresh(std::string*& result)
         }
     }
 
-  for (int i = 0; i < checkedApplications.size(); i++)
+  for (int i = 0; i < (int)(checkedApplications.size()); i++)
     {
       if(!checkedApplications[i])
         {
@@ -290,7 +396,7 @@ const bool modelCDMAppli::Refresh(std::string*& result)
           i--;
         }
     }
-  for (int i = 0; i < checked.size(); i++)
+  for (int i = 0; i < (int)(checked.size()); i++)
     {
       if(!checked[i])
         {
@@ -311,7 +417,7 @@ void modelCDMAppli::CheckStructure(std::map<std::string, bool>& properties)
   if(this->CMakeLists != NULL)
     {
       //set properties parameters based on model
-      for (int i = 0; i < this->applications.size(); i++)
+      for (int i = 0; i < (int)(this->applications.size()); i++)
         properties["appli add " + this->applications[i]->GetName()] = false;
 
       //open cmakelists
@@ -333,7 +439,7 @@ void modelCDMAppli::CheckStructure(std::map<std::string, bool>& properties)
                 {
                   word = words[0];
                   CDMUtilities::splitter::split(words, word, " ", CDMUtilities::splitter::empties_ok);
-                  for (int i = 0; i < words.size(); i++)
+                  for (int i = 0; i < (int)(words.size()); i++)
                     {
                       if(words[i].substr(0,2) == "//")
                         break;
@@ -371,9 +477,101 @@ void modelCDMAppli::CheckStructure(std::map<std::string, bool>& properties)
     }
 
   //check libraries' structure
-  for (int i = 0; i < this->applications.size(); i++)
+  for (int i = 0; i < (int)(this->applications.size()); i++)
     {
       properties["application " + this->applications[i]->GetName()] = true;
       this->applications[i]->CheckStructure(properties);
     }
 }
+
+bool modelCDMAppli::IsApplicationIncluded(const std::string& application_name)
+{
+  if (this->HasCMakeLists())
+      {
+        CDMUtilities::CMLFile cmlFile = CDMUtilities::readCMLFile(this->CMakeLists->GetPath().c_str());
+        for (int i = 0; i < cmlFile.size(); ++i)
+          {
+            if (cmlFile[i].first=="command" && cmlFile[i].second[0] == "ADD_SUBDIRECTORY")
+              {
+                int pos = 1;
+                while (pos < cmlFile[i].second.size())
+                  {
+                    if (!isspace(cmlFile[i].second[pos][0]) && cmlFile[i].second[pos][0] != '(' && cmlFile[i].second[pos][0] != '#')
+                      {
+                        if (application_name == cmlFile[i].second[pos])
+                          return true;
+                        break;
+                      }
+                    pos++;
+                  }
+              }
+          }
+      }
+    return false;
+}
+
+bool modelCDMAppli::SetApplicationInclude(const std::string& application_name, const bool& toInclude)
+{
+  if (this->HasCMakeLists())
+    {
+      CDMUtilities::CMLFile cmlFile = CDMUtilities::readCMLFile(this->CMakeLists->GetPath().c_str());
+
+      bool found = false;
+
+      for (int i = 0; i < cmlFile.size(); ++i)
+        {
+          if(toInclude && cmlFile[i].first == "comment")
+            {
+              std::vector<std::string> segments;
+              std::string line = cmlFile[i].second[0];
+              while(line[0] == '#')
+                line.erase(0,1);
+
+              CDMUtilities::splitter::split(segments, line, " ()", CDMUtilities::splitter::no_empties);
+              if (segments.size() > 1 && segments[0] == "ADD_SUBDIRECTORY" && segments[1] == application_name)
+                {
+                  found = true;
+                  while(cmlFile[i].second[0][0] == '#')
+                    cmlFile[i].second[0].erase(0,1);
+                }
+            }
+          else if(cmlFile[i].first == "command" && cmlFile[i].second[0] == "ADD_SUBDIRECTORY")
+            {
+              int pos = 1;
+              while (pos < cmlFile[i].second.size())
+                {
+                  if (!isspace(cmlFile[i].second[pos][0]) && cmlFile[i].second[pos][0] != '(' && cmlFile[i].second[pos][0] != '#')
+                    {
+                      if (application_name == cmlFile[i].second[pos])
+                        {
+                          found = true;
+                          if (!toInclude)
+                            {
+                              cmlFile[i].first = "comment";
+                              cmlFile[i].second[0] = "#" + cmlFile[i].second[0];
+                              while (cmlFile[i].second.size() > 1)
+                                {
+                                  cmlFile[i].second[0] += cmlFile[i].second[1];
+                                  cmlFile[i].second.erase(cmlFile[i].second.begin()+1);
+                                }
+
+                            }
+                        }
+                      break;
+                    }
+                  pos++;
+                }
+            }
+        }
+      if (!found && toInclude)
+        {
+          CDMUtilities::syntaxElement element;
+          element.first = "command";
+          element.second.push_back("ADD_SUBDIRECTORY(" + application_name + ")");
+          cmlFile.push_back(element);
+        }
+
+      return CDMUtilities::writeCMLFile(this->CMakeLists->GetPath().c_str(),cmlFile);
+    }
+  return false;
+}