atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

try to find the manager error

Browse Source
This commit is contained in:
Edouard Dupin 2012-08-27 23:26:59 +02:00
parent e9a3efba18
commit 5d2000e952
4 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Sources/libetk/etk/File.cpp
View File

@ -80,7 +80,7 @@ void etk::SetBaseFolderData(const char * folder)
s_fileAPK = folder; s_fileAPK = folder;
loadAPK(s_fileAPK); loadAPK(s_fileAPK);
#else #else
TK_ERROR("Not Availlable Outside Android"); TK_WARNING("Not Availlable Outside Android");
#endif #endif
} }
@ -89,7 +89,7 @@ void etk::SetBaseFolderDataUser(const char * folder)
#ifdef __TARGET_OS__Android #ifdef __TARGET_OS__Android
baseFolderDataUser = folder; baseFolderDataUser = folder;
#else #else
TK_ERROR("Not Availlable Outside Android"); TK_WARNING("Not Availlable Outside Android");
#endif #endif
} }
@ -98,7 +98,7 @@ void etk::SetBaseFolderCache(const char * folder)
#ifdef __TARGET_OS__Android #ifdef __TARGET_OS__Android
baseFolderCache = folder; baseFolderCache = folder;
#else #else
TK_ERROR("Not Availlable Outside Android"); TK_WARNING("Not Availlable Outside Android");
#endif #endif
} }
@ -143,10 +143,10 @@ void etk::InitDefaultFolder(const char * applName)
// start log // start log
} }
#endif #endif
TK_ERROR("baseFolderHome : \"" << baseFolderHome << "\""); TK_INFO("baseFolderHome : \"" << baseFolderHome << "\"");
TK_ERROR("baseFolderData : \"" << baseFolderData << "\""); TK_INFO("baseFolderData : \"" << baseFolderData << "\"");
TK_ERROR("baseFolderDataUser : \"" << baseFolderDataUser << "\""); TK_INFO("baseFolderDataUser : \"" << baseFolderDataUser << "\"");
TK_ERROR("baseFolderCache : \"" << baseFolderCache << "\""); TK_INFO("baseFolderCache : \"" << baseFolderCache << "\"");
} }
etk::UString etk::GetUserHomeFolder(void) etk::UString etk::GetUserHomeFolder(void)

6
Sources/libewol/ewol/Resource.h
View File

@ -39,7 +39,11 @@ namespace ewol
public: public:
Resource(etk::UString& filename) : m_name(filename), m_counter(1) { }; Resource(etk::UString& filename) : m_name(filename), m_counter(1) { };
virtual ~Resource(void) { }; virtual ~Resource(void) { };
virtual bool HasName(etk::UString& fileName) { return fileName==m_name; }; virtual bool HasName(etk::UString& fileName)
{
EWOL_DEBUG("check : " << fileName << " ?= " << m_name << " = " << (fileName==m_name) );
return fileName==m_name;
};
virtual etk::UString GetName(void) { return m_name; }; virtual etk::UString GetName(void) { return m_name; };
void Increment(void) { m_counter++; }; void Increment(void) { m_counter++; };
bool Decrement(void) { m_counter--; return (m_counter==0)?true:false; }; bool Decrement(void) { m_counter--; return (m_counter==0)?true:false; };

3
Sources/libewol/ewol/ResourceManager.cpp
View File

@ -57,7 +57,8 @@ void ewol::resource::UnInit(void)
static ewol::Resource* LocalKeep(etk::UString& filename) static ewol::Resource* LocalKeep(etk::UString& filename)
{ {
EWOL_DEBUG("KEEP : DEFAULT : file : \"" << filename << "\""); EWOL_DEBUG("KEEP : DEFAULT : file : \"" << filename << "\"");
for (int32_t iii=l_resourceList.Size()-1; iii>=0; iii--) { //for (int32_t iii=l_resourceList.Size()-1; iii>=0; iii--) {
for (int32_t iii=0; iii<l_resourceList.Size(); iii++) {
if (l_resourceList[iii] != NULL) { if (l_resourceList[iii] != NULL) {
if(l_resourceList[iii]->HasName(filename)) { if(l_resourceList[iii]->HasName(filename)) {
l_resourceList[iii]->Increment(); l_resourceList[iii]->Increment();

21
Sources/libewol/ewol/font/TexturedFont.cpp
View File

@ -62,17 +62,27 @@ ewol::TexturedFont::TexturedFont(etk::UString fontName) :
m_lastGlyphPos(0,0), m_lastGlyphPos(0,0),
m_lastRawHeigh(0) m_lastRawHeigh(0)
{ {
char tmpName[1024] = "";
int32_t tmpSize = 0; int32_t tmpSize = 0;
// extarct name and size : // extarct name and size :
if (sscanf(fontName.c_str(), "%s:%d", tmpName, &tmpSize)!=2) { char * tmpData = fontName.c_str();
char * tmpPos = strchr(tmpData, ':');
if (tmpPos==NULL) {
m_size = 1; m_size = 1;
EWOL_CRITICAL("Can not parse the font name : \"" << fontName << "\""); EWOL_CRITICAL("Can not parse the font name : \"" << fontName << "\" ??? ':' " );
return; return;
} else {
if (sscanf(tmpPos+1, "%d", &tmpSize)!=1) {
m_size = 1;
EWOL_CRITICAL("Can not parse the font name : \"" << fontName << "\" ==> size ???");
return;
}
*tmpPos = '\0';
} }
m_size = tmpSize; m_size = tmpSize;
m_name = tmpName; m_name = tmpData;
ewol::resource::Keep(fontName, m_font); //EWOL_CRITICAL("Load FONT name : \"" << m_name << "\" ==> size=" << m_size);
ewol::resource::Keep(m_name, m_font);
if (NULL == m_font) { if (NULL == m_font) {
return; return;
} }
@ -204,6 +214,7 @@ bool ewol::TexturedFont::HasName(etk::UString& fileName)
etk::UString tmpName = m_name; etk::UString tmpName = m_name;
tmpName += ":"; tmpName += ":";
tmpName += m_size; tmpName += m_size;
EWOL_DEBUG("check : " << fileName << " ?= " << tmpName << " = " << (fileName==tmpName) );
return fileName==tmpName; return fileName==tmpName;
} }