X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FcreaNewProject%2FcreaNewProject.cpp;h=5f61ddff2a216318e3ab88e88624e363c10f438a;hb=refs%2Fheads%2Fvtk7itk4wx3-mxecc;hp=2861429ba2da4b8890d5c52eccf8ea93c562527b;hpb=6c682789d8d4fc7ceebf3bdafd94024fba28de4f;p=crea.git

diff --git a/appli/creaNewProject/creaNewProject.cpp b/appli/creaNewProject/creaNewProject.cpp
index 2861429..5f61ddf 100644
--- a/appli/creaNewProject/creaNewProject.cpp
+++ b/appli/creaNewProject/creaNewProject.cpp
@@ -1,5 +1,34 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        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, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  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.
+# ------------------------------------------------------------------------ 
+*/ 
+
 #include <creaWx.h>
 #include <wx/dirdlg.h>
+#include <stdlib.h> // for getenv
+
 class myApp : public wxApp
 {
 public:
@@ -11,7 +40,7 @@ IMPLEMENT_APP(myApp);
 CREA_WXMAIN_WITH_CONSOLE
 
 bool myApp::OnInit( )
-{	 
+{
   wxApp::OnInit();
 #ifdef __WXGTK__
   //See http://www.wxwindows.org/faqgtk.htm#locale
@@ -28,11 +57,24 @@ bool myApp::OnInit( )
 				     _T("New"));
    if (name.IsEmpty()) return false;
    
+   wxString description = wxGetTextFromUser(_T("Enter Package Description (html format)"),
+				     _T("create New Package"),
+				     _T("NO_DESCRIPTION"));
+   if (description.IsEmpty()) return false;
+
+   wxString authorWX = wxGetTextFromUser(_T("Author (One word)"),
+				     _T("Author"),
+				     _T("Author_Name"));
+   if (description.IsEmpty()) return false;
+
+
+
 #if(_WIN32)
+     
 	std::string command("creaNewProject.bat ");
 	std::string command1("creaSed.exe ");
 	std::string command2("del ");
-	
+
 	command  += "\"" + crea::wx2std(dir) + "\" \"" + crea::wx2std(name) + "\"";
 	command1 += "\"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt.in\" " + "NameOfTheProject " + crea::wx2std(name) + "> \"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt\"";
 	command2 += "\"" + crea::wx2std(dir)+"\\"+crea::wx2std(name)+"\\CMakeLists.txt.in\"";
@@ -40,32 +82,72 @@ bool myApp::OnInit( )
 	{
 		system ( command1.c_str() );
 		system ( command2.c_str() );
-		wxMessageBox(_T("Done !"),_T("creaNewProject"),
+
+        // Create a Package at the same time.   JPR
+
+//EED 2018/01/22		char *author = (char*) (authorWX.mb_str()) ;
+                std::string author(authorWX.mb_str());
+
+		std::string nomDirectory = crea::wx2std(dir) + "\\" + crea::wx2std(name);
+		std::string nomPackageDirectory = nomDirectory + "\\" + "bbtk_" + crea::wx2std(name) + "_PKG";
+		std::string bbCreatePackage("bbCreatePackage ");
+		bbCreatePackage += nomDirectory + " " + crea::wx2std(name) + " " + author + " " + crea::wx2std(description);
+		system (bbCreatePackage.c_str());		
+		std::string add;
+		add = "echo ADD_SUBDIRECTORY(bbtk_" + crea::wx2std(name)  + "_PKG) >> " + nomDirectory + "/CMakeLists.txt";
+		system(add.c_str());
+
+		wxMessageBox(_T("New Project created !"),_T("creaNewProject"),
 				wxOK | wxICON_INFORMATION);
-	}
-	else 
-	{
+	}	else 	{
 		wxString err(_T("An error occured while running '"));
 		err +=  crea::std2wx(command) + _T("'");
-		wxMessageBox(err,_T("creaNewProject"),wxOK | wxICON_ERROR);      
-	}	
+		wxMessageBox(err,_T("creaNewProject"),wxOK | wxICON_ERROR);
+	}
+
+// ------ LINUX / MacOS
+
 #else
    	std::string command("creaNewProject.sh ");
 	command += "\"" + crea::wx2std(dir) + "\"" +" " + crea::wx2std(name);
+	
 	if ( ! system ( command.c_str() ) )
 	{
-		wxMessageBox(_T("Done !"),_T("creaNewProject"),
+		wxMessageBox(_T("New Project created !"),_T("creaNewProject"),
 					wxOK | wxICON_INFORMATION);
+
+                // Create a Package at the same time.   JPR
+		
+                //execGUICreateNewPackage += "/../../../share/bbtk/bbs/toolsbbtk/appli/GUICreatePackage.bbs";
+	        //system(execGUICreateNewPackage.c_str());
+		
+		// or, better, new trick :
+		// bbCreatePackage nomDirectory nomPackage author Description
+   
+//EED           char *author = getenv("USER");
+// JPR          char *author = (char*) (authorWX.mb_str());
+                std::string author(authorWX.mb_str());
+		std::string nomDirectory = crea::wx2std(dir) + "/" + crea::wx2std(name);
+		std::string nomPackageDirectory = nomDirectory + "/" + "bbtk_" + crea::wx2std(name) + "_PKG";
+
+		std::string bbCreatePackage("bbCreatePackage ");
+		bbCreatePackage += nomDirectory + " " + crea::wx2std(name) + " " + author + " " + crea::wx2std(description);
+		system (bbCreatePackage.c_str());
+		
+		std::string add;
+		add = "echo 'ADD_SUBDIRECTORY(bbtk_" + crea::wx2std(name)  + "_PKG)' >> " + nomDirectory + "/CMakeLists.txt";
+		//std::cout << add << std::endl;
+		system(add.c_str());
+		
 	}
-	else 
-	{
+	else
+	{	
 		wxString err(_T("An error occured while running '"));
 		err +=  crea::std2wx(command) + _T("'");
-		wxMessageBox(err,_T("creaNewProject"),wxOK | wxICON_ERROR);      
+		wxMessageBox(err,_T("creaNewProject"),wxOK | wxICON_ERROR);
 	}
-	
-#endif
 
+#endif
 
    return false;
 }