X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c99abbe83570b6ac52340b4db36ca6bafed28ad..6d53143092894553e276aecbc87b329bd2a6166c:/samples/image/image.cpp diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 7bfe2db778..9ba854ebe6 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -2,11 +2,12 @@ // Name: samples/image/image.cpp // Purpose: sample showing operations with wxImage // Author: Robert Roebling -// Modified by: +// Modified by: Francesco Montorsi // Created: 1998 // RCS-ID: $Id$ // Copyright: (c) 1998-2005 Robert Roebling -// License: wxWindows licence +// (c) 2005-2009 Vadim Zeitlin +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx/wx.h". @@ -17,7 +18,7 @@ #endif #ifndef WX_PRECOMP -#include "wx/wx.h" + #include "wx/wx.h" #endif #include "wx/image.h" @@ -26,15 +27,14 @@ #include "wx/mstream.h" #include "wx/wfstream.h" #include "wx/quantize.h" +#include "wx/stopwatch.h" +#include "wx/versioninfo.h" #if wxUSE_CLIPBOARD #include "wx/dataobj.h" #include "wx/clipbrd.h" #endif // wxUSE_CLIPBOARD -#include "smile.xbm" -#include "smile.xpm" - #if defined(__WXMSW__) #ifdef wxHAVE_RAW_BITMAP #include "wx/rawbmp.h" @@ -46,56 +46,29 @@ #include "wx/rawbmp.h" #endif -// derived classes +#include "canvas.h" + +#ifndef __WXMSW__ + #include "../sample.xpm" +#endif -class MyFrame; -class MyApp; +// ============================================================================ +// declarations +// ============================================================================ -// MyCanvas +//----------------------------------------------------------------------------- +// MyApp +//----------------------------------------------------------------------------- -class MyCanvas: public wxScrolledWindow +class MyApp: public wxApp { public: - MyCanvas() {} - MyCanvas( wxWindow *parent, wxWindowID, const wxPoint &pos, const wxSize &size ); - ~MyCanvas(); - void OnPaint( wxPaintEvent &event ); - void CreateAntiAliasedBitmap(); - - wxBitmap *my_horse_png; - wxBitmap *my_horse_jpeg; - wxBitmap *my_horse_gif; - wxBitmap *my_horse_bmp; - wxBitmap *my_horse_bmp2; - wxBitmap *my_horse_pcx; - wxBitmap *my_horse_pnm; - wxBitmap *my_horse_tiff; - wxBitmap *my_horse_xpm; - wxBitmap *my_horse_ico32; - wxBitmap *my_horse_ico16; - wxBitmap *my_horse_ico; - wxBitmap *my_horse_cur; - wxBitmap *my_horse_ani; - - wxBitmap *my_smile_xbm; - wxBitmap *my_square; - wxBitmap *my_anti; - - int xH, yH ; - int m_ani_images ; - -protected: - wxBitmap m_bmpSmileXpm; - wxIcon m_iconSmileXpm; - -private: - DECLARE_DYNAMIC_CLASS(MyCanvas) - DECLARE_EVENT_TABLE() + virtual bool OnInit(); }; - +// ---------------------------------------------------------------------------- // MyFrame - +// ---------------------------------------------------------------------------- class MyFrame: public wxFrame { @@ -104,6 +77,9 @@ public: void OnAbout( wxCommandEvent &event ); void OnNewFrame( wxCommandEvent &event ); + void OnImageInfo( wxCommandEvent &event ); + void OnThumbnail( wxCommandEvent &event ); + #ifdef wxHAVE_RAW_BITMAP void OnTestRawBitmap( wxCommandEvent &event ); #endif // wxHAVE_RAW_BITMAP @@ -117,20 +93,88 @@ public: MyCanvas *m_canvas; private: + // ask user for the file name and try to load an image from it + // + // return the file path on success, empty string if we failed to load the + // image or were cancelled by user + static wxString LoadUserImage(wxImage& image); + + DECLARE_DYNAMIC_CLASS(MyFrame) DECLARE_EVENT_TABLE() }; +// ---------------------------------------------------------------------------- +// Frame used for showing a standalone image +// ---------------------------------------------------------------------------- + +enum +{ + ID_ROTATE_LEFT = wxID_HIGHEST+1, + ID_ROTATE_RIGHT, + ID_RESIZE, + ID_PAINT_BG +}; + class MyImageFrame : public wxFrame { public: - MyImageFrame(wxFrame *parent, const wxBitmap& bitmap) - : wxFrame(parent, wxID_ANY, _T("Double click to save"), - wxDefaultPosition, wxDefaultSize, - wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX), - m_bitmap(bitmap) + MyImageFrame(wxFrame *parent, const wxString& desc, const wxImage& image) { + Create(parent, desc, wxBitmap(image), image.GetImageCount(desc)); + } + + MyImageFrame(wxFrame *parent, const wxString& desc, const wxBitmap& bitmap) + { + Create(parent, desc, bitmap); + } + +private: + bool Create(wxFrame *parent, + const wxString& desc, + const wxBitmap& bitmap, + int numImages = 1) + { + if ( !wxFrame::Create(parent, wxID_ANY, + wxString::Format(wxT("Image from %s"), desc), + wxDefaultPosition, wxDefaultSize, + wxDEFAULT_FRAME_STYLE | wxFULL_REPAINT_ON_RESIZE) ) + return false; + + m_bitmap = bitmap; + m_zoom = 1.; + + wxMenu *menu = new wxMenu; + menu->Append(wxID_SAVE); + menu->AppendSeparator(); + menu->AppendCheckItem(ID_PAINT_BG, wxT("&Paint background"), + "Uncheck this for transparent images"); + menu->AppendSeparator(); + menu->Append(ID_RESIZE, wxT("&Fit to window\tCtrl-F")); + menu->Append(wxID_ZOOM_IN, "Zoom &in\tCtrl-+"); + menu->Append(wxID_ZOOM_OUT, "Zoom &out\tCtrl--"); + menu->Append(wxID_ZOOM_100, "Reset zoom to &100%\tCtrl-1"); + menu->AppendSeparator(); + menu->Append(ID_ROTATE_LEFT, wxT("Rotate &left\tCtrl-L")); + menu->Append(ID_ROTATE_RIGHT, wxT("Rotate &right\tCtrl-R")); + + wxMenuBar *mbar = new wxMenuBar; + mbar->Append(menu, wxT("&Image")); + SetMenuBar(mbar); + + mbar->Check(ID_PAINT_BG, true); + + CreateStatusBar(2); + if ( numImages != 1 ) + SetStatusText(wxString::Format("%d images", numImages), 1); + SetClientSize(bitmap.GetWidth(), bitmap.GetHeight()); + + UpdateStatusBar(); + + Show(); + + return true; } void OnEraseBackground(wxEraseEvent& WXUNUSED(event)) @@ -140,27 +184,51 @@ public: void OnPaint(wxPaintEvent& WXUNUSED(event)) { - wxPaintDC dc( this ); - dc.DrawBitmap( m_bitmap, 0, 0, true /* use mask */ ); + wxPaintDC dc(this); + + if ( GetMenuBar()->IsChecked(ID_PAINT_BG) ) + dc.Clear(); + + dc.SetUserScale(m_zoom, m_zoom); + + const wxSize size = GetClientSize(); + dc.DrawBitmap + ( + m_bitmap, + dc.DeviceToLogicalX((size.x - m_zoom*m_bitmap.GetWidth())/2), + dc.DeviceToLogicalY((size.y - m_zoom*m_bitmap.GetHeight())/2), + true /* use mask */ + ); } - void OnSave(wxMouseEvent& WXUNUSED(event)) + void OnSave(wxCommandEvent& WXUNUSED(event)) { +#if wxUSE_FILEDLG wxImage image = m_bitmap.ConvertToImage(); wxString savefilename = wxFileSelector( wxT("Save Image"), - wxT(""), - wxT(""), + wxEmptyString, + wxEmptyString, (const wxChar *)NULL, - wxT("BMP files (*.bmp)|*.bmp|") - wxT("PNG files (*.png)|*.png|") - wxT("JPEG files (*.jpg)|*.jpg|") - wxT("GIF files (*.gif)|*.gif|") - wxT("TIFF files (*.tif)|*.tif|") - wxT("PCX files (*.pcx)|*.pcx|") - wxT("ICO files (*.ico)|*.ico|") - wxT("CUR files (*.cur)|*.cur"), - wxSAVE, + wxT("BMP files (*.bmp)|*.bmp|") +#if wxUSE_LIBPNG + wxT("PNG files (*.png)|*.png|") +#endif +#if wxUSE_LIBJPEG + wxT("JPEG files (*.jpg)|*.jpg|") +#endif +#if wxUSE_GIF + wxT("GIF files (*.gif)|*.gif|") +#endif +#if wxUSE_LIBTIFF + wxT("TIFF files (*.tif)|*.tif|") +#endif +#if wxUSE_PCX + wxT("PCX files (*.pcx)|*.pcx|") +#endif + wxT("ICO files (*.ico)|*.ico|") + wxT("CUR files (*.cur)|*.cur"), + wxFD_SAVE, this); if ( savefilename.empty() ) @@ -170,7 +238,7 @@ public: wxFileName::SplitPath(savefilename, NULL, NULL, &extension); bool saved = false; - if ( extension == _T("bpp") ) + if ( extension == wxT("bmp") ) { static const int bppvalues[] = { @@ -186,21 +254,21 @@ public: const wxString bppchoices[] = { - _T("1 bpp color"), - _T("1 bpp B&W"), - _T("4 bpp color"), - _T("8 bpp color"), - _T("8 bpp greyscale"), - _T("8 bpp red"), - _T("8 bpp own palette"), - _T("24 bpp") + wxT("1 bpp color"), + wxT("1 bpp B&W"), + wxT("4 bpp color"), + wxT("8 bpp color"), + wxT("8 bpp greyscale"), + wxT("8 bpp red"), + wxT("8 bpp own palette"), + wxT("24 bpp") }; - int bppselection = wxGetSingleChoiceIndex(_T("Set BMP BPP"), - _T("Image sample: save file"), - WXSIZEOF(bppchoices), - bppchoices, - this); + int bppselection = wxGetSingleChoiceIndex(wxT("Set BMP BPP"), + wxT("Image sample: save file"), + WXSIZEOF(bppchoices), + bppchoices, + this); if ( bppselection != -1 ) { int format = bppvalues[bppselection]; @@ -213,11 +281,12 @@ public: cmap[i] = (unsigned char)i; image.SetPalette(wxPalette(256, cmap, cmap, cmap)); - delete cmap; + delete[] cmap; } } } - else if ( extension == _T("png") ) +#if wxUSE_LIBPNG + else if ( extension == wxT("png") ) { static const int pngvalues[] = { @@ -231,26 +300,64 @@ public: const wxString pngchoices[] = { - _T("Colour 8bpp"), - _T("Colour 16bpp"), - _T("Grey 8bpp"), - _T("Grey 16bpp"), - _T("Grey red 8bpp"), - _T("Grey red 16bpp"), + wxT("Colour 8bpp"), + wxT("Colour 16bpp"), + wxT("Grey 8bpp"), + wxT("Grey 16bpp"), + wxT("Grey red 8bpp"), + wxT("Grey red 16bpp"), }; - int sel = wxGetSingleChoiceIndex(_T("Set PNG format"), - _T("Image sample: save file"), - WXSIZEOF(pngchoices), - pngchoices, - this); + int sel = wxGetSingleChoiceIndex(wxT("Set PNG format"), + wxT("Image sample: save file"), + WXSIZEOF(pngchoices), + pngchoices, + this); if ( sel != -1 ) { image.SetOption(wxIMAGE_OPTION_PNG_FORMAT, pngvalues[sel]); image.SetOption(wxIMAGE_OPTION_PNG_BITDEPTH, sel % 2 ? 16 : 8); + + // these values are taken from OptiPNG with -o3 switch + const wxString compressionChoices[] = + { + wxT("compression = 9, memory = 8, strategy = 0, filter = 0"), + wxT("compression = 9, memory = 9, strategy = 0, filter = 0"), + wxT("compression = 9, memory = 8, strategy = 1, filter = 0"), + wxT("compression = 9, memory = 9, strategy = 1, filter = 0"), + wxT("compression = 1, memory = 8, strategy = 2, filter = 0"), + wxT("compression = 1, memory = 9, strategy = 2, filter = 0"), + wxT("compression = 9, memory = 8, strategy = 0, filter = 5"), + wxT("compression = 9, memory = 9, strategy = 0, filter = 5"), + wxT("compression = 9, memory = 8, strategy = 1, filter = 5"), + wxT("compression = 9, memory = 9, strategy = 1, filter = 5"), + wxT("compression = 1, memory = 8, strategy = 2, filter = 5"), + wxT("compression = 1, memory = 9, strategy = 2, filter = 5"), + }; + + int sel = wxGetSingleChoiceIndex(wxT("Select compression option (Cancel to use default)\n"), + wxT("PNG Compression Options"), + WXSIZEOF(compressionChoices), + compressionChoices, + this); + if (sel != -1) + { + const int zc[] = {9, 9, 9, 9, 1, 1, 9, 9, 9, 9, 1, 1}; + const int zm[] = {8, 9, 8, 9, 8, 9, 8, 9, 8, 9, 8, 9}; + const int zs[] = {0, 0, 1, 1, 2, 2, 0, 0, 1, 1, 2, 2}; + const int f[] = {0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0xF8, 0xF8, 0xF8, 0xF8, 0xF8, 0xF8}; + + image.SetOption(wxIMAGE_OPTION_PNG_COMPRESSION_LEVEL , zc[sel]); + image.SetOption(wxIMAGE_OPTION_PNG_COMPRESSION_MEM_LEVEL , zm[sel]); + image.SetOption(wxIMAGE_OPTION_PNG_COMPRESSION_STRATEGY , zs[sel]); + image.SetOption(wxIMAGE_OPTION_PNG_FILTER , f[sel]); + image.SetOption(wxIMAGE_OPTION_PNG_COMPRESSION_BUFFER_SIZE, 1048576); // 1 MB + } } } - else if ( extension == _T("cur") ) +#endif // wxUSE_LIBPNG + else if ( extension == wxT("cur") ) { image.Rescale(32,32); image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, 0); @@ -266,10 +373,62 @@ public: // (it may fail if the extension is not recognized): image.SaveFile(savefilename); } +#endif // wxUSE_FILEDLG + } + + void OnResize(wxCommandEvent& WXUNUSED(event)) + { + wxImage img(m_bitmap.ConvertToImage()); + + const wxSize size = GetClientSize(); + img.Rescale(size.x, size.y, wxIMAGE_QUALITY_HIGH); + m_bitmap = wxBitmap(img); + + UpdateStatusBar(); + } + + void OnZoom(wxCommandEvent& event) + { + if ( event.GetId() == wxID_ZOOM_IN ) + m_zoom *= 1.2; + else if ( event.GetId() == wxID_ZOOM_OUT ) + m_zoom /= 1.2; + else // wxID_ZOOM_100 + m_zoom = 1.; + + UpdateStatusBar(); + } + + void OnRotate(wxCommandEvent& event) + { + double angle = 5; + if ( event.GetId() == ID_ROTATE_LEFT ) + angle = -angle; + + wxImage img(m_bitmap.ConvertToImage()); + img = img.Rotate(angle, wxPoint(img.GetWidth() / 2, img.GetHeight() / 2)); + if ( !img.Ok() ) + { + wxLogWarning(wxT("Rotation failed")); + return; + } + + m_bitmap = wxBitmap(img); + + UpdateStatusBar(); + } + + void UpdateStatusBar() + { + wxLogStatus(this, wxT("Image size: (%d, %d), zoom %.2f"), + m_bitmap.GetWidth(), + m_bitmap.GetHeight(), + m_zoom); + Refresh(); } -private: wxBitmap m_bitmap; + double m_zoom; DECLARE_EVENT_TABLE() }; @@ -289,29 +448,55 @@ public: }; MyRawBitmapFrame(wxFrame *parent) - : wxFrame(parent, wxID_ANY, _T("Raw bitmaps (how exciting)")), - m_bitmap(SIZE, SIZE, 32) + : wxFrame(parent, wxID_ANY, wxT("Raw bitmaps (how exciting)")), + m_bitmap(SIZE, SIZE, 24), + m_alphaBitmap(SIZE, SIZE, 32) { - SetClientSize(SIZE, SIZE); + SetClientSize(SIZE, SIZE*2+25); - // another possibility: wxNativePixelData (don't forget to remove code - // setting alpha in the loop below then) - typedef wxAlphaPixelData Data; + InitAlphaBitmap(); + InitBitmap(); - Data data(m_bitmap, wxPoint(BORDER, BORDER), wxSize(REAL_SIZE, REAL_SIZE)); + } + + void InitAlphaBitmap() + { + // First, clear the whole bitmap by making it alpha + { + wxAlphaPixelData data( m_alphaBitmap, wxPoint(0,0), wxSize(SIZE, SIZE) ); + if ( !data ) + { + wxLogError(wxT("Failed to gain raw access to bitmap data")); + return; + } + wxAlphaPixelData::Iterator p(data); + for ( int y = 0; y < SIZE; ++y ) + { + wxAlphaPixelData::Iterator rowStart = p; + for ( int x = 0; x < SIZE; ++x ) + { + p.Alpha() = 0; + ++p; // same as p.OffsetX(1) + } + p = rowStart; + p.OffsetY(data, 1); + } + } + + // Then, draw colourful alpha-blended stripes + wxAlphaPixelData data(m_alphaBitmap, wxPoint(BORDER, BORDER), + wxSize(REAL_SIZE, REAL_SIZE)); if ( !data ) { - wxLogError(_T("Failed to gain raw access to bitmap data")); + wxLogError(wxT("Failed to gain raw access to bitmap data")); return; } - data.UseAlpha(); - - Data::Iterator p(data); + wxAlphaPixelData::Iterator p(data); for ( int y = 0; y < REAL_SIZE; ++y ) { - Data::Iterator rowStart = p; + wxAlphaPixelData::Iterator rowStart = p; int r = y < REAL_SIZE/3 ? 255 : 0, g = (REAL_SIZE/3 <= y) && (y < 2*(REAL_SIZE/3)) ? 255 : 0, @@ -320,7 +505,7 @@ public: for ( int x = 0; x < REAL_SIZE; ++x ) { // note that RGB must be premultiplied by alpha - unsigned a = (Data::Iterator::ChannelType)((x*255.)/REAL_SIZE); + unsigned a = (wxAlphaPixelData::Iterator::ChannelType)((x*255.)/REAL_SIZE); p.Red() = r * a / 256; p.Green() = g * a / 256; p.Blue() = b * a / 256; @@ -334,45 +519,85 @@ public: } } + void InitBitmap() + { + // draw some colourful stripes without alpha + wxNativePixelData data(m_bitmap); + if ( !data ) + { + wxLogError(wxT("Failed to gain raw access to bitmap data")); + return; + } + + wxNativePixelData::Iterator p(data); + for ( int y = 0; y < SIZE; ++y ) + { + wxNativePixelData::Iterator rowStart = p; + + int r = y < SIZE/3 ? 255 : 0, + g = (SIZE/3 <= y) && (y < 2*(SIZE/3)) ? 255 : 0, + b = 2*(SIZE/3) <= y ? 255 : 0; + + for ( int x = 0; x < SIZE; ++x ) + { + p.Red() = r; + p.Green() = g; + p.Blue() = b; + ++p; // same as p.OffsetX(1) + } + + p = rowStart; + p.OffsetY(data, 1); + } + } + void OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc( this ); - dc.DrawText(_T("This is alpha and raw bitmap test"), 0, BORDER); - dc.DrawText(_T("This is alpha and raw bitmap test"), 0, SIZE/2 - BORDER); - dc.DrawText(_T("This is alpha and raw bitmap test"), 0, SIZE - 2*BORDER); - dc.DrawBitmap( m_bitmap, 0, 0, true /* use mask */ ); + dc.DrawText(wxT("This is alpha and raw bitmap test"), 0, BORDER); + dc.DrawText(wxT("This is alpha and raw bitmap test"), 0, SIZE/2 - BORDER); + dc.DrawText(wxT("This is alpha and raw bitmap test"), 0, SIZE - 2*BORDER); + dc.DrawBitmap( m_alphaBitmap, 0, 0, true /* use mask */ ); + + dc.DrawText(wxT("Raw bitmap access without alpha"), 0, SIZE+5); + dc.DrawBitmap( m_bitmap, 0, SIZE+5+dc.GetCharHeight()); } private: wxBitmap m_bitmap; + wxBitmap m_alphaBitmap; DECLARE_EVENT_TABLE() }; #endif // wxHAVE_RAW_BITMAP -// MyApp - -class MyApp: public wxApp -{ -public: - virtual bool OnInit(); -}; - -// main program - -IMPLEMENT_APP(MyApp) -// MyCanvas +// ============================================================================ +// implementations +// ============================================================================ -IMPLEMENT_DYNAMIC_CLASS(MyCanvas, wxScrolledWindow) +//----------------------------------------------------------------------------- +// MyImageFrame +//----------------------------------------------------------------------------- BEGIN_EVENT_TABLE(MyImageFrame, wxFrame) EVT_ERASE_BACKGROUND(MyImageFrame::OnEraseBackground) EVT_PAINT(MyImageFrame::OnPaint) - EVT_LEFT_DCLICK(MyImageFrame::OnSave) + + EVT_MENU(wxID_SAVE, MyImageFrame::OnSave) + EVT_MENU_RANGE(ID_ROTATE_LEFT, ID_ROTATE_RIGHT, MyImageFrame::OnRotate) + EVT_MENU(ID_RESIZE, MyImageFrame::OnResize) + + EVT_MENU(wxID_ZOOM_IN, MyImageFrame::OnZoom) + EVT_MENU(wxID_ZOOM_OUT, MyImageFrame::OnZoom) + EVT_MENU(wxID_ZOOM_100, MyImageFrame::OnZoom) END_EVENT_TABLE() +//----------------------------------------------------------------------------- +// MyRawBitmapFrame +//----------------------------------------------------------------------------- + #ifdef wxHAVE_RAW_BITMAP BEGIN_EVENT_TABLE(MyRawBitmapFrame, wxFrame) @@ -381,509 +606,30 @@ END_EVENT_TABLE() #endif // wxHAVE_RAW_BITMAP -BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) - EVT_PAINT(MyCanvas::OnPaint) -END_EVENT_TABLE() - -MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, - const wxPoint &pos, const wxSize &size ) - : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER ) - , m_bmpSmileXpm((const char **) smile_xpm) - , m_iconSmileXpm((const char **) smile_xpm) -{ - my_horse_png = (wxBitmap*) NULL; - my_horse_jpeg = (wxBitmap*) NULL; - my_horse_gif = (wxBitmap*) NULL; - my_horse_bmp = (wxBitmap*) NULL; - my_horse_bmp2 = (wxBitmap*) NULL; - my_horse_pcx = (wxBitmap*) NULL; - my_horse_pnm = (wxBitmap*) NULL; - my_horse_tiff = (wxBitmap*) NULL; - my_horse_xpm = (wxBitmap*) NULL; - my_horse_ico32 = (wxBitmap*) NULL; - my_horse_ico16 = (wxBitmap*) NULL; - my_horse_ico = (wxBitmap*) NULL; - my_horse_cur = (wxBitmap*) NULL; - my_horse_ani = (wxBitmap*) NULL; - - my_smile_xbm = (wxBitmap*) NULL; - my_square = (wxBitmap*) NULL; - my_anti = (wxBitmap*) NULL; - - m_ani_images = 0 ; - - SetBackgroundColour(* wxWHITE); - - wxBitmap bitmap( 100, 100 ); - - wxMemoryDC dc; - dc.SelectObject( bitmap ); - dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) ); - dc.SetPen( *wxBLACK_PEN ); - dc.DrawRectangle( 0, 0, 100, 100 ); - dc.SetBrush( *wxWHITE_BRUSH ); - dc.DrawRectangle( 20, 20, 60, 60 ); - dc.SelectObject( wxNullBitmap ); - - // try to find the directory with our images - wxString dir; - if ( wxFile::Exists(wxT("./horse.png")) ) - dir = wxT("./"); - else if ( wxFile::Exists(wxT("../horse.png")) ) - dir = wxT("../"); - else - wxLogWarning(wxT("Can't find image files in either '.' or '..'!")); - - wxImage image = bitmap.ConvertToImage(); - -#if wxUSE_LIBPNG - if ( !image.SaveFile( dir + _T("test.png"), wxBITMAP_TYPE_PNG )) - wxLogError(wxT("Can't save file")); - - image.Destroy(); - - if ( image.LoadFile( dir + _T("test.png") ) ) - my_square = new wxBitmap( image ); - - image.Destroy(); - - if ( !image.LoadFile( dir + _T("horse.png")) ) - wxLogError(wxT("Can't load PNG image")); - else - my_horse_png = new wxBitmap( image ); -#endif // wxUSE_LIBPNG - -#if wxUSE_LIBJPEG - image.Destroy(); - - if ( !image.LoadFile( dir + _T("horse.jpg")) ) - wxLogError(wxT("Can't load JPG image")); - else - my_horse_jpeg = new wxBitmap( image ); -#endif // wxUSE_LIBJPEG - -#if wxUSE_GIF - image.Destroy(); - - if ( !image.LoadFile( dir + _T("horse.gif" )) ) - wxLogError(wxT("Can't load GIF image")); - else - my_horse_gif = new wxBitmap( image ); -#endif - -#if wxUSE_PCX - image.Destroy(); - - if ( !image.LoadFile( dir + _T("horse.pcx"), wxBITMAP_TYPE_PCX ) ) - wxLogError(wxT("Can't load PCX image")); - else - my_horse_pcx = new wxBitmap( image ); -#endif - - image.Destroy(); - - if ( !image.LoadFile( dir + _T("horse.bmp"), wxBITMAP_TYPE_BMP ) ) - wxLogError(wxT("Can't load BMP image")); - else - my_horse_bmp = new wxBitmap( image ); - -#if wxUSE_XPM - image.Destroy(); - - if ( !image.LoadFile( dir + _T("horse.xpm"), wxBITMAP_TYPE_XPM ) ) - wxLogError(wxT("Can't load XPM image")); - else - my_horse_xpm = new wxBitmap( image ); - - if ( !image.SaveFile( dir + _T("test.xpm"), wxBITMAP_TYPE_XPM )) - wxLogError(wxT("Can't save file")); -#endif - -#if wxUSE_PNM - image.Destroy(); - - if ( !image.LoadFile( dir + _T("horse.pnm"), wxBITMAP_TYPE_PNM ) ) - wxLogError(wxT("Can't load PNM image")); - else - my_horse_pnm = new wxBitmap( image ); -#endif - -#if wxUSE_LIBTIFF - image.Destroy(); - - if ( !image.LoadFile( dir + _T("horse.tif"), wxBITMAP_TYPE_TIF ) ) - wxLogError(wxT("Can't load TIFF image")); - else - my_horse_tiff = new wxBitmap( image ); -#endif - - CreateAntiAliasedBitmap(); - - my_smile_xbm = new wxBitmap( (const char*)smile_bits, smile_width, - smile_height, 1 ); - - // demonstrates XPM automatically using the mask when saving - if ( m_bmpSmileXpm.Ok() ) - m_bmpSmileXpm.SaveFile(_T("saved.xpm"), wxBITMAP_TYPE_XPM); - -#if wxUSE_ICO_CUR - image.Destroy(); - - if ( !image.LoadFile( dir + _T("horse.ico"), wxBITMAP_TYPE_ICO, 0 ) ) - wxLogError(wxT("Can't load first ICO image")); - else - my_horse_ico32 = new wxBitmap( image ); - - image.Destroy(); - - if ( !image.LoadFile( dir + _T("horse.ico"), wxBITMAP_TYPE_ICO, 1 ) ) - wxLogError(wxT("Can't load second ICO image")); - else - my_horse_ico16 = new wxBitmap( image ); - - image.Destroy(); - - if ( !image.LoadFile( dir + _T("horse.ico") ) ) - wxLogError(wxT("Can't load best ICO image")); - else - my_horse_ico = new wxBitmap( image ); - - image.Destroy(); - - if ( !image.LoadFile( dir + _T("horse.cur"), wxBITMAP_TYPE_CUR ) ) - wxLogError(wxT("Can't load best ICO image")); - else - { - my_horse_cur = new wxBitmap( image ); - xH = 30 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X) ; - yH = 2420 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ; - } - - m_ani_images = wxImage::GetImageCount ( dir + _T("horse3.ani"), wxBITMAP_TYPE_ANI ); - if (m_ani_images==0) - wxLogError(wxT("No ANI-format images found")); - else - my_horse_ani = new wxBitmap [m_ani_images]; - int i ; - for (i=0; i < m_ani_images; i++) - { - image.Destroy(); - if (!image.LoadFile( dir + _T("horse3.ani"), wxBITMAP_TYPE_ANI, i )) - { - wxString tmp = wxT("Can't load image number "); - tmp << i ; - wxLogError(tmp); - } - else - my_horse_ani [i] = wxBitmap( image ); - } -#endif // wxUSE_ICO_CUR - - image.Destroy(); - - // test image loading from stream - wxFile file(dir + _T("horse.bmp")); - if ( file.IsOpened() ) - { - wxFileOffset len = file.Length(); - size_t dataSize = (size_t)len; - void *data = malloc(dataSize); - if ( file.Read(data, dataSize) != len ) - wxLogError(_T("Reading bitmap file failed")); - else - { - wxMemoryInputStream mis(data, dataSize); - if ( !image.LoadFile(mis) ) - wxLogError(wxT("Can't load BMP image from stream")); - else - my_horse_bmp2 = new wxBitmap( image ); - } - - free(data); - } -} - -MyCanvas::~MyCanvas() -{ - delete my_horse_pnm; - delete my_horse_png; - delete my_horse_jpeg; - delete my_horse_gif; - delete my_horse_bmp; - delete my_horse_bmp2; - delete my_horse_pcx; - delete my_horse_tiff; - delete my_horse_xpm; - delete my_horse_ico32; - delete my_horse_ico16; - delete my_horse_ico; - delete my_horse_cur; - delete [] my_horse_ani; - delete my_smile_xbm; - delete my_square; - delete my_anti; -} - -void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) -{ - wxPaintDC dc( this ); - PrepareDC( dc ); - - dc.DrawText( _T("Loaded image"), 30, 10 ); - if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 ); - - dc.DrawText( _T("Drawn directly"), 150, 10 ); - dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) ); - dc.SetPen( *wxBLACK_PEN ); - dc.DrawRectangle( 150, 30, 100, 100 ); - dc.SetBrush( *wxWHITE_BRUSH ); - dc.DrawRectangle( 170, 50, 60, 60 ); - - if (my_anti && my_anti->Ok()) - dc.DrawBitmap( *my_anti, 280, 30 ); - - dc.DrawText( _T("PNG handler"), 30, 135 ); - if (my_horse_png && my_horse_png->Ok()) - { - dc.DrawBitmap( *my_horse_png, 30, 150 ); - wxRect rect(0,0,100,100); - wxBitmap sub( my_horse_png->GetSubBitmap(rect) ); - dc.DrawText( _T("GetSubBitmap()"), 280, 190 ); - dc.DrawBitmap( sub, 280, 210 ); - } - - dc.DrawText( _T("JPEG handler"), 30, 365 ); - if (my_horse_jpeg && my_horse_jpeg->Ok()) - dc.DrawBitmap( *my_horse_jpeg, 30, 380 ); - - dc.DrawText( _T("GIF handler"), 30, 595 ); - if (my_horse_gif && my_horse_gif->Ok()) - dc.DrawBitmap( *my_horse_gif, 30, 610 ); - - dc.DrawText( _T("PCX handler"), 30, 825 ); - if (my_horse_pcx && my_horse_pcx->Ok()) - dc.DrawBitmap( *my_horse_pcx, 30, 840 ); - - dc.DrawText( _T("BMP handler"), 30, 1055 ); - if (my_horse_bmp && my_horse_bmp->Ok()) - dc.DrawBitmap( *my_horse_bmp, 30, 1070 ); - - dc.DrawText( _T("BMP read from memory"), 280, 1055 ); - if (my_horse_bmp2 && my_horse_bmp2->Ok()) - dc.DrawBitmap( *my_horse_bmp2, 280, 1070 ); - - dc.DrawText( _T("PNM handler"), 30, 1285 ); - if (my_horse_pnm && my_horse_pnm->Ok()) - dc.DrawBitmap( *my_horse_pnm, 30, 1300 ); - - dc.DrawText( _T("TIFF handler"), 30, 1515 ); - if (my_horse_tiff && my_horse_tiff->Ok()) - dc.DrawBitmap( *my_horse_tiff, 30, 1530 ); - - dc.DrawText( _T("XPM handler"), 30, 1745 ); - if (my_horse_xpm && my_horse_xpm->Ok()) - dc.DrawBitmap( *my_horse_xpm, 30, 1760 ); - - - if (my_smile_xbm && my_smile_xbm->Ok()) - { - dc.DrawText( _T("XBM bitmap"), 30, 1975 ); - dc.DrawText( _T("(green on red)"), 30, 1990 ); - dc.SetTextForeground( _T("GREEN") ); - dc.SetTextBackground( _T("RED") ); - dc.DrawBitmap( *my_smile_xbm, 30, 2010 ); - - dc.SetTextForeground( wxT("BLACK") ); - dc.DrawText( _T("After wxImage conversion"), 150, 1975 ); - dc.DrawText( _T("(red on white)"), 150, 1990 ); - dc.SetTextForeground( wxT("RED") ); - wxImage i = my_smile_xbm->ConvertToImage(); - i.SetMaskColour( 255, 255, 255 ); - i.Replace( 0, 0, 0, - wxRED_PEN->GetColour().Red(), - wxRED_PEN->GetColour().Green(), - wxRED_PEN->GetColour().Blue() ); - dc.DrawBitmap( wxBitmap(i), 150, 2010, true ); - dc.SetTextForeground( wxT("BLACK") ); - } - - - wxBitmap mono( 60,50,1 ); - wxMemoryDC memdc; - memdc.SelectObject( mono ); - memdc.SetPen( *wxBLACK_PEN ); - memdc.SetBrush( *wxWHITE_BRUSH ); - memdc.DrawRectangle( 0,0,60,50 ); - memdc.SetTextForeground( *wxBLACK ); -#ifndef __WXGTK20__ - // I cannot convince GTK2 to draw into mono bitmaps - memdc.DrawText( _T("Hi!"), 5, 5 ); -#endif - memdc.SetBrush( *wxBLACK_BRUSH ); - memdc.DrawRectangle( 33,5,20,20 ); - memdc.SetPen( *wxRED_PEN ); - memdc.DrawLine( 5, 42, 50, 42 ); - memdc.SelectObject( wxNullBitmap ); - - if (mono.Ok()) - { - dc.DrawText( _T("Mono bitmap"), 30, 2095 ); - dc.DrawText( _T("(red on green)"), 30, 2110 ); - dc.SetTextForeground( wxT("RED") ); - dc.SetTextBackground( wxT("GREEN") ); - dc.DrawBitmap( mono, 30, 2130 ); - - dc.SetTextForeground( wxT("BLACK") ); - dc.DrawText( _T("After wxImage conversion"), 150, 2095 ); - dc.DrawText( _T("(red on white)"), 150, 2110 ); - dc.SetTextForeground( wxT("RED") ); - wxImage i = mono.ConvertToImage(); - i.SetMaskColour( 255,255,255 ); - i.Replace( 0,0,0, - wxRED_PEN->GetColour().Red(), - wxRED_PEN->GetColour().Green(), - wxRED_PEN->GetColour().Blue() ); - dc.DrawBitmap( wxBitmap(i), 150, 2130, true ); - dc.SetTextForeground( wxT("BLACK") ); - } - - // For testing transparency - dc.SetBrush( *wxRED_BRUSH ); - dc.DrawRectangle( 20, 2220, 560, 68 ); - - dc.DrawText(_T("XPM bitmap"), 30, 2230 ); - if ( m_bmpSmileXpm.Ok() ) - dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, true); - - dc.DrawText(_T("XPM icon"), 110, 2230 ); - if ( m_iconSmileXpm.Ok() ) - dc.DrawIcon(m_iconSmileXpm, 110, 2250); - - // testing icon -> bitmap conversion - wxBitmap to_blit( m_iconSmileXpm ); - if (to_blit.Ok()) - { - dc.DrawText( _T("SubBitmap"), 170, 2230 ); - wxBitmap sub = to_blit.GetSubBitmap( wxRect(0,0,15,15) ); - if (sub.Ok()) - dc.DrawBitmap( sub, 170, 2250, true ); - - dc.DrawText( _T("Enlarged"), 250, 2230 ); - dc.SetUserScale( 1.5, 1.5 ); - dc.DrawBitmap( to_blit, (int)(250/1.5), (int)(2250/1.5), true ); - dc.SetUserScale( 2, 2 ); - dc.DrawBitmap( to_blit, (int)(300/2), (int)(2250/2), true ); - dc.SetUserScale( 1.0, 1.0 ); - - dc.DrawText( _T("Blit"), 400, 2230); - wxMemoryDC blit_dc; - blit_dc.SelectObject( to_blit ); - dc.Blit( 400, 2250, to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, true ); - dc.SetUserScale( 1.5, 1.5 ); - dc.Blit( (int)(450/1.5), (int)(2250/1.5), to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, true ); - dc.SetUserScale( 2, 2 ); - dc.Blit( (int)(500/2), (int)(2250/2), to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, true ); - dc.SetUserScale( 1.0, 1.0 ); - } - - dc.DrawText( _T("ICO handler (1st image)"), 30, 2290 ); - if (my_horse_ico32 && my_horse_ico32->Ok()) - dc.DrawBitmap( *my_horse_ico32, 30, 2330, true ); - - dc.DrawText( _T("ICO handler (2nd image)"), 230, 2290 ); - if (my_horse_ico16 && my_horse_ico16->Ok()) - dc.DrawBitmap( *my_horse_ico16, 230, 2330, true ); - - dc.DrawText( _T("ICO handler (best image)"), 430, 2290 ); - if (my_horse_ico && my_horse_ico->Ok()) - dc.DrawBitmap( *my_horse_ico, 430, 2330, true ); - - dc.DrawText( _T("CUR handler"), 30, 2390 ); - if (my_horse_cur && my_horse_cur->Ok()) - { - dc.DrawBitmap( *my_horse_cur, 30, 2420, true ); - dc.SetPen (*wxRED_PEN); - dc.DrawLine (xH-10,yH,xH+10,yH); - dc.DrawLine (xH,yH-10,xH,yH+10); - } - dc.DrawText( _T("ANI handler"), 230, 2390 ); - int i ; - for (i=0; i < m_ani_images; i ++) - if (my_horse_ani[i].Ok()) - { - dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, true ); - } -} - -void MyCanvas::CreateAntiAliasedBitmap() -{ - wxBitmap bitmap( 300, 300 ); - - wxMemoryDC dc; - - dc.SelectObject( bitmap ); - - dc.Clear(); - - dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) ); - dc.SetTextForeground( wxT("RED") ); - dc.DrawText( _T("This is anti-aliased Text."), 20, 20 ); - dc.DrawText( _T("And a Rectangle."), 20, 60 ); - - dc.SetBrush( *wxRED_BRUSH ); - dc.SetPen( *wxTRANSPARENT_PEN ); - dc.DrawRoundedRectangle( 20, 100, 200, 180, 20 ); - - wxImage original= bitmap.ConvertToImage(); - wxImage anti( 150, 150 ); - - /* This is quite slow, but safe. Use wxImage::GetData() for speed instead. */ - - for (int y = 1; y < 149; y++) - for (int x = 1; x < 149; x++) - { - int red = original.GetRed( x*2, y*2 ) + - original.GetRed( x*2-1, y*2 ) + - original.GetRed( x*2, y*2+1 ) + - original.GetRed( x*2+1, y*2+1 ); - red = red/4; - - int green = original.GetGreen( x*2, y*2 ) + - original.GetGreen( x*2-1, y*2 ) + - original.GetGreen( x*2, y*2+1 ) + - original.GetGreen( x*2+1, y*2+1 ); - green = green/4; - - int blue = original.GetBlue( x*2, y*2 ) + - original.GetBlue( x*2-1, y*2 ) + - original.GetBlue( x*2, y*2+1 ) + - original.GetBlue( x*2+1, y*2+1 ); - blue = blue/4; - anti.SetRGB( x, y, (unsigned char)red, (unsigned char)green, (unsigned char)blue ); - } - my_anti = new wxBitmap(anti); -} - +//----------------------------------------------------------------------------- // MyFrame +//----------------------------------------------------------------------------- enum { - ID_QUIT = 108, - ID_ABOUT, - ID_NEW, - ID_SHOWRAW + ID_QUIT = wxID_EXIT, + ID_ABOUT = wxID_ABOUT, + ID_NEW = 100, + ID_INFO, + ID_SHOWRAW, + ID_SHOWTHUMBNAIL }; IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame ) - -BEGIN_EVENT_TABLE(MyFrame,wxFrame) - EVT_MENU (ID_ABOUT, MyFrame::OnAbout) - EVT_MENU (ID_QUIT, MyFrame::OnQuit) - EVT_MENU (ID_NEW, MyFrame::OnNewFrame) +BEGIN_EVENT_TABLE(MyFrame, wxFrame) + EVT_MENU (ID_ABOUT, MyFrame::OnAbout) + EVT_MENU (ID_QUIT, MyFrame::OnQuit) + EVT_MENU (ID_NEW, MyFrame::OnNewFrame) + EVT_MENU (ID_INFO, MyFrame::OnImageInfo) + EVT_MENU (ID_SHOWTHUMBNAIL, MyFrame::OnThumbnail) #ifdef wxHAVE_RAW_BITMAP - EVT_MENU (ID_SHOWRAW, MyFrame::OnTestRawBitmap) + EVT_MENU (ID_SHOWRAW, MyFrame::OnTestRawBitmap) #endif - #if wxUSE_CLIPBOARD EVT_MENU(wxID_COPY, MyFrame::OnCopy) EVT_MENU(wxID_PASTE, MyFrame::OnPaste) @@ -891,71 +637,154 @@ BEGIN_EVENT_TABLE(MyFrame,wxFrame) END_EVENT_TABLE() MyFrame::MyFrame() - : wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxImage sample"), - wxPoint(20,20), wxSize(470,360) ) + : wxFrame( (wxFrame *)NULL, wxID_ANY, wxT("wxImage sample"), + wxPoint(20, 20), wxSize(950, 700) ) { - wxMenuBar *menu_bar = new wxMenuBar(); + SetIcon(wxICON(sample)); - wxMenu *menuImage = new wxMenu; - menuImage->Append( ID_NEW, _T("&Show any image...\tCtrl-O")); + wxMenuBar *menu_bar = new wxMenuBar(); + wxMenu *menuImage = new wxMenu; + menuImage->Append( ID_NEW, wxT("&Show any image...\tCtrl-O")); + menuImage->Append( ID_INFO, wxT("Show image &information...\tCtrl-I")); #ifdef wxHAVE_RAW_BITMAP - menuImage->Append( ID_SHOWRAW, _T("Test &raw bitmap...\tCtrl-R")); + menuImage->AppendSeparator(); + menuImage->Append( ID_SHOWRAW, wxT("Test &raw bitmap...\tCtrl-R")); #endif - menuImage->AppendSeparator(); - menuImage->Append( ID_ABOUT, _T("&About...")); - menuImage->AppendSeparator(); - menuImage->Append( ID_QUIT, _T("E&xit\tCtrl-Q")); - menu_bar->Append(menuImage, _T("&Image")); + menuImage->AppendSeparator(); + menuImage->Append( ID_SHOWTHUMBNAIL, wxT("Test &thumbnail...\tCtrl-T"), + "Test scaling the image during load (try with JPEG)"); + menuImage->AppendSeparator(); + menuImage->Append( ID_ABOUT, wxT("&About...\tF1")); + menuImage->AppendSeparator(); + menuImage->Append( ID_QUIT, wxT("E&xit\tCtrl-Q")); + menu_bar->Append(menuImage, wxT("&Image")); #if wxUSE_CLIPBOARD - wxMenu *menuClipboard = new wxMenu; - menuClipboard->Append(wxID_COPY, _T("&Copy test image\tCtrl-C")); - menuClipboard->Append(wxID_PASTE, _T("&Paste image\tCtrl-V")); - menu_bar->Append(menuClipboard, _T("&Clipboard")); + wxMenu *menuClipboard = new wxMenu; + menuClipboard->Append(wxID_COPY, wxT("&Copy test image\tCtrl-C")); + menuClipboard->Append(wxID_PASTE, wxT("&Paste image\tCtrl-V")); + menu_bar->Append(menuClipboard, wxT("&Clipboard")); #endif // wxUSE_CLIPBOARD - SetMenuBar( menu_bar ); + SetMenuBar( menu_bar ); #if wxUSE_STATUSBAR - CreateStatusBar(2); - int widths[] = { -1, 100 }; - SetStatusWidths( 2, widths ); + CreateStatusBar(2); + int widths[] = { -1, 100 }; + SetStatusWidths( 2, widths ); #endif // wxUSE_STATUSBAR - m_canvas = new MyCanvas( this, wxID_ANY, wxPoint(0,0), wxSize(10,10) ); + m_canvas = new MyCanvas( this, wxID_ANY, wxPoint(0,0), wxSize(10,10) ); - // 500 width * 2500 height - m_canvas->SetScrollbars( 10, 10, 50, 250 ); + // 500 width * 2750 height + m_canvas->SetScrollbars( 10, 10, 50, 275 ); + m_canvas->SetCursor(wxImage("cursor.png")); } void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) ) { - Close( true ); + Close( true ); } +#if wxUSE_ZLIB && wxUSE_STREAMS +#include "wx/zstream.h" +#endif + void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) ) { - (void)wxMessageBox( _T("wxImage demo\n") - _T("Robert Roebling (c) 1998,2000"), - _T("About wxImage Demo"), wxICON_INFORMATION | wxOK ); + wxArrayString array; + + array.Add("wxImage demo"); + array.Add("(c) Robert Roebling 1998-2005"); + array.Add("(c) Vadim Zeitlin 2005-2009"); + + array.Add(wxEmptyString); + array.Add("Version of the libraries used:"); + +#if wxUSE_LIBPNG + array.Add(wxPNGHandler::GetLibraryVersionInfo().ToString()); +#endif +#if wxUSE_LIBJPEG + array.Add(wxJPEGHandler::GetLibraryVersionInfo().ToString()); +#endif +#if wxUSE_LIBTIFF + array.Add(wxTIFFHandler::GetLibraryVersionInfo().ToString()); +#endif +#if wxUSE_ZLIB && wxUSE_STREAMS + // zlib is used by libpng + array.Add(wxGetZlibVersionInfo().ToString()); +#endif + (void)wxMessageBox( wxJoin(array, '\n'), + "About wxImage Demo", + wxICON_INFORMATION | wxOK ); +} + +wxString MyFrame::LoadUserImage(wxImage& image) +{ + wxString filename; + +#if wxUSE_FILEDLG + filename = wxLoadFileSelector(wxT("image"), wxEmptyString); + if ( !filename.empty() ) + { + if ( !image.LoadFile(filename) ) + { + wxLogError(wxT("Couldn't load image from '%s'."), filename.c_str()); + + return wxEmptyString; + } + } +#endif // wxUSE_FILEDLG + + return filename; } void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) ) { - wxString filename = wxFileSelector(_T("Select image file")); - if ( !filename ) - return; + wxImage image; + wxString filename = LoadUserImage(image); + if ( !filename.empty() ) + new MyImageFrame(this, filename, image); +} +void MyFrame::OnImageInfo( wxCommandEvent &WXUNUSED(event) ) +{ wxImage image; - if ( !image.LoadFile(filename) ) + if ( !LoadUserImage(image).empty() ) { - wxLogError(_T("Couldn't load image from '%s'."), filename.c_str()); + // TODO: show more information about the file + wxString info = wxString::Format("Image size: %dx%d", + image.GetWidth(), + image.GetHeight()); + + int xres = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONX), + yres = image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONY); + if ( xres || yres ) + { + info += wxString::Format("\nResolution: %dx%d", xres, yres); + switch ( image.GetOptionInt(wxIMAGE_OPTION_RESOLUTIONUNIT) ) + { + default: + wxFAIL_MSG( "unknown image resolution units" ); + // fall through - return; - } + case wxIMAGE_RESOLUTION_NONE: + info += " in default units"; + break; + + case wxIMAGE_RESOLUTION_INCHES: + info += " in"; + break; + + case wxIMAGE_RESOLUTION_CM: + info += " cm"; + break; + } + } - (new MyImageFrame(this, wxBitmap(image)))->Show(); + wxLogMessage("%s", info); + } } #ifdef wxHAVE_RAW_BITMAP @@ -972,13 +801,13 @@ void MyFrame::OnTestRawBitmap( wxCommandEvent &WXUNUSED(event) ) void MyFrame::OnCopy(wxCommandEvent& WXUNUSED(event)) { wxBitmapDataObject *dobjBmp = new wxBitmapDataObject; - dobjBmp->SetBitmap(*m_canvas->my_horse_png); + dobjBmp->SetBitmap(m_canvas->my_horse_png); wxTheClipboard->Open(); if ( !wxTheClipboard->SetData(dobjBmp) ) { - wxLogError(_T("Failed to copy bitmap to clipboard")); + wxLogError(wxT("Failed to copy bitmap to clipboard")); } wxTheClipboard->Close(); @@ -991,60 +820,63 @@ void MyFrame::OnPaste(wxCommandEvent& WXUNUSED(event)) wxTheClipboard->Open(); if ( !wxTheClipboard->GetData(dobjBmp) ) { - wxLogMessage(_T("No bitmap data in the clipboard")); + wxLogMessage(wxT("No bitmap data in the clipboard")); } else { - (new MyImageFrame(this, dobjBmp.GetBitmap()))->Show(); + new MyImageFrame(this, wxT("Clipboard"), dobjBmp.GetBitmap()); } wxTheClipboard->Close(); } #endif // wxUSE_CLIPBOARD -//----------------------------------------------------------------------------- -// MyApp -//----------------------------------------------------------------------------- - -bool MyApp::OnInit() +void MyFrame::OnThumbnail( wxCommandEvent &WXUNUSED(event) ) { -#if wxUSE_LIBPNG - wxImage::AddHandler( new wxPNGHandler ); -#endif +#if wxUSE_FILEDLG + wxString filename = wxLoadFileSelector(wxT("image"), wxEmptyString, wxEmptyString, this); + if ( filename.empty() ) + return; -#if wxUSE_LIBJPEG - wxImage::AddHandler( new wxJPEGHandler ); -#endif + static const int THUMBNAIL_WIDTH = 320; + static const int THUMBNAIL_HEIGHT = 240; -#if wxUSE_LIBTIFF - wxImage::AddHandler( new wxTIFFHandler ); -#endif + wxImage image; + image.SetOption(wxIMAGE_OPTION_MAX_WIDTH, THUMBNAIL_WIDTH); + image.SetOption(wxIMAGE_OPTION_MAX_HEIGHT, THUMBNAIL_HEIGHT); -#if wxUSE_GIF - wxImage::AddHandler( new wxGIFHandler ); -#endif + wxStopWatch sw; + if ( !image.LoadFile(filename) ) + { + wxLogError(wxT("Couldn't load image from '%s'."), filename.c_str()); + return; + } -#if wxUSE_PCX - wxImage::AddHandler( new wxPCXHandler ); -#endif + const long loadTime = sw.Time(); -#if wxUSE_PNM - wxImage::AddHandler( new wxPNMHandler ); -#endif + MyImageFrame * const frame = new MyImageFrame(this, filename, image); + wxLogStatus(frame, "Loaded \"%s\" in %ldms", filename, loadTime); +#else + wxLogError( wxT("Couldn't create file selector dialog") ); + return; +#endif // wxUSE_FILEDLG +} -#if wxUSE_XPM - wxImage::AddHandler( new wxXPMHandler ); -#endif +//----------------------------------------------------------------------------- +// MyApp +//----------------------------------------------------------------------------- -#if wxUSE_ICO_CUR - wxImage::AddHandler( new wxICOHandler ); - wxImage::AddHandler( new wxCURHandler ); - wxImage::AddHandler( new wxANIHandler ); -#endif +IMPLEMENT_APP(MyApp) - wxFrame *frame = new MyFrame(); - frame->Show( true ); +bool MyApp::OnInit() +{ + if ( !wxApp::OnInit() ) + return false; - return true; -} + wxInitAllImageHandlers(); + wxFrame *frame = new MyFrame(); + frame->Show( true ); + + return true; +}