diff --git a/Documentation/NXGraphicsSubsystem.html b/Documentation/NXGraphicsSubsystem.html
index 930f84fb2e3..9b8c84c3410 100644
--- a/Documentation/NXGraphicsSubsystem.html
+++ b/Documentation/NXGraphicsSubsystem.html
@@ -12,7 +12,7 @@
NX Graphics Subsystem
- Last Updated: August 2, 2011
+ Last Updated: August 24, 2011
@@ -77,7 +77,9 @@
2.2.16 nxgl_trapoffset()
2.2.17 nxgl_trapcopy()
2.2.18 nxgl_colorcopy
- 2.2.19 nxgl_splitline
+ 2.2.19 nxgl_splitline()
+ 2.2.20 nxgl_circlepts()
+ 2.2.21 nxgl_circletraps()
@@ -115,11 +117,13 @@
2.3.20 nx_fill()
2.3.21 nx_filltrapezoid()
2.3.22 nx_drawline()
- 2.3.23 nx_setbgcolor()
- 2.3.24 nx_move()
- 2.3.25 nx_bitmap()
- 2.3.26 nx_kbdin()
- 2.3.27 nx_mousein()
+ 2.3.23 nx_drawcircle()
+ 2.3.24 nx_fillcircle()
+ 2.3.25 nx_setbgcolor()
+ 2.3.26 nx_move()
+ 2.3.27 nx_bitmap()
+ 2.3.28 nx_kbdin()
+ 2.3.29 nx_mousein()
@@ -140,15 +144,19 @@
2.4.9 nxtk_fillwindow()
2.4.10 nxtk_filltrapwindow()
2.4.11 nxtk_drawlinewindow()
- 2.4.12 nxtk_movewindow()
- 2.4.13 nxtk_bitmapwindow()
- 2.4.14 nxtk_opentoolbar()
- 2.4.15 nxtk_closetoolbar()
- 2.4.16 nxtk_filltoolbar()
- 2.4.17 nxtk_filltraptoolbar()
- 2.4.18 nxtk_drawlinetoolbar()
- 2.4.19 nxtk_movetoolbar()
- 2.4.20 nxtk_bitmaptoolbar()
+ 2.4.12 nxtk_drawcirclewindow()
+ 2.4.13 nxtk_fillcirclewindow()
+ 2.4.14 nxtk_movewindow()
+ 2.4.15 nxtk_bitmapwindow()
+ 2.4.16 nxtk_opentoolbar()
+ 2.4.17 nxtk_closetoolbar()
+ 2.4.18 nxtk_filltoolbar()
+ 2.4.19 nxtk_filltraptoolbar()
+ 2.4.20 nxtk_drawlinetoolbar()
+ 2.4.21 nxtk_drawcircletoolbar()
+ 2.4.22 nxtk_fillcircletoolbar()
+ 2.4.23 nxtk_movetoolbar()
+ 2.4.24 nxtk_bitmaptoolbar()
@@ -806,6 +814,57 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector, FAR struct nxgl_trapezoid_s
+
+
+#include <nuttx/nx/nxglib.h>
+void nxgl_circlepts(FAR struct nxgl_point_s *center, nxgl_coord_t radius,
+ FAR struct nxgl_point_s *circle);
+
+
+ Description:
+ Given a description of a circle, return a set of 16 points on the circumference of the circle.
+ These points may then be used by nx_drawcircle() or related APIs to draw a circle outline.
+
+
+ Input parameters:
+
+
+ center
+ - A pointer to the point that is the center of the circle.
+
radius
+ - The radius of the circle in pixels.
+
circle
+ - A pointer the first entry in an array of 16 points where the circle points will be returned.
+
+
+ Returned value: None
+
+
+
+
+#include <nuttx/nx/nxglib.h>
+oid nxgl_circletraps(FAR struct nxgl_point_s *center, nxgl_coord_t radius,
+ FAR struct nxgl_trapezoid_s *circle);
+
+
+ Description:
+ Given a description of a a circle, return 8 trapezoids that can be used to fill the circle by nx_fillcircle() and other interfaces.
+
+
+ Input parameters:
+
+
+ center
+ - A pointer to the point that is the center of the circle.
+
radius
+ - The radius of the circle in pixels.
+
circle
+ - A pointer the first entry in an array of 8 trapezoids where the circle description will be returned.
+
+
+ Returned value: None
+
+
@@ -1685,7 +1744,76 @@ int nx_drawline(NXWINDOW hwnd, FAR struct nxgl_vector_s *vector,
ERROR on failure with errno set appropriately
-
+
+Function Prototype:
+
+#include <nuttx/nx/nxglib.h>
+#include <nuttx/nx/nx.h>
+
+int nx_drawcircle(NXWINDOW hwnd, FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius, nxgl_coord_t width,
+ nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+
+
+ Description:
+ Draw a circular outline using the specified line thickness and color.
+
+
+ Input Parameters:
+
+ hwnd
+ - The handle returned by
nx_openwindow()
+ or nx_requestbkgd()
+ center
+ - A pointer to the point that is the center of the circle.
+
radius
+ - The radius of the circle in pixels.
+
width
+ - The width of the line
+
color
+ - The color to use to fill the line
+
+
+
+ Returned Value:
+ OK on success;
+ ERROR on failure with errno set appropriately
+
+
+
+Function Prototype:
+
+#include <nuttx/nx/nxglib.h>
+#include <nuttx/nx/nx.h>
+
+int nx_fillcircle(NXWINDOW hwnd, FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+
+
+ Description:
+ Fill a circular region using the specified color.
+
+
+ Input Parameters:
+
+ hwnd
+ - The handle returned by
nx_openwindow()
+ or nx_requestbkgd()
+ center
+ - A pointer to the point that is the center of the circle.
+
radius
+ - The width of the line
+
color
+ - The color to use to fill the circle
+
+
+
+ Returned Value:
+ OK on success;
+ ERROR on failure with errno set appropriately
+
+
+
Function Prototype:
#include <nuttx/nx/nxglib.h>
@@ -1713,7 +1841,7 @@ int nx_setbgcolor(NXHANDLE handle,
ERROR on failure with errno set appropriately
-
+
Function Prototype:
#include <nuttx/nx/nxglib.h>
@@ -1744,7 +1872,7 @@ int nx_move(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
ERROR on failure with errno set appropriately
-
+
Function Prototype:
#include <nuttx/nx/nxglib.h>
@@ -1786,7 +1914,7 @@ int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest,
ERROR on failure with errno set appropriately
-
+
Function Prototype:
#include <nuttx/nx/nxglib.h>
@@ -1809,7 +1937,7 @@ int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch);
ERROR on failure with errno set appropriately
-
+
Function Prototype:
#include <nuttx/nx/nxglib.h>
@@ -2202,7 +2330,76 @@ int nxtk_drawlinewindow(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector,
ERROR on failure with errno set appropriately
-
+
+Function Prototype:
+
+#include <nuttx/nx/nxglib.h>
+#include <nuttx/nx/nxtk.h>
+
+int nxtk_drawcirclewindow(NXTKWINDOW hfwnd, FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius, nxgl_coord_t width,
+ nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+
+
+ Description:
+ Draw a circular outline using the specified line thickness and color.
+
+
+ Input Parameters:
+
+ hfwnd
+ - A handle previously returned by
+
nxtk_openwindow().
+ center
+ - A pointer to the point that is the center of the circle.
+
radius
+ - The radius of the circle in pixels.
+
width
+ - The width of the line
+
color
+ - The color to use to fill the line
+
+
+
+ Returned Value:
+ OK on success;
+ ERROR on failure with errno set appropriately
+
+
+
+Function Prototype:
+
+#include <nuttx/nx/nxglib.h>
+#include <nuttx/nx/nxtk.h>
+
+int nxtk_fillcirclewindow(NXWINDOW hfwnd, FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+
+
+ Description:
+ Fill a circular region using the specified color.
+
+
+ Input Parameters:
+
+ hfwnd
+ - A handle previously returned by
+
nxtk_openwindow().
+ center
+ - A pointer to the point that is the center of the circle.
+
radius
+ - The width of the line
+
color
+ - The color to use to fill the circle
+
+
+
+ Returned Value:
+ OK on success;
+ ERROR on failure with errno set appropriately
+
+
+
Function Prototype:
#include <nuttx/nx/nxglib.h>
@@ -2235,7 +2432,7 @@ int nxtk_movewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
ERROR on failure with errno set appropriately
-
+
Function Prototype:
#include <nuttx/nx/nxglib.h>
@@ -2280,7 +2477,7 @@ int nxtk_bitmapwindow(NXTKWINDOW hfwnd,
ERROR on failure with errno set appropriately
-
+
Function Prototype:
#include <nuttx/nx/nxglib.h>
@@ -2315,7 +2512,7 @@ int nxtk_opentoolbar(NXTKWINDOW hfwnd, nxgl_coord_t height,
ERROR on failure with errno set appropriately
-
+
Function Prototype:
#include <nuttx/nx/nxglib.h>
@@ -2344,7 +2541,7 @@ int nxtk_closetoolbar(NXTKWINDOW hfwnd);
ERROR on failure with errno set appropriately
-
+
Function Prototype:
#include <nuttx/nx/nxglib.h>
@@ -2376,7 +2573,7 @@ int nxtk_filltoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
ERROR on failure with errno set appropriately
-
+
Function Prototype:
#include <nuttx/nx/nxglib.h>
@@ -2408,7 +2605,7 @@ int nxtk_filltraptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_trapezoid_s *tr
ERROR on failure with errno set appropriately
-
+
Function Prototype:
#include <nuttx/nx/nxglib.h>
@@ -2445,7 +2642,76 @@ int nxtk_drawlinetoolbar(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector,
ERROR on failure with errno set appropriately
-
+
+Function Prototype:
+
+#include <nuttx/nx/nxglib.h>
+#include <nuttx/nx/nxtk.h>
+
+int nxtk_drawcircletoolbar(NXTKWINDOW hfwnd, FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius, nxgl_coord_t width,
+ nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+
+
+ Description:
+ Draw a circular outline using the specified line thickness and color.
+
+
+ Input Parameters:
+
+ hfwnd
+ - A handle previously returned by
+
nxtk_openwindow().
+ center
+ - A pointer to the point that is the center of the circle.
+
radius
+ - The radius of the circle in pixels.
+
width
+ - The width of the line
+
color
+ - The color to use to fill the line
+
+
+
+ Returned Value:
+ OK on success;
+ ERROR on failure with errno set appropriately
+
+
+
+Function Prototype:
+
+#include <nuttx/nx/nxglib.h>
+#include <nuttx/nx/nxtk.h>
+
+int nxtk_fillcircletoolbar(NXWINDOW hfwnd, FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+
+
+ Description:
+ Fill a circular region using the specified color.
+
+
+ Input Parameters:
+
+ hfwnd
+ - A handle previously returned by
+
nxtk_openwindow().
+ center
+ - A pointer to the point that is the center of the circle.
+
radius
+ - The width of the line
+
color
+ - The color to use to fill the circle
+
+
+
+ Returned Value:
+ OK on success;
+ ERROR on failure with errno set appropriately
+
+
+
Function Prototype:
#include <nuttx/nx/nxglib.h>
@@ -2479,7 +2745,7 @@ int nxtk_movetoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,
ERROR on failure with errno set appropriately
-
+
Function Prototype:
#include <nuttx/nx/nxglib.h>
@@ -3330,6 +3596,20 @@ make
| YES |
+
+ nxgl_circlepts |
+
+ Verified by apps/examples/nxlines.
+ |
+ YES |
+
+
+ nxgl_circletraps |
+
+ Verified by apps/examples/nxlines.
+ |
+ YES |
+
@@ -3484,6 +3764,20 @@ make
YES |
+
+ nx_drawcircle() |
+
+ Verified by apps/examples/nxlines.
+ |
+ YES |
+
+
+ nx_fillcircle() |
+
+ Verified by apps/examples/nxlines.
+ |
+ YES |
+
nx_setbgcolor() |
|
@@ -3571,6 +3865,16 @@ make
|
YES |
+
+ nxtk_drawcirclewindow() |
+
|
+ YES |
+
+
+ nxtk_fillcirclewindow() |
+
|
+ YES |
+
nxtk_movewindow() |
|
@@ -3606,6 +3910,16 @@ make
|
NO |
+
+ nxtk_drawcircletoolbar() |
+
|
+ NO |
+
+
+ nxtk_fillcircletoolbar() |
+
|
+ NO |
+
nxtk_movetoolbar() |
|
diff --git a/graphics/nxglib/Make.defs b/graphics/nxglib/Make.defs
index 22c9573968a..89eb3704ba2 100644
--- a/graphics/nxglib/Make.defs
+++ b/graphics/nxglib/Make.defs
@@ -73,13 +73,15 @@ RECT_CSRCS = nxglib_rectcopy.c nxglib_rectoffset.c nxglib_vectoradd.c \
TRAP_CSRCS = nxglib_runoffset.c nxglib_runcopy.c \
nxglib_trapoffset.c nxglib_trapcopy.c
-COLOR_CSRCS = nxglib_colorcopy.c
+COLOR_CSRCS = nxglib_colorcopy.c nxglib_rgb2yuv.c nxglib_yuv2rgb.c
+
+DRAW_CSRCS = nxglib_splitline.c nxglib_circlepts.c nxglib_circletraps.c
LCD_CSRCS =
-NXGLIB_CSRCS = nxglib_rgb2yuv.c nxglib_yuv2rgb.c nxglib_splitline.c \
+NXGLIB_CSRCS = \
$(SETP1_CSRCS) $(SETP2_CSRCS) $(RFILL1_CSRCS) $(RFILL2_CSRCS) \
$(TFILL1_CSRCS) $(TFILL2_CSRCS) $(RMOVE1_CSRCS) $(RMOVE2_CSRCS) \
$(RCOPY1_CSRCS) $(RCOPY2_CSRCS) $(RECT_CSRCS) $(TRAP_CSRCS) \
- $(COLOR_CSRCS) $(LCD_CSRCS)
+ $(COLOR_CSRCS) $(DRAW_CSRCS) $(LCD_CSRCS)
diff --git a/graphics/nxglib/nxglib_circlepts.c b/graphics/nxglib/nxglib_circlepts.c
new file mode 100644
index 00000000000..46ebe329112
--- /dev/null
+++ b/graphics/nxglib/nxglib_circlepts.c
@@ -0,0 +1,171 @@
+/****************************************************************************
+ * graphics/nxglib/nxglib_circlepts.c
+ *
+ * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name NuttX 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 THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include
+
+#include
+#include
+#include
+
+#include
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+/* Trigonometry */
+
+#define SIN_0p0 0 /* sin(0) = 0 */
+#define COS_0p0 1 /* cos(0) = 1 */
+#define SIN_22p5 25080 /* sin(22.5) = 25080 / 65536 */
+#define COS_22p5 60547 /* cos(22.5) = 60547 / 65536 */
+#define SIN_45p0 46341 /* sin(45) = 46341 / 65536 */
+#define COS_45p0 SIN_45p0 /* cos(45) = sin(45) */
+
+/* Named indices into the 16 circle points generated by nxgl_circlepts */
+
+#define POINT_0p0 0
+#define POINT_22p5 1
+#define POINT_45p0 2
+#define POINT_67p5 3
+#define POINT_90p0 4
+#define POINT_112p5 5
+#define POINT_135p0 6
+#define POINT_157p5 7
+#define POINT_180p0 8
+#define POINT_202p5 9
+#define POINT_225p0 10
+#define POINT_247p5 11
+#define POINT_270p0 12
+#define POINT_292p5 13
+#define POINT_315p0 14
+#define POINT_337p5 15
+#define NCIRCLE_POINTS 16
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxgl_circlepts
+ *
+ * Description:
+ * Given a description of a circle, return a set of 16 points on the
+ * circumference of the circle. These points may then be used by
+ * nx_drawcircle() or related APIs to draw a circle outline.
+ *
+ * Input parameters:
+ * center - A pointer to the point that is the center of the circle
+ * radius - The radius of the circle in pixels.
+ * circle - A pointer the first entry in an array of 16 points where the
+ * circle points will be returned.
+ *
+ * Returned value:
+ * None
+ *
+ ****************************************************************************/
+
+void nxgl_circlepts(FAR struct nxgl_point_s *center, nxgl_coord_t radius,
+ FAR struct nxgl_point_s *circle)
+{
+ nxgl_coord_t xoffs;
+ nxgl_coord_t yoffs;
+
+ /* 0, 90, 180, and 270 degrees are the easiest */
+
+ circle[POINT_0p0].x = center->x + radius;
+ circle[POINT_0p0].y = center->y;
+ circle[POINT_90p0].x = center->x;
+ circle[POINT_90p0].y = center->y + radius;
+ circle[POINT_180p0].x = center->x - radius;
+ circle[POINT_180p0].y = center->y;
+ circle[POINT_270p0].x = center->x;
+ circle[POINT_270p0].y = center->y - radius;
+
+ /* Now 22.5, 67.5, 112.5, 157.5, 202.5, 247.5, 292.5, and 337.5 */
+
+ xoffs = b16toi(b16muli(COS_22p5, radius) + b16HALF);
+ yoffs = b16toi(b16muli(SIN_22p5, radius) + b16HALF);
+
+ circle[POINT_22p5].x = center->x + xoffs;
+ circle[POINT_22p5].y = center->y + yoffs;
+ circle[POINT_157p5].x = center->x - xoffs;
+ circle[POINT_157p5].y = center->y + yoffs;
+ circle[POINT_202p5].x = center->x - xoffs;
+ circle[POINT_202p5].y = center->y - yoffs;
+ circle[POINT_337p5].x = center->x + xoffs;
+ circle[POINT_337p5].y = center->y - yoffs;
+
+ circle[POINT_67p5].x = center->x + yoffs;
+ circle[POINT_67p5].y = center->y + xoffs;
+ circle[POINT_112p5].x = center->x - yoffs;
+ circle[POINT_112p5].y = center->y + xoffs;
+ circle[POINT_247p5].x = center->x - yoffs;
+ circle[POINT_247p5].y = center->y - xoffs;
+ circle[POINT_292p5].x = center->x + yoffs;
+ circle[POINT_292p5].y = center->y - xoffs;
+
+ /* Finally, 45.0, 135.0, 225.0, 315.0 */
+
+ xoffs = b16toi(b16muli(COS_45p0, radius) + b16HALF);
+
+ circle[POINT_45p0].x = center->x + xoffs;
+ circle[POINT_45p0].y = center->y + xoffs;
+ circle[POINT_135p0].x = center->x - xoffs;
+ circle[POINT_135p0].y = center->y + xoffs;
+ circle[POINT_225p0].x = center->x - xoffs;
+ circle[POINT_225p0].y = center->y - xoffs;
+ circle[POINT_315p0].x = center->x + xoffs;
+ circle[POINT_315p0].y = center->y - xoffs;
+}
diff --git a/graphics/nxglib/nxglib_circletraps.c b/graphics/nxglib/nxglib_circletraps.c
new file mode 100644
index 00000000000..9c9a93cec9f
--- /dev/null
+++ b/graphics/nxglib/nxglib_circletraps.c
@@ -0,0 +1,176 @@
+/****************************************************************************
+ * graphics/nxglib/nxglib_circletraps.c
+ *
+ * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name NuttX 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 THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include
+
+#include
+#include
+#include
+
+#include
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+/* Trigonometry */
+
+#define SIN_0p0 0 /* sin(0) = 0 */
+#define COS_0p0 1 /* cos(0) = 1 */
+#define SIN_22p5 25080 /* sin(22.5) = 25080 / 65536 */
+#define COS_22p5 60547 /* cos(22.5) = 60547 / 65536 */
+#define SIN_45p0 46341 /* sin(45) = 46341 / 65536 */
+#define COS_45p0 SIN_45p0 /* cos(45) = sin(45) */
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxgl_circletraps
+ *
+ * Description:
+ * Given a description of a a circle, return 8 trapezoids that can be
+ * used to fill the circle by nx_fillcircle() and other interfaces.
+ *
+ * Input parameters:
+ * center - A pointer to the point that is the center of the circle
+ * radius - The radius of the circle in pixels.
+ * circle - A pointer the first entry in an array of 8 trapezoids where
+ * the circle description will be returned.
+ *
+ * Returned value:
+ * None
+ *
+ ****************************************************************************/
+
+void nxgl_circletraps(FAR struct nxgl_point_s *center, nxgl_coord_t radius,
+ FAR struct nxgl_trapezoid_s *circle)
+{
+ nxgl_coord_t xoffs;
+ nxgl_coord_t yoffs;
+
+ circle[0].top.x1 = itob16(center->x);
+ circle[0].top.x2 = circle[0].top.x1;
+ circle[0].top.y = center->y + radius;
+
+ circle[7].bot.x1 = circle[0].top.x1;
+ circle[7].bot.x2 = circle[0].top.x1;
+ circle[7].bot.y = center->y - radius;
+
+ circle[3].bot.x1 = itob16(center->x - radius);
+ circle[3].bot.x2 = itob16(center->x + radius);
+ circle[3].bot.y = center->y;
+
+ circle[4].top.x1 = circle[3].bot.x1;
+ circle[4].top.x2 = circle[3].bot.x2;
+ circle[4].top.y = circle[3].bot.y;
+
+ /* Now 22.5, 67.5, 112.5, 157.5, 202.5, 247.5, 292.5, and 337.5 */
+
+ xoffs = b16toi(b16muli(COS_22p5, radius) + b16HALF);
+ yoffs = b16toi(b16muli(SIN_22p5, radius) + b16HALF);
+
+ circle[2].bot.x1 = itob16(center->x - xoffs);
+ circle[2].bot.x2 = itob16(center->x + xoffs);
+ circle[2].bot.y = center->y + yoffs;
+
+ circle[3].top.x1 = circle[2].bot.x1;
+ circle[3].top.x2 = circle[2].bot.x2;
+ circle[3].top.y = circle[2].bot.y;
+
+ circle[4].bot.x1 = circle[2].bot.x1;
+ circle[4].bot.x2 = circle[2].bot.x2;
+ circle[4].bot.y = center->y - yoffs;
+
+ circle[5].top.x1 = circle[4].bot.x1;
+ circle[5].top.x2 = circle[4].bot.x2;
+ circle[5].top.y = circle[4].bot.y;
+
+ circle[0].bot.x1 = itob16(center->x - yoffs);
+ circle[0].bot.x2 = itob16(center->x + yoffs);
+ circle[0].bot.y = center->y + xoffs;
+
+ circle[1].top.x1 = circle[0].bot.x1;
+ circle[1].top.x2 = circle[0].bot.x2;
+ circle[1].top.y = circle[0].bot.y;
+
+ circle[6].bot.x1 = circle[1].top.x1;
+ circle[6].bot.x2 = circle[1].top.x2;
+ circle[6].bot.y = center->y - xoffs;
+
+ circle[7].top.x1 = circle[6].bot.x1;
+ circle[7].top.x2 = circle[6].bot.x2;
+ circle[7].top.y = circle[6].bot.y;
+
+ /* Finally, 45.0, 135.0, 225.0, 315.0 */
+
+ xoffs = b16toi(b16muli(COS_45p0, radius) + b16HALF);
+
+ circle[1].bot.x1 = itob16(center->x - xoffs);
+ circle[1].bot.x2 = itob16(center->x + xoffs);
+ circle[1].bot.y = center->y + xoffs;
+
+ circle[2].top.x1 = circle[1].bot.x1;
+ circle[2].top.x2 = circle[1].bot.x2;
+ circle[2].top.y = circle[1].bot.y;
+
+ circle[5].bot.x1 = circle[1].bot.x1;
+ circle[5].bot.x2 = circle[1].bot.x2;
+ circle[5].bot.y = center->y - xoffs;
+
+ circle[6].top.x1 = circle[5].bot.x1;
+ circle[6].top.x2 = circle[5].bot.x2;
+ circle[6].top.y = circle[5].bot.y;
+}
diff --git a/graphics/nxglib/nxglib_splitline.c b/graphics/nxglib/nxglib_splitline.c
index 5cc33fd2bd4..5bace1448be 100644
--- a/graphics/nxglib/nxglib_splitline.c
+++ b/graphics/nxglib/nxglib_splitline.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * graphics/nxglib/nxsglib_splitline.c
+ * graphics/nxglib/nxglib_splitline.c
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/graphics/nxmu/Make.defs b/graphics/nxmu/Make.defs
index 79959a4a059..f661198d58f 100644
--- a/graphics/nxmu/Make.defs
+++ b/graphics/nxmu/Make.defs
@@ -38,8 +38,8 @@ NXAPI_CSRCS = nx_bitmap.c nx_closewindow.c nx_connect.c nx_disconnect.c \
nx_eventhandler.c nx_eventnotify.c nx_fill.c nx_filltrapezoid.c \
nx_getposition.c nx_kbdchin.c nx_kbdin.c nx_lower.c \
nx_mousein.c nx_move.c nx_openwindow.c nx_raise.c \
- nx_releasebkgd.c nx_requestbkgd.c nx_setsize.c \
- nx_setbgcolor.c nx_setposition.c nx_drawline.c
+ nx_releasebkgd.c nx_requestbkgd.c nx_setsize.c nx_setbgcolor.c \
+ nx_setposition.c nx_drawcircle.c nx_drawline.c nx_fillcircle.c
NXMU_CSRCS = nxmu_constructwindow.c nxmu_kbdin.c nxmu_mouse.c \
nxmu_openwindow.c nxmu_redrawreq.c nxmu_releasebkgd.c \
nxmu_requestbkgd.c nxmu_reportposition.c nxmu_semtake.c \
diff --git a/graphics/nxmu/nx_drawcircle.c b/graphics/nxmu/nx_drawcircle.c
new file mode 100644
index 00000000000..5403ee9ef7a
--- /dev/null
+++ b/graphics/nxmu/nx_drawcircle.c
@@ -0,0 +1,145 @@
+/****************************************************************************
+ * graphics/nxmu/nx_drawcircle.c
+ *
+ * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name NuttX 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 THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include
+
+#include
+#include
+#include
+
+#include
+#include
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+/* Named indices into the 16 circle points generated by nxgl_circlepts */
+
+#define POINT_0p0 0
+#define POINT_22p5 1
+#define POINT_45p0 2
+#define POINT_67p5 3
+#define POINT_90p0 4
+#define POINT_112p5 5
+#define POINT_135p0 6
+#define POINT_157p5 7
+#define POINT_180p0 8
+#define POINT_202p5 9
+#define POINT_225p0 10
+#define POINT_247p5 11
+#define POINT_270p0 12
+#define POINT_292p5 13
+#define POINT_315p0 14
+#define POINT_337p5 15
+#define NCIRCLE_POINTS 16
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nx_drawcircle
+ *
+ * Description:
+ * Draw a circular outline using the specified line thickness and color.
+ *
+ * Input Parameters:
+ * hwnd - The window handle
+ * center - A pointer to the point that is the center of the circle
+ * radius - The radius of the circle in pixels.
+ * width - The width of the line
+ * color - The color to use to fill the line
+ *
+ * Return:
+ * OK on success; ERROR on failure with errno set appropriately
+ *
+ ****************************************************************************/
+
+int nx_drawcircle(NXWINDOW hwnd, FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius, nxgl_coord_t width,
+ nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
+{
+ struct nxgl_point_s pts[NCIRCLE_POINTS];
+ FAR struct nxgl_vector_s vector;
+ int i;
+ int ret;
+
+ /* Convert the circle to a set of 16 points */
+
+ nxgl_circlepts(center, radius, pts);
+
+ /* Draw each pair of points as a vector */
+
+ for (i = POINT_0p0; i < POINT_337p5; i++)
+ {
+ vector.pt1.x = pts[i].x;
+ vector.pt1.y = pts[i].y;
+ vector.pt2.x = pts[i+1].x;
+ vector.pt2.y = pts[i+1].y;
+ ret = nx_drawline(hwnd, &vector, width, color);
+ if (ret != OK)
+ {
+ return ret;
+ }
+ }
+
+ /* The final, closing vector is a special case */
+
+ vector.pt1.x = pts[POINT_337p5].x;
+ vector.pt1.y = pts[POINT_337p5].y;
+ vector.pt2.x = pts[POINT_0p0].x;
+ vector.pt2.y = pts[POINT_0p0].y;
+ return nx_drawline(hwnd, &vector, width, color);
+}
diff --git a/graphics/nxmu/nx_fillcircle.c b/graphics/nxmu/nx_fillcircle.c
new file mode 100644
index 00000000000..dc4115782ae
--- /dev/null
+++ b/graphics/nxmu/nx_fillcircle.c
@@ -0,0 +1,114 @@
+/****************************************************************************
+ * graphics/nxsu/nx_fillcircle.c
+ *
+ * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name NuttX 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 THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include
+
+#include
+#include
+#include
+
+#include
+#include
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+#define NCIRCLE_TRAPS 8
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nx_fillcircle
+ *
+ * Description:
+ * Fill a circular region using the specified color.
+ *
+ * Input Parameters:
+ * hwnd - The window handle
+ * center - A pointer to the point that is the center of the circle
+ * radius - The radius of the circle in pixels.
+ * color - The color to use to fill the circle.
+ *
+ * Return:
+ * OK on success; ERROR on failure with errno set appropriately
+ *
+ ****************************************************************************/
+
+int nx_fillcircle(NXWINDOW hwnd, FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius, nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
+{
+ FAR struct nxgl_trapezoid_s traps[NCIRCLE_TRAPS];
+ int i;
+ int ret;
+
+ /* Describe the circular region as a sequence of 8 trapezoids */
+
+ nxgl_circletraps(center, radius, traps);
+
+ /* Then rend those trapezoids */
+
+ for (i = 0; i < NCIRCLE_TRAPS; i++)
+ {
+ ret = nx_filltrapezoid(hwnd, NULL, &traps[i], color);
+ if (ret != OK)
+ {
+ return ret;
+ }
+ }
+ return OK;
+}
diff --git a/graphics/nxsu/Make.defs b/graphics/nxsu/Make.defs
index 3cddf3a2c5b..e87f6d03579 100644
--- a/graphics/nxsu/Make.defs
+++ b/graphics/nxsu/Make.defs
@@ -38,6 +38,7 @@ NXAPI_CSRCS = nx_bitmap.c nx_close.c nx_closewindow.c nx_fill.c \
nx_filltrapezoid.c nx_getposition.c nx_kbdchin.c \
nx_kbdin.c nx_lower.c nx_mousein.c nx_move.c nx_open.c \
nx_openwindow.c nx_raise.c nx_releasebkgd.c nx_requestbkgd.c \
- nx_setsize.c nx_setbgcolor.c nx_setposition.c nx_drawline.c
+ nx_setsize.c nx_setbgcolor.c nx_setposition.c nx_drawcircle.c \
+ nx_drawline.c nx_fillcircle.c
NXSU_CSRCS = nxsu_constructwindow.c nxsu_redrawreq.c nxsu_reportposition.c
NX_CSRCS = $(NXAPI_CSRCS) $(NXSU_CSRCS)
diff --git a/graphics/nxsu/nx_drawcircle.c b/graphics/nxsu/nx_drawcircle.c
new file mode 100644
index 00000000000..741886bc88b
--- /dev/null
+++ b/graphics/nxsu/nx_drawcircle.c
@@ -0,0 +1,145 @@
+/****************************************************************************
+ * graphics/nxsu/nx_drawcircle.c
+ *
+ * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name NuttX 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 THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include
+
+#include
+#include
+#include
+
+#include
+#include
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+/* Named indices into the 16 circle points generated by nxgl_circlepts */
+
+#define POINT_0p0 0
+#define POINT_22p5 1
+#define POINT_45p0 2
+#define POINT_67p5 3
+#define POINT_90p0 4
+#define POINT_112p5 5
+#define POINT_135p0 6
+#define POINT_157p5 7
+#define POINT_180p0 8
+#define POINT_202p5 9
+#define POINT_225p0 10
+#define POINT_247p5 11
+#define POINT_270p0 12
+#define POINT_292p5 13
+#define POINT_315p0 14
+#define POINT_337p5 15
+#define NCIRCLE_POINTS 16
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nx_drawcircle
+ *
+ * Description:
+ * Draw a circular outline using the specified line thickness and color.
+ *
+ * Input Parameters:
+ * hwnd - The window handle
+ * center - A pointer to the point that is the center of the circle
+ * radius - The radius of the circle in pixels.
+ * width - The width of the line
+ * color - The color to use to fill the line
+ *
+ * Return:
+ * OK on success; ERROR on failure with errno set appropriately
+ *
+ ****************************************************************************/
+
+int nx_drawcircle(NXWINDOW hwnd, FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius, nxgl_coord_t width,
+ nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
+{
+ struct nxgl_point_s pts[NCIRCLE_POINTS];
+ FAR struct nxgl_vector_s vector;
+ int i;
+ int ret;
+
+ /* Convert the circle to a set of 16 points */
+
+ nxgl_circlepts(center, radius, pts);
+
+ /* Draw each pair of points as a vector */
+
+ for (i = POINT_0p0; i < POINT_337p5; i++)
+ {
+ vector.pt1.x = pts[i].x;
+ vector.pt1.y = pts[i].y;
+ vector.pt2.x = pts[i+1].x;
+ vector.pt2.y = pts[i+1].y;
+ ret = nx_drawline(hwnd, &vector, width, color);
+ if (ret != OK)
+ {
+ return ret;
+ }
+ }
+
+ /* The final, closing vector is a special case */
+
+ vector.pt1.x = pts[POINT_337p5].x;
+ vector.pt1.y = pts[POINT_337p5].y;
+ vector.pt2.x = pts[POINT_0p0].x;
+ vector.pt2.y = pts[POINT_0p0].y;
+ return nx_drawline(hwnd, &vector, width, color);
+}
diff --git a/graphics/nxsu/nx_fillcircle.c b/graphics/nxsu/nx_fillcircle.c
new file mode 100644
index 00000000000..9a89c332e4d
--- /dev/null
+++ b/graphics/nxsu/nx_fillcircle.c
@@ -0,0 +1,114 @@
+/****************************************************************************
+ * graphics/nxmu/nx_fillcircle.c
+ *
+ * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name NuttX 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 THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include
+
+#include
+#include
+#include
+
+#include
+#include
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+#define NCIRCLE_TRAPS 8
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nx_fillcircle
+ *
+ * Description:
+ * Fill a circular region using the specified color.
+ *
+ * Input Parameters:
+ * hwnd - The window handle
+ * center - A pointer to the point that is the center of the circle
+ * radius - The radius of the circle in pixels.
+ * color - The color to use to fill the circle.
+ *
+ * Return:
+ * OK on success; ERROR on failure with errno set appropriately
+ *
+ ****************************************************************************/
+
+int nx_fillcircle(NXWINDOW hwnd, FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius, nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
+{
+ FAR struct nxgl_trapezoid_s traps[NCIRCLE_TRAPS];
+ int i;
+ int ret;
+
+ /* Describe the circular region as a sequence of 8 trapezoids */
+
+ nxgl_circletraps(center, radius, traps);
+
+ /* Then rend those trapezoids */
+
+ for (i = 0; i < NCIRCLE_TRAPS; i++)
+ {
+ ret = nx_filltrapezoid(hwnd, NULL, &traps[i], color);
+ if (ret != OK)
+ {
+ return ret;
+ }
+ }
+ return OK;
+}
diff --git a/graphics/nxtk/Make.defs b/graphics/nxtk/Make.defs
index 736d91003c9..782fbc9b6b0 100644
--- a/graphics/nxtk/Make.defs
+++ b/graphics/nxtk/Make.defs
@@ -38,9 +38,9 @@ NXTKWIN_CSRCS = nxtk_openwindow.c nxtk_closewindow.c nxtk_getposition.c \
nxtk_setposition.c nxtk_setsize.c nxtk_raise.c nxtk_lower.c \
nxtk_fillwindow.c nxtk_filltrapwindow.c nxtk_movewindow.c \
nxtk_bitmapwindow.c nxtk_events.c nxtk_setsubwindows.c \
- nxtk_drawlinewindow.c
+ nxtk_drawcirclewindow.c nxtk_drawlinewindow.c nxtk_fillcirclewindow.c
NXTKTB_CSRCS = nxtk_opentoolbar.c nxtk_closetoolbar.c nxtk_filltoolbar.c \
nxtk_filltraptoolbar.c nxtk_movetoolbar.c nxtk_bitmaptoolbar.c \
- nxtk_drawlinetoolbar.c
+ nxtk_drawcircletoolbar.c nxtk_drawlinetoolbar.c nxtk_fillcircletoolbar.c
NXTK_CSRCS = $(NXTKWIN_CSRCS) $(NXTKTB_CSRCS) nxtk_subwindowclip.c \
nxtk_containerclip.c nxtk_subwindowmove.c nxtk_drawframe.c
diff --git a/graphics/nxtk/nxtk_drawcircletoolbar.c b/graphics/nxtk/nxtk_drawcircletoolbar.c
new file mode 100644
index 00000000000..558b3413b38
--- /dev/null
+++ b/graphics/nxtk/nxtk_drawcircletoolbar.c
@@ -0,0 +1,145 @@
+/****************************************************************************
+ * graphics/nxtk/nxtk_drawcircletoolbar.c
+ *
+ * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name NuttX 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 THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include
+
+#include
+#include
+#include
+
+#include
+#include
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+/* Named indices into the 16 circle points generated by nxgl_circlepts */
+
+#define POINT_0p0 0
+#define POINT_22p5 1
+#define POINT_45p0 2
+#define POINT_67p5 3
+#define POINT_90p0 4
+#define POINT_112p5 5
+#define POINT_135p0 6
+#define POINT_157p5 7
+#define POINT_180p0 8
+#define POINT_202p5 9
+#define POINT_225p0 10
+#define POINT_247p5 11
+#define POINT_270p0 12
+#define POINT_292p5 13
+#define POINT_315p0 14
+#define POINT_337p5 15
+#define NCIRCLE_POINTS 16
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxtk_drawcircletoolbar
+ *
+ * Description:
+ * Draw a circular outline using the specified line thickness and color.
+ *
+ * Input Parameters:
+ * hfwnd - The window handle returned by nxtk_openwindow()
+ * center - A pointer to the point that is the center of the circle
+ * radius - The radius of the circle in pixels.
+ * width - The width of the line
+ * color - The color to use to fill the line
+ *
+ * Return:
+ * OK on success; ERROR on failure with errno set appropriately
+ *
+ ****************************************************************************/
+
+int nxtk_drawcircletoolbar(NXTKWINDOW hfwnd, FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius, nxgl_coord_t width,
+ nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
+{
+ struct nxgl_point_s pts[NCIRCLE_POINTS];
+ FAR struct nxgl_vector_s vector;
+ int i;
+ int ret;
+
+ /* Convert the circle to a set of 16 points */
+
+ nxgl_circlepts(center, radius, pts);
+
+ /* Draw each pair of points as a vector */
+
+ for (i = POINT_0p0; i < POINT_337p5; i++)
+ {
+ vector.pt1.x = pts[i].x;
+ vector.pt1.y = pts[i].y;
+ vector.pt2.x = pts[i+1].x;
+ vector.pt2.y = pts[i+1].y;
+ ret = nxtk_drawlinetoolbar(hfwnd, &vector, width, color);
+ if (ret != OK)
+ {
+ return ret;
+ }
+ }
+
+ /* The final, closing vector is a special case */
+
+ vector.pt1.x = pts[POINT_337p5].x;
+ vector.pt1.y = pts[POINT_337p5].y;
+ vector.pt2.x = pts[POINT_0p0].x;
+ vector.pt2.y = pts[POINT_0p0].y;
+ return nxtk_drawlinetoolbar(hfwnd, &vector, width, color);
+}
diff --git a/graphics/nxtk/nxtk_drawcirclewindow.c b/graphics/nxtk/nxtk_drawcirclewindow.c
new file mode 100644
index 00000000000..d4bd79a3018
--- /dev/null
+++ b/graphics/nxtk/nxtk_drawcirclewindow.c
@@ -0,0 +1,145 @@
+/****************************************************************************
+ * graphics/nxtk/nxtk_drawcirclewindow.c
+ *
+ * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name NuttX 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 THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include
+
+#include
+#include
+#include
+
+#include
+#include
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+/* Named indices into the 16 circle points generated by nxgl_circlepts */
+
+#define POINT_0p0 0
+#define POINT_22p5 1
+#define POINT_45p0 2
+#define POINT_67p5 3
+#define POINT_90p0 4
+#define POINT_112p5 5
+#define POINT_135p0 6
+#define POINT_157p5 7
+#define POINT_180p0 8
+#define POINT_202p5 9
+#define POINT_225p0 10
+#define POINT_247p5 11
+#define POINT_270p0 12
+#define POINT_292p5 13
+#define POINT_315p0 14
+#define POINT_337p5 15
+#define NCIRCLE_POINTS 16
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxtk_drawcirclewindow
+ *
+ * Description:
+ * Draw a circular outline using the specified line thickness and color.
+ *
+ * Input Parameters:
+ * hfwnd - The window handle returned by nxtk_openwindow()
+ * center - A pointer to the point that is the center of the circle
+ * radius - The radius of the circle in pixels.
+ * width - The width of the line
+ * color - The color to use to fill the line
+ *
+ * Return:
+ * OK on success; ERROR on failure with errno set appropriately
+ *
+ ****************************************************************************/
+
+int nxtk_drawcirclewindow(NXTKWINDOW hfwnd, FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius, nxgl_coord_t width,
+ nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
+{
+ struct nxgl_point_s pts[NCIRCLE_POINTS];
+ FAR struct nxgl_vector_s vector;
+ int i;
+ int ret;
+
+ /* Convert the circle to a set of 16 points */
+
+ nxgl_circlepts(center, radius, pts);
+
+ /* Draw each pair of points as a vector */
+
+ for (i = POINT_0p0; i < POINT_337p5; i++)
+ {
+ vector.pt1.x = pts[i].x;
+ vector.pt1.y = pts[i].y;
+ vector.pt2.x = pts[i+1].x;
+ vector.pt2.y = pts[i+1].y;
+ ret = nxtk_drawlinewindow(hfwnd, &vector, width, color);
+ if (ret != OK)
+ {
+ return ret;
+ }
+ }
+
+ /* The final, closing vector is a special case */
+
+ vector.pt1.x = pts[POINT_337p5].x;
+ vector.pt1.y = pts[POINT_337p5].y;
+ vector.pt2.x = pts[POINT_0p0].x;
+ vector.pt2.y = pts[POINT_0p0].y;
+ return nxtk_drawlinewindow(hfwnd, &vector, width, color);
+}
diff --git a/graphics/nxtk/nxtk_fillcircletoolbar.c b/graphics/nxtk/nxtk_fillcircletoolbar.c
new file mode 100644
index 00000000000..d2e7e5ecbee
--- /dev/null
+++ b/graphics/nxtk/nxtk_fillcircletoolbar.c
@@ -0,0 +1,115 @@
+/****************************************************************************
+ * graphics/nxtk/nxtk_fillcircletoolbar.c
+ *
+ * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name NuttX 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 THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include
+
+#include
+#include
+#include
+
+#include
+#include
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+#define NCIRCLE_TRAPS 8
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxtk_fillcircletoolbar
+ *
+ * Description:
+ * Fill a circular region using the specified color.
+ *
+ * Input Parameters:
+ * hfwnd - The window handle returned by nxtk_openwindow()
+ * center - A pointer to the point that is the center of the circle
+ * radius - The radius of the circle in pixels.
+ * color - The color to use to fill the circle.
+ *
+ * Return:
+ * OK on success; ERROR on failure with errno set appropriately
+ *
+ ****************************************************************************/
+
+int nxtk_fillcircletoolbar(NXWINDOW hfwnd, FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius,
+ nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
+{
+ FAR struct nxgl_trapezoid_s traps[NCIRCLE_TRAPS];
+ int i;
+ int ret;
+
+ /* Describe the circular region as a sequence of 8 trapezoids */
+
+ nxgl_circletraps(center, radius, traps);
+
+ /* Then rend those trapezoids */
+
+ for (i = 0; i < NCIRCLE_TRAPS; i++)
+ {
+ ret = nxtk_filltraptoolbar(hfwnd, &traps[i], color);
+ if (ret != OK)
+ {
+ return ret;
+ }
+ }
+ return OK;
+}
diff --git a/graphics/nxtk/nxtk_fillcirclewindow.c b/graphics/nxtk/nxtk_fillcirclewindow.c
new file mode 100644
index 00000000000..4fc7fef644c
--- /dev/null
+++ b/graphics/nxtk/nxtk_fillcirclewindow.c
@@ -0,0 +1,115 @@
+/****************************************************************************
+ * graphics/nxtk/nxtk_fillcirclewindow.c
+ *
+ * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. Neither the name NuttX 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 THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include
+
+#include
+#include
+#include
+
+#include
+#include
+
+/****************************************************************************
+ * Pre-Processor Definitions
+ ****************************************************************************/
+
+#define NCIRCLE_TRAPS 8
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nxtk_fillcirclewindow
+ *
+ * Description:
+ * Fill a circular region using the specified color.
+ *
+ * Input Parameters:
+ * hfwnd - The window handle returned by nxtk_openwindow()
+ * center - A pointer to the point that is the center of the circle
+ * radius - The radius of the circle in pixels.
+ * color - The color to use to fill the circle.
+ *
+ * Return:
+ * OK on success; ERROR on failure with errno set appropriately
+ *
+ ****************************************************************************/
+
+int nxtk_fillcirclewindow(NXWINDOW hfwnd, FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius,
+ nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
+{
+ FAR struct nxgl_trapezoid_s traps[NCIRCLE_TRAPS];
+ int i;
+ int ret;
+
+ /* Describe the circular region as a sequence of 8 trapezoids */
+
+ nxgl_circletraps(center, radius, traps);
+
+ /* Then rend those trapezoids */
+
+ for (i = 0; i < NCIRCLE_TRAPS; i++)
+ {
+ ret = nxtk_filltrapwindow(hfwnd, &traps[i], color);
+ if (ret != OK)
+ {
+ return ret;
+ }
+ }
+ return OK;
+}
diff --git a/include/nuttx/nx/nx.h b/include/nuttx/nx/nx.h
index 66163e6793e..6912d5552fe 100644
--- a/include/nuttx/nx/nx.h
+++ b/include/nuttx/nx/nx.h
@@ -633,6 +633,49 @@ EXTERN int nx_filltrapezoid(NXWINDOW hwnd, FAR const struct nxgl_rect_s *clip,
EXTERN int nx_drawline(NXWINDOW hwnd, FAR struct nxgl_vector_s *vector,
nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+/****************************************************************************
+ * Name: nx_drawcircle
+ *
+ * Description:
+ * Draw a circular outline using the specified line thickness and color.
+ *
+ * Input Parameters:
+ * hwnd - The window handle
+ * center - A pointer to the point that is the center of the circle
+ * radius - The radius of the circle in pixels.
+ * width - The width of the line
+ * color - The color to use to fill the line
+ *
+ * Return:
+ * OK on success; ERROR on failure with errno set appropriately
+ *
+ ****************************************************************************/
+
+EXTERN int nx_drawcircle(NXWINDOW hwnd, FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius, nxgl_coord_t width,
+ nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+
+/****************************************************************************
+ * Name: nx_fillcircle
+ *
+ * Description:
+ * Fill a circular region using the specified color.
+ *
+ * Input Parameters:
+ * hwnd - The window handle
+ * center - A pointer to the point that is the center of the circle
+ * radius - The radius of the circle in pixels.
+ * color - The color to use to fill the circle
+ *
+ * Return:
+ * OK on success; ERROR on failure with errno set appropriately
+ *
+ ****************************************************************************/
+
+EXTERN int nx_fillcircle(NXWINDOW hwnd, FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius,
+ nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+
/****************************************************************************
* Name: nx_setbgcolor
*
diff --git a/include/nuttx/nx/nxglib.h b/include/nuttx/nx/nxglib.h
index 03f87f7856d..06c9eb383a2 100644
--- a/include/nuttx/nx/nxglib.h
+++ b/include/nuttx/nx/nxglib.h
@@ -631,6 +631,51 @@ EXTERN int nxgl_splitline(FAR struct nxgl_vector_s *vector,
FAR struct nxgl_rect_s *rect,
nxgl_coord_t linewidth);
+/****************************************************************************
+ * Name: nxgl_circlepts
+ *
+ * Description:
+ * Given a description of a circle, return a set of 16 points on the
+ * circumference of the circle. These points may then be used by
+ * nx_drawcircle() or related APIs to draw a circle outline.
+ *
+ * Input parameters:
+ * center - A pointer to the point that is the center of the circle
+ * radius - The radius of the circle in pixels.
+ * circle - A pointer the first entry in an array of 16 points where the
+ * circle points will be returned.
+ *
+ * Returned value:
+ * None
+ *
+ ****************************************************************************/
+
+EXTERN void nxgl_circlepts(FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius,
+ FAR struct nxgl_point_s *circle);
+
+/****************************************************************************
+ * Name: nxgl_circletraps
+ *
+ * Description:
+ * Given a description of a a circle, return 8 trapezoids that can be
+ * used to fill the circle by nx_fillcircle() and other interfaces.
+ *
+ * Input parameters:
+ * center - A pointer to the point that is the center of the circle
+ * radius - The radius of the circle in pixels.
+ * circle - A pointer the first entry in an array of 8 trapezoids where
+ * the circle description will be returned.
+ *
+ * Returned value:
+ * None
+ *
+ ****************************************************************************/
+
+EXTERN void nxgl_circletraps(FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius,
+ FAR struct nxgl_trapezoid_s *circle);
+
#undef EXTERN
#if defined(__cplusplus)
}
diff --git a/include/nuttx/nx/nxtk.h b/include/nuttx/nx/nxtk.h
index d0a4dcb867b..6a288c37a88 100644
--- a/include/nuttx/nx/nxtk.h
+++ b/include/nuttx/nx/nxtk.h
@@ -264,6 +264,51 @@ EXTERN int nxtk_drawlinewindow(NXTKWINDOW hfwnd,
nxgl_coord_t width,
nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+/****************************************************************************
+ * Name: nxtk_drawcirclewindow
+ *
+ * Description:
+ * Draw a circular outline using the specified line thickness and color.
+ *
+ * Input Parameters:
+ * hfwnd - The window handle returned by nxtk_openwindow()
+ * center - A pointer to the point that is the center of the circle
+ * radius - The radius of the circle in pixels.
+ * width - The width of the line
+ * color - The color to use to fill the line
+ *
+ * Return:
+ * OK on success; ERROR on failure with errno set appropriately
+ *
+ ****************************************************************************/
+
+EXTERN int nxtk_drawcirclewindow(NXTKWINDOW hfwnd,
+ FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius, nxgl_coord_t width,
+ nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+
+/****************************************************************************
+ * Name: nxtk_fillcirclewindow
+ *
+ * Description:
+ * Fill a circular region using the specified color.
+ *
+ * Input Parameters:
+ * hfwnd - The window handle returned by nxtk_openwindow()
+ * center - A pointer to the point that is the center of the circle
+ * radius - The radius of the circle in pixels.
+ * color - The color to use to fill the circle
+ *
+ * Return:
+ * OK on success; ERROR on failure with errno set appropriately
+ *
+ ****************************************************************************/
+
+EXTERN int nxtk_fillcirclewindow(NXWINDOW hfwnd,
+ FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius,
+ nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+
/****************************************************************************
* Name: nxtk_movewindow
*
@@ -395,8 +440,8 @@ EXTERN int nxtk_filltraptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_trapezoi
* Description:
* Fill the specified line in the toolbar sub-window with the specified
* color. This is simply a wrapper that uses nxgl_splitline() to break the
- * line into trapezoids and then calls nxtk_filltrapwindow() to render the
- * line.
+ * line into trapezoids and then calls nxtk_filltraptoolbar() to render the
+ * lines.
*
* Input Parameters:
* hfwnd - The window handle returned by nxtk_openwindow
@@ -414,6 +459,51 @@ EXTERN int nxtk_drawlinetoolbar(NXTKWINDOW hfwnd,
nxgl_coord_t width,
nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+/****************************************************************************
+ * Name: nxtk_drawcircletoolbar
+ *
+ * Description:
+ * Draw a circular outline using the specified line thickness and color.
+ *
+ * Input Parameters:
+ * hfwnd - The window handle returned by nxtk_openwindow()
+ * center - A pointer to the point that is the center of the circle
+ * radius - The radius of the circle in pixels.
+ * width - The width of the line
+ * color - The color to use to fill the line
+ *
+ * Return:
+ * OK on success; ERROR on failure with errno set appropriately
+ *
+ ****************************************************************************/
+
+EXTERN int nxtk_drawcircletoolbar(NXTKWINDOW hfwnd,
+ FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius, nxgl_coord_t width,
+ nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+
+/****************************************************************************
+ * Name: nxtk_fillcircletoolbar
+ *
+ * Description:
+ * Fill a circular region using the specified color.
+ *
+ * Input Parameters:
+ * hfwnd - The window handle returned by nxtk_openwindow()
+ * center - A pointer to the point that is the center of the circle
+ * radius - The radius of the circle in pixels.
+ * color - The color to use to fill the circle
+ *
+ * Return:
+ * OK on success; ERROR on failure with errno set appropriately
+ *
+ ****************************************************************************/
+
+EXTERN int nxtk_fillcircletoolbar(NXWINDOW hfwnd,
+ FAR struct nxgl_point_s *center,
+ nxgl_coord_t radius,
+ nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+
/****************************************************************************
* Name: nxtk_movetoolbar
*