From 3e3d8a2ec4dd07d0ba03eef9ce694950ad2a6368 Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 24 Aug 2011 17:00:51 +0000 Subject: [PATCH] Add a test of the circle rendering logic git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3911 42af7a65-404d-4744-a932-0658087f49c3 --- configs/sim/nx/defconfig | 13 +++++++++++-- configs/stm3210e-eval/nsh2/defconfig | 16 ++++++++++++++-- configs/stm3210e-eval/nxlines/defconfig | 16 ++++++++++++++-- configs/stm3210e-eval/nxtext/defconfig | 16 ++++++++++++++-- 4 files changed, 53 insertions(+), 8 deletions(-) diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig index 9859e74c5a9..3dfd3e820ff 100644 --- a/configs/sim/nx/defconfig +++ b/configs/sim/nx/defconfig @@ -537,8 +537,17 @@ CONFIG_EXAMPLES_NX_NOTIFYSIGNO=4 # depends on CONFIG_EXAMPLES_NXLINES_BPP. # CONFIG_EXAMPLES_NXLINES_LINEWIDTH - Selects the width of the lines in # pixels (default: 16) -# CONFIG_EXAMPLES_NXLINES_LINECOLOR -- The color of the lines drawn in the -# background window. Default depends on CONFIG_EXAMPLES_NXLINES_BPP. +# CONFIG_EXAMPLES_NXLINES_LINECOLOR -- The color of the central lines drawn +# in the background window. Default depends on CONFIG_EXAMPLES_NXLINES_BPP +# (there really is no meaningful default). +# CONFIG_EXAMPLES_NXLINES_BORDERWIDTH -- The width of the circular border +# drawn in the background window. (default: 4). +# CONFIG_EXAMPLES_NXLINES_BORDERCOLOR -- The color of the circular border +# drawn in the background window. Default depends on CONFIG_EXAMPLES_NXLINES_BPP +# (there really is no meaningful default). +# CONFIG_EXAMPLES_NXLINES_CIRCLECOLOR -- The color of the circular region +# filled in the background window. Default depends on CONFIG_EXAMPLES_NXLINES_BPP +# (there really is no meaningful default). # CONFIG_EXAMPLES_NXLINES_BPP -- Pixels per pixel to use. Valid options # include 2, 4, 8, 16, 24, and 32. Default is 16. # CONFIG_EXAMPLES_NXLINES_EXTERNINIT - The driver for the graphics device on diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig index 987127cfdde..d4966988687 100644 --- a/configs/stm3210e-eval/nsh2/defconfig +++ b/configs/stm3210e-eval/nsh2/defconfig @@ -1145,8 +1145,17 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n # depends on CONFIG_EXAMPLES_NXLINES_BPP. # CONFIG_EXAMPLES_NXLINES_LINEWIDTH - Selects the width of the lines in # pixels (default: 16) -# CONFIG_EXAMPLES_NXLINES_LINECOLOR -- The color of the lines drawn in the -# background window. Default depends on CONFIG_EXAMPLES_NXLINES_BPP. +# CONFIG_EXAMPLES_NXLINES_LINECOLOR -- The color of the central lines drawn +# in the background window. Default depends on CONFIG_EXAMPLES_NXLINES_BPP +# (there really is no meaningful default). +# CONFIG_EXAMPLES_NXLINES_BORDERWIDTH -- The width of the circular border +# drawn in the background window. (default: 4). +# CONFIG_EXAMPLES_NXLINES_BORDERCOLOR -- The color of the circular border +# drawn in the background window. Default depends on CONFIG_EXAMPLES_NXLINES_BPP +# (there really is no meaningful default). +# CONFIG_EXAMPLES_NXLINES_CIRCLECOLOR -- The color of the circular region +# filled in the background window. Default depends on CONFIG_EXAMPLES_NXLINES_BPP +# (there really is no meaningful default). # CONFIG_EXAMPLES_NXLINES_BPP -- Pixels per pixel to use. Valid options # include 2, 4, 8, 16, 24, and 32. Default is 16. # CONFIG_EXAMPLES_NXLINES_EXTERNINIT - The driver for the graphics device on @@ -1161,6 +1170,9 @@ CONFIG_EXAMPLES_NXLINES_DEVNO=0 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320 CONFIG_EXAMPLES_NXLINES_LINEWIDTH=16 CONFIG_EXAMPLES_NXLINES_LINECOLOR=0xffe0 +CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=4 +CONFIG_EXAMPLES_NXLINES_BORDERCOLOR=0xffe0 +CONFIG_EXAMPLES_NXLINES_CIRCLECOLOR=0xf7bb CONFIG_EXAMPLES_NXLINES_BPP=16 CONFIG_EXAMPLES_NXLINES_EXTERNINIT=n diff --git a/configs/stm3210e-eval/nxlines/defconfig b/configs/stm3210e-eval/nxlines/defconfig index af7c1b7d00b..6a9ea3979ad 100644 --- a/configs/stm3210e-eval/nxlines/defconfig +++ b/configs/stm3210e-eval/nxlines/defconfig @@ -1156,8 +1156,17 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n # depends on CONFIG_EXAMPLES_NXLINES_BPP. # CONFIG_EXAMPLES_NXLINES_LINEWIDTH - Selects the width of the lines in # pixels (default: 16) -# CONFIG_EXAMPLES_NXLINES_LINECOLOR -- The color of the lines drawn in the -# background window. Default depends on CONFIG_EXAMPLES_NXLINES_BPP. +# CONFIG_EXAMPLES_NXLINES_LINECOLOR -- The color of the central lines drawn +# in the background window. Default depends on CONFIG_EXAMPLES_NXLINES_BPP +# (there really is no meaningful default). +# CONFIG_EXAMPLES_NXLINES_BORDERWIDTH -- The width of the circular border +# drawn in the background window. (default: 4). +# CONFIG_EXAMPLES_NXLINES_BORDERCOLOR -- The color of the circular border +# drawn in the background window. Default depends on CONFIG_EXAMPLES_NXLINES_BPP +# (there really is no meaningful default). +# CONFIG_EXAMPLES_NXLINES_CIRCLECOLOR -- The color of the circular region +# filled in the background window. Default depends on CONFIG_EXAMPLES_NXLINES_BPP +# (there really is no meaningful default). # CONFIG_EXAMPLES_NXLINES_BPP -- Pixels per pixel to use. Valid options # include 2, 4, 8, 16, 24, and 32. Default is 16. # CONFIG_EXAMPLES_NXLINES_EXTERNINIT - The driver for the graphics device on @@ -1172,6 +1181,9 @@ CONFIG_EXAMPLES_NXLINES_DEVNO=0 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320 CONFIG_EXAMPLES_NXLINES_LINEWIDTH=16 CONFIG_EXAMPLES_NXLINES_LINECOLOR=0xffe0 +CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=4 +CONFIG_EXAMPLES_NXLINES_BORDERCOLOR=0xffe0 +CONFIG_EXAMPLES_NXLINES_CIRCLECOLOR=0xf7bb CONFIG_EXAMPLES_NXLINES_BPP=16 CONFIG_EXAMPLES_NXLINES_EXTERNINIT=n diff --git a/configs/stm3210e-eval/nxtext/defconfig b/configs/stm3210e-eval/nxtext/defconfig index dc66b0fa8ba..d48637a1b6c 100644 --- a/configs/stm3210e-eval/nxtext/defconfig +++ b/configs/stm3210e-eval/nxtext/defconfig @@ -1156,8 +1156,17 @@ CONFIG_EXAMPLES_NXIMAGE_EXTERNINIT=n # depends on CONFIG_EXAMPLES_NXLINES_BPP. # CONFIG_EXAMPLES_NXLINES_LINEWIDTH - Selects the width of the lines in # pixels (default: 16) -# CONFIG_EXAMPLES_NXLINES_LINECOLOR -- The color of the lines drawn in the -# background window. Default depends on CONFIG_EXAMPLES_NXLINES_BPP. +# CONFIG_EXAMPLES_NXLINES_LINECOLOR -- The color of the central lines drawn +# in the background window. Default depends on CONFIG_EXAMPLES_NXLINES_BPP +# (there really is no meaningful default). +# CONFIG_EXAMPLES_NXLINES_BORDERWIDTH -- The width of the circular border +# drawn in the background window. (default: 4). +# CONFIG_EXAMPLES_NXLINES_BORDERCOLOR -- The color of the circular border +# drawn in the background window. Default depends on CONFIG_EXAMPLES_NXLINES_BPP +# (there really is no meaningful default). +# CONFIG_EXAMPLES_NXLINES_CIRCLECOLOR -- The color of the circular region +# filled in the background window. Default depends on CONFIG_EXAMPLES_NXLINES_BPP +# (there really is no meaningful default). # CONFIG_EXAMPLES_NXLINES_BPP -- Pixels per pixel to use. Valid options # include 2, 4, 8, 16, 24, and 32. Default is 16. # CONFIG_EXAMPLES_NXLINES_EXTERNINIT - The driver for the graphics device on @@ -1172,6 +1181,9 @@ CONFIG_EXAMPLES_NXLINES_DEVNO=0 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x0320 CONFIG_EXAMPLES_NXLINES_LINEWIDTH=16 CONFIG_EXAMPLES_NXLINES_LINECOLOR=0xffe0 +CONFIG_EXAMPLES_NXLINES_BORDERWIDTH=4 +CONFIG_EXAMPLES_NXLINES_BORDERCOLOR=0xffe0 +CONFIG_EXAMPLES_NXLINES_CIRCLECOLOR=0xf7bb CONFIG_EXAMPLES_NXLINES_BPP=16 CONFIG_EXAMPLES_NXLINES_EXTERNINIT=n