second try...

[wxWidgets.git] / samples / image / image.cpp

diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index 382979d4e2f7d1c3fe06144de76fac28299279e7..36879ba4c8d5de673afd91b12728c21d03e6b132 100644 (file)
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -20,6 +20,8 @@
 
 #include "wx/image.h"
 
 
 #include "wx/image.h"
 

+#include "wx/file.h"
+

 // derived classes
 
 class MyFrame;
 // derived classes
 
 class MyFrame;


@@ -34,9 +36,14 @@ public:
     MyCanvas( wxWindow *parent, wxWindowID, const wxPoint &pos, const wxSize &size );
     ~MyCanvas();
     void OnPaint( wxPaintEvent &event );
     MyCanvas( wxWindow *parent, wxWindowID, const wxPoint &pos, const wxSize &size );
     ~MyCanvas();
     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_square;

+    wxBitmap  *my_anti;

 
     DECLARE_DYNAMIC_CLASS(MyCanvas)
     DECLARE_EVENT_TABLE()
 
     DECLARE_DYNAMIC_CLASS(MyCanvas)
     DECLARE_EVENT_TABLE()


@@ -78,10 +85,17 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
   EVT_PAINT(MyCanvas::OnPaint)
 END_EVENT_TABLE()
 
   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 )
 {
                     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 );
   SetBackgroundColour(* wxWHITE);
 
   wxBitmap bitmap( 100, 100 );


@@ -93,38 +107,53 @@ MyCanvas::MyCanvas( wxWindow *parent, const wxWindowID id,
   dc.DrawRectangle( 0, 0, 100, 100 );
   dc.SelectObject( wxNullBitmap );
 
   dc.DrawRectangle( 0, 0, 100, 100 );
   dc.SelectObject( wxNullBitmap );
 

-  wxString dir("");
-
-#ifdef __WXGTK__
-  dir = wxString("../");
-#endif
-
-//#ifdef __WXMOTIF__
-  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 '..'!");

 
 

-#ifndef __WXMOTIF__

   wxImage image( bitmap );
   wxImage image( bitmap );

-  image.SaveFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG );
-#else
-  wxImage image;
-#endif
+  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() );

   
   

-  image.LoadFile( dir + wxString("horse.png"), wxBITMAP_TYPE_PNG );
-  my_horse = 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() );

   
   

-#ifndef __WXMOTIF__

   image.LoadFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG );
   my_square = new wxBitmap( image.ConvertToBitmap() );
   image.LoadFile( dir + wxString("test.png"), wxBITMAP_TYPE_PNG );
   my_square = new wxBitmap( image.ConvertToBitmap() );

-#endif
+  
+  CreateAntiAliasedBitmap();

 }
 
 MyCanvas::~MyCanvas()
 {
 }
 
 MyCanvas::~MyCanvas()
 {

-  delete my_horse;
-#ifndef __WXMOTIF__
+  delete my_horse_png;
+  delete my_horse_jpeg;
+  delete my_horse_gif;
+  delete my_horse_bmp;

   delete my_square;
   delete my_square;

-#endif
+  delete my_anti;

 }
 
 void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
 }
 
 void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )


@@ -132,21 +161,75 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
   wxPaintDC dc( this );
   PrepareDC( dc );
 
   wxPaintDC dc( this );
   PrepareDC( dc );
 

-#ifndef __WXMOTIF__
-  dc.DrawText( "Loaded image", 30, 100 );
-  if (my_square->Ok()) dc.DrawBitmap( *my_square, 30, 120 );
-
-  dc.DrawText( "Drawn directly", 150, 100 );
+  dc.DrawText( "Loaded image", 30, 10 );
+  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.SetBrush( wxBrush( "orange", wxSOLID ) );
   dc.SetPen( *wxWHITE_PEN );

-  dc.DrawRectangle( 150, 120, 100, 100 );
-<<<<<<< image.cpp
-#endif
+  dc.DrawRectangle( 150, 30, 100, 100 );
+
+  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 );
+  
+  dc.DrawText( "BMP handler", 30, 815 );
+  if (my_horse_bmp && my_horse_bmp->Ok()) dc.DrawBitmap( *my_horse_bmp, 30, 830 );
+}

 
 

->>>>>>> 1.11
-  if (my_horse->Ok()) dc.DrawBitmap( *my_horse, 30, 240 );
+void MyCanvas::CreateAntiAliasedBitmap()
+{
+  wxBitmap bitmap( 300, 300 );
+
+  wxMemoryDC dc;
+
+  dc.SelectObject( bitmap );
+
+  dc.Clear();
+  
+  dc.SetFont( wxFont( 24, wxDECORATIVE, wxDEFAULT, wxDEFAULT ) );
+  dc.SetTextForeground( "RED" );
+  dc.DrawText( "This is anti-aliased Text.", 20, 20 );
+  dc.DrawText( "And a Rectangle.", 20, 60 );
+  
+  dc.SetBrush( *wxRED_BRUSH );
+  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++)
+    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, red, green, blue );
+    }
+  my_anti = new wxBitmap( anti.ConvertToBitmap() );

 }
 
 // MyFrame
 }
 
 // MyFrame


@@ -166,11 +249,11 @@ MyFrame::MyFrame()
                   wxPoint(20,20), wxSize(470,360) )
 {
   wxMenu *file_menu = new wxMenu();
                   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();
 
   wxMenuBar *menu_bar = new wxMenuBar();

-  menu_bar->Append(file_menu, "File");
+  menu_bar->Append(file_menu, "&File");

 
   SetMenuBar( menu_bar );
 
 
   SetMenuBar( menu_bar );
 


@@ -179,7 +262,7 @@ MyFrame::MyFrame()
   SetStatusWidths( 2, widths );
 
   m_canvas = new MyCanvas( this, -1, wxPoint(0,0), wxSize(10,10) );
   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) )
 }
 
 void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )


@@ -200,7 +283,15 @@ void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
 
 bool MyApp::OnInit()
 {
 
 bool MyApp::OnInit()
 {

+#if wxUSE_LIBPNG

   wxImage::AddHandler( new wxPNGHandler );
   wxImage::AddHandler( new wxPNGHandler );

+#endif
+
+#if wxUSE_LIBJPEG
+  wxImage::AddHandler( new wxJPEGHandler );
+#endif
+
+  wxImage::AddHandler( new wxGIFHandler );

 
   wxFrame *frame = new MyFrame();
   frame->Show( TRUE );
 
   wxFrame *frame = new MyFrame();
   frame->Show( TRUE );