diff options
7 files changed, 829 insertions, 1 deletions
diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt index 6a9164bb6..dfd4c8c14 100644 --- a/NxWidgets/ChangeLog.txt +++ b/NxWidgets/ChangeLog.txt @@ -362,3 +362,7 @@ should be 100, not 50, to be consistent with other default priorities. * NxWidgets::CGlyphSliderHorizontal and NxWidgets::CGlyphSliderHorizontalGrip: New widgets added by Ken Pettit (2013-5-15). +* NxWidgets/UnitTests/CGlyphSliderHorizontal: Addes a unit test for the + NxWidgets::CGlyphSliderHorizontal class. From Ken Pettit (2013-5-17) . +* NxWidgets::CGlyphSliderHorizontal: Fix a drawing error. From Ken + Pettit (2013-5-17). diff --git a/NxWidgets/UnitTests/CGlyphSliderHorizontal/.gitignore b/NxWidgets/UnitTests/CGlyphSliderHorizontal/.gitignore new file mode 100644 index 000000000..22a689acd --- /dev/null +++ b/NxWidgets/UnitTests/CGlyphSliderHorizontal/.gitignore @@ -0,0 +1,12 @@ +Make.dep +.context +.depend +.built +*.swp +*.asm +*.rel +*.lst +*.sym +*.adb +*.lib +*.src diff --git a/NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile b/NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile new file mode 100644 index 000000000..5ab64b10d --- /dev/null +++ b/NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile @@ -0,0 +1,169 @@ +################################################################################# +# NxWidgets/UnitTests/CGlyphSliderHorizontal/Makefile +# +# Copyright (C) 2012-213 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt <gnutt@nuttx.org> +# +# 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, NxWidgets, nor the names of its contributors +# me 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. +# +################################################################################# + +TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} + +-include $(TOPDIR)/Make.defs +include $(APPDIR)$(DELIM)Make.defs + +# Add the path to the NXWidget include directory to the CFLAGS + +NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets" +NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include" +NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)" + +ifeq ($(WINTOOL),y) + CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} + CXXFLAGS += ${shell $(INCDIR) -w "$(CXX)" "$(NXWIDGETS_INC)"} +else + CFLAGS += ${shell $(INCDIR) "$(CC)" "$(NXWIDGETS_INC)"} + CXXFLAGS += ${shell $(INCDIR) "$(CXX)" "$(NXWIDGETS_INC)"} +endif + +# Get the path to the archiver tool + +TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools" +ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh + +# Hello, World! C++ Example + +ASRCS = +CSRCS = +CXXSRCS = cglyphsliderhorizontal_main.cxx cglyphsliderhorizontaltest.cxx + +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) +CXXOBJS = $(CXXSRCS:.cxx=$(OBJEXT)) + +SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS) +OBJS = $(AOBJS) $(COBJS) $(CXXOBJS) + +POSIX_BIN = "$(APPDIR)$(DELIM)libapps$(LIBEXT)" +ifeq ($(WINTOOL),y) + BIN = "${shell cygpath -w $(POSIX_BIN)}" +else + BIN = $(POSIX_BIN) +endif + +ROOTDEPPATH = --dep-path . + +# helloxx built-in application info + +APPNAME = cglyphsliderhorizontal +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 + +# Common build + +VPATH = + +all: .built +.PHONY: clean depend context disclean chkcxx chklib + +# Object file creation targets + +$(AOBJS): %$(OBJEXT): %.S + $(call ASSEMBLE, $<, $@) + +$(COBJS): %$(OBJEXT): %.c + $(call COMPILE, $<, $@) + +$(CXXOBJS): %$(OBJEXT): %.cxx + $(call COMPILEXX, $<, $@) + +# Verify that the NuttX configuration is setup to support C++ + +chkcxx: +ifneq ($(CONFIG_HAVE_CXX),y) + @echo "" + @echo "In order to use this example, you toolchain must support must" + @echo "" + @echo " (1) Explicitly select CONFIG_HAVE_CXX to build in C++ support" + @echo " (2) Define CXX, CXXFLAGS, and COMPILEXX in the Make.defs file" + @echo " of the configuration that you are using." + @echo "" + @exit 1 +endif + +# Verify that the NXWidget library has been built + +chklib: + $(Q) ( \ + if [ ! -e "$(NXWIDGETS_LIB)" ]; then \ + echo "$(NXWIDGETS_LIB) does not exist."; \ + echo "Please go to $(NXWIDGETS_DIR)"; \ + echo "and rebuild the library"; \ + exit 1; \ + fi; \ + ) + +# Library creation targets + +$(NXWIDGETS_LIB): # Just to keep make happy. chklib does the work. + +.built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB) + $(call ARCHIVE, $(BIN), $(OBJS)) +ifeq ($(WINTOOL),y) + $(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR) +else + $(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR) +endif + $(Q) touch .built + +# Standard housekeeping targets + +.context: +ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) +endif + $(Q) touch $@ + +context: .context + +.depend: Makefile $(SRCS) + $(Q) $(MKDEP) $(ROOTDEPPATH) $(CXX) -- $(CXXFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ + +depend: .depend + +clean: + $(call DELFILE, .built) + $(call CLEAN) + +distclean: clean + $(call DELFILE, Make.dep) + $(call DELFILE, .depend) + +-include Make.dep diff --git a/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx b/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx new file mode 100644 index 000000000..24450fcfd --- /dev/null +++ b/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx @@ -0,0 +1,230 @@ +///////////////////////////////////////////////////////////////////////////// +// NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx +// +// Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +// Author: Gregory Nutt <gnutt@nuttx.org> +// +// 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, NxWidgets, nor the names of its contributors +// me 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 <nuttx/init.h> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <unistd.h> +#include <debug.h> + +#include <nuttx/nx/nx.h> + +#include "cglyphsliderhorizontaltest.hxx" + +///////////////////////////////////////////////////////////////////////////// +// Definitions +///////////////////////////////////////////////////////////////////////////// + +#define MAX_SLIDER 50 + +///////////////////////////////////////////////////////////////////////////// +// Private Classes +///////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// Private Data +///////////////////////////////////////////////////////////////////////////// + +static unsigned int g_mmInitial; +static unsigned int g_mmprevious; + +///////////////////////////////////////////////////////////////////////////// +// Public Function Prototypes +///////////////////////////////////////////////////////////////////////////// + +// Suppress name-mangling + +extern "C" int cglyphsliderhorizontal_main(int argc, char *argv[]); + +///////////////////////////////////////////////////////////////////////////// +// Private Functions +///////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// Name: updateMemoryUsage +///////////////////////////////////////////////////////////////////////////// + +static void updateMemoryUsage(unsigned int previous, + FAR const char *msg) +{ + struct mallinfo mmcurrent; + + /* Get the current memory usage */ + +#ifdef CONFIG_CAN_PASS_STRUCTS + mmcurrent = mallinfo(); +#else + (void)mallinfo(&mmcurrent); +#endif + + /* Show the change from the previous time */ + + message("\n%s:\n", msg); + message(" Before: %8d After: %8d Change: %8d\n\n", + previous, mmcurrent.uordblks, mmcurrent.uordblks - previous); + + /* Set up for the next test */ + + g_mmprevious = mmcurrent.uordblks; +} + +///////////////////////////////////////////////////////////////////////////// +// Name: initMemoryUsage +///////////////////////////////////////////////////////////////////////////// + +static void initMemoryUsage(void) +{ + struct mallinfo mmcurrent; + + /* Get the current memory usage */ + +#ifdef CONFIG_CAN_PASS_STRUCTS + mmcurrent = mallinfo(); +#else + (void)mallinfo(&mmcurrent); +#endif + + g_mmInitial = mmcurrent.uordblks; + g_mmprevious = mmcurrent.uordblks; +} + +///////////////////////////////////////////////////////////////////////////// +// Public Functions +///////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// Name: nxheaders_main +///////////////////////////////////////////////////////////////////////////// + +int cglyphsliderhorizontal_main(int argc, char *argv[]) +{ + // Initialize memory monitor logic + + initMemoryUsage(); + + // Create an instance of the checkbox test + + message("csliderhorizontal_main: Create CGlyphSliderHorizontalTest instance\n"); + CGlyphSliderHorizontalTest *test = new CGlyphSliderHorizontalTest(); + updateMemoryUsage(g_mmprevious, "After creating CGlyphSliderHorizontalTest"); + + // Connect the NX server + + message("csliderhorizontal_main: Connect the CGlyphSliderHorizontalTest instance to the NX server\n"); + if (!test->connect()) + { + message("csliderhorizontal_main: Failed to connect the CGlyphSliderHorizontalTest instance to the NX server\n"); + delete test; + return 1; + } + updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After connecting to the server"); + + // Create a window to draw into + + message("csliderhorizontal_main: Create a Window\n"); + if (!test->createWindow()) + { + message("csliderhorizontal_main: Failed to create a window\n"); + delete test; + return 1; + } + updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After creating a window"); + + // Create a slider + + message("csliderhorizontal_main: Create a Slider\n"); + CGlyphSliderHorizontal *slider = test->createSlider(); + if (!slider) + { + message("csliderhorizontal_main: Failed to create a slider\n"); + delete test; + return 1; + } + updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After creating a slider"); + + + // Set the slider minimum and maximum values + + slider->setMinimumValue(0); + slider->setMaximumValue(MAX_SLIDER); + slider->setValue(0); + message("csliderhorizontal_main: Slider range %d->%d Initial value %d\n", + slider->getMinimumValue(), slider->getMaximumValue(), + slider->getValue()); + + // Show the initial state of the checkbox + + test->showSlider(slider); + + // Now move the slider up + + for (int i = 0; i <= MAX_SLIDER; i++) + { + slider->setValue(i); + test->showSlider(slider); + message("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue()); + usleep(1000 * 50); // The simulation needs this to let the X11 event loop run + } + updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After moving the slider up"); + + // And move the slider down + + for (int i = MAX_SLIDER; i >= 0; i--) + { + slider->setValue(i); + test->showSlider(slider); + message("csliderhorizontal_main: %d. New value %d\n", i, slider->getValue()); + usleep(1000 * 50); // The simulation needs this to let the X11 event loop run + } + updateMemoryUsage(g_mmprevious, "csliderhorizontal_main: After moving the slider down"); + sleep(1); + + // Clean up and exit + + message("csliderhorizontal_main: Clean-up and exit\n"); + delete slider; + updateMemoryUsage(g_mmprevious, "After deleting the slider"); + delete test; + updateMemoryUsage(g_mmprevious, "After deleting the test"); + updateMemoryUsage(g_mmInitial, "Final memory usage"); + return 0; +} diff --git a/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx b/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx new file mode 100644 index 000000000..28f47af36 --- /dev/null +++ b/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx @@ -0,0 +1,276 @@ +///////////////////////////////////////////////////////////////////////////// +// NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.cxx +// +// Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +// Author: Gregory Nutt <gnutt@nuttx.org> +// +// 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, NxWidgets, nor the names of its contributors +// me 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 <nuttx/init.h> +#include <cstdio> +#include <cerrno> +#include <debug.h> + +#include <nuttx/nx/nx.h> +#include <nuttx/nx/nxfonts.h> + +#include "nxconfig.hxx" +#include "crlepalettebitmap.hxx" +#include "cbgwindow.hxx" +#include "cglyphsliderhorizontaltest.hxx" + +///////////////////////////////////////////////////////////////////////////// +// Definitions +///////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// Private Classes +///////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// Private Data +///////////////////////////////////////////////////////////////////////////// + +static const NXWidgets::nxwidget_pixel_t hilight_palette[8] = +{ + CONFIG_CGLYPHSLIDERHORIZONTALTEST_BGCOLOR, MKRGB( 61, 74,158), MKRGB(113,140,242), MKRGB(171,186,255), + MKRGB(255,255,255), MKRGB(119,130,199), MKRGB(177,219,255), MKRGB(202,224,255), +}; + +static const NXWidgets::SRlePaletteBitmapEntry vol_bitmap[] = +{ + { 22, 0}, /* Row 0 */ + { 9, 0}, { 5, 7}, { 8, 0}, /* Row 1 */ + { 6, 0}, { 2, 6}, { 6, 7}, { 2, 6}, { 1, 7}, { 5, 0}, /* Row 2 */ + { 4, 0}, { 2, 3}, { 9, 6}, { 3, 3}, { 4, 0}, /* Row 3 */ + { 3, 0}, { 5, 3}, { 6, 6}, { 5, 3}, { 3, 0}, /* Row 4 */ + { 3, 0}, { 16, 3}, { 3, 0}, /* Row 5 */ + { 2, 0}, { 2, 2}, { 13, 3}, { 3, 2}, { 2, 0}, /* Row 6 */ + { 1, 0}, { 1, 5}, { 4, 2}, { 10, 3}, { 4, 2}, { 1, 5}, + { 1, 0}, /* Row 7 */ + { 1, 0}, { 2, 5}, { 15, 2}, { 3, 5}, { 1, 0}, /* Row 8 */ + { 1, 0}, { 5, 5}, { 10, 2}, { 5, 5}, { 1, 0}, /* Row 9 */ + { 1, 0}, { 2, 1}, { 15, 5}, { 3, 1}, { 1, 0}, /* Row 10 */ + { 1, 0}, { 5, 1}, { 10, 5}, { 5, 1}, { 1, 0}, /* Row 11 */ + { 1, 0}, { 20, 1}, { 1, 0}, /* Row 12 */ + { 1, 0}, { 20, 1}, { 1, 0}, /* Row 13 */ + { 1, 0}, { 19, 1}, { 1, 5}, { 1, 0}, /* Row 14 */ + { 1, 0}, { 1, 5}, { 7, 1}, { 1, 5}, { 4, 2}, { 6, 1}, + { 2, 0}, /* Row 15 */ + { 2, 0}, { 5, 1}, { 8, 2}, { 4, 1}, { 1, 5}, { 2, 0}, /* Row 16 */ + { 3, 0}, { 2, 1}, { 12, 2}, { 2, 1}, { 3, 0}, /* Row 17 */ + { 3, 0}, { 1, 5}, { 1, 1}, { 13, 2}, { 1, 5}, { 3, 0}, /* Row 18 */ + { 6, 0}, { 10, 2}, { 1, 5}, { 5, 0}, /* Row 19 */ + { 6, 0}, { 1, 5}, { 8, 2}, { 7, 0}, /* Row 20 */ + { 22, 0}, /* Row 21 */ +}; + +const struct NXWidgets::SRlePaletteBitmap g_mplayerVolBitmap = +{ + 16, + CONFIG_NXWIDGETS_FMT, + 8, + 22, + 22, + {hilight_palette, hilight_palette}, + vol_bitmap +}; + +///////////////////////////////////////////////////////////////////////////// +// Public Data +///////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// Public Function Prototypes +///////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// CGlyphSliderHorizontalTest Method Implementations +///////////////////////////////////////////////////////////////////////////// + +// CGlyphSliderHorizontalTest Constructor + +CGlyphSliderHorizontalTest::CGlyphSliderHorizontalTest() +{ + // Initialize state data + + m_widgetControl = (CWidgetControl *)NULL; + m_bgWindow = (CBgWindow *)NULL; +} + +// CGlyphSliderHorizontalTest Descriptor + +CGlyphSliderHorizontalTest::~CGlyphSliderHorizontalTest(void) +{ + disconnect(); +} + +// Connect to the NX server + +bool CGlyphSliderHorizontalTest::connect(void) +{ + // Connect to the server + + bool nxConnected = CNxServer::connect(); + if (nxConnected) + { + // Set the background color + + if (!setBackgroundColor(CONFIG_CGLYPHSLIDERHORIZONTALTEST_BGCOLOR)) + { + message("CGlyphSliderHorizontalTest::connect: setBackgroundColor failed\n"); + } + } + + return nxConnected; +} + +// Disconnect from the NX server + +void CGlyphSliderHorizontalTest::disconnect(void) +{ + // Close the window + + if (m_bgWindow) + { + delete m_bgWindow; + m_bgWindow = (CBgWindow *)NULL; + } + + // Free the widget control instance + + if (m_widgetControl) + { + delete m_widgetControl; + m_widgetControl = (CWidgetControl *)NULL; + } + + // And disconnect from the server + + CNxServer::disconnect(); +} + +// Create the background window instance. This function illustrates +// the basic steps to instantiate any window: +// +// 1) Create a dumb CWigetControl instance +// 2) Pass the dumb CWidgetControl instance to the window constructor +// that inherits from INxWindow. This will "smarten" the CWidgetControl +// instance with some window knowlede +// 3) Call the open() method on the window to display the window. +// 4) After that, the fully smartened CWidgetControl instance can +// be used to generate additional widgets by passing it to the +// widget constructor + +bool CGlyphSliderHorizontalTest::createWindow(void) +{ + // Initialize the widget control using the default style + + m_widgetControl = new CWidgetControl((CWidgetStyle *)NULL); + + // Get an (uninitialized) instance of the background window as a class + // that derives from INxWindow. + + m_bgWindow = getBgWindow(m_widgetControl); + if (!m_bgWindow) + { + message("CGlyphSliderHorizontalTest::createWindow: Failed to create CBgWindow instance\n"); + disconnect(); + return false; + } + + // Open (and initialize) the window + + bool success = m_bgWindow->open(); + if (!success) + { + message("CGlyphSliderHorizontalTest::createWindow: Failed to open background window\n"); + disconnect(); + return false; + } + + return true; +} + +// Create a slider in the center of the window + +CGlyphSliderHorizontal *CGlyphSliderHorizontalTest::createSlider(void) +{ + // Get the size of the display + + struct nxgl_size_s windowSize; + if (!m_bgWindow->getSize(&windowSize)) + { + printf("CGlyphSliderHorizontalTest::createSlider: Failed to get window size\n"); + disconnect(); + return false; + } + + // Put the slider in the center of the display + + nxgl_coord_t sliderWidth = windowSize.w >> 1; + nxgl_coord_t sliderX = windowSize.w >> 2; + + nxgl_coord_t sliderHeight = 26; + nxgl_coord_t sliderY = (windowSize.h - sliderHeight) >> 1; + + // Create the bitmap for the slider grip + + NXWidgets::CRlePaletteBitmap *pBitmap = new NXWidgets:: + CRlePaletteBitmap(&g_mplayerVolBitmap); + + // Create the slider + + CGlyphSliderHorizontal *slider = new CGlyphSliderHorizontal(m_widgetControl, + sliderX, sliderY, + sliderWidth, sliderHeight, + pBitmap, MKRGB(63, 90, 192)); + if (!slider) + { + printf("CGlyphSliderHorizontalTest::createSlider: Failed to create CGlyphSliderHorizontal\n"); + disconnect(); + } + return slider; +} + +// (Re-)draw the slider. + +void CGlyphSliderHorizontalTest::showSlider(CGlyphSliderHorizontal *slider) +{ + slider->enable(); // Un-necessary, the widget is enabled by default + slider->enableDrawing(); + slider->redraw(); +} diff --git a/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx b/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx new file mode 100644 index 000000000..3311abe50 --- /dev/null +++ b/NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx @@ -0,0 +1,137 @@ +///////////////////////////////////////////////////////////////////////////// +// NxWidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontaltest.hxx +// +// Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. +// Author: Gregory Nutt <gnutt@nuttx.org> +// +// 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, NxWidgets, nor the names of its contributors +// me 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. +// +////////////////////////////////////////////////////////////////////////////// + +#ifndef __UNITTESTS_CGLYPHSLIDERHORIZONTAL_CGLYPHSLIDERHORIZONTALTEST_HXX +#define __UNITTESTS_CGLYPHSLIDERHORIZONTAL_CGLYPHSLIDERHORIZONTALTEST_HXX + +///////////////////////////////////////////////////////////////////////////// +// Included Files +///////////////////////////////////////////////////////////////////////////// + +#include <nuttx/config.h> + +#include <nuttx/init.h> +#include <cstdio> +#include <semaphore.h> +#include <debug.h> + +#include <nuttx/nx/nx.h> + +#include "nxconfig.hxx" +#include "cwidgetcontrol.hxx" +#include "ccallback.hxx" +#include "cbgwindow.hxx" +#include "cnxserver.hxx" +#include "cglyphsliderhorizontal.hxx" + +///////////////////////////////////////////////////////////////////////////// +// Definitions +///////////////////////////////////////////////////////////////////////////// +// Configuration //////////////////////////////////////////////////////////// + +#ifndef CONFIG_HAVE_CXX +# error "CONFIG_HAVE_CXX must be defined" +#endif + +#ifndef CONFIG_CGLYPHSLIDERHORIZONTALTEST_BGCOLOR +# define CONFIG_CGLYPHSLIDERHORIZONTALTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR +#endif + +// If debug is enabled, use the debug function, syslog() instead +// of printf() so that the output is synchronized. + +#ifdef CONFIG_DEBUG +# define message lowsyslog +#else +# define message printf +#endif + +///////////////////////////////////////////////////////////////////////////// +// Public Classes +///////////////////////////////////////////////////////////////////////////// + +using namespace NXWidgets; + +class CGlyphSliderHorizontalTest : public CNxServer +{ +private: + CWidgetControl *m_widgetControl; // The controlling widget for the window + CBgWindow *m_bgWindow; // Background window instance + +public: + // Constructor/destructors + + CGlyphSliderHorizontalTest(void); + ~CGlyphSliderHorizontalTest(void); + + // Initializer/unitializer. These methods encapsulate the basic steps for + // starting and stopping the NX server + + bool connect(void); + void disconnect(void); + + // Create a window. This method provides the general operations for + // creating a window that you can draw within. + // + // Those general operations are: + // 1) Create a dumb CWigetControl instance + // 2) Pass the dumb CWidgetControl instance to the window constructor + // that inherits from INxWindow. This will "smarten" the CWidgetControl + // instance with some window knowlede + // 3) Call the open() method on the window to display the window. + // 4) After that, the fully smartened CWidgetControl instance can + // be used to generate additional widgets by passing it to the + // widget constructor + + bool createWindow(void); + + // Create a slider in the center of the window + + CGlyphSliderHorizontal *createSlider(void); + + // (Re-)draw the slider. + + void showSlider(CGlyphSliderHorizontal *slider); +}; + +///////////////////////////////////////////////////////////////////////////// +// Public Data +///////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// Public Function Prototypes +///////////////////////////////////////////////////////////////////////////// + +#endif // __UNITTESTS_CGLYPHSLIDERHORIZONTAL_CGLYPHSLIDERHORIZONTALTEST_HXX diff --git a/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx b/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx index 97d8d01ad..93984e1bc 100644 --- a/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx +++ b/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx @@ -331,7 +331,7 @@ void CGlyphSliderHorizontal::drawContents(CGraphicsPort * port) if (m_grip->getX() > halfGripWidth) port->drawFilledRect(getX() + 1 + halfGripWidth, getY() + halfHeight - halfBar + 1, - m_grip->getX() - halfGripWidth, m_barThickness - 2, + m_grip->getX() - getX() - halfGripWidth, m_barThickness - 2, color); // Fill in bar the area to the right of the grip |