HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change the color management use uint32_t instead of 4 float

Browse Source
This commit is contained in:
Edouard Dupin 2012-04-23 17:05:56 +02:00
parent 586cd62f44
commit 5cc4a1a779
6 changed files with 28 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jni/Android.mk
View File

@ -25,7 +25,6 @@ LOCAL_LDLIBS := -llog -landroid
LOCAL_CFLAGS := -D__PLATFORM__Android \
-D__MODE__Touch \
-DEWOL_USE_FREE_TYPE \
-DETK_DEBUG_LEVEL=3 \
-DAPPL_DEBUG_LEVEL=3 \
-DDATA_IN_APK \

7
jni/Linux.mk
View File

@ -6,7 +6,7 @@ include $(CLEAR_VARS)
include $(LOCAL_PATH)/file.mk
# name of the librairy
LOCAL_MODULE := ednn
LOCAL_MODULE := edn
# get the tag of the current project :
LOCAL_VERSION_TAG=$(shell cd $(LOCAL_PATH) ; git describe --tags)
@ -14,7 +14,7 @@ LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev=
$(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG))
# name of the dependency
LOCAL_STATIC_LIBRARIES := ewol etk tinyxml libzip libpng libfreetype parsersvg agg
LOCAL_STATIC_LIBRARIES := etk ewol tinyxml libzip libpng libfreetype parsersvg agg
LOCAL_C_INCLUDES := -I$(LOCAL_PATH) $(addprefix -I$(LOCAL_PATH)/, $(sort $(dir $(FILE_LIST))))
@ -25,7 +25,8 @@ LOCAL_LDLIBS :=
LOCAL_CFLAGS := -D__PLATFORM__Linux \
-DEWOL_USE_FREE_TYPE \
-DEDN_DEBUG_LEVEL=3
-DETK_DEBUG_LEVEL=3 \
-DAPPL_DEBUG_LEVEL=3
include $(BUILD_EXECUTABLE)

8
jni/appl/Buffer/BufferEmpty.cpp
View File

@ -94,13 +94,7 @@ int32_t BufferEmpty::Display(ewol::OObject2DTextColored& OOTextNormal,
tmpDisplay = "No Buffer Availlable to display";
OOTextNormal.Text(textPos, tmpDisplay);
color_ts bgColor; //!< Text color
bgColor.red = 1.0;
bgColor.green = 1.0;
bgColor.blue = 1.0;
bgColor.alpha = 1.0;
OOColored.SetColor(bgColor);
OOColored.SetColor(etk::color::color_White);
OOColored.Rectangle( 0, 0, sizeX, sizeY);
return ERR_NONE;

71
jni/appl/Colorize/Colorize.cpp
View File

@ -35,42 +35,30 @@
Colorize::Colorize( etk::UString &newColorName)
{
m_colorFG.red=0;
m_colorFG.green=0;
m_colorFG.blue=0;
m_colorFG.alpha=1;
m_colorBG.red=0;
m_colorBG.green=0;
m_colorBG.blue=0;
m_colorBG.alpha=1;
m_colorFG = etk::color::color_Black;
m_colorBG = etk::color::color_Black;
italic = false;
bold = false;
haveFG = false;
haveBG = false;
SetName(newColorName);
//APPL_INFO("New(Colorise)");
APPL_VERBOSE("New(Colorise)");
}
Colorize::Colorize(void)
{
ColorName = "no_name";
m_colorFG.red=0;
m_colorFG.green=0;
m_colorFG.blue=0;
m_colorFG.alpha=1;
m_colorBG.red=0;
m_colorBG.green=0;
m_colorBG.blue=0;
m_colorBG.alpha=1;
m_colorFG = etk::color::color_Black;
m_colorBG = etk::color::color_Black;
italic = false;
bold = false;
haveFG = false;
haveBG = false;
//APPL_INFO("New(Colorise)");
APPL_VERBOSE("New(Colorise)");
}
Colorize::~Colorize(void)
@ -81,13 +69,13 @@ Colorize::~Colorize(void)
void Colorize::SetName(const char *newColorName)
{
//APPL_INFO("color change name : \"%s\" ==> \"%s\"",ColorName.c_str(), newColorName);
APPL_VERBOSE("color change name : \"" << ColorName << "\" ==> \"" << newColorName << "\"");
ColorName = newColorName;
}
void Colorize::SetName(etk::UString &newColorName)
{
//APPL_INFO("color change name : \"%s\" ==> \"%s\"",ColorName.c_str(), newColorName.c_str());
APPL_VERBOSE("color change name : \"" << ColorName << "\" ==> \"" << newColorName << "\"");
ColorName = newColorName;
}
@ -101,38 +89,15 @@ etk::UString Colorize::GetName(void)
void Colorize::SetFgColor(const char *myColor)
{
haveFG = true;
signed int r=0;
signed int v=0;
signed int b=0;
signed int a=-1;
sscanf(myColor, "#%02x%02x%02x%02x", &r, &v, &b, &a);
m_colorFG.red = (float)r/255.0;
m_colorFG.green = (float)v/255.0;
m_colorFG.blue = (float)b/255.0;
if (-1 == a) {
m_colorFG.alpha = 1;
} else {
m_colorFG.alpha = (float)a/255.0;
}
//APPL_INFO(myColor << " ==> r="<< r <<" v="<< v <<" b="<< b );
m_colorFG = etk::color::Parse(myColor);
APPL_VERBOSE(myColor << " ==> "<< m_colorFG );
}
void Colorize::SetBgColor(const char *myColor)
{
haveBG = true;
signed int r=0;
signed int v=0;
signed int b=0;
signed int a=-1;
sscanf(myColor, "#%02x%02x%02x%02x", &r, &v, &b, &a);
m_colorBG.red = (float)r/255.0;
m_colorBG.green = (float)v/255.0;
m_colorBG.blue = (float)b/255.0;
if (-1 == a) {
m_colorBG.alpha = 1;
} else {
m_colorBG.alpha = (float)a/255.0;
}
m_colorBG = etk::color::Parse(myColor);
APPL_VERBOSE(myColor << " ==> "<< m_colorBG );
}
bool Colorize::HaveBg(void)
@ -144,13 +109,11 @@ bool Colorize::HaveBg(void)
void Colorize::SetItalic(bool enable)
{
italic = enable;
/*
if (true == enable) {
APPL_INFO("color : \"%s\" enable italic", ColorName.c_str());
APPL_VERBOSE("color : \"" << ColorName << "\" enable italic");
} else {
APPL_INFO("color : \"%s\" disable italic", ColorName.c_str());
APPL_VERBOSE("color : \"" << ColorName << "\" disable italic");
}
*/
}
bool Colorize::GetItalic(void)
@ -162,13 +125,11 @@ bool Colorize::GetItalic(void)
void Colorize::SetBold(bool enable)
{
bold = enable;
/*
if (true == enable) {
APPL_INFO("color : \"%s\" enable bold", ColorName.c_str());
APPL_VERBOSE("color : \"" << ColorName << "\" enable bold");
} else {
APPL_INFO("color : \"%s\" disable bold", ColorName.c_str());
APPL_VERBOSE("color : \"" << ColorName << "\" disable bold");
}
*/
}
bool Colorize::GetBold(void)

27
jni/appl/Colorize/ColorizeManager.cpp
View File

@ -165,8 +165,8 @@ void classColorManager::LoadFile(const char * xmlFilename)
m_fileColor = xmlFilename;
APPL_DEBUG("open file (COLOR) \"" << xmlFilename << "\" ? = \"" << m_fileColor << "\"");
errorColor = new Colorize();
errorColor->SetBgColor("#000000");
errorColor->SetFgColor("#FFFFFF");
errorColor->SetBgColor("#00FF00FF");
errorColor->SetFgColor("#FF00FFFF");
// allocate the document in the stack
TiXmlDocument XmlDocument;
@ -253,24 +253,7 @@ void classColorManager::LoadFile(const char * xmlFilename)
}
const char *color = pGuiNode->ToElement()->Attribute("val");
if (NULL != color) {
int r=0;
int v=0;
int b=0;
int a=-1;
sscanf(color, "#%02x%02x%02x%02x", &r, &v, &b, &a);
basicColors[id].red = (float)r/255.0;
basicColors[id].green = (float)v/255.0;
basicColors[id].blue = (float)b/255.0;
if (-1 == a) {
basicColors[id].alpha = 1;
} else {
basicColors[id].alpha = (float)a/255.0;
}
/*
APPL_INFO(" Specify color for system ID="<< id );
APPL_INFO(" " << color << " ==> r="<< r <<" v="<< v <<" b="<< b );
APPL_INFO(" " << color << " ==> r="<< basicColors[id].red <<" v="<< basicColors[id].green <<" b="<< basicColors[id].blue );
*/
basicColors[id] = etk::color::Parse(color);
}
} else {
APPL_ERROR("(l "<<pGuiNode->Row()<<") node not suported : \""<<pGuiNode->Value()<<"\" must be [color]");
@ -300,24 +283,20 @@ void classColorManager::LoadFile(const char * xmlFilename)
myNewColor->SetName(colorName);
//APPL_INFO(PFX"Add a new color in the panel : \"%s\"", colorName);
}
const char *colorBG = pGuiNode->ToElement()->Attribute("BG");
if (NULL != colorBG) {
myNewColor->SetBgColor(colorBG);
}
const char *colorFG = pGuiNode->ToElement()->Attribute("FG");
if (NULL != colorFG) {
myNewColor->SetFgColor(colorFG);
}
const char *bold = pGuiNode->ToElement()->Attribute("bold");
if (NULL != bold) {
if(0 == strcmp(bold, "yes") ) {
myNewColor->SetBold(true);
}
}
const char *italic = pGuiNode->ToElement()->Attribute("italic");
if (NULL != italic) {
if(0 == strcmp(italic, "yes") ) {

13
jni/appl/Gui/CodeView.cpp
View File

@ -56,14 +56,9 @@ CodeView::CodeView(void)
m_bufferID = -1;
m_buttunOneSelected = false;
m_textColorFg.red = 0.0;
m_textColorFg.green = 0.0;
m_textColorFg.blue = 0.0;
m_textColorFg.alpha = 1.0;
m_textColorFg = etk::color::color_Black;
m_textColorBg.red = 0.0;
m_textColorBg.green = 0.0;
m_textColorBg.blue = 0.0;
m_textColorBg = etk::color::color_Black;
m_textColorBg.alpha = 0.25;
SetCanHaveFocus(true);
RegisterMultiCast(ednMsgBufferId);
@ -91,7 +86,7 @@ CodeView::~CodeView(void)
bool CodeView::CheckObjectType(const char * const objectType)
{
if (NULL == objectType) {
EWOL_ERROR("check error : \"" << TYPE_EOBJECT_EDN_CODE_VIEW << "\" != NULL(pointer) ");
APPL_ERROR("check error : \"" << TYPE_EOBJECT_EDN_CODE_VIEW << "\" != NULL(pointer) ");
return false;
}
if (objectType == TYPE_EOBJECT_EDN_CODE_VIEW) {
@ -100,7 +95,7 @@ bool CodeView::CheckObjectType(const char * const objectType)
if(true == ewol::WidgetScrooled::CheckObjectType(objectType)) {
return true;
}
EWOL_ERROR("check error : \"" << TYPE_EOBJECT_EDN_CODE_VIEW << "\" != \"" << objectType << "\"");
APPL_ERROR("check error : \"" << TYPE_EOBJECT_EDN_CODE_VIEW << "\" != \"" << objectType << "\"");
return false;
}
}