From: Daniel Felipe Gonzalez Date: Thu, 31 Jan 2013 17:07:39 +0000 (+0100) Subject: Feature #1711 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=crea.git;a=commitdiff_plain;h=845d7d4510d91df6289b20d2c7e3fa01632edf06 Feature #1711 CreaDevManager application implementation - Fixed new GUI application main file not recognized bug. - Fixed new GUI application description view not changed. --- diff --git a/lib/creaDevManagerLib/CDMUtilities.cpp b/lib/creaDevManagerLib/CDMUtilities.cpp index 09e25f3..ac1b532 100644 --- a/lib/creaDevManagerLib/CDMUtilities.cpp +++ b/lib/creaDevManagerLib/CDMUtilities.cpp @@ -316,7 +316,7 @@ namespace CDMUtilities std::string stringify(const std::string& line) { std::string res; - for (int i = 0; i < line.size(); i++) + for (int i = 0; i < (int)(line.size()); i++) { if(line[i] == '\\') res.push_back('\\'); diff --git a/lib/creaDevManagerLib/modelCDMApplication.cpp b/lib/creaDevManagerLib/modelCDMApplication.cpp index dcfb21e..7083c47 100644 --- a/lib/creaDevManagerLib/modelCDMApplication.cpp +++ b/lib/creaDevManagerLib/modelCDMApplication.cpp @@ -363,7 +363,7 @@ const bool modelCDMApplication::Refresh(std::string*& result) std::getline(fileStream,word,'('); std::vector wordBits; CDMUtilities::splitter::split(wordBits,word," \n",CDMUtilities::splitter::no_empties); - if (wordBits[wordBits.size() - 1] == "main") + if (wordBits[wordBits.size() - 1] == "main" || wordBits[wordBits.size() - 1] == "IMPLEMENT_APP") { this->mainFile = dynamic_cast(children[i]); } @@ -389,7 +389,7 @@ const bool modelCDMApplication::Refresh(std::string*& result) std::getline(fileStream,word,'('); std::vector wordBits; CDMUtilities::splitter::split(wordBits,word," \n",CDMUtilities::splitter::no_empties); - if (wordBits[wordBits.size() - 1] == "main") + if (wordBits[wordBits.size() - 1] == "main" || wordBits[wordBits.size() - 1] == "IMPLEMENT_APP") { this->mainFile = file; }