From 560f946cd9896b5126c2066058c63d8cbc3d0539 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Sun, 1 Dec 2013 23:53:42 +0100 Subject: Added progressbar widget (demos still to do) --- demos/modules/gwin/progressbar/gfxconf.h | 91 ++++++++++++++++++++++++++++++++ demos/modules/gwin/progressbar/main.c | 39 ++++++++++++++ 2 files changed, 130 insertions(+) create mode 100644 demos/modules/gwin/progressbar/gfxconf.h create mode 100644 demos/modules/gwin/progressbar/main.c (limited to 'demos') diff --git a/demos/modules/gwin/progressbar/gfxconf.h b/demos/modules/gwin/progressbar/gfxconf.h new file mode 100644 index 00000000..4ea487b9 --- /dev/null +++ b/demos/modules/gwin/progressbar/gfxconf.h @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu + * Copyright (c) 2012, 2013, Andrew Hannam aka inmarket + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _GFXCONF_H +#define _GFXCONF_H + +//#define GFX_USE_OS_CHIBIOS TRUE +//#define GFX_USE_OS_WIN32 TRUE +//#define GFX_USE_OS_LINUX TRUE + +/* GFX sub-systems to turn on */ +#define GFX_USE_GDISP TRUE +#define GFX_USE_GWIN TRUE +#define GFX_USE_GEVENT TRUE +#define GFX_USE_GTIMER TRUE +#define GFX_USE_GINPUT TRUE + +/* Features for the GDISP sub-system. */ +#define GDISP_NEED_VALIDATION TRUE +#define GDISP_NEED_CLIP TRUE +#define GDISP_NEED_TEXT TRUE +#define GDISP_NEED_CIRCLE TRUE +#define GDISP_NEED_ELLIPSE FALSE +#define GDISP_NEED_ARC FALSE +#define GDISP_NEED_CONVEX_POLYGON TRUE +#define GDISP_NEED_SCROLL TRUE +#define GDISP_NEED_PIXELREAD FALSE +#define GDISP_NEED_CONTROL FALSE +#define GDISP_NEED_IMAGE TRUE +#define GDISP_NEED_MULTITHREAD TRUE +#define GDISP_NEED_ASYNC FALSE +#define GDISP_NEED_MSGAPI FALSE + +/* Builtin Fonts */ +#define GDISP_INCLUDE_FONT_UI2 TRUE +#define GDISP_NEED_ANTIALIAS FALSE + +/* GDISP image decoders */ +#define GDISP_NEED_IMAGE_NATIVE FALSE +#define GDISP_NEED_IMAGE_GIF TRUE +#define GDISP_NEED_IMAGE_BMP FALSE +#define GDISP_NEED_IMAGE_JPG FALSE +#define GDISP_NEED_IMAGE_PNG FALSE + +/* Features for the GWIN sub-system. */ +#define GWIN_NEED_WINDOWMANAGER TRUE +#define GWIN_NEED_CONSOLE FALSE +#define GWIN_NEED_GRAPH FALSE +#define GWIN_NEED_WIDGET TRUE +#define GWIN_NEED_BUTTON FALSE +#define GWIN_NEED_SLIDER FALSE +#define GWIN_NEED_CHECKBOX FALSE +#define GWIN_NEED_LABEL FALSE +#define GWIN_NEED_IMAGE FALSE +#define GWIN_NEED_RADIO FALSE +#define GWIN_NEED_LIST FALSE +#define GWIN_NEED_IMAGE_ANIMATION FALSE +#define GWIN_NEED_LIST_IMAGES FALSE +#define GWIN_NEED_PROGRESSBAR TRUE + +/* Features for the GINPUT sub-system. */ +#define GINPUT_NEED_MOUSE TRUE +#define GINPUT_NEED_TOGGLE FALSE +#define GINPUT_NEED_DIAL FALSE + +#endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/progressbar/main.c b/demos/modules/gwin/progressbar/main.c new file mode 100644 index 00000000..6217f4c1 --- /dev/null +++ b/demos/modules/gwin/progressbar/main.c @@ -0,0 +1,39 @@ +#include "gfx.h" + +GHandle ghProgressbar; + +static void _createWidget(void) { + GWidgetInit wi; + + wi.customDraw = 0; + wi.customParam = 0; + wi.customStyle = 0; + wi.g.show = TRUE; + + wi.g.y = 10; wi.g.x = 10; wi.g.width = 200; wi.g.height = 20; wi.text = "Progress 1"; + ghProgressbar = gwinProgressbarCreate(NULL, &wi); +} + +int main(void) { + gfxInit(); + + gwinSetDefaultFont(gdispOpenFont("UI2")); + gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); + gdispClear(White); + + _createWidget(); + + gwinProgressbarSetResolution(ghProgressbar, 10); + gwinProgressbarStart(ghProgressbar, 500); + + //gwinProgressbarSetPosition(ghProgressbar, 42); + //gwinProgressbarIncrement(ghProgressbar); + //gwinProgressbarDecrement(ghProgressbar); + + while (1) { + gfxSleepMilliseconds(500); + } + + return 0; +} + -- cgit v1.2.3