Update graph demo and move under gwin demos

3 files changed, 165 insertions, 153 deletions

diff --git a/demos/modules/graph/gfxconf.h b/demos/modules/gwin/graph/gfxconf.h
index a2d0fa88..57903253 100644
--- a/demos/modules/graph/gfxconf.h
+++ b/demos/modules/gwin/graph/gfxconf.h
@@ -1,59 +1,63 @@
-/*

- * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>

- * 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 <organization> 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 <COPYRIGHT HOLDER> 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

-

-/* The operating system to use - one of these must be defined */

-#define GFX_USE_OS_CHIBIOS		TRUE

-#define GFX_USE_OS_WIN32		FALSE

-#define GFX_USE_OS_POSIX		FALSE

-

-/* GFX sub-systems to turn on */

-#define GFX_USE_GDISP			TRUE

-#define GFX_USE_GWIN			TRUE

-

-/* Features for the GDISP sub-system. */

-#define GDISP_NEED_VALIDATION	TRUE

-#define GDISP_NEED_CLIP			TRUE

-#define GDISP_NEED_TEXT			FALSE

-#define GDISP_NEED_CIRCLE		TRUE

-#define GDISP_NEED_ELLIPSE		FALSE

-#define GDISP_NEED_ARC			FALSE

-#define GDISP_NEED_SCROLL		FALSE

-#define GDISP_NEED_PIXELREAD	FALSE

-#define GDISP_NEED_CONTROL		FALSE

-#define GDISP_NEED_MULTITHREAD	FALSE

-#define GDISP_NEED_ASYNC		FALSE

-#define GDISP_NEED_MSGAPI		FALSE

-

-/* Features for the GWIN sub-system. */

-#define GWIN_NEED_GRAPH			TRUE

-

-#endif /* _GFXCONF_H */

+/*
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
+ * 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 <organization> 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 <COPYRIGHT HOLDER> 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
+
+/* The operating system to use - one of these must be defined */
+#define GFX_USE_OS_CHIBIOS		TRUE
+#define GFX_USE_OS_WIN32		FALSE
+#define GFX_USE_OS_POSIX		FALSE
+
+/* GFX sub-systems to turn on */
+#define GFX_USE_GDISP			TRUE
+#define GFX_USE_GWIN			TRUE
+#define GFX_USE_GMISC			TRUE
+
+/* Features for the GDISP sub-system. */
+#define GDISP_NEED_VALIDATION	TRUE
+#define GDISP_NEED_CLIP			TRUE
+#define GDISP_NEED_TEXT			FALSE
+#define GDISP_NEED_CIRCLE		TRUE
+#define GDISP_NEED_ELLIPSE		FALSE
+#define GDISP_NEED_ARC			FALSE
+#define GDISP_NEED_SCROLL		FALSE
+#define GDISP_NEED_PIXELREAD	FALSE
+#define GDISP_NEED_CONTROL		FALSE
+#define GDISP_NEED_MULTITHREAD	FALSE
+#define GDISP_NEED_ASYNC		FALSE
+#define GDISP_NEED_MSGAPI		FALSE
+
+/* Features for the GWIN sub-system. */
+#define GWIN_NEED_GRAPH			TRUE
+
+/* Turn on fast trig */
+#define GMISC_NEED_FASTTRIG		TRUE
+
+#endif /* _GFXCONF_H */
diff --git a/demos/modules/graph/main.c b/demos/modules/gwin/graph/main.c
index 7eb64b4b..c5b7b352 100644
--- a/demos/modules/graph/main.c
+++ b/demos/modules/gwin/graph/main.c
@@ -1,94 +1,102 @@
-/*

- * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>

- * 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 <organization> 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 <COPYRIGHT HOLDER> 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.

- */

-

-#include "gfx.h"

-#include "math.h"

-

-const GGraphPoint data[5] = {

-	{ -40, -40 },

-	{ 70, 40 },

-	{ 140, 60 },

-	{ 210, 60 },

-	{ 280, 200 }

-};

-

-GGraphObject	g;

-

-GGraphStyle GraphStyle1 = {

-	{ GGRAPH_POINT_DOT, 0, Blue },			// point

-	{ GGRAPH_LINE_NONE, 2, Gray },			// line

-	{ GGRAPH_LINE_SOLID, 0, White },		// x axis

-	{ GGRAPH_LINE_SOLID, 0, White },		// y axis

-	{ GGRAPH_LINE_DASH, 5, Gray, 50 },		// x grid

-	{ GGRAPH_LINE_DOT, 7, Yellow, 50 },		// y grid

-	GWIN_GRAPH_STYLE_POSITIVE_AXIS_ARROWS	// flags

-};

-

-GGraphStyle GraphStyle2 = {

-	{ GGRAPH_POINT_SQUARE, 5, Red },		// point

-	{ GGRAPH_LINE_DOT, 2, Pink },			// line

-	{ GGRAPH_LINE_SOLID, 0, White },		// x axis

-	{ GGRAPH_LINE_SOLID, 0, White },		// y axis

-	{ GGRAPH_LINE_DASH, 5, Gray, 50 },		// x grid

-	{ GGRAPH_LINE_DOT, 7, Yellow, 50 },		// y grid

-	GWIN_GRAPH_STYLE_POSITIVE_AXIS_ARROWS	// flags

-};

-

-int main(void) {

-	GHandle		gh;

-	uint16_t 	i;

-	

-	gfxInit();

-	

-	gh = gwinCreateGraph(&g, 0, 0, gdispGetWidth(), gdispGetHeight());

-

-	gwinGraphSetOrigin(gh, gwinGetWidth(gh)/2, gwinGetHeight(gh)/2);

-	gwinGraphSetStyle(gh, &GraphStyle1);

-	gwinGraphDrawAxis(gh);

-	

-	for(i = 0; i < gwinGetWidth(gh); i++)

-		gwinGraphDrawPoint(gh, i-gwinGetWidth(gh)/2, 80*sin(2*0.2*M_PI*i/180));

-

-	gwinGraphStartSet(gh);

-	GraphStyle1.point.color = Green;

-	gwinGraphSetStyle(gh, &GraphStyle1);

-	

-	for(i = 0; i < gwinGetWidth(gh)*5; i++)

-		gwinGraphDrawPoint(gh, i/5-gwinGetWidth(gh)/2, 95*sin(2*0.2*M_PI*i/180));

-

-	gwinGraphStartSet(gh);

-	gwinGraphSetStyle(gh, &GraphStyle2);

-

-	gwinGraphDrawPoints(gh, data, sizeof(data)/sizeof(data[0]));

-

-	while(TRUE) {

-		gfxSleepMilliseconds(100);

-	}

-}

-

+/*
+ * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
+ * 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 <organization> 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 <COPYRIGHT HOLDER> 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.
+ */
+
+#include "gfx.h"
+#include "math.h"
+
+static const point data[5] = {
+	{ -40, -40 },
+	{ 70, 40 },
+	{ 140, 60 },
+	{ 210, 60 },
+	{ 280, 200 }
+};
+
+static GGraphObject	g;
+
+static GGraphStyle GraphStyle1 = {
+	{ GGRAPH_POINT_DOT, 0, Blue },			// point
+	{ GGRAPH_LINE_NONE, 2, Gray },			// line
+	{ GGRAPH_LINE_SOLID, 0, White },		// x axis
+	{ GGRAPH_LINE_SOLID, 0, White },		// y axis
+	{ GGRAPH_LINE_DASH, 5, Gray, 50 },		// x grid
+	{ GGRAPH_LINE_DOT, 7, Yellow, 50 },		// y grid
+	GWIN_GRAPH_STYLE_POSITIVE_AXIS_ARROWS	// flags
+};
+
+static const GGraphStyle GraphStyle2 = {
+	{ GGRAPH_POINT_SQUARE, 5, Red },		// point
+	{ GGRAPH_LINE_DOT, 2, Pink },			// line
+	{ GGRAPH_LINE_SOLID, 0, White },		// x axis
+	{ GGRAPH_LINE_SOLID, 0, White },		// y axis
+	{ GGRAPH_LINE_DASH, 5, Gray, 50 },		// x grid
+	{ GGRAPH_LINE_DOT, 7, Yellow, 50 },		// y grid
+	GWIN_GRAPH_STYLE_POSITIVE_AXIS_ARROWS	// flags
+};
+
+int main(void) {
+	GHandle		gh;
+	uint16_t 	i;
+	
+	gfxInit();
+	
+	{
+		GWindowInit wi;
+
+		wi.show = TRUE;
+		wi.x = wi.y = 0;
+		wi.width = gdispGetWidth();
+		wi.height = gdispGetHeight();
+		gh = gwinGraphCreate(&g, &wi);
+	}
+
+	gwinGraphSetOrigin(gh, gwinGetWidth(gh)/2, gwinGetHeight(gh)/2);
+	gwinGraphSetStyle(gh, &GraphStyle1);
+	gwinGraphDrawAxis(gh);
+	
+	for(i = 0; i < gwinGetWidth(gh); i++)
+		gwinGraphDrawPoint(gh, i-gwinGetWidth(gh)/2, 80*fsin(2*i/5));	//sin(2*0.2*M_PI*i/180));
+
+	gwinGraphStartSet(gh);
+	GraphStyle1.point.color = Green;
+	gwinGraphSetStyle(gh, &GraphStyle1);
+	
+	for(i = 0; i < gwinGetWidth(gh)*5; i++)
+		gwinGraphDrawPoint(gh, i/5-gwinGetWidth(gh)/2, 95*fsin(2*i/5));	//sin(2*0.2*M_PI*i/180));
+
+	gwinGraphStartSet(gh);
+	gwinGraphSetStyle(gh, &GraphStyle2);
+
+	gwinGraphDrawPoints(gh, data, sizeof(data)/sizeof(data[0]));
+
+	while(TRUE) {
+		gfxSleepMilliseconds(100);
+	}
+}
+
diff --git a/demos/modules/graph/result-640x480.gif b/demos/modules/gwin/graph/result-640x480.gif
index 6fc8b30c..6fc8b30c 100644
--- a/demos/modules/graph/result-640x480.gif
+++ b/demos/modules/gwin/graph/result-640x480.gif