Add NX line drawing interfaces

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3836 42af7a65-404d-4744-a932-0658087f49c3

2 files changed, 137 insertions, 1 deletions

diff --git a/nuttx/graphics/nxsu/Make.defs b/nuttx/graphics/nxsu/Make.defs
index af525bea9..3cddf3a2c 100644
--- a/nuttx/graphics/nxsu/Make.defs
+++ b/nuttx/graphics/nxsu/Make.defs
@@ -38,6 +38,6 @@ 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_setsize.c nx_setbgcolor.c nx_setposition.c nx_drawline.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_drawline.c b/nuttx/graphics/nxsu/nx_drawline.c
new file mode 100644
index 000000000..ca4ddaf18
--- /dev/null
+++ b/nuttx/graphics/nxsu/nx_drawline.c
@@ -0,0 +1,136 @@
+/****************************************************************************
+ * graphics/nxsu/nx_drawline.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
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: nx_drawline
+ *
+ * Description:
+ *  Fill the specified line in the window with the specified color.  This
+ *  is simply a wrapper that uses nxgl_splitline() to break the line into
+ *  trapezoids and then calls nx_filltrapezoid() to render the line.
+ *
+ * Input Parameters:
+ *   hwnd   - The window handle
+ *   vector - Describes the line to be drawn
+ *   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_drawline(NXWINDOW hwnd, FAR struct nxgl_vector_s *vector,
+                nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
+{
+  struct nxgl_trapezoid_s trap[3];
+  struct nxgl_rect_s rect;
+  int ret;
+
+#ifdef CONFIG_DEBUG
+  if (!hwnd || !vector || width < 1 || !color)
+    {
+      set_errno(EINVAL);
+      return ERROR;
+    }
+#endif
+
+  ret = nxgl_splitline(vector, trap, &rect, width);
+  switch (ret)
+    {
+      case 0:
+        ret = nx_filltrapezoid(hwnd, NULL, &trap[0], color);
+        if (ret == OK)
+          {
+            ret = nx_filltrapezoid(hwnd, NULL, &trap[1], color);
+            if (ret == OK)
+              {
+                ret = nx_filltrapezoid(hwnd, NULL, &trap[2], color);
+              }
+          }
+        break;
+
+      case 1:
+        ret = nx_filltrapezoid(hwnd, NULL, &trap[1], color);
+        break;
+
+      case 2:
+        ret = nx_fill(hwnd, &rect, color);
+        break;
+
+      default:
+        set_errno(-ret);
+        return ERROR;
+    }
+
+  return ret;
+}