X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a10132773600053c2c4d32b0d588cb9f4d9065c..b156929dd096cb0c0c46cd4a5747556dde228675:/samples/image/image.cpp diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 75a6f4b543..04e04cd670 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -81,6 +81,11 @@ public: wxBitmap *my_square; wxBitmap *my_anti; + wxBitmap *my_horse_asciigrey_pnm; + wxBitmap *my_horse_rawgrey_pnm; + + wxBitmap *colorized_horse_jpeg; + int xH, yH ; int m_ani_images ; @@ -146,20 +151,21 @@ public: void OnSave(wxMouseEvent& 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"), + 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, this); @@ -184,7 +190,7 @@ public: wxBMP_24BPP }; - static const wxString bppchoices[] = + const wxString bppchoices[] = { _T("1 bpp color"), _T("1 bpp B&W"), @@ -213,7 +219,7 @@ public: cmap[i] = (unsigned char)i; image.SetPalette(wxPalette(256, cmap, cmap, cmap)); - delete cmap; + delete[] cmap; } } } @@ -229,7 +235,7 @@ public: wxPNG_TYPE_GREY_RED, }; - static const wxString pngchoices[] = + const wxString pngchoices[] = { _T("Colour 8bpp"), _T("Colour 16bpp"), @@ -266,6 +272,7 @@ public: // (it may fail if the extension is not recognized): image.SaveFile(savefilename); } +#endif // wxUSE_FILEDLG } private: @@ -319,10 +326,12 @@ public: for ( int x = 0; x < REAL_SIZE; ++x ) { - p.Red() = r; - p.Green() = g; - p.Blue() = b; - p.Alpha() = (Data::Iterator::ChannelType)((x*255.)/REAL_SIZE); + // note that RGB must be premultiplied by alpha + unsigned a = (Data::Iterator::ChannelType)((x*255.)/REAL_SIZE); + p.Red() = r * a / 256; + p.Green() = g * a / 256; + p.Blue() = b * a / 256; + p.Alpha() = a; ++p; // same as p.OffsetX(1) } @@ -403,11 +412,15 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, my_horse_ico = (wxBitmap*) NULL; my_horse_cur = (wxBitmap*) NULL; my_horse_ani = (wxBitmap*) NULL; + colorized_horse_jpeg = (wxBitmap*) NULL; my_smile_xbm = (wxBitmap*) NULL; my_square = (wxBitmap*) NULL; my_anti = (wxBitmap*) NULL; + my_horse_asciigrey_pnm = (wxBitmap*) NULL; + my_horse_rawgrey_pnm = (wxBitmap*) NULL; + m_ani_images = 0 ; SetBackgroundColour(* wxWHITE); @@ -457,7 +470,14 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, if ( !image.LoadFile( dir + _T("horse.jpg")) ) wxLogError(wxT("Can't load JPG image")); else + { my_horse_jpeg = new wxBitmap( image ); + // Colorize by rotating green hue to red + wxImage::HSVValue greenHSV = wxImage::RGBtoHSV(wxImage::RGBValue(0, 255, 0)); + wxImage::HSVValue redHSV = wxImage::RGBtoHSV(wxImage::RGBValue(255, 0, 0)); + image.RotateHue(redHSV.hue - greenHSV.hue); + colorized_horse_jpeg = new wxBitmap( image ); + } #endif // wxUSE_LIBJPEG #if wxUSE_GIF @@ -504,6 +524,20 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, wxLogError(wxT("Can't load PNM image")); else my_horse_pnm = new wxBitmap( image ); + + image.Destroy(); + + if ( !image.LoadFile( dir + _T("horse_ag.pnm"), wxBITMAP_TYPE_PNM ) ) + wxLogError(wxT("Can't load PNM image")); + else + my_horse_asciigrey_pnm = new wxBitmap( image ); + + image.Destroy(); + + if ( !image.LoadFile( dir + _T("horse_rg.pnm"), wxBITMAP_TYPE_PNM ) ) + wxLogError(wxT("Can't load PNM image")); + else + my_horse_rawgrey_pnm = new wxBitmap( image ); #endif #if wxUSE_LIBTIFF @@ -620,6 +654,9 @@ MyCanvas::~MyCanvas() delete my_smile_xbm; delete my_square; delete my_anti; + delete my_horse_asciigrey_pnm; + delete my_horse_rawgrey_pnm; + delete colorized_horse_jpeg; } void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) @@ -674,6 +711,14 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) if (my_horse_pnm && my_horse_pnm->Ok()) dc.DrawBitmap( *my_horse_pnm, 30, 1300 ); + dc.DrawText( _T("PNM handler (ascii grey)"), 280, 1285 ); + if (my_horse_asciigrey_pnm && my_horse_asciigrey_pnm->Ok()) + dc.DrawBitmap( *my_horse_asciigrey_pnm, 280, 1300 ); + + dc.DrawText( _T("PNM handler (raw grey)"), 530, 1285 ); + if (my_horse_rawgrey_pnm && my_horse_rawgrey_pnm->Ok()) + dc.DrawBitmap( *my_horse_rawgrey_pnm, 530, 1300 ); + dc.DrawText( _T("TIFF handler"), 30, 1515 ); if (my_horse_tiff && my_horse_tiff->Ok()) dc.DrawBitmap( *my_horse_tiff, 30, 1530 ); @@ -811,6 +856,14 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) { dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, true ); } +#if wxUSE_LIBJPEG + if (colorized_horse_jpeg) + { + dc.DrawText( _T("Colorize image by rotating green hue to red"), 30, 2490 ); + dc.DrawBitmap( *colorized_horse_jpeg, 30, 2520 ); + } +#endif // wxUSE_LIBJPEG + } void MyCanvas::CreateAntiAliasedBitmap() @@ -866,10 +919,10 @@ void MyCanvas::CreateAntiAliasedBitmap() enum { - ID_QUIT = 108, - ID_ABOUT, - ID_NEW, - ID_SHOWRAW + ID_QUIT = wxID_EXIT, + ID_ABOUT = wxID_ABOUT, + ID_NEW = 100, + ID_SHOWRAW = 101 }; IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame ) @@ -923,8 +976,8 @@ MyFrame::MyFrame() 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 ); } void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) ) @@ -941,6 +994,7 @@ void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) ) void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) ) { +#if wxUSE_FILEDLG wxString filename = wxFileSelector(_T("Select image file")); if ( !filename ) return; @@ -954,6 +1008,7 @@ void MyFrame::OnNewFrame( wxCommandEvent &WXUNUSED(event) ) } (new MyImageFrame(this, wxBitmap(image)))->Show(); +#endif // wxUSE_FILEDLG } #ifdef wxHAVE_RAW_BITMAP @@ -1045,4 +1100,3 @@ bool MyApp::OnInit() return true; } -