Add a 'capped' boolean parameter to all drawline/drawLine functions/methods. The idea is that this will produce better joining between lines

10 files changed, 69 insertions, 38 deletions

diff --git a/nuttx/Documentation/NXGraphicsSubsystem.html b/nuttx/Documentation/NXGraphicsSubsystem.html
index c8c3e0b83..d13a115b5 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: December 28, 2013</p>
+      <p>Last Updated: April 5, 2015</p>
     </td>
   </tr>
 </table>
@@ -1759,7 +1759,8 @@ int nx_filltrapezoid(NXWINDOW hwnd, FAR const struct nxgl_rect_s *clip,
 #include &lt;nuttx/nx/nx.h&gt;
 
 int nx_drawline(NXWINDOW hwnd, FAR struct nxgl_vector_s *vector,
-               nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+               nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES],
+               bool capped);
 </pre></ul>
 <p>
   <b>Description:</b>
@@ -1780,6 +1781,8 @@ int nx_drawline(NXWINDOW hwnd, FAR struct nxgl_vector_s *vector,
       <dd>The width of the line
     <dt><code>color</code>
       <dd>The color to use to fill the line
+    <dt><code>capped</code>
+      <dd>Draw a circular cap both ends of the line to support better line joins
   </dl></ul>
 </p>
 <p>
@@ -2385,7 +2388,8 @@ int nxtk_filltrapwindow(NXTKWINDOW hfwnd,
 #include &lt;nuttx/nx/nxtk.h&gt;
 
 int nxtk_drawlinewindow(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector,
-                        nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+                        nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES],
+                        bool capped);
 </pre></ul>
 <p>
   <b>Description:</b>
@@ -2406,6 +2410,8 @@ int nxtk_drawlinewindow(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector,
       <dd>The width of the line
     <dt><code>color</code>
       <dd>The color to use to fill the line
+    <dt><code>capped</code>
+      <dd>Draw a circular cap both ends of the line to support better line joins
   </dl></ul>
 </p>
 <p>
@@ -2738,7 +2744,8 @@ int nxtk_filltraptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_trapezoid_s *tr
 #include &lt;nuttx/nx/nxtk.h&gt;
 
 int nxtk_drawlinetoolbar(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector,
-                         nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+                         nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES],
+                         capped);
 
 </pre></ul>
 <p>
@@ -2759,6 +2766,8 @@ int nxtk_drawlinetoolbar(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector,
       <dd>The width of the line
     <dt><code>color</code>
       <dd>The color to use to fill the line
+    <dt><code>capped</code>
+      <dd>Draw a circular cap both ends of the line to support better line joins
   </dl></ul>
 </p>
 <p>
diff --git a/nuttx/TODO b/nuttx/TODO
index d0d4027f3..373a586f7 100644
--- a/nuttx/TODO
+++ b/nuttx/TODO
@@ -880,20 +880,24 @@ o Network (net/, drivers/net)
                should be eliminated).  This applies to almost all Ethernet
                drivers:
 
-               ARCHITECTURE   CONFIG_NET_NOINTS
-               C5471          NO
-               STM32          YES <<
-               TIVA/LM3S      NO
-               TIVA/TM4C      YES <<
-               eZ80           NO
-               LPC17xx        YES <<
-               DMxxx NIC      NO
-               PIC32          NO
-               RGMP           NO
-               SAM3/4         YES <<
-               SAMA5D3        NO
-               SAMA5D4        YES <<
-               SIM            N/A << Doesn't support interrupts
+               ARCHITECTURE   CONFIG_NET_NOINTS?      ADDRESS FILTER SUPPORT?
+               C5471          NO                      NO
+               STM32          YES                     YES
+               TIVA           ----------------------- ------
+                 LM3S         NO                      NO
+                 TM4C         YES                     YES
+               eZ80           NO                      NO
+               LPC17xx        YES (could be issues)   YES (not tested)
+               DMxxx NIC      NO                      NO
+               PIC32          NO                      NO
+               RGMP           ???                     ???
+               SAM3/4         YES                     YES
+               SAMA5D         ----------------------- ------
+                 EMACA        NO                      YES (not tested)
+                 EMACB        YES                     YES
+                 GMAC         NO                      YES (not tested)
+               SAMV7          YES                     YES
+               SIM            N/A  (No interrupts)    NO
 
                The general outline of how this might be done is included in
                drivers/net/skeleton.c
diff --git a/nuttx/include/nuttx/nx/nx.h b/nuttx/include/nuttx/nx/nx.h
index 6093a0878..6f8077f61 100644
--- a/nuttx/include/nuttx/nx/nx.h
+++ b/nuttx/include/nuttx/nx/nx.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * include/nuttx/nx/nx.h
  *
- *   Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -776,6 +776,8 @@ int nx_filltrapezoid(NXWINDOW hwnd, FAR const struct nxgl_rect_s *clip,
  *   vector - Describes the line to be drawn
  *   width  - The width of the line
  *   color  - The color to use to fill the line
+ *   capped - Draw a circular cap both ends of the line to support better
+ *            line joins
  *
  * Return:
  *   OK on success; ERROR on failure with errno set appropriately
@@ -783,7 +785,8 @@ int nx_filltrapezoid(NXWINDOW hwnd, FAR const struct nxgl_rect_s *clip,
  ****************************************************************************/
 
 int nx_drawline(NXWINDOW hwnd, FAR struct nxgl_vector_s *vector,
-                nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+                nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES],
+                bool capped);
 
 /****************************************************************************
  * Name: nx_drawcircle
diff --git a/nuttx/include/nuttx/nx/nxtk.h b/nuttx/include/nuttx/nx/nxtk.h
index eb0d9df6f..7b7d76212 100644
--- a/nuttx/include/nuttx/nx/nxtk.h
+++ b/nuttx/include/nuttx/nx/nxtk.h
@@ -1,7 +1,7 @@
 /****************************************************************************
  * include/nuttx/nx/nxtk.h
  *
- *   Copyright (C) 2008-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2012, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -354,6 +354,8 @@ EXTERN int nxtk_filltrapwindow(NXTKWINDOW hfwnd,
  *   vector - Describes the line to be drawn
  *   width  - The width of the line
  *   color  - The color to use to fill the line
+ *   capped - Draw a circular cap both ends of the line to support better
+ *            line joins
  *
  * Return:
  *   OK on success; ERROR on failure with errno set appropriately
@@ -363,7 +365,8 @@ EXTERN int nxtk_filltrapwindow(NXTKWINDOW hfwnd,
 EXTERN int nxtk_drawlinewindow(NXTKWINDOW hfwnd,
                               FAR struct nxgl_vector_s *vector,
                               nxgl_coord_t width,
-                              nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+                              nxgl_mxpixel_t color[CONFIG_NX_NPLANES],
+                              bool capped);
 
 /****************************************************************************
  * Name: nxtk_drawcirclewindow
@@ -598,6 +601,8 @@ EXTERN int nxtk_filltraptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_trapezoi
  *   vector - Describes the line to be drawn
  *   width  - The width of the line
  *   color  - The color to use to fill the line
+ *   capped - Draw a circular cap both ends of the line to support better
+ *            line joins
  *
  * Return:
  *   OK on success; ERROR on failure with errno set appropriately
@@ -607,7 +612,8 @@ EXTERN int nxtk_filltraptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_trapezoi
 EXTERN int nxtk_drawlinetoolbar(NXTKWINDOW hfwnd,
                                 FAR struct nxgl_vector_s *vector,
                                 nxgl_coord_t width,
-                                nxgl_mxpixel_t color[CONFIG_NX_NPLANES]);
+                                nxgl_mxpixel_t color[CONFIG_NX_NPLANES],
+                                bool capped);
 
 /****************************************************************************
  * Name: nxtk_drawcircletoolbar
diff --git a/nuttx/libnx/nx/nx_drawcircle.c b/nuttx/libnx/nx/nx_drawcircle.c
index 97f0a4e3f..ea279a45d 100644
--- a/nuttx/libnx/nx/nx_drawcircle.c
+++ b/nuttx/libnx/nx/nx_drawcircle.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * libnx/nx/nx_drawcircle.c
  *
- *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -128,7 +128,7 @@ int nx_drawcircle(NXWINDOW hwnd, FAR const struct nxgl_point_s *center,
       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);
+      ret = nx_drawline(hwnd, &vector, width, color, true);
       if (ret != OK)
         {
           return ret;
@@ -141,5 +141,5 @@ int nx_drawcircle(NXWINDOW hwnd, FAR const struct nxgl_point_s *center,
   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);
+  return nx_drawline(hwnd, &vector, width, color, true);
 }
diff --git a/nuttx/libnx/nx/nx_drawline.c b/nuttx/libnx/nx/nx_drawline.c
index ac47a4418..f29c3b609 100644
--- a/nuttx/libnx/nx/nx_drawline.c
+++ b/nuttx/libnx/nx/nx_drawline.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * libnx/nx/nx_drawline.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -83,6 +83,8 @@
  *   vector - Describes the line to be drawn
  *   width  - The width of the line
  *   color  - The color to use to fill the line
+ *   capped - Draw a circular cap both ends of the line to support better
+ *            line joins
  *
  * Return:
  *   OK on success; ERROR on failure with errno set appropriately
@@ -90,7 +92,8 @@
  ****************************************************************************/
 
 int nx_drawline(NXWINDOW hwnd, FAR struct nxgl_vector_s *vector,
-                nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
+                nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES],
+                bool capped)
 {
   struct nxgl_trapezoid_s trap[3];
   struct nxgl_rect_s rect;
diff --git a/nuttx/libnx/nxtk/nxtk_drawcircletoolbar.c b/nuttx/libnx/nxtk/nxtk_drawcircletoolbar.c
index fa7905cd4..3aab9fd6e 100644
--- a/nuttx/libnx/nxtk/nxtk_drawcircletoolbar.c
+++ b/nuttx/libnx/nxtk/nxtk_drawcircletoolbar.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * libnx/nxtk/nxtk_drawcircletoolbar.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -128,7 +128,7 @@ int nxtk_drawcircletoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_point_s *cent
       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);
+      ret = nxtk_drawlinetoolbar(hfwnd, &vector, width, color, true);
       if (ret != OK)
         {
           return ret;
@@ -141,5 +141,5 @@ int nxtk_drawcircletoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_point_s *cent
   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);
+  return nxtk_drawlinetoolbar(hfwnd, &vector, width, color, true);
 }
diff --git a/nuttx/libnx/nxtk/nxtk_drawcirclewindow.c b/nuttx/libnx/nxtk/nxtk_drawcirclewindow.c
index ec0fe6312..38435d943 100644
--- a/nuttx/libnx/nxtk/nxtk_drawcirclewindow.c
+++ b/nuttx/libnx/nxtk/nxtk_drawcirclewindow.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * libnx/nxtk/nxtk_drawcirclewindow.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -128,7 +128,7 @@ int nxtk_drawcirclewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_point_s *cente
       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);
+      ret = nxtk_drawlinewindow(hfwnd, &vector, width, color, true);
       if (ret != OK)
         {
           return ret;
@@ -141,5 +141,5 @@ int nxtk_drawcirclewindow(NXTKWINDOW hfwnd, FAR const struct nxgl_point_s *cente
   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);
+  return nxtk_drawlinewindow(hfwnd, &vector, width, color, true);
 }
diff --git a/nuttx/libnx/nxtk/nxtk_drawlinetoolbar.c b/nuttx/libnx/nxtk/nxtk_drawlinetoolbar.c
index 2bcb8b890..8c2810ce3 100644
--- a/nuttx/libnx/nxtk/nxtk_drawlinetoolbar.c
+++ b/nuttx/libnx/nxtk/nxtk_drawlinetoolbar.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * libnx/nxtk/nxtk_drawlinetoolbar.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -85,6 +85,8 @@
  *   vector - Describes the line to be drawn
  *   width  - The width of the line
  *   color  - The color to use to fill the line
+ *   capped - Draw a circular cap both ends of the line to support better
+ *            line joins
  *
  * Return:
  *   OK on success; ERROR on failure with errno set appropriately
@@ -92,7 +94,8 @@
  ****************************************************************************/
 
 int nxtk_drawlinetoolbar(NXTKWINDOW hfwnd,  FAR struct nxgl_vector_s *vector,
-                         nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
+                         nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES],
+                         bool capped)
 
 {
   struct nxgl_trapezoid_s trap[3];
diff --git a/nuttx/libnx/nxtk/nxtk_drawlinewindow.c b/nuttx/libnx/nxtk/nxtk_drawlinewindow.c
index 176f60b82..8183bf79d 100644
--- a/nuttx/libnx/nxtk/nxtk_drawlinewindow.c
+++ b/nuttx/libnx/nxtk/nxtk_drawlinewindow.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * libnx/nxtk/nxtk_drawlinewindow.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -84,6 +84,8 @@
  *   vector - Describes the line to be drawn
  *   width  - The width of the line
  *   color  - The color to use to fill the line
+ *   capped - Draw a circular cap both ends of the line to support better
+ *            line joins
  *
  * Return:
  *   OK on success; ERROR on failure with errno set appropriately
@@ -91,7 +93,8 @@
  ****************************************************************************/
 
 int nxtk_drawlinewindow(NXTKWINDOW hfwnd, FAR struct nxgl_vector_s *vector,
-                        nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
+                        nxgl_coord_t width, nxgl_mxpixel_t color[CONFIG_NX_NPLANES],
+                        bool capped)
 
 {
   struct nxgl_trapezoid_s trap[3];