Last Updated: August 2, 2011
+Last Updated: August 24, 2011
@@ -77,7 +77,9 @@ 2.2.16nxgl_trapoffset()nxgl_trapcopy()nxgl_colorcopynxgl_splitline
+ 2.2.19 nxgl_splitline()nxgl_circlepts()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()
nxtk_fillwindow()nxtk_filltrapwindow()nxtk_drawlinewindow()nxtk_movewindow()nxtk_bitmapwindow()nxtk_opentoolbar()nxtk_closetoolbar()nxtk_filltoolbar()nxtk_filltraptoolbar()nxtk_drawlinetoolbar()nxtk_movetoolbar()nxtk_bitmaptoolbar()
+ 2.4.12 nxtk_drawcirclewindow()nxtk_fillcirclewindow()nxtk_movewindow()nxtk_bitmapwindow()nxtk_opentoolbar()nxtk_closetoolbar()nxtk_filltoolbar()nxtk_filltraptoolbar()nxtk_drawlinetoolbar()nxtk_drawcircletoolbar()nxtk_fillcircletoolbar()nxtk_movetoolbar()nxtk_bitmaptoolbar()
@@ -806,6 +814,57 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector, FAR struct nxgl_trapezoid_s
+
nxgl_circlepts+#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
+ radius
+ circle
+ + Returned value: None +
+ +nxgl_circletraps+#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
+ radius
+ circle
+ + Returned value: None +
+ERROR on failure with errno set appropriately
-nx_setbgcolor()nx_drawcircle()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
+ nx_openwindow()
+ or nx_requestbkgd()
+ center
+ radius
+ width
+ color
+
+ Returned Value:
+ OK on success;
+ ERROR on failure with errno set appropriately
+
nx_fillcircle()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
+ nx_openwindow()
+ or nx_requestbkgd()
+ center
+ radius
+ color
+
+ Returned Value:
+ OK on success;
+ ERROR on failure with errno set appropriately
+
nx_setbgcolor()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -1713,7 +1841,7 @@ int nx_setbgcolor(NXHANDLE handle,ERRORon failure witherrnoset appropriately -2.3.24
+nx_move()2.3.26
nx_move()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -1744,7 +1872,7 @@ int nx_move(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,ERRORon failure witherrnoset appropriately -2.3.25
+nx_bitmap()2.3.27
nx_bitmap()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -1786,7 +1914,7 @@ int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest,ERRORon failure witherrnoset appropriately -2.3.26
+nx_kbdin()2.3.28
nx_kbdin()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -1809,7 +1937,7 @@ int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch);ERRORon failure witherrnoset appropriately -2.3.27
+nx_mousein()2.3.29
nx_mousein()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2202,7 +2330,76 @@ int nxtk_drawlinewindow(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector,ERRORon failure witherrnoset appropriately -2.4.12
+nxtk_movewindow()2.4.12
+nxtk_drawcirclewindow()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
+ nxtk_openwindow().
+ center
+ radius
+ width
+ color
+
+ Returned Value:
+ OK on success;
+ ERROR on failure with errno set appropriately
+
nxtk_fillcirclewindow()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
+ nxtk_openwindow().
+ center
+ radius
+ color
+
+ Returned Value:
+ OK on success;
+ ERROR on failure with errno set appropriately
+
nxtk_movewindow()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2235,7 +2432,7 @@ int nxtk_movewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,ERRORon failure witherrnoset appropriately -2.4.13
+nxtk_bitmapwindow()2.4.15
nxtk_bitmapwindow()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2280,7 +2477,7 @@ int nxtk_bitmapwindow(NXTKWINDOW hfwnd,ERRORon failure witherrnoset appropriately -2.4.14
+nxtk_opentoolbar()2.4.16
nxtk_opentoolbar()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2315,7 +2512,7 @@ int nxtk_opentoolbar(NXTKWINDOW hfwnd, nxgl_coord_t height,ERRORon failure witherrnoset appropriately -2.4.15
+nxtk_closetoolbar()2.4.17
nxtk_closetoolbar()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2344,7 +2541,7 @@ int nxtk_closetoolbar(NXTKWINDOW hfwnd);ERRORon failure witherrnoset appropriately -2.4.16
+nxtk_filltoolbar()2.4.18
nxtk_filltoolbar()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2376,7 +2573,7 @@ int nxtk_filltoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,ERRORon failure witherrnoset appropriately -2.4.17
+nxtk_filltraptoolbar()2.4.19
nxtk_filltraptoolbar()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2408,7 +2605,7 @@ int nxtk_filltraptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_trapezoid_s *trERRORon failure witherrnoset appropriately -2.4.18
+nxtk_drawlinetoolbar()2.4.20
nxtk_drawlinetoolbar()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2445,7 +2642,76 @@ int nxtk_drawlinetoolbar(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector,ERRORon failure witherrnoset appropriately -2.4.19
+nxtk_movetoolbar()2.4.21
+nxtk_drawcircletoolbar()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
+ nxtk_openwindow().
+ center
+ radius
+ width
+ color
+
+ Returned Value:
+ OK on success;
+ ERROR on failure with errno set appropriately
+
nxtk_fillcircletoolbar()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
+ nxtk_openwindow().
+ center
+ radius
+ color
+
+ Returned Value:
+ OK on success;
+ ERROR on failure with errno set appropriately
+
nxtk_movetoolbar()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -2479,7 +2745,7 @@ int nxtk_movetoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect,ERRORon failure witherrnoset appropriately -2.4.20
+nxtk_bitmaptoolbar()2.4.24
nxtk_bitmaptoolbar()Function Prototype:
#include <nuttx/nx/nxglib.h> @@ -3330,6 +3596,20 @@ makeYES ++ ++ nxgl_circlepts+ Verified by +apps/examples/nxlines. +YES ++ + nxgl_circletraps+ Verified by +apps/examples/nxlines. +YES +@@ -3484,6 +3764,20 @@ make Table D.2: NX Server Callbacks Test Coverage
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()