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

[DEV] downgrade some logs

Browse Source
This commit is contained in:
Edouard DUPIN 2016-10-06 22:31:25 +02:00
parent 0cf4e92bc9
commit 4632a3b939
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ewol/resource/Texture.cpp
View File

@ -50,7 +50,7 @@ ewol::resource::Texture::~Texture() {
#include <egami/egami.hpp> #include <egami/egami.hpp>
bool ewol::resource::Texture::updateContext() { bool ewol::resource::Texture::updateContext() {
EWOL_INFO("updateContext [START]"); EWOL_DEBUG("updateContext [START]");
std::unique_lock<std::recursive_mutex> lock(m_mutex, std::defer_lock); std::unique_lock<std::recursive_mutex> lock(m_mutex, std::defer_lock);
if (lock.try_lock() == false) { if (lock.try_lock() == false) {
//Lock error ==> try later ... //Lock error ==> try later ...
@ -60,7 +60,7 @@ bool ewol::resource::Texture::updateContext() {
// Request a new texture at openGl : // Request a new texture at openGl :
glGenTextures(1, &m_texId); glGenTextures(1, &m_texId);
} }
EWOL_INFO("load the image:" << m_name); EWOL_DEBUG("load the image:" << m_name);
// in all case we set the texture properties : // in all case we set the texture properties :
// TODO : check error ??? // TODO : check error ???
glBindTexture(GL_TEXTURE_2D, m_texId); glBindTexture(GL_TEXTURE_2D, m_texId);
@ -99,7 +99,7 @@ bool ewol::resource::Texture::updateContext() {
EWOL_ERROR("Not manage the type " << m_data.getType() << " for texture"); EWOL_ERROR("Not manage the type " << m_data.getType() << " for texture");
break; break;
} }
EWOL_INFO("TEXTURE: add [" << getId() << "]=" << m_data.getSize() << " OGl_Id=" << m_texId << " type=" << m_data.getType()); EWOL_DEBUG("TEXTURE: add [" << getId() << "]=" << m_data.getSize() << " OGl_Id=" << m_texId << " type=" << m_data.getType());
//egami::store(m_data, std::string("~/texture_") + etk::to_string(getId()) + ".bmp"); //egami::store(m_data, std::string("~/texture_") + etk::to_string(getId()) + ".bmp");
glTexImage2D(GL_TEXTURE_2D, // Target glTexImage2D(GL_TEXTURE_2D, // Target
0, // Level 0, // Level
@ -112,7 +112,7 @@ bool ewol::resource::Texture::updateContext() {
m_data.getTextureDataPointer() ); m_data.getTextureDataPointer() );
// now the data is loaded // now the data is loaded
m_loaded = true; m_loaded = true;
EWOL_INFO("updateContext [STOP]"); EWOL_DEBUG("updateContext [STOP]");
return true; return true;
} }
@ -135,7 +135,7 @@ void ewol::resource::Texture::removeContextToLate() {
void ewol::resource::Texture::flush() { void ewol::resource::Texture::flush() {
std::unique_lock<std::recursive_mutex> lock(m_mutex); std::unique_lock<std::recursive_mutex> lock(m_mutex);
// request to the manager to be call at the next update ... // request to the manager to be call at the next update ...
EWOL_INFO("Request UPDATE of Element"); EWOL_VERBOSE("Request UPDATE of Element");
getManager().update(ememory::dynamicPointerCast<gale::Resource>(sharedFromThis())); getManager().update(ememory::dynamicPointerCast<gale::Resource>(sharedFromThis()));
} }

4
ewol/widget/ContextMenu.cpp
View File

@ -59,8 +59,8 @@ void ewol::widget::ContextMenu::onChangeSize() {
if (m_subWidget == nullptr) { if (m_subWidget == nullptr) {
return; return;
} }
vec2 subWidgetSize; vec2 subWidgetSize(0,0);
vec2 subWidgetOrigin; vec2 subWidgetOrigin(0,0);
subWidgetSize = m_subWidget->getCalculateMinSize(); subWidgetSize = m_subWidget->getCalculateMinSize();
if (m_subWidget->canExpand().x() == true) { if (m_subWidget->canExpand().x() == true) {
subWidgetSize.setX(m_size.x()); subWidgetSize.setX(m_size.x());

2
ewol/widget/Image.cpp
View File

@ -108,9 +108,11 @@ void ewol::widget::Image::onRegenerateDisplay() {
} }
void ewol::widget::Image::calculateMinMaxSize() { void ewol::widget::Image::calculateMinMaxSize() {
EWOL_VERBOSE("calculate min size: border=" << propertyBorder << " size=" << propertyImageSize << " min-size=" << propertyMinSize);
vec2 imageBoder = propertyBorder->getPixel()*2.0f; vec2 imageBoder = propertyBorder->getPixel()*2.0f;
vec2 imageSize = propertyImageSize->getPixel(); vec2 imageSize = propertyImageSize->getPixel();
vec2 size = propertyMinSize->getPixel(); vec2 size = propertyMinSize->getPixel();
EWOL_VERBOSE(" ==> border=" << imageBoder << " size=" << imageSize << " min-size=" << size);
if (imageSize != vec2(0,0)) { if (imageSize != vec2(0,0)) {
m_minSize = imageBoder+imageSize; m_minSize = imageBoder+imageSize;
m_maxSize = m_minSize; m_maxSize = m_minSize;