A slightly modified version of Patch #1197468. Keeps track of pending

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

diff --git a/samples/rotate/rotate.cpp b/samples/rotate/rotate.cpp
index 2f26cf2a7ef9e237bd53b923d5d986bd621f4cfa..002cc3bebdfe7d6964199c4f7c1904db2f507ec8 100644 (file)
--- a/samples/rotate/rotate.cpp
+++ b/samples/rotate/rotate.cpp
@@ -9,6 +9,14 @@
 // Licence:   wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:   wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -21,41 +29,64 @@
 #endif
 
 #include "wx/image.h"
 #endif
 
 #include "wx/image.h"

+#include "wx/numdlg.h"
+#include "wx/dynarray.h"

 
 

-/* GRG: This is not ANSI standard, define M_PI explicitly
-#include <math.h>       // M_PI
-*/
-
-#ifndef M_PI
-#define M_PI 3.1415926535897932384626433832795
-#endif
-
+// ----------------------------------------------------------------------------
+// application class
+// ----------------------------------------------------------------------------

 
 class MyApp: public wxApp
 {
 public:
     virtual bool OnInit();
 
 class MyApp: public wxApp
 {
 public:
     virtual bool OnInit();

-

     const wxImage& GetImage() const { return m_image; }
 
 private:
     wxImage m_image;
 };
 
     const wxImage& GetImage() const { return m_image; }
 
 private:
     wxImage m_image;
 };
 

+// ----------------------------------------------------------------------------
+// data class for cards that need to be rendered
+// ----------------------------------------------------------------------------
+
+class MyRenderedCard
+{
+public:
+    MyRenderedCard(const wxBitmap& bmp, int x, int y)
+        : m_bmp(bmp), m_x(x), m_y(y) { }
+    wxBitmap m_bmp;
+    int m_x, m_y;
+};
+
+// Declare a wxArray type to hold MyRenderedCards.
+WX_DECLARE_OBJARRAY(MyRenderedCard, ArrayOfCards);
+
+// ----------------------------------------------------------------------------
+// custom canvas control that we can draw on
+// ----------------------------------------------------------------------------

 
 class MyCanvas: public wxScrolledWindow
 {
 public:
     MyCanvas(wxWindow* parent);
 
 
 class MyCanvas: public wxScrolledWindow
 {
 public:
     MyCanvas(wxWindow* parent);
 

+    void ClearCards();
+

     void OnMouseLeftUp (wxMouseEvent & event);
     void OnMouseRightUp (wxMouseEvent & event);
     void OnMouseLeftUp (wxMouseEvent & event);
     void OnMouseRightUp (wxMouseEvent & event);

+    void OnPaint (wxPaintEvent & event);

 
 private:
 
 private:

+    ArrayOfCards m_cards;

 
     DECLARE_EVENT_TABLE()
 };
 
 
     DECLARE_EVENT_TABLE()
 };
 

+// ----------------------------------------------------------------------------
+// main frame
+// ----------------------------------------------------------------------------
+

 class MyFrame: public wxFrame
 {
 public:
 class MyFrame: public wxFrame
 {
 public:


@@ -63,33 +94,40 @@ public:
 
     void OnQuit (wxCommandEvent &);
     void OnAngle(wxCommandEvent &);
 
     void OnQuit (wxCommandEvent &);
     void OnAngle(wxCommandEvent &);

+    void OnClear(wxCommandEvent &);

 
     double  m_angle;
 
     DECLARE_EVENT_TABLE()
 
     double  m_angle;
 
     DECLARE_EVENT_TABLE()

+
+private:
+    MyCanvas *m_canvas;

 };
 
 };
 

+// ----------------------------------------------------------------------------
+// menu item identifiers
+// ----------------------------------------------------------------------------
+

 enum
 {
     ID_Quit = 1,
 enum
 {
     ID_Quit = 1,

-    ID_Angle
+    ID_Angle,
+    ID_Clear

 };
 
 };
 

-BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
-    EVT_LEFT_UP (MyCanvas::OnMouseLeftUp)
-    EVT_RIGHT_UP (MyCanvas::OnMouseRightUp)
-END_EVENT_TABLE()
+// ============================================================================
+// implementation
+// ============================================================================

 
 

-BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-    EVT_MENU (ID_Quit, MyFrame::OnQuit)
-    EVT_MENU (ID_Angle, MyFrame::OnAngle)
-END_EVENT_TABLE()
+// ----------------------------------------------------------------------------
+// application class
+// ----------------------------------------------------------------------------

 
 IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {
 
 IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit()
 {

-    m_image = wxImage("kclub.bmp", wxBITMAP_TYPE_BMP);
+    m_image = wxImage(_T("kclub.bmp"), wxBITMAP_TYPE_BMP);

 
     // any unused colour will do
     m_image.SetMaskColour( 0, 255, 255 );
 
     // any unused colour will do
     m_image.SetMaskColour( 0, 255, 255 );


@@ -98,58 +136,45 @@ bool MyApp::OnInit()
     {
         wxLogError(wxT("Can't load the test image, please copy it to the ")
                    wxT("program directory"));
     {
         wxLogError(wxT("Can't load the test image, please copy it to the ")
                    wxT("program directory"));

-        return FALSE;
+        return false;

     }
 
     }
 

-    MyFrame *frame = new MyFrame ("wxWindows rotate sample",
-                                  wxPoint(20,20), wxSize(600,450));
+    MyFrame *frame = new MyFrame (_T("wxWidgets rotate sample"),
+                                  wxPoint(20, 20), wxSize(600, 450));

 
 

-    frame->Show (TRUE);
+    frame->Show (true);

     SetTopWindow (frame);
     SetTopWindow (frame);

-    return TRUE;
+    return true;

 }
 
 }
 

-MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
-    : wxFrame((wxFrame *)NULL, -1, title, pos, size)
-{
-    m_angle = 0.1;
-
-    new MyCanvas(this);
-
-    wxMenu *menuFile = new wxMenu;
-    menuFile->Append (ID_Angle, "Set &angle\tCtrl-A");
-    menuFile->AppendSeparator();
-    menuFile->Append (ID_Quit, "E&xit\tAlt-X");
+// ----------------------------------------------------------------------------
+// data class for cards that need to be rendered
+// ----------------------------------------------------------------------------

 
 

-    wxMenuBar *menuBar = new wxMenuBar;
-    menuBar->Append (menuFile, "&File");
+#include "wx/arrimpl.cpp"
+WX_DEFINE_OBJARRAY(ArrayOfCards);

 
 

-    SetMenuBar (menuBar);
-}
+// ----------------------------------------------------------------------------
+// custom canvas control that we can draw on
+// ----------------------------------------------------------------------------

 
 

-void MyFrame::OnAngle (wxCommandEvent &)
-{
-    long degrees = (long)((180*m_angle)/M_PI);
-    degrees = wxGetNumberFromUser("Change the image rotation angle",
-                                  "Angle in degrees:",
-                                  "wxWindows rotate sample",
-                                  degrees,
-                                  -180, +180,
-                                  this);
-    if ( degrees != -1 )
-        m_angle = (degrees * M_PI) / 180.0;
-}
+BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
+    EVT_LEFT_UP (MyCanvas::OnMouseLeftUp)
+    EVT_RIGHT_UP (MyCanvas::OnMouseRightUp)
+    EVT_PAINT (MyCanvas::OnPaint)
+END_EVENT_TABLE()

 
 

-void MyFrame::OnQuit (wxCommandEvent &)
+MyCanvas::MyCanvas(wxWindow* parent):
+  wxScrolledWindow(parent, wxID_ANY)

 {
 {

-    Close (TRUE);
+    SetBackgroundColour (wxColour (0,80,60));
+    ClearBackground();

 }
 
 }
 

-MyCanvas::MyCanvas(wxWindow* parent):
-  wxScrolledWindow(parent, -1)
+void MyCanvas::ClearCards ()

 {
 {

-    SetBackgroundColour (wxColour (0,80,60));
-    Clear();
+    m_cards.Clear();
+    Refresh(true);

 }
 
 // Rotate with interpolation and with offset correction
 }
 
 // Rotate with interpolation and with offset correction


@@ -159,12 +184,13 @@ void MyCanvas::OnMouseLeftUp (wxMouseEvent & event)
 
     wxPoint offset;
     const wxImage& img = wxGetApp().GetImage();
 
     wxPoint offset;
     const wxImage& img = wxGetApp().GetImage();

-    wxImage img2 = img.Rotate(frame->m_angle, wxPoint(img.GetWidth()/2, img.GetHeight()/2), TRUE, &offset);
-
-    wxBitmap bmp(img2);
+    wxImage img2 = img.Rotate(frame->m_angle,
+        wxPoint(img.GetWidth() / 2, img.GetHeight() / 2), true, &offset);

 
 

-    wxClientDC dc (this);
-    dc.DrawBitmap (bmp, event.m_x + offset.x, event.m_y + offset.y, TRUE);
+    // Add the cards to an array to be drawn later in OnPaint()
+    m_cards.Add(new MyRenderedCard(wxBitmap(img2),
+        event.m_x + offset.x, event.m_y + offset.y));
+    Refresh(false);

 }
 
 // without interpolation, and without offset correction
 }
 
 // without interpolation, and without offset correction


@@ -173,10 +199,80 @@ void MyCanvas::OnMouseRightUp (wxMouseEvent & event)
     MyFrame* frame = (MyFrame*) GetParent();
 
     const wxImage& img = wxGetApp().GetImage();
     MyFrame* frame = (MyFrame*) GetParent();
 
     const wxImage& img = wxGetApp().GetImage();

-    wxImage img2 = img.Rotate(frame->m_angle, wxPoint(img.GetWidth()/2, img.GetHeight()/2), FALSE);
+    wxImage img2 = img.Rotate(frame->m_angle,
+        wxPoint(img.GetWidth() / 2, img.GetHeight() / 2), false);
+
+    // Add the cards to an array to be drawn later in OnPaint()
+    m_cards.Add(new MyRenderedCard(wxBitmap(img2), event.m_x, event.m_y));
+    Refresh(false);
+}
+
+void MyCanvas::OnPaint (wxPaintEvent &)
+{
+    size_t numCards = m_cards.GetCount();
+
+    wxPaintDC dc(this);
+    dc.BeginDrawing();
+
+    dc.SetTextForeground(wxColour(255, 255, 255));
+    dc.DrawText(wxT("Click on the canvas to draw a card."), 10, 10);
+
+    for (size_t i = 0; i < numCards; i++) {
+        MyRenderedCard & card = m_cards.Item(i);
+        dc.DrawBitmap(card.m_bmp, card.m_x, card.m_y, true);
+    }
+
+    dc.EndDrawing();
+}
+
+// ----------------------------------------------------------------------------
+// main frame
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+    EVT_MENU (ID_Quit, MyFrame::OnQuit)
+    EVT_MENU (ID_Angle, MyFrame::OnAngle)
+    EVT_MENU (ID_Clear, MyFrame::OnClear)
+END_EVENT_TABLE()
+
+MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
+    : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
+{
+    m_angle = 0.1;
+
+    m_canvas = new MyCanvas(this);
+
+    wxMenu *menuFile = new wxMenu;
+    menuFile->Append (ID_Angle, _T("Set &angle...\tCtrl-A"));
+    menuFile->Append (ID_Clear, _T("&Clear all cards\tCtrl-C"));
+    menuFile->AppendSeparator();
+    menuFile->Append (ID_Quit, _T("E&xit\tAlt-X"));
+
+    wxMenuBar *menuBar = new wxMenuBar;
+    menuBar->Append (menuFile, _T("&File"));
+
+    SetMenuBar (menuBar);
+}
+
+void MyFrame::OnAngle (wxCommandEvent &)
+{
+    long degrees = (long)((180*m_angle)/M_PI);
+    degrees = wxGetNumberFromUser(_T("Change the image rotation angle"),
+                                  _T("Angle in degrees:"),
+                                  _T("wxWidgets rotate sample"),
+                                  degrees,
+                                  -180, +180,
+                                  this);
+    if ( degrees != -1 )
+        m_angle = (degrees * M_PI) / 180.0;
+}

 
 

-    wxBitmap bmp(img2);
+void MyFrame::OnQuit (wxCommandEvent &)
+{
+    Close (true);
+}

 
 

-    wxClientDC dc (this);
-    dc.DrawBitmap (bmp, event.m_x, event.m_y, TRUE);
+void MyFrame::OnClear (wxCommandEvent &)
+{
+    m_canvas->ClearCards ();

 }
 }