[DEBUG] build back tools & sample

This commit is contained in:
Edouard DUPIN 2017-11-07 10:19:06 +01:00
parent dd8daa7e3d
commit 7eb68dfa72
8 changed files with 203 additions and 202 deletions

View File

@ -16,45 +16,46 @@
#include <ewol/context/Context.hpp> #include <ewol/context/Context.hpp>
#include <appl/widget/VectorDisplay.hpp> #include <appl/widget/VectorDisplay.hpp>
namespace appl {
class MainApplication : public ewol::context::Application { class MainApplication : public ewol::context::Application {
public: public:
void onCreate(ewol::Context& _context) override { void onCreate(ewol::Context& _context) override {
APPL_INFO(" == > CREATE ... " << PROJECT_NAME << " v" << APPL_VERSION << " (START) [" << gale::getBoardType() << "] (" << gale::getCompilationMode() << ") (BEGIN)"); APPL_INFO(" == > CREATE ... " << PROJECT_NAME << " v" << APPL_VERSION << " (START) [" << gale::getBoardType() << "] (" << gale::getCompilationMode() << ") (BEGIN)");
for( int32_t iii=0 ; iii<_context.getCmd().size(); iii++) { for( int32_t iii=0 ; iii<_context.getCmd().size(); iii++) {
etk::String tmpppp = _context.getCmd().get(iii); etk::String tmpppp = _context.getCmd().get(iii);
if ( tmpppp == "-h" if ( tmpppp == "-h"
|| tmpppp == "--help") { || tmpppp == "--help") {
APPL_INFO(" -h/--help display this help" ); APPL_INFO(" -h/--help display this help" );
exit(0); exit(0);
}
} }
// TODO : Remove this : Move if in the windows properties
_context.setSize(vec2(800, 600));
// select internal data for font ...
_context.getFontDefault().setUseExternal(true);
_context.getFontDefault().set("FreeSerif;DejaVuSansMono", 19);
appl::widget::VectorDisplay::createManagerWidget(_context.getWidgetManager());
ewol::widget::WindowsShared basicWindows = appl::Windows::create();
// create the specific windows
_context.setWindows(basicWindows);
APPL_INFO("==> CREATE ... " PROJECT_NAME " (END)");
} }
// TODO : Remove this : Move if in the windows properties
_context.setSize(vec2(800, 600));
// select internal data for font ... void onStart(ewol::Context& _context) override {
_context.getFontDefault().setUseExternal(true); APPL_INFO("==> START ... " PROJECT_NAME " (BEGIN)");
_context.getFontDefault().set("FreeSerif;DejaVuSansMono", 19); // nothing to do ...
APPL_INFO("==> START ... " PROJECT_NAME " (END)");
appl::widget::VectorDisplay::createManagerWidget(_context.getWidgetManager()); }
void onStop(ewol::Context& _context) override {
ewol::widget::WindowsShared basicWindows = appl::Windows::create(); APPL_INFO("==> STOP ... " PROJECT_NAME " (START)");
// create the specific windows // nothing to do ...
_context.setWindows(basicWindows); APPL_INFO("==> STOP ... " PROJECT_NAME " (END)");
APPL_INFO("==> CREATE ... " PROJECT_NAME " (END)"); }
} };
}
void onStart(ewol::Context& _context) override {
APPL_INFO("==> START ... " PROJECT_NAME " (BEGIN)");
// nothing to do ...
APPL_INFO("==> START ... " PROJECT_NAME " (END)");
}
void onStop(ewol::Context& _context) override {
APPL_INFO("==> STOP ... " PROJECT_NAME " (START)");
// nothing to do ...
APPL_INFO("==> STOP ... " PROJECT_NAME " (END)");
}
};
/** /**
* @brief Main of the program (This can be set in every case, but it is not used in Andoid...). * @brief Main of the program (This can be set in every case, but it is not used in Andoid...).
@ -63,5 +64,5 @@ class MainApplication : public ewol::context::Application {
*/ */
int main(int _argc, const char *_argv[]) { int main(int _argc, const char *_argv[]) {
// second possibility // second possibility
return ewol::run(ETK_NEW(appl::MainApplication)(), _argc, _argv); return ewol::run(ETK_NEW(appl::MainApplication), _argc, _argv);
} }

View File

@ -19,7 +19,7 @@ namespace appl {
protected: protected:
//! @brief constructor //! @brief constructor
VectorDisplay(); VectorDisplay();
void init(); void init() override;
public: public:
DECLARE_WIDGET_FACTORY(VectorDisplay, "VectorDisplay"); DECLARE_WIDGET_FACTORY(VectorDisplay, "VectorDisplay");
//! @brief destructor //! @brief destructor

View File

@ -95,7 +95,7 @@ namespace appl {
*/ */
int main(int _argc, const char *_argv[]) { int main(int _argc, const char *_argv[]) {
// second possibility // second possibility
return ewol::run(ETK_NEW(appl::MainApplication)(), _argc, _argv); return ewol::run(ETK_NEW(appl::MainApplication), _argc, _argv);
} }
//! [ewol_sample_HW_main_main] //! [ewol_sample_HW_main_main]

View File

@ -15,44 +15,44 @@
#include <ewol/widget/Manager.hpp> #include <ewol/widget/Manager.hpp>
#include <ewol/context/Context.hpp> #include <ewol/context/Context.hpp>
namespace appl {
class MainApplication : public ewol::context::Application { class MainApplication : public ewol::context::Application {
public: public:
void onCreate(ewol::Context& _context) override { void onCreate(ewol::Context& _context) override {
APPL_INFO(" == > CREATE ... " << PROJECT_NAME << " v" << APPL_VERSION << " (START) [" << gale::getBoardType() << "] (" << gale::getCompilationMode() << ") (BEGIN)"); APPL_INFO(" == > CREATE ... " << PROJECT_NAME << " v" << APPL_VERSION << " (START) [" << gale::getBoardType() << "] (" << gale::getCompilationMode() << ") (BEGIN)");
for( int32_t iii=0 ; iii<_context.getCmd().size(); iii++) { for( int32_t iii=0 ; iii<_context.getCmd().size(); iii++) {
etk::String tmpppp = _context.getCmd().get(iii); etk::String tmpppp = _context.getCmd().get(iii);
if ( tmpppp == "-h" if ( tmpppp == "-h"
|| tmpppp == "--help") { || tmpppp == "--help") {
APPL_INFO(" -h/--help display this help" ); APPL_INFO(" -h/--help display this help" );
exit(0); exit(0);
}
} }
// TODO : Remove this : Move if in the windows properties
_context.setSize(vec2(800, 600));
// select internal data for font ...
_context.getFontDefault().setUseExternal(true);
_context.getFontDefault().set("FreeSerif;DejaVuSansMono", 19);
ewol::widget::WindowsShared basicWindows = appl::Windows::create();
// create the specific windows
_context.setWindows(basicWindows);
APPL_INFO("==> CREATE ... " PROJECT_NAME " (END)");
} }
// TODO : Remove this : Move if in the windows properties
_context.setSize(vec2(800, 600));
// select internal data for font ... void onStart(ewol::Context& _context) override {
_context.getFontDefault().setUseExternal(true); APPL_INFO("==> START ... " PROJECT_NAME " (BEGIN)");
_context.getFontDefault().set("FreeSerif;DejaVuSansMono", 19); // nothing to do ...
APPL_INFO("==> START ... " PROJECT_NAME " (END)");
ewol::widget::WindowsShared basicWindows = appl::Windows::create(); }
// create the specific windows void onStop(ewol::Context& _context) override {
_context.setWindows(basicWindows); APPL_INFO("==> STOP ... " PROJECT_NAME " (START)");
APPL_INFO("==> CREATE ... " PROJECT_NAME " (END)"); // nothing to do ...
} APPL_INFO("==> STOP ... " PROJECT_NAME " (END)");
}
void onStart(ewol::Context& _context) override { };
APPL_INFO("==> START ... " PROJECT_NAME " (BEGIN)"); }
// nothing to do ...
APPL_INFO("==> START ... " PROJECT_NAME " (END)");
}
void onStop(ewol::Context& _context) override {
APPL_INFO("==> STOP ... " PROJECT_NAME " (START)");
// nothing to do ...
APPL_INFO("==> STOP ... " PROJECT_NAME " (END)");
}
};
/** /**
@ -62,5 +62,5 @@ class MainApplication : public ewol::context::Application {
*/ */
int main(int _argc, const char *_argv[]) { int main(int _argc, const char *_argv[]) {
// second possibility // second possibility
return ewol::run(ETK_NEW(appl::MainApplication)(), _argc, _argv); return ewol::run(ETK_NEW(appl::MainApplication), _argc, _argv);
} }

View File

@ -30,14 +30,14 @@ namespace appl {
}; };
protected: protected:
WidgetDisplay(); WidgetDisplay();
void init(); void init() override;
public: public:
DECLARE_FACTORY(WidgetDisplay); DECLARE_FACTORY(WidgetDisplay);
virtual ~WidgetDisplay(); virtual ~WidgetDisplay();
ewol::compositing::Image m_compositing; ewol::compositing::Image m_compositing;
etk::Vector<Element> m_elements; etk::Vector<Element> m_elements;
public: // Derived function public: // Derived function
void onRegenerateDisplay(); void onRegenerateDisplay() override;
void periodicCall(const ewol::event::Time& _event); void periodicCall(const ewol::event::Time& _event);
bool onEventInput(const ewol::event::Input& _event) override; bool onEventInput(const ewol::event::Input& _event) override;
void onDraw() override; void onDraw() override;

View File

@ -38,7 +38,7 @@ namespace appl {
bool onEventInput(const ewol::event::Input& _event) override; bool onEventInput(const ewol::event::Input& _event) override;
bool onEventEntry(const ewol::event::Entry& _event) override; bool onEventEntry(const ewol::event::Entry& _event) override;
void forceFocusCall(const ewol::event::Time& _event); void forceFocusCall(const ewol::event::Time& _event);
virtual ewol::WidgetShared getWidgetAtPos(const vec2& _pos) { virtual ewol::WidgetShared getWidgetAtPos(const vec2& _pos) override {
ewol::WidgetShared wid = ewol::widget::Windows::getWidgetAtPos(_pos); ewol::WidgetShared wid = ewol::widget::Windows::getWidgetAtPos(_pos);
if (wid != nullptr) { if (wid != nullptr) {
return wid; return wid;

View File

@ -15,72 +15,72 @@
#include <appl/debug.hpp> #include <appl/debug.hpp>
#include <appl/MainWindows.hpp> #include <appl/MainWindows.hpp>
#include <appl/widget/SizerColor.hpp> #include <appl/widget/SizerColor.hpp>
namespace appl {
class MainApplication : public ewol::context::Application { class MainApplication : public ewol::context::Application {
public: public:
virtual void onCreate(ewol::Context& _context) { virtual void onCreate(ewol::Context& _context) {
APPL_INFO(" == > CREATE ... (START) [" << gale::getBoardType() << "] (" << gale::getCompilationMode() << ") (BEGIN)"); APPL_INFO(" == > CREATE ... (START) [" << gale::getBoardType() << "] (" << gale::getCompilationMode() << ") (BEGIN)");
for( int32_t iii=0 ; iii<_context.getCmd().size(); iii++) { for( int32_t iii=0 ; iii<_context.getCmd().size(); iii++) {
etk::String tmpppp = _context.getCmd().get(iii); etk::String tmpppp = _context.getCmd().get(iii);
if ( tmpppp == "-h" if ( tmpppp == "-h"
|| tmpppp == "--help") { || tmpppp == "--help") {
APPL_INFO(" -t c-flags-file-name" ); APPL_INFO(" -t c-flags-file-name" );
APPL_INFO(" -h/--help display this help" ); APPL_INFO(" -h/--help display this help" );
exit(0); exit(0);
} }
}
//etk::theme::setName("COLOR", "color/black/");
etk::theme::setName("COLOR", "color/white/");
_context.setSize(vec2(800, 600));
_context.setTitle("ewol-tools-visual-test");
// select internal data for font ...
_context.getFontDefault().setUseExternal(true);
#ifdef __TARGET_OS__Android
_context.getFontDefault().set("FreeSerif", 19);
#else
_context.getFontDefault().set("FreeSerif;DejaVuSansMono",14);
#endif
// set the application icon ...
_context.setIcon("DATA:icon.png");
appl::widget::SizerColor::createManagerWidget(_context.getWidgetManager());
APPL_INFO("==> CREATE ... (END)");
} }
//etk::theme::setName("COLOR", "color/black/");
etk::theme::setName("COLOR", "color/white/");
_context.setSize(vec2(800, 600)); void onStart(ewol::Context& _context) {
APPL_INFO("==> START ... (BEGIN)");
_context.setTitle("ewol-tools-visual-test");
ememory::SharedPtr<appl::MainWindows> basicWindows = appl::MainWindows::create();
// select internal data for font ... if (basicWindows == nullptr) {
_context.getFontDefault().setUseExternal(true); APPL_ERROR("Can not allocate the basic windows");
#ifdef __TARGET_OS__Android return;
_context.getFontDefault().set("FreeSerif", 19); }
#else // create the specific windows
_context.getFontDefault().set("FreeSerif;DejaVuSansMono",14); _context.setWindows(basicWindows);
#endif if (basicWindows == nullptr) {
APPL_ERROR("Can not allocate the basic windows");
// set the application icon ... _context.exit(-1);
_context.setIcon("DATA:icon.png"); return;
}
appl::widget::SizerColor::createManagerWidget(_context.getWidgetManager());
// create the specific windows
APPL_INFO("==> CREATE ... (END)"); _context.setWindows(basicWindows);
}
APPL_INFO("==> START ... (END)");
void onStart(ewol::Context& _context) {
APPL_INFO("==> START ... (BEGIN)");
ememory::SharedPtr<appl::MainWindows> basicWindows = appl::MainWindows::create();
if (basicWindows == nullptr) {
APPL_ERROR("Can not allocate the basic windows");
return;
}
// create the specific windows
_context.setWindows(basicWindows);
if (basicWindows == nullptr) {
APPL_ERROR("Can not allocate the basic windows");
_context.exit(-1);
return; return;
} }
// create the specific windows void onStop(ewol::Context& _context) {
_context.setWindows(basicWindows); APPL_INFO("==> STOP ... (START)");
APPL_INFO("==> STOP ... (END)");
APPL_INFO("==> START ... (END)"); }
return; };
} }
void onStop(ewol::Context& _context) {
APPL_INFO("==> STOP ... (START)");
APPL_INFO("==> STOP ... (END)");
}
};
/** /**
@ -90,7 +90,7 @@ class MainApplication : public ewol::context::Application {
*/ */
int main(int _argc, const char *_argv[]) { int main(int _argc, const char *_argv[]) {
// second possibility // second possibility
return ewol::run(ETK_NEW(appl::MainApplication)(), _argc, _argv); return ewol::run(ETK_NEW(appl::MainApplication), _argc, _argv);
} }

View File

@ -15,72 +15,72 @@
#include <appl/debug.hpp> #include <appl/debug.hpp>
#include <appl/MainWindows.hpp> #include <appl/MainWindows.hpp>
#include <appl/widget/SizerColor.hpp> #include <appl/widget/SizerColor.hpp>
namespace appl {
class MainApplication : public ewol::context::Application { class MainApplication : public ewol::context::Application {
public: public:
virtual void onCreate(ewol::Context& _context) { virtual void onCreate(ewol::Context& _context) {
APPL_INFO(" == > CREATE ... (START) [" << gale::getBoardType() << "] (" << gale::getCompilationMode() << ") (BEGIN)"); APPL_INFO(" == > CREATE ... (START) [" << gale::getBoardType() << "] (" << gale::getCompilationMode() << ") (BEGIN)");
for( int32_t iii=0 ; iii<_context.getCmd().size(); iii++) { for( int32_t iii=0 ; iii<_context.getCmd().size(); iii++) {
etk::String tmpppp = _context.getCmd().get(iii); etk::String tmpppp = _context.getCmd().get(iii);
if ( tmpppp == "-h" if ( tmpppp == "-h"
|| tmpppp == "--help") { || tmpppp == "--help") {
APPL_INFO(" -t c-flags-file-name" ); APPL_INFO(" -t c-flags-file-name" );
APPL_INFO(" -h/--help display this help" ); APPL_INFO(" -h/--help display this help" );
exit(0); exit(0);
} }
}
//etk::theme::setName("COLOR", "color/black/");
etk::theme::setName("COLOR", "color/white/");
_context.setSize(vec2(800, 600));
_context.setTitle("ewol-tools-visual-test");
// select internal data for font ...
_context.getFontDefault().setUseExternal(true);
#ifdef __TARGET_OS__Android
_context.getFontDefault().set("FreeSerif", 19);
#else
_context.getFontDefault().set("FreeSerif;DejaVuSansMono",14);
#endif
// set the application icon ...
_context.setIcon("DATA:icon.png");
appl::widget::SizerColor::createManagerWidget(_context.getWidgetManager());
APPL_INFO("==> CREATE ... (END)");
} }
//etk::theme::setName("COLOR", "color/black/");
etk::theme::setName("COLOR", "color/white/");
_context.setSize(vec2(800, 600)); void onStart(ewol::Context& _context) {
APPL_INFO("==> START ... (BEGIN)");
_context.setTitle("ewol-tools-visual-test");
ememory::SharedPtr<appl::MainWindows> basicWindows = appl::MainWindows::create();
// select internal data for font ... if (basicWindows == nullptr) {
_context.getFontDefault().setUseExternal(true); APPL_ERROR("Can not allocate the basic windows");
#ifdef __TARGET_OS__Android return;
_context.getFontDefault().set("FreeSerif", 19); }
#else // create the specific windows
_context.getFontDefault().set("FreeSerif;DejaVuSansMono",14); _context.setWindows(basicWindows);
#endif if (basicWindows == nullptr) {
APPL_ERROR("Can not allocate the basic windows");
// set the application icon ... _context.exit(-1);
_context.setIcon("DATA:icon.png"); return;
}
appl::widget::SizerColor::createManagerWidget(_context.getWidgetManager());
// create the specific windows
APPL_INFO("==> CREATE ... (END)"); _context.setWindows(basicWindows);
}
APPL_INFO("==> START ... (END)");
void onStart(ewol::Context& _context) {
APPL_INFO("==> START ... (BEGIN)");
ememory::SharedPtr<appl::MainWindows> basicWindows = appl::MainWindows::create();
if (basicWindows == nullptr) {
APPL_ERROR("Can not allocate the basic windows");
return;
}
// create the specific windows
_context.setWindows(basicWindows);
if (basicWindows == nullptr) {
APPL_ERROR("Can not allocate the basic windows");
_context.exit(-1);
return; return;
} }
// create the specific windows void onStop(ewol::Context& _context) {
_context.setWindows(basicWindows); APPL_INFO("==> STOP ... (START)");
APPL_INFO("==> STOP ... (END)");
APPL_INFO("==> START ... (END)"); }
return; };
} }
void onStop(ewol::Context& _context) {
APPL_INFO("==> STOP ... (START)");
APPL_INFO("==> STOP ... (END)");
}
};
/** /**
@ -90,7 +90,7 @@ class MainApplication : public ewol::context::Application {
*/ */
int main(int _argc, const char *_argv[]) { int main(int _argc, const char *_argv[]) {
// second possibility // second possibility
return ewol::run(ETK_NEW(appl::MainApplication)(), _argc, _argv); return ewol::run(ETK_NEW(appl::MainApplication), _argc, _argv);
} }