diff --git a/jni/Linux.mk b/jni/Linux.mk index 86cc39d..6357278 100644 --- a/jni/Linux.mk +++ b/jni/Linux.mk @@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := ewolDrawer -LOCAL_STATIC_LIBRARIES := ewol etk tinyxml libzip libpng libfreetype +LOCAL_STATIC_LIBRARIES := ewol etk tinyxml libzip libpng libfreetype parsersvg agg # load the common sources file of the platform diff --git a/jni/Main.cpp b/jni/Main.cpp index 9b05d11..f945c9c 100644 --- a/jni/Main.cpp +++ b/jni/Main.cpp @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -284,10 +285,11 @@ class MainWindows :public ewol::Windows etk::UString tmpData = tmpWidget->GetCompleateFileName(); DRAW_DEBUG("Request opening the file : " << tmpData); if (NULL != m_drawer) { - m_drawer->Load(tmpData); + //m_drawer->Load(tmpData); } } else if (eventId == drawMsgGuiSave) { if (NULL != m_drawer) { + /* if (m_drawer->HasName()) { m_drawer->Save(); } else { @@ -297,6 +299,7 @@ class MainWindows :public ewol::Windows PopUpWidgetPush(tmpWidget); tmpWidget->RegisterOnEvent(this, ewolEventFileChooserValidate, drawerEventRequestSaveFileSelected); } + */ } } else if (eventId == drawerEventRequestSaveFileSelected) { // get widget: @@ -309,8 +312,10 @@ class MainWindows :public ewol::Windows etk::UString tmpData = tmpWidget->GetCompleateFileName(); DRAW_DEBUG("Request opening the file : " << tmpData); if (NULL != m_drawer) { + /* m_drawer->SetFilename(tmpData); m_drawer->Save(); + */ } } else if (eventId == drawerEventColorHasChange) { // the button color has change ==> we really change the current color ... @@ -442,6 +447,14 @@ void APP_Init(void) // create the specific windows ewol::DisplayWindows(basicWindows); DRAW_INFO("==> Init Ewol Drawer (END)"); + etk::File svgFile("lion.svg", etk::FILE_TYPE_DATA); + svg::Parser *mySVGElement = new svg::Parser(svgFile); + + mySVGElement->DisplayDebug(); + mySVGElement->GenerateTestFile(); + + exit(-1); + } /** diff --git a/jni/elementCircle.h b/jni/elementCircle.h index 033ec3e..79b3487 100644 --- a/jni/elementCircle.h +++ b/jni/elementCircle.h @@ -28,7 +28,7 @@ namespace drawElement { coord2D_ts m_center; int32_t m_nbRay; etkFloat_t m_ratio; - bool m_fill + bool m_fill; etkFloat_t m_thickness; etkFloat_t m_shadowOutput; etkFloat_t m_shadowInput; diff --git a/jni/elementManager.cpp b/jni/elementManager.cpp index d40f16e..e5602d9 100644 --- a/jni/elementManager.cpp +++ b/jni/elementManager.cpp @@ -170,6 +170,7 @@ bool drawElement::HasName(void) void drawElement::Load(etk::UString fileName) { +/* drawElement::RemoveAll(); SetFilename(newFileName); @@ -218,7 +219,7 @@ void drawElement::Load(etk::UString fileName) if (pNode->Type()==TiXmlNode::TINYXML_COMMENT) { // nothing to do, just proceed to next step } else if (!strcmp(pNode->Value(), "element")) { - /* + #if 0 for(TiXmlNode * pGuiNode = pNode->FirstChild(); NULL != pGuiNode; pGuiNode = pGuiNode->NextSibling()) { @@ -280,7 +281,7 @@ void drawElement::Load(etk::UString fileName) DRAW_ERROR("(l "<Row()<<") node not suported : \""<Value()<<"\" must be [dot,link]"); } } - */ + #endif } else { DRAW_ERROR("(l "<Row()<<") node not suported : \""<Value()<<"\" must be [element]"); } @@ -289,10 +290,12 @@ void drawElement::Load(etk::UString fileName) if (NULL != fileBuffer) { delete[] fileBuffer; } + */ } void drawElement::Save(void) { +/* if (l_fileName == "") { DRAW_ERROR("No filename set ..."); return; @@ -347,5 +350,6 @@ void drawElement::Save(void) } //Save Document doc.SaveFile( l_fileName.Utf8Data() ); +*/ } diff --git a/jni/elementRectangle.h b/jni/elementRectangle.h index 4929aef..c0dd0c4 100644 --- a/jni/elementRectangle.h +++ b/jni/elementRectangle.h @@ -27,7 +27,7 @@ namespace drawElement { color_ts m_colorInside; coord2D_ts m_center; coord2D_ts m_size; - bool m_fill + bool m_fill; etkFloat_t m_thickness; etkFloat_t m_shadowOutput; etkFloat_t m_shadowInput;