diff --git a/doc/mainpage.md b/doc/mainpage.md index 38b56d0d..c0676048 100644 --- a/doc/mainpage.md +++ b/doc/mainpage.md @@ -1,13 +1,15 @@ Ewol library {#mainpage} ============ -What is EWOL, and how can I use it? ------------------------------------ +@tableofcontents + +What is EWOL? {#ewol_mainpage_what} +============= EWOL, or Edn Widget OpenGl Layer, is a multi-platform library for creating graphical user interfaces in OpenGL. Offering a complete set of widgets. -Where can I use it? -------------------- +Where can I use it? {#ewol_mainpage_where} +=================== Everywhere! EWOL is cross-platform devolopped to support bases OS: - Linux (X11) (mouse) @@ -16,15 +18,16 @@ Everywhere! EWOL is cross-platform devolopped to support bases OS: - Android (mouse + touch) - IOs (touch) -What languages are supported? ------------------------------ +What languages are supported? {#ewol_mainpage_language} +============================= EWOL is written in C++ and is not (for now) supported for other languages. -Are there any licensing restrictions? -------------------------------------- -EWOL is EWOL is **FREE software** and //all sub-library are FREE and staticly linkable !!!// +Are there any licensing restrictions? {#ewol_mainpage_restriction} +===================================== + +EWOL is **FREE software** and _all sub-library are FREE and staticly linkable !!!_ That allow you to use it for every program you want, including those developing proprietary software, without any license fees or royalties. @@ -39,8 +42,8 @@ This exclude the classical extern library with licence: - L-GPL - GPL -License (APACHE 2) ------------------- +License (APACHE 2) {#ewol_mainpage_license} +================== Copyright ewol Edouard DUPIN @@ -57,8 +60,8 @@ See the License for the specific language governing permissions and limitations under the License. -Sub library: ------------- +Sub library: {#ewol_mainpage_sub} +============ License: @@ -80,7 +83,7 @@ License: ... -Description: +Description: {#ewol_mainpage_desc} ------------ Internal: @@ -97,7 +100,7 @@ Internal: - [**audio-river**](http://musicdsp.github.io/audio-river) : High level audio abstraction - [**ege**](http://musicdsp.github.io/ege) : Ewol Game engine is a wrapper on the the bullet physical engine and ewol renderer engin. This is in developpement for now (the simple objective is to produce game to make profitable all my work) -External: +External: {#ewol_mainpage_ext} --------- - **linearmath** : bullet mathamatical sub lib (for using same vec3). @@ -107,15 +110,15 @@ External: - **freetype** : The classicle true-type reader lib. - **bulletlib** : the classical bullet library physical engine. (dependence by ege) -Program Using EWOL +Program Using EWOL {#ewol_mainpage_using} ------------------ - [**edn**](http://musicdsp.github.io/edn): (Application in GPLv3) Edn is the main application using this lib and designed for (in the first time). This is a "Code editor". - [**worddown**](http://play.google.com/store/apps/details?id=com.edouarddupin.worddown): (Proprietary) Worddown is a simple word game. -Main documentation: -------------------- +Main documentation: {#ewol_mainpage_sub_doc} +=================== [page_bases] [page_FAQ] diff --git a/doxy_ewol.py b/doxy_ewol.py index 27a10223..7fae9860 100644 --- a/doxy_ewol.py +++ b/doxy_ewol.py @@ -10,9 +10,9 @@ def create(target, module_name): my_module.set_title("Ewol: Ewol Widget in OpenGl") my_module.set_website("http://atria-soft.github.io/" + module_name) my_module.set_website_sources("http://github.com/atria-soft/" + module_name) - my_module.set_path([ - os.path.join(tools.get_current_path(__file__), module_name), - os.path.join(tools.get_current_path(__file__), "doc") + my_module.add_path([ + module_name, + "doc" ]) my_module.add_module_depend([ 'elog', @@ -25,5 +25,15 @@ def create(target, module_name): 'ejson', 'egami' ]) + my_module.add_exclude_symbols([ + '*operator<<*', + ]) + my_module.add_exclude_file([ + 'debug.h', + ]) + my_module.add_file_patterns([ + '*.h', + '*.md', + ]) return my_module \ No newline at end of file diff --git a/ewol/compositing/TextBase.cpp b/ewol/compositing/TextBase.cpp index ab5a49c3..84edaccb 100644 --- a/ewol/compositing/TextBase.cpp +++ b/ewol/compositing/TextBase.cpp @@ -942,7 +942,7 @@ bool ewol::compositing::TextBase::extrapolateLastId(const std::string& _text, _space = 0; int32_t lastSpacePosition = _start; - int32_t lastSpacefreeSize; + int32_t lastSpacefreeSize = 0; float endPos = m_position.x(); bool endOfLine = false; @@ -1005,7 +1005,7 @@ bool ewol::compositing::TextBase::extrapolateLastId(const std::u32string& _text, _space = 0; int32_t lastSpacePosition = _start; - int32_t lastSpacefreeSize; + int32_t lastSpacefreeSize = 0; float endPos = m_position.x(); bool endOfLine = false; diff --git a/ewol/object/Object.cpp b/ewol/object/Object.cpp index 0800a8b5..406119e5 100644 --- a/ewol/object/Object.cpp +++ b/ewol/object/Object.cpp @@ -127,7 +127,7 @@ bool ewol::Object::loadXML(const std::shared_ptr& _node) { if (pair.first == "") { continue; } - if (propertySet(pair.first, pair.second) == false) { + if (properties.set(pair.first, pair.second) == false) { errorOccured = true; } } @@ -139,7 +139,7 @@ bool ewol::Object::storeXML(const std::shared_ptr& _node) const { return false; } bool errorOccured = true; - for (auto &it : propertyGetAll(true)) { + for (auto &it : properties.getAll(true)) { _node->setAttribute(it.first, it.second); } return errorOccured; @@ -150,7 +150,7 @@ bool ewol::Object::propertySetOnWidgetNamed(const std::string& _objectName, cons if (object == nullptr) { return false; } - return object->propertySet(_config, _value); + return object->properties.set(_config, _value); } ewol::object::Manager& ewol::Object::getObjectManager() { @@ -180,6 +180,6 @@ bool ewol::propertySetOnObjectNamed(const std::string& _objectName, const std::s if (object == nullptr) { return false; } - return object->propertySet(_config, _value); + return object->properties.set(_config, _value); } diff --git a/ewol/object/Object.h b/ewol/object/Object.h index 2767d45c..013c4493 100644 --- a/ewol/object/Object.h +++ b/ewol/object/Object.h @@ -44,7 +44,7 @@ template static void baseInit EWOL_ERROR("EMPTY pointer"); return; } - prop = _object->getPropertyRaw(_name); + prop = _object->properties.getRaw(_name); if (prop == nullptr) { EWOL_ERROR("property does not exit ... '" << _name << "'"); goto exit_on_error; diff --git a/ewol/widget/ListFileSystem.cpp b/ewol/widget/ListFileSystem.cpp index 106550c7..4c1c737e 100644 --- a/ewol/widget/ListFileSystem.cpp +++ b/ewol/widget/ListFileSystem.cpp @@ -206,10 +206,10 @@ bool ewol::widget::ListFileSystem::onItemEvent(int32_t _IdInput, && nullptr != m_list[m_selectedLine-offset] ) { // generate event extern : switch(m_list[m_selectedLine-offset]->getNodeType()) { - case etk::FSN_FILE : + case etk::typeNode_file : signalFileSelect.emit(m_list[m_selectedLine-offset]->getNameFile()); break; - case etk::FSN_FOLDER : + case etk::typeNode_folder : signalFolderSelect.emit(m_list[m_selectedLine-offset]->getNameFile()); break; default: @@ -230,10 +230,10 @@ bool ewol::widget::ListFileSystem::onItemEvent(int32_t _IdInput, && m_selectedLine-offset < (int32_t)m_list.size() && nullptr != m_list[m_selectedLine-offset] ) { switch(m_list[m_selectedLine-offset]->getNodeType()) { - case etk::FSN_FILE : + case etk::typeNode_file : signalFileValidate.emit(m_list[m_selectedLine-offset]->getNameFile()); break; - case etk::FSN_FOLDER : + case etk::typeNode_folder : signalFolderValidate.emit(m_list[m_selectedLine-offset]->getNameFile()); break; default: diff --git a/sample/CustomWidgets/appl/widget/VectorDisplay.cpp b/sample/CustomWidgets/appl/widget/VectorDisplay.cpp index 6564aa63..227e45d1 100644 --- a/sample/CustomWidgets/appl/widget/VectorDisplay.cpp +++ b/sample/CustomWidgets/appl/widget/VectorDisplay.cpp @@ -6,6 +6,7 @@ #include #include +#include #include #undef __class__ diff --git a/test/main.cpp b/test/main.cpp index 2b1b7741..82e3302c 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -28,10 +28,7 @@ int main(int argc, const char *argv[]) { // init Google test : ::testing::InitGoogleTest(&argc, const_cast(argv)); - // the only one init for etk: - //elog::setLevel(elog::logLevelVerbose); - elog::setLevel(elog::logLevelInfo); - etk::setArgZero(argv[0]); + etk::init(argc, argv); etk::initDefaultFolder("ewol-test"); return RUN_ALL_TESTS(); } diff --git a/tools/visual_test/appl/MainWindows.cpp b/tools/visual_test/appl/MainWindows.cpp index 6c921d01..bcc280df 100644 --- a/tools/visual_test/appl/MainWindows.cpp +++ b/tools/visual_test/appl/MainWindows.cpp @@ -211,8 +211,8 @@ void appl::MainWindows::updateProperty() { widget->propertyValue.set(m_subWidget->getObjectType()); m_sizerDynamic->subWidgetAdd(widget); addSpacer(m_sizerDynamic, etk::color::red); - for (size_t iii=0; iiigetPropertyCount(); ++iii) { - eproperty::Property* param = m_subWidget->getPropertyRaw(iii); + for (size_t iii=0; iiiproperties.size(); ++iii) { + eproperty::Property* param = m_subWidget->properties.getRaw(iii); if (param == nullptr) { APPL_WARNING("Parameter EMPTY . " << iii << " : nullptr"); continue; @@ -487,7 +487,7 @@ void appl::MainWindows::updateProperty() { return; } APPL_INFO("set parameter : name=" << param->getName() << " value=" << _value); - m_subWidget->propertySet(param->getName(), etk::to_string(_value)); + m_subWidget->properties.set(param->getName(), etk::to_string(_value)); return; }); m_listConnection.push_back(std::move(conn));