From c96506f914b598e59fce7cc9b3c394a5ebe8d23c Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 16 Nov 2012 15:53:16 +0000 Subject: Fixes for CCycleButton unit test; Add CNumericEdit. Both from Petteri Aimonen git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5363 42af7a65-404d-4744-a932-0658087f49c3 --- NxWidgets/ChangeLog.txt | 4 + NxWidgets/libnxwidgets/Makefile | 1 + NxWidgets/libnxwidgets/include/ccyclebutton.hxx | 12 +- NxWidgets/libnxwidgets/include/cnumericedit.hxx | 213 +++++++++++++++++++ NxWidgets/libnxwidgets/src/cnumericedit.cxx | 262 ++++++++++++++++++++++++ NxWidgets/libnxwidgets/src/glyph_cycle.cxx | 4 +- 6 files changed, 488 insertions(+), 8 deletions(-) create mode 100644 NxWidgets/libnxwidgets/include/cnumericedit.hxx create mode 100644 NxWidgets/libnxwidgets/src/cnumericedit.cxx diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt index 113945f2f..dca1f856d 100644 --- a/NxWidgets/ChangeLog.txt +++ b/NxWidgets/ChangeLog.txt @@ -200,3 +200,7 @@ Contributed by Petteri Aimonen. * NxWidgets/nxwm/src/ctaskbar.cxx: Highlight the current window in the task bar. Contributed by Petteri Aimonen. +* NxWidgets/libnxwidgets/src/glyph_cycle.cxx: Width of glyph_cycle was wrong; + Desctructor needs to by public. From Petteri Aimonen. +* CNumericEdit. This is basically a label with plus and minus buttons. + Contributed by Petteri, Aimonen. diff --git a/NxWidgets/libnxwidgets/Makefile b/NxWidgets/libnxwidgets/Makefile index 222f008b7..654f1d2fc 100644 --- a/NxWidgets/libnxwidgets/Makefile +++ b/NxWidgets/libnxwidgets/Makefile @@ -58,6 +58,7 @@ CXXSRCS += cwindoweventhandlerlist.cxx singletons.cxx CXXSRCS += cbutton.cxx cbuttonarray.cxx ccheckbox.cxx ccyclebutton.cxx CXXSRCS += cglyphbutton.cxx cimage.cxx ckeypad.cxx clabel.cxx clatchbutton.cxx CXXSRCS += clatchbuttonarray.cxx clistbox.cxx clistboxdataitem.cxx cmultilinetextbox.cxx +CXXSRCS += cnumericedit.cxx CXXSRCS += cprogressbar.cxx cradiobutton.cxx cradiobuttongroup.cxx cscrollbarhorizontal.cxx CXXSRCS += cscrollbarpanel.cxx cscrollbarvertical.cxx cscrollinglistbox.cxx CXXSRCS += cscrollingpanel.cxx cscrollingtextbox.cxx csliderhorizontal.cxx diff --git a/NxWidgets/libnxwidgets/include/ccyclebutton.hxx b/NxWidgets/libnxwidgets/include/ccyclebutton.hxx index 5fd9405d8..f7f965933 100644 --- a/NxWidgets/libnxwidgets/include/ccyclebutton.hxx +++ b/NxWidgets/libnxwidgets/include/ccyclebutton.hxx @@ -179,12 +179,6 @@ namespace NXWidgets virtual inline void calculateTextPosition(void) { } - /** - * Destructor. - */ - - virtual ~CCycleButton(void) { } - /** * Copy constructor is protected to prevent usage. */ @@ -212,6 +206,12 @@ namespace NXWidgets nxgl_coord_t width, nxgl_coord_t height, CWidgetStyle *style = (CWidgetStyle *)NULL); + /** + * Destructor. + */ + + virtual ~CCycleButton(void) { } + /** * Add a new option to the widget. * diff --git a/NxWidgets/libnxwidgets/include/cnumericedit.hxx b/NxWidgets/libnxwidgets/include/cnumericedit.hxx new file mode 100644 index 000000000..3de01a4c1 --- /dev/null +++ b/NxWidgets/libnxwidgets/include/cnumericedit.hxx @@ -0,0 +1,213 @@ +/**************************************************************************** + * NxWidgets/libnxwidgets/include/cnumericedit.hxx + * + * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * Petteri Aimonen + * + * 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. + * + **************************************************************************** + * + * Portions of this package derive from Woopsi (http://woopsi.org/) and + * portions are original efforts. It is difficult to determine at this + * point what parts are original efforts and which parts derive from Woopsi. + * However, in any event, the work of Antony Dzeryn will be acknowledged + * in all NxWidget files. Thanks Antony! + * + * Copyright (c) 2007-2011, Antony Dzeryn + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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. + * * Neither the names "Woopsi", "Simian Zombie" 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 Antony Dzeryn ``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 Antony Dzeryn 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 __INCLUDE_CNUMERICEDIT_HXX +#define __INCLUDE_CNUMERICEDIT_HXX + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include + +#include + +#include "cnxwidget.hxx" +#include "cwidgetstyle.hxx" +#include "cnxstring.hxx" + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Implementation Classes + ****************************************************************************/ + +#if defined(__cplusplus) + +namespace NXWidgets +{ + /** + * Forward references + */ + + class CWidgetControl; + class CRect; + class CLabel; + class CButton; + class CNxTimer; + + /** + * Numeric edit control, with plus and minus buttons. + */ + + class CNumericEdit : public CNxWidget, public CWidgetEventHandler + { + protected: + CLabel *m_label; + CButton *m_button_minus; + CButton *m_button_plus; + CNxTimer *m_timer; + int m_value; + int m_minimum; + int m_maximum; + int m_increment; + int m_timercount; + + /** + * Resize the widget to the new dimensions. + * + * @param width The new width. + * @param height The new height. + */ + + virtual void onResize(nxgl_coord_t width, nxgl_coord_t height); + + virtual void handleClickEvent(const CWidgetEventArgs &e); + + virtual void handleReleaseEvent(const CWidgetEventArgs &e); + + virtual void handleReleaseOutsideEvent(const CWidgetEventArgs &e); + + virtual void handleActionEvent(const CWidgetEventArgs &e); + + virtual void handleDragEvent(const CWidgetEventArgs &e); + + /** + * Copy constructor is protected to prevent usage. + */ + + inline CNumericEdit(const CNumericEdit &num) : CNxWidget(num) { }; + + public: + + /** + * Constructor for a numeric edit control. + * + * @param pWidgetControl The controlling widget for the display + * @param x The x coordinate of the text box, relative to its parent. + * @param y The y coordinate of the text box, relative to its parent. + * @param width The width of the textbox. + * @param height The height of the textbox. + * @param style The style that the button should use. If this is not + * specified, the button will use the global default widget + * style. + */ + + CNumericEdit(CWidgetControl *pWidgetControl, nxgl_coord_t x, nxgl_coord_t y, + nxgl_coord_t width, nxgl_coord_t height, + CWidgetStyle *style = (CWidgetStyle *)NULL); + + /** + * Destructor. + */ + + virtual ~CNumericEdit(); + + /** + * Insert the dimensions that this widget wants to have into the rect + * passed in as a parameter. All coordinates are relative to the + * widget's parent. + * + * @param rect Reference to a rect to populate with data. + */ + + virtual void getPreferredDimensions(CRect &rect) const; + + /** + * Sets the font. + * + * @param font A pointer to the font to use. + */ + + virtual void setFont(CNxFont *font); + + inline int getValue() const { return m_value; } + void setValue(int value); + + inline int getMaximum() const { return m_maximum; } + inline void setMaximum(int value) { m_maximum = value; setValue(m_value); } + + inline int getMinimum() const { return m_minimum; } + inline void setMinimum(int value) { m_minimum = value; setValue(m_value); } + + inline int getIncrement() const { return m_increment; } + inline void setIncrement(int value) { m_increment = value; setValue(m_value); } + + }; +} + +#endif // __cplusplus + +#endif // __INCLUDE_CLABEL_HXX diff --git a/NxWidgets/libnxwidgets/src/cnumericedit.cxx b/NxWidgets/libnxwidgets/src/cnumericedit.cxx new file mode 100644 index 000000000..e0df014c5 --- /dev/null +++ b/NxWidgets/libnxwidgets/src/cnumericedit.cxx @@ -0,0 +1,262 @@ +/**************************************************************************** + * NxWidgets/libnxwidgets/include/cnumericedit.cxx + * + * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * Petteri Aimonen + * + * 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. + * + **************************************************************************** + * + * Portions of this package derive from Woopsi (http://woopsi.org/) and + * portions are original efforts. It is difficult to determine at this + * point what parts are original efforts and which parts derive from Woopsi. + * However, in any event, the work of Antony Dzeryn will be acknowledged + * in all NxWidget files. Thanks Antony! + * + * Copyright (c) 2007-2011, Antony Dzeryn + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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. + * * Neither the names "Woopsi", "Simian Zombie" 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 Antony Dzeryn ``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 Antony Dzeryn 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 + +#include +#include +#include +#include + +#include +#include + +#include "cnumericedit.hxx" +#include "cbutton.hxx" +#include "clabel.hxx" +#include "cnxtimer.hxx" + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * CNumericEdit Method Implementations + ****************************************************************************/ + +using namespace NXWidgets; + +// Label that passes drag events + +class CDraggableLabel: public CLabel +{ +public: + CDraggableLabel(CWidgetControl *pWidgetControl, nxgl_coord_t x, nxgl_coord_t y, + nxgl_coord_t width, nxgl_coord_t height, const CNxString &text, + CWidgetStyle *style = (CWidgetStyle *)NULL): + CLabel(pWidgetControl, x, y, width, height, text, style) + { + setDraggable(true); + } + + virtual void onClick(nxgl_coord_t x, nxgl_coord_t y) + { + startDragging(x, y); + } +}; + +/** + * Constructor for a numeric edit control. + * + * @param pWidgetControl The controlling widget for the display + * @param x The x coordinate of the text box, relative to its parent. + * @param y The y coordinate of the text box, relative to its parent. + * @param width The width of the textbox. + * @param height The height of the textbox. + * @param style The style that the button should use. If this is not + * specified, the button will use the global default widget + * style. + */ + +CNumericEdit::CNumericEdit(CWidgetControl *pWidgetControl, nxgl_coord_t x, nxgl_coord_t y, + nxgl_coord_t width, nxgl_coord_t height, + CWidgetStyle *style) +: CNxWidget(pWidgetControl, x, y, width, height, 0, style) +{ + m_label = new CDraggableLabel(pWidgetControl, height, 0, width - 2 * height, height, CNxString("0"), style); + m_label->addWidgetEventHandler(this); + addWidget(m_label); + + m_button_minus = new CButton(pWidgetControl, 0, 0, height, height, CNxString("-")); + m_button_minus->addWidgetEventHandler(this); + addWidget(m_button_minus); + + m_button_plus = new CButton(pWidgetControl, width - height, 0, height, height, CNxString("+")); + m_button_plus->addWidgetEventHandler(this); + addWidget(m_button_plus); + + m_timer = new CNxTimer(pWidgetControl, 100, true); + m_timer->addWidgetEventHandler(this); + addWidget(m_timer); + + m_minimum = INT_MIN; + m_maximum = INT_MAX; + m_increment = 1; + setValue(0); +} + +CNumericEdit::~CNumericEdit() +{ + delete m_label; + delete m_button_minus; + delete m_button_plus; +} + +void CNumericEdit::getPreferredDimensions(CRect &rect) const +{ +} + +void CNumericEdit::setFont(CNxFont *font) +{ + m_label->setFont(font); +} + +void CNumericEdit::onResize(nxgl_coord_t width, nxgl_coord_t height) +{ +} + +void CNumericEdit::handleClickEvent(const CWidgetEventArgs &e) +{ + if (e.getSource() == m_button_plus) + { + setValue(m_value + m_increment); + m_timercount = 0; + m_timer->start(); + } + else if (e.getSource() == m_button_minus) + { + setValue(m_value - m_increment); + m_timercount = 0; + m_timer->start(); + } +} + +void CNumericEdit::handleReleaseEvent(const CWidgetEventArgs &e) +{ + if (e.getSource() == m_button_plus || e.getSource() == m_button_minus) + { + m_timer->stop(); + } +} + +void CNumericEdit::handleReleaseOutsideEvent(const CWidgetEventArgs &e) +{ + if (e.getSource() == m_button_plus || e.getSource() == m_button_minus) + { + m_timer->stop(); + } +} + +void CNumericEdit::handleActionEvent(const CWidgetEventArgs &e) +{ + if (e.getSource() == m_timer) + { + m_timercount++; + + int increment = m_increment; + if (m_timercount > 50) + { + increment = m_increment * 100; + } + else if (m_timercount > 10) + { + increment = m_increment * 10; + } + + if (m_button_minus->isClicked()) + { + setValue(m_value - increment); + } + else if (m_button_plus->isClicked()) + { + setValue(m_value + increment); + } + } +} + +void CNumericEdit::handleDragEvent(const CWidgetEventArgs &e) +{ + int x = e.getX() - m_label->getX(); + int width = m_label->getWidth(); + int value = m_minimum + (m_maximum - m_minimum) * x / width; + setValue(value / m_increment * m_increment); +} + +void CNumericEdit::setValue(int value) +{ + if (value < m_minimum) value = m_minimum; + if (value > m_maximum) value = m_maximum; + + m_value = value; + + char buf[10]; + snprintf(buf, sizeof(buf), "%d", m_value); + CNxString text(buf); + + m_label->setText(text); + + m_widgetEventHandlers->raiseValueChangeEvent(); + + redraw(); +} diff --git a/NxWidgets/libnxwidgets/src/glyph_cycle.cxx b/NxWidgets/libnxwidgets/src/glyph_cycle.cxx index 5c98b8b90..d706adddb 100644 --- a/NxWidgets/libnxwidgets/src/glyph_cycle.cxx +++ b/NxWidgets/libnxwidgets/src/glyph_cycle.cxx @@ -145,9 +145,9 @@ const struct SBitmap NXWidgets::g_cycle = { CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel COLOR_FMT, // fmt - Color format - 7, // width - Width in pixels + 8, // width - Width in pixels 10, // height - Height in rows - (7*CONFIG_NXWIDGETS_BPP + 7) / 8, // stride - Width in bytes + (8*CONFIG_NXWIDGETS_BPP + 7) / 8, // stride - Width in bytes g_cycleGlyph // data - Pointer to the beginning of pixel data }; -- cgit v1.2.3