Add a 320x320 NuttX logo image
This commit is contained in:
Gregory Nutt
parent
d9d02140d8
commit
4f24c69538
@ -392,4 +392,7 @@
|
||||
so that images can be scaled to any size desired (2013-10-15).
|
||||
* NxWM::CTaskbar:: Can now be configured to scale taskbasr icons using
|
||||
NxWidgets::CScaledImage (2013-10-15)
|
||||
* NxWidgets/libnxwidgets/src/glyph_nxlogo320x320.cxx: Add a big, 320x320
|
||||
NuttX logo image. The older, smaller NuttX logo was renamed from
|
||||
nxlogo to nxlogo160x160 in all places (2015-10-15).
|
||||
|
||||
|
||||
@ -185,7 +185,7 @@ int cimage_main(int argc, char *argv[])
|
||||
|
||||
// Create an instance of the NuttX logo
|
||||
|
||||
CRlePaletteBitmap *nuttxBitmap = new CRlePaletteBitmap(&g_nuttxBitmap);
|
||||
CRlePaletteBitmap *nuttxBitmap = new CRlePaletteBitmap(&g_nuttxBitmap160x160);
|
||||
updateMemoryUsage(&g_mmprevious, "After creating the bitmap");
|
||||
|
||||
// Create a CImage instance
|
||||
|
||||
@ -66,7 +66,7 @@ CXXSRCS += cscrollingpanel.cxx cscrollingtextbox.cxx csliderhorizontal.cxx
|
||||
CXXSRCS += csliderhorizontalgrip.cxx cslidervertical.cxx csliderverticalgrip.cxx
|
||||
CXXSRCS += cstickybutton.cxx cstickybuttonarray.cxx ctabpanel.cxx ctextbox.cxx
|
||||
# Images
|
||||
CXXSRCS += glyph_nxlogo.cxx
|
||||
CXXSRCS += glyph_nxlogo160x160.cxx glyph_nxlogo320x320.cxx
|
||||
CXXSRCS += glyph_arrowdown.cxx glyph_checkboxon.cxx glyph_screendepthup.cxx
|
||||
CXXSRCS += glyph_arrowleft.cxx glyph_control.cxx glyph_screenflipdown.cxx
|
||||
CXXSRCS += glyph_arrowright.cxx glyph_cycle.cxx glyph_screenflipup.cxx
|
||||
|
||||
@ -146,6 +146,12 @@ namespace NXWidgets
|
||||
|
||||
CText(CNxFont *font, const CNxString &text, nxgl_coord_t width);
|
||||
|
||||
/**
|
||||
* Destructor.
|
||||
*/
|
||||
|
||||
virtual ~CText(void) {}
|
||||
|
||||
/**
|
||||
* Set the text in the string.
|
||||
*
|
||||
|
||||
@ -1,131 +1,132 @@
|
||||
/****************************************************************************
|
||||
* NxWidgets/libnxwidgets/include/glyphs.hxx
|
||||
*
|
||||
* Copyright (C) 2012 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.
|
||||
*
|
||||
****************************************************************************
|
||||
*
|
||||
* 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 most 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_GLYPHS_HXX
|
||||
#define __INCLUDE_GLYPHS_HXX
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
#include <nuttx/nx/nxglib.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Bitmap Glyph References
|
||||
****************************************************************************/
|
||||
|
||||
#if defined(__cplusplus)
|
||||
|
||||
namespace NXWidgets
|
||||
{
|
||||
struct SBitmap;
|
||||
|
||||
// Global RLE Paletted Bitmaps
|
||||
|
||||
extern const struct SRlePaletteBitmap g_nuttxBitmap;
|
||||
|
||||
// Global Simple Bitmaps
|
||||
|
||||
extern const struct SBitmap g_screenDepthUp;
|
||||
extern const struct SBitmap g_screenDepthDown;
|
||||
extern const struct SBitmap g_windowClose;
|
||||
extern const struct SBitmap g_windowDepthUp;
|
||||
extern const struct SBitmap g_windowDepthDown;
|
||||
extern const struct SBitmap g_radioButtonOn;
|
||||
extern const struct SBitmap g_radioButtonOff;
|
||||
extern const struct SBitmap g_radioButtonMu;
|
||||
extern const struct SBitmap g_checkBoxOff;
|
||||
extern const struct SBitmap g_checkBoxOn;
|
||||
extern const struct SBitmap g_checkBoxMu;
|
||||
extern const struct SBitmap g_screenFlipUp;
|
||||
extern const struct SBitmap g_screenFlipDown;
|
||||
extern const struct SBitmap g_arrowUp;
|
||||
extern const struct SBitmap g_arrowDown;
|
||||
extern const struct SBitmap g_arrowLeft;
|
||||
extern const struct SBitmap g_arrowRight;
|
||||
extern const struct SBitmap g_cycle;
|
||||
extern const struct SBitmap g_backspace;
|
||||
extern const struct SBitmap g_return;
|
||||
extern const struct SBitmap g_shift;
|
||||
extern const struct SBitmap g_capslock;
|
||||
extern const struct SBitmap g_control;
|
||||
}
|
||||
|
||||
#endif // __cplusplus
|
||||
|
||||
#endif // __INCLUDE_GLYPHS_HXX
|
||||
/****************************************************************************
|
||||
* NxWidgets/libnxwidgets/include/glyphs.hxx
|
||||
*
|
||||
* Copyright (C) 2012 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.
|
||||
*
|
||||
****************************************************************************
|
||||
*
|
||||
* 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 most 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_GLYPHS_HXX
|
||||
#define __INCLUDE_GLYPHS_HXX
|
||||
|
||||
/****************************************************************************
|
||||
* Included Files
|
||||
****************************************************************************/
|
||||
|
||||
#include <nuttx/config.h>
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
#include <nuttx/nx/nxglib.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Pre-Processor Definitions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Bitmap Glyph References
|
||||
****************************************************************************/
|
||||
|
||||
#if defined(__cplusplus)
|
||||
|
||||
namespace NXWidgets
|
||||
{
|
||||
struct SBitmap;
|
||||
|
||||
// Global RLE Paletted Bitmaps
|
||||
|
||||
extern const struct SRlePaletteBitmap g_nuttxBitmap160x160;
|
||||
extern const struct SRlePaletteBitmap g_nuttxBitmap320x320;
|
||||
|
||||
// Global Simple Bitmaps
|
||||
|
||||
extern const struct SBitmap g_screenDepthUp;
|
||||
extern const struct SBitmap g_screenDepthDown;
|
||||
extern const struct SBitmap g_windowClose;
|
||||
extern const struct SBitmap g_windowDepthUp;
|
||||
extern const struct SBitmap g_windowDepthDown;
|
||||
extern const struct SBitmap g_radioButtonOn;
|
||||
extern const struct SBitmap g_radioButtonOff;
|
||||
extern const struct SBitmap g_radioButtonMu;
|
||||
extern const struct SBitmap g_checkBoxOff;
|
||||
extern const struct SBitmap g_checkBoxOn;
|
||||
extern const struct SBitmap g_checkBoxMu;
|
||||
extern const struct SBitmap g_screenFlipUp;
|
||||
extern const struct SBitmap g_screenFlipDown;
|
||||
extern const struct SBitmap g_arrowUp;
|
||||
extern const struct SBitmap g_arrowDown;
|
||||
extern const struct SBitmap g_arrowLeft;
|
||||
extern const struct SBitmap g_arrowRight;
|
||||
extern const struct SBitmap g_cycle;
|
||||
extern const struct SBitmap g_backspace;
|
||||
extern const struct SBitmap g_return;
|
||||
extern const struct SBitmap g_shift;
|
||||
extern const struct SBitmap g_capslock;
|
||||
extern const struct SBitmap g_control;
|
||||
}
|
||||
|
||||
#endif // __cplusplus
|
||||
|
||||
#endif // __INCLUDE_GLYPHS_HXX
|
||||
|
||||
@ -179,6 +179,11 @@ const size_t CScaledBitmap::getStride(void) const
|
||||
/**
|
||||
* Get one row from the bit map image.
|
||||
*
|
||||
* REVISIT: This algorithm is really intended to expand images. Hence,
|
||||
* for example, interpolation is between row and row+1 and column and
|
||||
* column+1 in the original, unscaled image. You would the interpolation
|
||||
* differently if you really wanted to sub-sample well.
|
||||
*
|
||||
* @param x The offset into the row to get
|
||||
* @param y The row number to get
|
||||
* @param width The number of pixels to get from the row
|
||||
@ -580,6 +585,9 @@ bool CScaledBitmap::rowColor(FAR uint8_t *row, b16_t column,
|
||||
// between transparent and opaque regions.
|
||||
|
||||
// Return the color closest to the requested position
|
||||
//
|
||||
// A fraction of < 0.5 would mean to use use mostly color1; a fraction
|
||||
// greater than 0.5 would men to use mostly color2
|
||||
|
||||
if (fraction < b16HALF)
|
||||
{
|
||||
|
||||
3453
libnxwidgets/src/glyph_nxlogo160x160.cxx
Normal file
3453
libnxwidgets/src/glyph_nxlogo160x160.cxx
Normal file
File diff suppressed because it is too large
Load Diff
1043
libnxwidgets/src/glyph_nxlogo320x320.cxx
Normal file
1043
libnxwidgets/src/glyph_nxlogo320x320.cxx
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user