while (cont)
{
std::string stdfileName = crea::wx2std(fileName);
- modelCDMFile* file;
+ std::size_t fileTypePos = stdfileName.find_last_of(".");
+ std::string fileType;
+ if(fileTypePos != std::string::npos)
+ fileType = stdfileName.substr(fileTypePos);
+ else
+ fileType = "";
+
+ modelCDMCodeFile* file;
if(stdfileName.substr(0,2) == "bb")
{
- file = new modelCDMFile(this, path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+ file = new modelCDMCodeFile(this, path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
this->children.push_back(file);
modelCDMBlackBox* blackBox = new modelCDMBlackBox(this, path, stdfileName.substr(2,stdfileName.size()-4), level + 1);
blackBox->SetHeaderFile(file);
cont = dir2.GetFirst(&fileName, crea::std2wx(stdfileName.substr(0,stdfileName.size()-2) + ".cxx"), wxDIR_FILES);
if (cont)
{
- file = new modelCDMFile(this, path + CDMUtilities::SLASH + crea::wx2std(fileName), crea::wx2std(fileName), this->level + 1);
+ file = new modelCDMCodeFile(this, path + CDMUtilities::SLASH + crea::wx2std(fileName), crea::wx2std(fileName), this->level + 1);
this->children.push_back(file);
blackBox->SetSourceFile(file);
}
command += " \"" + bbDescription + "\"";
command += " \"" + bbCategories + "\"";
+
+#ifdef __APPLE__
+ command = "source ~/.bashrc ; " + command;
+#endif
+
//excecute command
+// wxMessageBox(crea::std2wx("Command: ->" + command + "<-"),_T("Creating Black Box"),wxOK | wxICON_INFORMATION);
if(system(command.c_str()))
{
result = new std::string("Error executing command '" + command + "'");
modelCDMFile* header = NULL;
modelCDMFile* source = NULL;
wxDir dir(crea::std2wx(path));
- if (dir.IsOpened())
+ if (dir.IsOpened())
{
wxString fileName;
bool cont = dir.GetFirst(&fileName, crea::std2wx("bb"+package+bbName+".h"), wxDIR_FILES);
}
}
//if source and header exist
+
+
if (header != NULL && source != NULL)
{
//create black box
while (cont)
{
std::string stdfileName = crea::wx2std(fileName);
+ std::size_t fileTypePos = stdfileName.find_last_of(".");
+ std::string fileType;
+ if(fileTypePos != std::string::npos)
+ fileType = stdfileName.substr(fileTypePos);
+ else
+ fileType = "";
//if CMakeLists, create CMakeLists
if(stdfileName == "CMakeLists.txt")
if(!found)
{
- modelCDMFile* file = new modelCDMFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
- this->children.push_back(file);
+ //if is a code file, create modelCDMCodeFile
+ if(
+ fileType == ".c" ||
+ fileType == ".cxx" ||
+ fileType == ".h" ||
+ fileType == ".cpp" ||
+ fileType == ".txx" ||
+ fileType == ".cmake" )
+ {
+ this->children.push_back(new modelCDMCodeFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1));
+ }
+ else
+ {
+ modelCDMFile* file = new modelCDMFile(this, this->path + CDMUtilities::SLASH + stdfileName, stdfileName, this->level + 1);
+ this->children.push_back(file);
+ }
}
}