X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FmodelCDMAppli.cpp;h=bcb0876ae6fcef9063820a0f535a8206ecb3875a;hb=845d7d4510d91df6289b20d2c7e3fa01632edf06;hp=4f61e13de3c84c765474ec4d709b798e46a5a265;hpb=6a43a8cc1e5216f06e41799fbe154b2b1ef6d44b;p=crea.git

diff --git a/lib/creaDevManagerLib/modelCDMAppli.cpp b/lib/creaDevManagerLib/modelCDMAppli.cpp
index 4f61e13..bcb0876 100644
--- a/lib/creaDevManagerLib/modelCDMAppli.cpp
+++ b/lib/creaDevManagerLib/modelCDMAppli.cpp
@@ -121,51 +121,141 @@ 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 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 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;
+      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);
+
+      return NULL;
+    }
 }
 
 const bool modelCDMAppli::Refresh(std::string*& result)