X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9390a202a8b9d67d393faf3e1323885e6a27c127..cae5359f186e755ca52b8e69e311b4ec6c0a1836:/samples/image/image.cpp?ds=sidebyside diff --git a/samples/image/image.cpp b/samples/image/image.cpp index 56c4b6ddc7..30bb7eb986 100644 --- a/samples/image/image.cpp +++ b/samples/image/image.cpp @@ -20,6 +20,8 @@ #include "wx/image.h" +#include "wx/file.h" + // derived classes class MyFrame; @@ -36,7 +38,10 @@ public: void OnPaint( wxPaintEvent &event ); void CreateAntiAliasedBitmap(); - wxBitmap *my_horse; + wxBitmap *my_horse_png; + wxBitmap *my_horse_jpeg; + wxBitmap *my_horse_gif; + wxBitmap *my_horse_bmp; wxBitmap *my_square; wxBitmap *my_anti; @@ -80,10 +85,17 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) EVT_PAINT(MyCanvas::OnPaint) END_EVENT_TABLE() -MyCanvas::MyCanvas( wxWindow *parent, const wxWindowID id, +MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size ) : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER ) { + my_horse_png = (wxBitmap*) NULL; + my_horse_jpeg = (wxBitmap*) NULL; + my_horse_gif = (wxBitmap*) NULL; + my_horse_bmp = (wxBitmap*) NULL; + my_square = (wxBitmap*) NULL; + my_anti = (wxBitmap*) NULL; + SetBackgroundColour(* wxWHITE); wxBitmap bitmap( 100, 100 ); @@ -95,17 +107,39 @@ MyCanvas::MyCanvas( wxWindow *parent, const wxWindowID id, dc.DrawRectangle( 0, 0, 100, 100 ); dc.SelectObject( wxNullBitmap ); - wxString dir(""); - -#ifdef __WXGTK__ - dir = wxString("../"); -#endif + // try to find the directory with our images + wxString dir; + if ( wxFile::Exists("./horse.png") ) + dir = "./"; + else if ( wxFile::Exists("../horse.png") ) + dir = "../"; + else + wxLogWarning("Can't find image files in either '.' or '..'!"); wxImage image( bitmap ); - image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ); - image.LoadFile( dir + wxString("horse.png"), wxBITMAP_TYPE_PNG ); - my_horse = new wxBitmap( image.ConvertToBitmap() ); + if ( !image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ) ) + wxLogError("Can't save file"); + + if ( !image.LoadFile( dir + wxString("horse.png"), wxBITMAP_TYPE_PNG ) ) + wxLogError("Can't load PNG image"); + else + my_horse_png = new wxBitmap( image.ConvertToBitmap() ); + + if ( !image.LoadFile( dir + wxString("horse.jpg"), wxBITMAP_TYPE_JPEG ) ) + wxLogError("Can't load JPG image"); + else + my_horse_jpeg = new wxBitmap( image.ConvertToBitmap() ); + + if ( !image.LoadFile( dir + wxString("horse.gif"), wxBITMAP_TYPE_GIF ) ) + wxLogError("Can't load GIF image"); + else + my_horse_gif = new wxBitmap( image.ConvertToBitmap() ); + + if ( !image.LoadFile( dir + wxString("horse.bmp"), wxBITMAP_TYPE_BMP ) ) + wxLogError("Can't load BMP image"); + else + my_horse_bmp = new wxBitmap( image.ConvertToBitmap() ); image.LoadFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG ); my_square = new wxBitmap( image.ConvertToBitmap() ); @@ -115,7 +149,10 @@ MyCanvas::MyCanvas( wxWindow *parent, const wxWindowID id, MyCanvas::~MyCanvas() { - delete my_horse; + delete my_horse_png; + delete my_horse_jpeg; + delete my_horse_gif; + delete my_horse_bmp; delete my_square; delete my_anti; } @@ -126,26 +163,36 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) ) PrepareDC( dc ); dc.DrawText( "Loaded image", 30, 10 ); - if (my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 ); - + if (my_square && my_square->Ok()) dc.DrawBitmap( *my_square, 30, 30 ); + dc.DrawText( "Drawn directly", 150, 10 ); dc.SetBrush( wxBrush( "orange", wxSOLID ) ); dc.SetPen( *wxWHITE_PEN ); dc.DrawRectangle( 150, 30, 100, 100 ); - if (my_horse->Ok()) dc.DrawBitmap( *my_horse, 30, 140 ); + if (my_anti && my_anti->Ok()) dc.DrawBitmap( *my_anti, 250, 140 ); + + dc.DrawText( "PNG handler", 30, 135 ); + if (my_horse_png && my_horse_png->Ok()) dc.DrawBitmap( *my_horse_png, 30, 150 ); + + dc.DrawText( "JPEG handler", 30, 365 ); + if (my_horse_jpeg && my_horse_jpeg->Ok()) dc.DrawBitmap( *my_horse_jpeg, 30, 380 ); + + dc.DrawText( "GIF handler", 30, 595 ); + if (my_horse_gif && my_horse_gif->Ok()) dc.DrawBitmap( *my_horse_gif, 30, 610 ); - if (my_anti->Ok()) dc.DrawBitmap( *my_anti, 250, 140 ); + dc.DrawText( "BMP handler", 30, 815 ); + if (my_horse_bmp && my_horse_bmp->Ok()) dc.DrawBitmap( *my_horse_bmp, 30, 830 ); } void MyCanvas::CreateAntiAliasedBitmap() { wxBitmap bitmap( 300, 300 ); + wxMemoryDC dc; + dc.SelectObject( bitmap ); - - dc.SetPen( *wxTRANSPARENT_PEN ); - + dc.Clear(); dc.SetFont( wxFont( 24, wxDECORATIVE, wxDEFAULT, wxDEFAULT ) ); @@ -154,11 +201,12 @@ void MyCanvas::CreateAntiAliasedBitmap() dc.DrawText( "And a Rectangle.", 20, 60 ); dc.SetBrush( *wxRED_BRUSH ); + dc.SetPen( *wxTRANSPARENT_PEN ); dc.DrawRoundedRectangle( 20, 100, 200, 180, 20 ); wxImage original( bitmap ); wxImage anti( 150, 150 ); - + /* This is quite slow, but safe. Use wxImage::GetData() for speed instead. */ for (int y = 1; y < 149; y++) @@ -203,11 +251,11 @@ MyFrame::MyFrame() wxPoint(20,20), wxSize(470,360) ) { wxMenu *file_menu = new wxMenu(); - file_menu->Append( ID_ABOUT, "About.."); - file_menu->Append( ID_QUIT, "Exit"); + file_menu->Append( ID_ABOUT, "&About.."); + file_menu->Append( ID_QUIT, "E&xit"); wxMenuBar *menu_bar = new wxMenuBar(); - menu_bar->Append(file_menu, "File"); + menu_bar->Append(file_menu, "&File"); SetMenuBar( menu_bar ); @@ -216,7 +264,7 @@ MyFrame::MyFrame() SetStatusWidths( 2, widths ); m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) ); - m_canvas->SetScrollbars( 10, 10, 50, 50 ); + m_canvas->SetScrollbars( 10, 10, 50, 100 ); } void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) ) @@ -227,6 +275,7 @@ void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) ) void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) ) { (void)wxMessageBox( "wxImage demo\n" + "\n" "Robert Roebling (c) 1998", "About wxImage Demo", wxICON_INFORMATION | wxOK ); } @@ -237,7 +286,15 @@ void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) ) bool MyApp::OnInit() { +#if wxUSE_LIBPNG wxImage::AddHandler( new wxPNGHandler ); +#endif + +#if wxUSE_LIBJPEG + wxImage::AddHandler( new wxJPEGHandler ); +#endif + + wxImage::AddHandler( new wxGIFHandler ); wxFrame *frame = new MyFrame(); frame->Show( TRUE );