Add a 320x320 NuttX logo image

This commit is contained in:
Gregory Nutt 2013-10-15 16:08:06 -06:00
parent d9d02140d8
commit 4f24c69538
8 changed files with 4647 additions and 133 deletions

View File

@ -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).

View File

@ -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

View File

@ -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

View File

@ -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.
*

View File

@ -97,7 +97,8 @@ namespace NXWidgets
// Global RLE Paletted Bitmaps
extern const struct SRlePaletteBitmap g_nuttxBitmap;
extern const struct SRlePaletteBitmap g_nuttxBitmap160x160;
extern const struct SRlePaletteBitmap g_nuttxBitmap320x320;
// Global Simple Bitmaps

View File

@ -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)
{

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff