diff options
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/Documentation/NXGraphicsSubsystem.html | 374 | ||||
-rw-r--r-- | nuttx/graphics/nxglib/Make.defs | 8 | ||||
-rw-r--r-- | nuttx/graphics/nxglib/nxglib_circlepts.c | 171 | ||||
-rw-r--r-- | nuttx/graphics/nxglib/nxglib_circletraps.c | 176 | ||||
-rw-r--r-- | nuttx/graphics/nxglib/nxglib_splitline.c | 2 | ||||
-rw-r--r-- | nuttx/graphics/nxmu/Make.defs | 4 | ||||
-rw-r--r-- | nuttx/graphics/nxmu/nx_drawcircle.c | 145 | ||||
-rw-r--r-- | nuttx/graphics/nxmu/nx_fillcircle.c | 114 | ||||
-rw-r--r-- | nuttx/graphics/nxsu/Make.defs | 3 | ||||
-rw-r--r-- | nuttx/graphics/nxsu/nx_drawcircle.c | 145 | ||||
-rw-r--r-- | nuttx/graphics/nxsu/nx_fillcircle.c | 114 | ||||
-rw-r--r-- | nuttx/graphics/nxtk/Make.defs | 4 | ||||
-rw-r--r-- | nuttx/graphics/nxtk/nxtk_drawcircletoolbar.c | 145 | ||||
-rw-r--r-- | nuttx/graphics/nxtk/nxtk_drawcirclewindow.c | 145 | ||||
-rw-r--r-- | nuttx/graphics/nxtk/nxtk_fillcircletoolbar.c | 115 | ||||
-rw-r--r-- | nuttx/graphics/nxtk/nxtk_fillcirclewindow.c | 115 | ||||
-rw-r--r-- | nuttx/include/nuttx/nx/nx.h | 43 | ||||
-rw-r--r-- | nuttx/include/nuttx/nx/nxglib.h | 45 | ||||
-rw-r--r-- | nuttx/include/nuttx/nx/nxtk.h | 94 |
19 files changed, 1921 insertions, 41 deletions
diff --git a/nuttx/Documentation/NXGraphicsSubsystem.html b/nuttx/Documentation/NXGraphicsSubsystem.html index 930f84fb2..9b8c84c34 100644 --- a/nuttx/Documentation/NXGraphicsSubsystem.html +++ b/nuttx/Documentation/NXGraphicsSubsystem.html @@ -12,7 +12,7 @@ <h1><big><font color="#3c34ec"> <i>NX Graphics Subsystem</i> </font></big></h1> - <p>Last Updated: August 2, 2011</p> + <p>Last Updated: August 24, 2011</p> </td> </tr> </table> @@ -77,7 +77,9 @@ <i>2.2.16 <a href="#nxgltrapoffset"><code>nxgl_trapoffset()</code></a></i><br> <i>2.2.17 <a href="#nxgltrapcopy"><code>nxgl_trapcopy()</code></a></i><br> <i>2.2.18 <a href="#nxglcolorcopy"><code>nxgl_colorcopy</code></a></i><br> - <i>2.2.19 <a href="#nxglsplitline"><code>nxgl_splitline</code></a></i> + <i>2.2.19 <a href="#nxglsplitline"><code>nxgl_splitline()</code></a></i><br> + <i>2.2.20 <a href="#nxglcirclepts"><code>nxgl_circlepts()</code></a></i><br> + <i>2.2.21 <a href="#nxglcircletraps"><code>nxgl_circletraps()</code></a></i> </ul> </p> <p> @@ -115,11 +117,13 @@ <i>2.3.20 <a href="#nxfill"><code>nx_fill()</code></a></i><br> <i>2.3.21 <a href="#nxfilltrapezoid"><code>nx_filltrapezoid()</code></a></i><br> <i>2.3.22 <a href="#nxdrawline"><code>nx_drawline()</code></a></i><br> - <i>2.3.23 <a href="#nxglrgb2yuv"><code>nx_setbgcolor()</code></a></i><br> - <i>2.3.24 <a href="#nxmove"><code>nx_move()</code></a></i><br> - <i>2.3.25 <a href="#nxbitmap"><code>nx_bitmap()</code></a></i><br> - <i>2.3.26 <a href="#nxkbdin"><code>nx_kbdin()</code></a></i><br> - <i>2.3.27 <a href="#nxmousein"><code>nx_mousein()</code></a></i><br> + <i>2.3.23 <a href="#nxdrawcircle"><code>nx_drawcircle()</code></a></i><br> + <i>2.3.24 <a href="#nxfillcircle"><code>nx_fillcircle()</code></a></i><br> + <i>2.3.25 <a href="#nxglrgb2yuv"><code>nx_setbgcolor()</code></a></i><br> + <i>2.3.26 <a href="#nxmove"><code>nx_move()</code></a></i><br> + <i>2.3.27 <a href="#nxbitmap"><code>nx_bitmap()</code></a></i><br> + <i>2.3.28 <a href="#nxkbdin"><code>nx_kbdin()</code></a></i><br> + <i>2.3.29 <a href="#nxmousein"><code>nx_mousein()</code></a></i><br> </ul> </p> </td> @@ -140,15 +144,19 @@ <i>2.4.9 <a href="#nxtkfillwindow"><code>nxtk_fillwindow()</code></a></i><br> <i>2.4.10 <a href="#nxtkfilltrapwindow"><code>nxtk_filltrapwindow()</code></a></i><br> <i>2.4.11 <a href="#nxtkdrawlinewindow"><code>nxtk_drawlinewindow()</code></a></i><br> - <i>2.4.12 <a href="#nxtkmovewindow"><code>nxtk_movewindow()</code></a></i><br> - <i>2.4.13 <a href="#nxtkbitmapwindow"><code>nxtk_bitmapwindow()</code></a></i><br> - <i>2.4.14 <a href="#nxtkopentoolbar"><code>nxtk_opentoolbar()</code></a></i><br> - <i>2.4.15 <a href="#nxtkclosetoolbar"><code>nxtk_closetoolbar()</code></a></i><br> - <i>2.4.16 <a href="#nxtkfilltoolbar"><code>nxtk_filltoolbar()</code></a></i><br> - <i>2.4.17 <a href="#nxtkfilltraptoolbar"><code>nxtk_filltraptoolbar()</code></a></i><br> - <i>2.4.18 <a href="#nxtkdrawlinetoolbar"><code>nxtk_drawlinetoolbar()</code></a></i><br> - <i>2.4.19 <a href="#nxtkmovetoolbar"><code>nxtk_movetoolbar()</code></a></i><br> - <i>2.4.20 <a href="#nxtkbitmaptoolbar"><code>nxtk_bitmaptoolbar()</code></a></i> + <i>2.4.12 <a href="#nxtkdrawcirclewindow"><code>nxtk_drawcirclewindow()</code></a></i><br> + <i>2.4.13 <a href="#nxtkfillcirclewindow"><code>nxtk_fillcirclewindow()</code></a></i><br> + <i>2.4.14 <a href="#nxtkmovewindow"><code>nxtk_movewindow()</code></a></i><br> + <i>2.4.15 <a href="#nxtkbitmapwindow"><code>nxtk_bitmapwindow()</code></a></i><br> + <i>2.4.16 <a href="#nxtkopentoolbar"><code>nxtk_opentoolbar()</code></a></i><br> + <i>2.4.17 <a href="#nxtkclosetoolbar"><code>nxtk_closetoolbar()</code></a></i><br> + <i>2.4.18 <a href="#nxtkfilltoolbar"><code>nxtk_filltoolbar()</code></a></i><br> + <i>2.4.19 <a href="#nxtkfilltraptoolbar"><code>nxtk_filltraptoolbar()</code></a></i><br> + <i>2.4.20 <a href="#nxtkdrawlinetoolbar"><code>nxtk_drawlinetoolbar()</code></a></i><br> + <i>2.4.21 <a href="#nxtkdrawcircletoolbar"><code>nxtk_drawcircletoolbar()</code></a></i><br> + <i>2.4.22 <a href="#nxtkfillcircletoolbar"><code>nxtk_fillcircletoolbar()</code></a></i><br> + <i>2.4.23 <a href="#nxtkmovetoolbar"><code>nxtk_movetoolbar()</code></a></i><br> + <i>2.4.24 <a href="#nxtkbitmaptoolbar"><code>nxtk_bitmaptoolbar()</code></a></i> </ul> </p> <p> @@ -806,6 +814,57 @@ int nxgl_splitline(FAR struct nxgl_vector_s *vector, FAR struct nxgl_trapezoid_s <p> </ul> +<h3>2.2.20 <a name="nxglcirclepts"><code>nxgl_circlepts</code></a></h3> +<ul><pre> +#include <nuttx/nx/nxglib.h> +void nxgl_circlepts(FAR struct nxgl_point_s *center, nxgl_coord_t radius, + FAR struct nxgl_point_s *circle); +</pre></ul> +<p> + <b>Description:</b> + 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 <a href="nxdrawcircle"><code>nx_drawcircle()</code></a> or related APIs to draw a circle outline. +</p> +<p> + <b>Input parameters</b>: +<p> +<ul><dl> + <dt><code>center</code> + <dd>A pointer to the point that is the center of the circle. + <dt><code>radius</code> + <dd>The radius of the circle in pixels. + <dt><code>circle</code> + <dd>A pointer the first entry in an array of 16 points where the circle points will be returned. +</dl></ul> +<p> + <b>Returned value</b>: None +</p> + +<h3>2.2.21 <a name="nxglcircletraps"><code>nxgl_circletraps</code></a></h3> +<ul><pre> +#include <nuttx/nx/nxglib.h> +oid nxgl_circletraps(FAR struct nxgl_point_s *center, nxgl_coord_t radius, + FAR struct nxgl_trapezoid_s *circle); +</pre></ul> +<p> + <b>Description:</b> + Given a description of a a circle, return 8 trapezoids that can be used to fill the circle by <a href="nxfillcircle"><code>nx_fillcircle()</code></a> and other interfaces. +</p> +<p> + <b>Input parameters</b>: +<p> +<ul><dl> + <dt><code>center</code> + <dd>A pointer to the point that is the center of the circle. + <dt><code>radius</code> + <dd>The radius of the circle in pixels. + <dt><code>circle</code> + <dd>A pointer the first entry in an array of 8 trapezoids where the circle description will be returned. +</dl></ul> +<p> + <b>Returned value</b>: None +</p> + <h2>2.3 <a name="nx2">NX</a></h2> <h3>2.3.1 <a name="nxppdefs">Pre-Processor Definitions</a></h3> @@ -1685,7 +1744,76 @@ int nx_drawline(NXWINDOW hwnd, FAR struct nxgl_vector_s *vector, <code>ERROR</code> on failure with <code>errno</code> set appropriately </p> -<h3>2.3.23 <a name="nxglrgb2yuv"><code>nx_setbgcolor()</code></a></h3> +<h3>2.3.23 <a name="nxdrawcircle"><code>nx_drawcircle()</code></a></h3> +<p><b>Function Prototype:</b></p> +<ul><pre> +#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]); +</pre></ul> +<p> + <b>Description:</b> + Draw a circular outline using the specified line thickness and color. +</p> +<p> + <b>Input Parameters:</b> + <ul><dl> + <dt><code>hwnd</code> + <dd>The handle returned by <a href="#nxopenwindow"><code>nx_openwindow()</code></a> + or <a href="#nxrequestbkgd"><code>nx_requestbkgd()</code></a> + <dt><code>center</code> + <dd>A pointer to the point that is the center of the circle. + <dt><code>radius</code> + <dd>The radius of the circle in pixels. + <dt><code>width</code> + <dd>The width of the line + <dt><code>color</code> + <dd>The color to use to fill the line + </dl></ul> +</p> +<p> + <b>Returned Value:</b> + <code>OK</code> on success; + <code>ERROR</code> on failure with <code>errno</code> set appropriately +</p> + +<h3>2.3.24 <a name="nxfillcircle"><code>nx_fillcircle()</code></a></h3> +<p><b>Function Prototype:</b></p> +<ul><pre> +#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]); +</pre></ul> +<p> + <b>Description:</b> + Fill a circular region using the specified color. +</p> +<p> + <b>Input Parameters:</b> + <ul><dl> + <dt><code>hwnd</code> + <dd>The handle returned by <a href="#nxopenwindow"><code>nx_openwindow()</code></a> + or <a href="#nxrequestbkgd"><code>nx_requestbkgd()</code></a> + <dt><code>center</code> + <dd>A pointer to the point that is the center of the circle. + <dt><code>radius</code> + <dd>The width of the line + <dt><code>color</code> + <dd>The color to use to fill the circle + </dl></ul> +</p> +<p> + <b>Returned Value:</b> + <code>OK</code> on success; + <code>ERROR</code> on failure with <code>errno</code> set appropriately +</p> + +<h3>2.3.25 <a name="nxglrgb2yuv"><code>nx_setbgcolor()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nx/nxglib.h> @@ -1713,7 +1841,7 @@ int nx_setbgcolor(NXHANDLE handle, <code>ERROR</code> on failure with <code>errno</code> set appropriately </p> -<h3>2.3.24 <a name="nxmove"><code>nx_move()</code></a></h3> +<h3>2.3.26 <a name="nxmove"><code>nx_move()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nx/nxglib.h> @@ -1744,7 +1872,7 @@ int nx_move(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, <code>ERROR</code> on failure with <code>errno</code> set appropriately </p> -<h3>2.3.25 <a name="nxbitmap"><code>nx_bitmap()</code></a></h3> +<h3>2.3.27 <a name="nxbitmap"><code>nx_bitmap()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nx/nxglib.h> @@ -1786,7 +1914,7 @@ int nx_bitmap(NXWINDOW hwnd, FAR const struct nxgl_rect_s *dest, <code>ERROR</code> on failure with <code>errno</code> set appropriately </p> -<h3>2.3.26 <a name="nxkbdin"><code>nx_kbdin()</code></a></h3> +<h3>2.3.28 <a name="nxkbdin"><code>nx_kbdin()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nx/nxglib.h> @@ -1809,7 +1937,7 @@ int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch); <code>ERROR</code> on failure with <code>errno</code> set appropriately </p> -<h3>2.3.27 <a name="nxmousein"><code>nx_mousein()</code></a></h3> +<h3>2.3.29 <a name="nxmousein"><code>nx_mousein()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nx/nxglib.h> @@ -2202,7 +2330,76 @@ int nxtk_drawlinewindow(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector, <code>ERROR</code> on failure with <code>errno</code> set appropriately </p> -<h3>2.4.12 <a name="nxtkmovewindow"><code>nxtk_movewindow()</code></a></h3> +<h3>2.4.12 <a name="nxtkdrawcirclewindow"><code>nxtk_drawcirclewindow()</code></a></h3> +<p><b>Function Prototype:</b></p> +<ul><pre> +#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]); +</pre></ul> +<p> + <b>Description:</b> + Draw a circular outline using the specified line thickness and color. +</p> +<p> + <b>Input Parameters:</b> + <ul><dl> + <dt><code>hfwnd</code> + <dd>A handle previously returned by + <a href="#nxtkopenwindow"><code>nxtk_openwindow()</code></a>. + <dt><code>center</code> + <dd>A pointer to the point that is the center of the circle. + <dt><code>radius</code> + <dd>The radius of the circle in pixels. + <dt><code>width</code> + <dd>The width of the line + <dt><code>color</code> + <dd>The color to use to fill the line + </dl></ul> +</p> +<p> + <b>Returned Value:</b> + <code>OK</code> on success; + <code>ERROR</code> on failure with <code>errno</code> set appropriately +</p> + +<h3>2.4.13 <a name="nxtkfillcirclewindow"><code>nxtk_fillcirclewindow()</code></a></h3> +<p><b>Function Prototype:</b></p> +<ul><pre> +#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]); +</pre></ul> +<p> + <b>Description:</b> + Fill a circular region using the specified color. +</p> +<p> + <b>Input Parameters:</b> + <ul><dl> + <dt><code>hfwnd</code> + <dd>A handle previously returned by + <a href="#nxtkopenwindow"><code>nxtk_openwindow()</code></a>. + <dt><code>center</code> + <dd>A pointer to the point that is the center of the circle. + <dt><code>radius</code> + <dd>The width of the line + <dt><code>color</code> + <dd>The color to use to fill the circle + </dl></ul> +</p> +<p> + <b>Returned Value:</b> + <code>OK</code> on success; + <code>ERROR</code> on failure with <code>errno</code> set appropriately +</p> + +<h3>2.4.14 <a name="nxtkmovewindow"><code>nxtk_movewindow()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nx/nxglib.h> @@ -2235,7 +2432,7 @@ int nxtk_movewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, <code>ERROR</code> on failure with <code>errno</code> set appropriately </p> -<h3>2.4.13 <a name="nxtkbitmapwindow"><code>nxtk_bitmapwindow()</code></a></h3> +<h3>2.4.15 <a name="nxtkbitmapwindow"><code>nxtk_bitmapwindow()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nx/nxglib.h> @@ -2280,7 +2477,7 @@ int nxtk_bitmapwindow(NXTKWINDOW hfwnd, <code>ERROR</code> on failure with <code>errno</code> set appropriately </p> -<h3>2.4.14 <a name="nxtkopentoolbar"><code>nxtk_opentoolbar()</code></a></h3> +<h3>2.4.16 <a name="nxtkopentoolbar"><code>nxtk_opentoolbar()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nx/nxglib.h> @@ -2315,7 +2512,7 @@ int nxtk_opentoolbar(NXTKWINDOW hfwnd, nxgl_coord_t height, <code>ERROR</code> on failure with <code>errno</code> set appropriately </p> -<h3>2.4.15 <a name="nxtkclosetoolbar"><code>nxtk_closetoolbar()</code></a></h3> +<h3>2.4.17 <a name="nxtkclosetoolbar"><code>nxtk_closetoolbar()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nx/nxglib.h> @@ -2344,7 +2541,7 @@ int nxtk_closetoolbar(NXTKWINDOW hfwnd); <code>ERROR</code> on failure with <code>errno</code> set appropriately </p> -<h3>2.4.16 <a name="nxtkfilltoolbar"><code>nxtk_filltoolbar()</code></a></h3> +<h3>2.4.18 <a name="nxtkfilltoolbar"><code>nxtk_filltoolbar()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nx/nxglib.h> @@ -2376,7 +2573,7 @@ int nxtk_filltoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, <code>ERROR</code> on failure with <code>errno</code> set appropriately </p> -<h3>2.4.17 <a name="nxtkfilltraptoolbar"><code>nxtk_filltraptoolbar()</code></a></h3> +<h3>2.4.19 <a name="nxtkfilltraptoolbar"><code>nxtk_filltraptoolbar()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nx/nxglib.h> @@ -2408,7 +2605,7 @@ int nxtk_filltraptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_trapezoid_s *tr <code>ERROR</code> on failure with <code>errno</code> set appropriately </p> -<h3>2.4.18 <a name="nxtkdrawlinetoolbar"><code>nxtk_drawlinetoolbar()</code></a></h3> +<h3>2.4.20 <a name="nxtkdrawlinetoolbar"><code>nxtk_drawlinetoolbar()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nx/nxglib.h> @@ -2445,7 +2642,76 @@ int nxtk_drawlinetoolbar(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector, <code>ERROR</code> on failure with <code>errno</code> set appropriately </p> -<h3>2.4.19 <a name="nxtkmovetoolbar"><code>nxtk_movetoolbar()</code></a></h3> +<h3>2.4.21 <a name="nxtkdrawcircletoolbar"><code>nxtk_drawcircletoolbar()</code></a></h3> +<p><b>Function Prototype:</b></p> +<ul><pre> +#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]); +</pre></ul> +<p> + <b>Description:</b> + Draw a circular outline using the specified line thickness and color. +</p> +<p> + <b>Input Parameters:</b> + <ul><dl> + <dt><code>hfwnd</code> + <dd>A handle previously returned by + <a href="#nxtkopenwindow"><code>nxtk_openwindow()</code></a>. + <dt><code>center</code> + <dd>A pointer to the point that is the center of the circle. + <dt><code>radius</code> + <dd>The radius of the circle in pixels. + <dt><code>width</code> + <dd>The width of the line + <dt><code>color</code> + <dd>The color to use to fill the line + </dl></ul> +</p> +<p> + <b>Returned Value:</b> + <code>OK</code> on success; + <code>ERROR</code> on failure with <code>errno</code> set appropriately +</p> + +<h3>2.4.22 <a name="nxtkfillcircletoolbar"><code>nxtk_fillcircletoolbar()</code></a></h3> +<p><b>Function Prototype:</b></p> +<ul><pre> +#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]); +</pre></ul> +<p> + <b>Description:</b> + Fill a circular region using the specified color. +</p> +<p> + <b>Input Parameters:</b> + <ul><dl> + <dt><code>hfwnd</code> + <dd>A handle previously returned by + <a href="#nxtkopenwindow"><code>nxtk_openwindow()</code></a>. + <dt><code>center</code> + <dd>A pointer to the point that is the center of the circle. + <dt><code>radius</code> + <dd>The width of the line + <dt><code>color</code> + <dd>The color to use to fill the circle + </dl></ul> +</p> +<p> + <b>Returned Value:</b> + <code>OK</code> on success; + <code>ERROR</code> on failure with <code>errno</code> set appropriately +</p> + +<h3>2.4.23 <a name="nxtkmovetoolbar"><code>nxtk_movetoolbar()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nx/nxglib.h> @@ -2479,7 +2745,7 @@ int nxtk_movetoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *rect, <code>ERROR</code> on failure with <code>errno</code> set appropriately </p> -<h3>2.4.20 <a name="nxtkbitmaptoolbar"><code>nxtk_bitmaptoolbar()</code></a></h3> +<h3>2.4.24 <a name="nxtkbitmaptoolbar"><code>nxtk_bitmaptoolbar()</code></a></h3> <p><b>Function Prototype:</b></p> <ul><pre> #include <nuttx/nx/nxglib.h> @@ -3330,6 +3596,20 @@ make </td> <td align="center" bgcolor="skyblue">YES</td> </tr> +<tr> + <td align="left" valign="top"><a href="#nxglcirclepts"><code>nxgl_circlepts</code></a></td> + <td> + Verified by <code>apps/examples/nxlines</code>. + </td> + <td align="center" bgcolor="skyblue">YES</td> +</tr> +<tr> + <td align="left" valign="top"><a href="#nxglcircletraps"><code>nxgl_circletraps</code></a></td> + <td> + Verified by <code>apps/examples/nxlines</code>. + </td> + <td align="center" bgcolor="skyblue">YES</td> +</tr> </table></center> <center><h2>Table D.2: <a name="nxcbcoverage">NX Server Callbacks Test Coverage</a></h2></center> @@ -3485,6 +3765,20 @@ make <td align="center" bgcolor="skyblue">YES</td> </tr> <tr> + <td align="left" valign="top"><a href="#nxdrawcircle"><code>nx_drawcircle()</code></a></td> + <td> + Verified by <code>apps/examples/nxlines</code>. + </td> + <td align="center" bgcolor="skyblue">YES</td> +</tr> +<tr> + <td align="left" valign="top"><a href="#nxfillcircle"><code>nx_fillcircle()</code></a></td> + <td> + Verified by <code>apps/examples/nxlines</code>. + </td> + <td align="center" bgcolor="skyblue">YES</td> +</tr> +<tr> <td align="left" valign="top"><a href="#nxglrgb2yuv"><code>nx_setbgcolor()</code></a></td> <td><br></td> <td align="center" bgcolor="skyblue">YES</td> @@ -3572,6 +3866,16 @@ make <td align="center" bgcolor="skyblue">YES</td> </tr> <tr> + <td align="left" valign="top"><a href="#nxtkdrawcirclewindow"><code>nxtk_drawcirclewindow()</code></a></td> + <td><br></td> + <td align="center" bgcolor="skyblue">YES</td> +</tr> +<tr> + <td align="left" valign="top"><a href="#nxtkfillcirclewindow"><code>nxtk_fillcirclewindow()</code></a></td> + <td><br></td> + <td align="center" bgcolor="skyblue">YES</td> +</tr> +<tr> <td align="left" valign="top"><a href="#nxtkmovewindow"><code>nxtk_movewindow()</code></a></td> <td><br></td> <td align="center" bgcolor="lightgrey">NO</td> @@ -3607,6 +3911,16 @@ make <td align="center" bgcolor="lightgrey">NO</td> </tr> <tr> + <td align="left" valign="top"><a href="#nxtkdrawcircletoolbar"><code>nxtk_drawcircletoolbar()</code></a></td> + <td><br></td> + <td align="center" bgcolor="lightgrey">NO</td> +</tr> +<tr> + <td align="left" valign="top"><a href="#nxtkfillcircletoolbar"><code>nxtk_fillcircletoolbar()</code></a></td> + <td><br></td> + <td align="center" bgcolor="lightgrey">NO</td> +</tr> +<tr> <td align="left" valign="top"><a href="#nxtkmovetoolbar"><code>nxtk_movetoolbar()</code></a></td> <td><br></td> <td align="center" bgcolor="lightgrey">NO</td> diff --git a/nuttx/graphics/nxglib/Make.defs b/nuttx/graphics/nxglib/Make.defs index 22c957396..89eb3704b 100644 --- a/nuttx/graphics/nxglib/Make.defs +++ b/nuttx/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/nuttx/graphics/nxglib/nxglib_circlepts.c b/nuttx/graphics/nxglib/nxglib_circlepts.c new file mode 100644 index 000000000..46ebe3291 --- /dev/null +++ b/nuttx/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 <spudmonkey@racsa.co.cr> + * + * 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 <nuttx/config.h> + +#include <string.h> +#include <errno.h> +#include <fixedmath.h> + +#include <nuttx/nx/nxglib.h> + +/**************************************************************************** + * 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/nuttx/graphics/nxglib/nxglib_circletraps.c b/nuttx/graphics/nxglib/nxglib_circletraps.c new file mode 100644 index 000000000..9c9a93cec --- /dev/null +++ b/nuttx/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 <spudmonkey@racsa.co.cr> + * + * 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 <nuttx/config.h> + +#include <string.h> +#include <errno.h> +#include <fixedmath.h> + +#include <nuttx/nx/nxglib.h> + +/**************************************************************************** + * 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/nuttx/graphics/nxglib/nxglib_splitline.c b/nuttx/graphics/nxglib/nxglib_splitline.c index 5cc33fd2b..5bace1448 100644 --- a/nuttx/graphics/nxglib/nxglib_splitline.c +++ b/nuttx/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 <spudmonkey@racsa.co.cr> diff --git a/nuttx/graphics/nxmu/Make.defs b/nuttx/graphics/nxmu/Make.defs index 79959a4a0..f661198d5 100644 --- a/nuttx/graphics/nxmu/Make.defs +++ b/nuttx/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/nuttx/graphics/nxmu/nx_drawcircle.c b/nuttx/graphics/nxmu/nx_drawcircle.c new file mode 100644 index 000000000..5403ee9ef --- /dev/null +++ b/nuttx/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 <spudmonkey@racsa.co.cr> + * + * 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 <nuttx/config.h> + +#include <sys/types.h> +#include <debug.h> +#include <errno.h> + +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> + +/**************************************************************************** + * 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/nuttx/graphics/nxmu/nx_fillcircle.c b/nuttx/graphics/nxmu/nx_fillcircle.c new file mode 100644 index 000000000..dc4115782 --- /dev/null +++ b/nuttx/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 <spudmonkey@racsa.co.cr> + * + * 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 <nuttx/config.h> + +#include <sys/types.h> +#include <debug.h> +#include <errno.h> + +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> + +/**************************************************************************** + * 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/nuttx/graphics/nxsu/Make.defs b/nuttx/graphics/nxsu/Make.defs index 3cddf3a2c..e87f6d035 100644 --- a/nuttx/graphics/nxsu/Make.defs +++ b/nuttx/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/nuttx/graphics/nxsu/nx_drawcircle.c b/nuttx/graphics/nxsu/nx_drawcircle.c new file mode 100644 index 000000000..741886bc8 --- /dev/null +++ b/nuttx/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 <spudmonkey@racsa.co.cr> + * + * 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 <nuttx/config.h> + +#include <sys/types.h> +#include <debug.h> +#include <errno.h> + +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> + +/**************************************************************************** + * 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/nuttx/graphics/nxsu/nx_fillcircle.c b/nuttx/graphics/nxsu/nx_fillcircle.c new file mode 100644 index 000000000..9a89c332e --- /dev/null +++ b/nuttx/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 <spudmonkey@racsa.co.cr> + * + * 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 <nuttx/config.h> + +#include <sys/types.h> +#include <debug.h> +#include <errno.h> + +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nx.h> + +/**************************************************************************** + * 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/nuttx/graphics/nxtk/Make.defs b/nuttx/graphics/nxtk/Make.defs index 736d91003..782fbc9b6 100644 --- a/nuttx/graphics/nxtk/Make.defs +++ b/nuttx/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/nuttx/graphics/nxtk/nxtk_drawcircletoolbar.c b/nuttx/graphics/nxtk/nxtk_drawcircletoolbar.c new file mode 100644 index 000000000..558b3413b --- /dev/null +++ b/nuttx/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 <spudmonkey@racsa.co.cr> + * + * 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 <nuttx/config.h> + +#include <sys/types.h> +#include <debug.h> +#include <errno.h> + +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nxtk.h> + +/**************************************************************************** + * 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/nuttx/graphics/nxtk/nxtk_drawcirclewindow.c b/nuttx/graphics/nxtk/nxtk_drawcirclewindow.c new file mode 100644 index 000000000..d4bd79a30 --- /dev/null +++ b/nuttx/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 <spudmonkey@racsa.co.cr> + * + * 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 <nuttx/config.h> + +#include <sys/types.h> +#include <debug.h> +#include <errno.h> + +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nxtk.h> + +/**************************************************************************** + * 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/nuttx/graphics/nxtk/nxtk_fillcircletoolbar.c b/nuttx/graphics/nxtk/nxtk_fillcircletoolbar.c new file mode 100644 index 000000000..d2e7e5ecb --- /dev/null +++ b/nuttx/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 <spudmonkey@racsa.co.cr> + * + * 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 <nuttx/config.h> + +#include <sys/types.h> +#include <debug.h> +#include <errno.h> + +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nxtk.h> + +/**************************************************************************** + * 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/nuttx/graphics/nxtk/nxtk_fillcirclewindow.c b/nuttx/graphics/nxtk/nxtk_fillcirclewindow.c new file mode 100644 index 000000000..4fc7fef64 --- /dev/null +++ b/nuttx/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 <spudmonkey@racsa.co.cr> + * + * 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 <nuttx/config.h> + +#include <sys/types.h> +#include <debug.h> +#include <errno.h> + +#include <nuttx/nx/nxglib.h> +#include <nuttx/nx/nxtk.h> + +/**************************************************************************** + * 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/nuttx/include/nuttx/nx/nx.h b/nuttx/include/nuttx/nx/nx.h index 66163e679..6912d5552 100644 --- a/nuttx/include/nuttx/nx/nx.h +++ b/nuttx/include/nuttx/nx/nx.h @@ -634,6 +634,49 @@ 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 * * Description: diff --git a/nuttx/include/nuttx/nx/nxglib.h b/nuttx/include/nuttx/nx/nxglib.h index 03f87f785..06c9eb383 100644 --- a/nuttx/include/nuttx/nx/nxglib.h +++ b/nuttx/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/nuttx/include/nuttx/nx/nxtk.h b/nuttx/include/nuttx/nx/nxtk.h index d0a4dcb86..6a288c37a 100644 --- a/nuttx/include/nuttx/nx/nxtk.h +++ b/nuttx/include/nuttx/nx/nxtk.h @@ -265,6 +265,51 @@ EXTERN int nxtk_drawlinewindow(NXTKWINDOW hfwnd, 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 * * Description: @@ -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 @@ -415,6 +460,51 @@ EXTERN int nxtk_drawlinetoolbar(NXTKWINDOW hfwnd, 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 * * Description: |