wxFileSelector should have file name only, not path, passed to 3rd arg

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

diff --git a/samples/rotate/rotate.cpp b/samples/rotate/rotate.cpp
index df87c29685fb75686e1d301e936b9415682fd3cb..89c7a0d2999bbfd4a1db2e2b0d34894e2f485790 100644 (file)
--- a/samples/rotate/rotate.cpp
+++ b/samples/rotate/rotate.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:      test.cpp
+// Name:      rotate.cpp

 // Purpose:   Image rotation test
 // Author:    Carlos Moreno
 // Modified by:
 // Purpose:   Image rotation test
 // Author:    Carlos Moreno
 // Modified by:


@@ -22,44 +22,87 @@
 
 #include "wx/image.h"
 
 
 #include "wx/image.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
+
+

 class MyApp: public wxApp
 {
 class MyApp: public wxApp
 {

+public:

     virtual bool OnInit();
     virtual bool OnInit();

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

 };
 
 
 };
 
 

-class MyFrame: public wxFrame
+class MyCanvas: public wxScrolledWindow

 {
 public:
 {
 public:

-    MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
+    MyCanvas(wxWindow* parent);

 
 

-    void OnQuit (wxCommandEvent &);

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

+
+    DECLARE_EVENT_TABLE()
+};
+
+class MyFrame: public wxFrame
+{
+public:
+    MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
+
+    void OnQuit (wxCommandEvent &);
+    void OnAngle(wxCommandEvent &);
+
+    double  m_angle;
+

     DECLARE_EVENT_TABLE()
 };
 
 enum
 {
     DECLARE_EVENT_TABLE()
 };
 
 enum
 {

-    ID_Quit = 1
+    ID_Quit = 1,
+    ID_Angle

 };
 
 };
 

+BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
+    EVT_LEFT_UP (MyCanvas::OnMouseLeftUp)
+    EVT_RIGHT_UP (MyCanvas::OnMouseRightUp)
+END_EVENT_TABLE()
+

 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU (ID_Quit, MyFrame::OnQuit)
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU (ID_Quit, MyFrame::OnQuit)

-    EVT_LEFT_UP (MyFrame::OnMouseLeftUp)
-    EVT_RIGHT_UP (MyFrame::OnMouseRightUp)
+    EVT_MENU (ID_Angle, MyFrame::OnAngle)

 END_EVENT_TABLE()
 
 IMPLEMENT_APP(MyApp)
 
 END_EVENT_TABLE()
 
 IMPLEMENT_APP(MyApp)
 

-

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

-    MyFrame *frame = new MyFrame ("wxWindows Skeleton", wxPoint(20,20), wxSize(600,450));
+    m_image = wxImage("kclub.bmp", wxBITMAP_TYPE_BMP);
+
+    // any unused colour will do
+    m_image.SetMaskColour( 0, 255, 255 );
+
+    if ( !m_image.Ok() )
+    {
+        wxLogError("Can't load the test image, please copy it to the "
+                   "program directory");
+        return FALSE;
+    }

 
 

-    frame->SetBackgroundColour (wxColour (0,80,60));
+    MyFrame *frame = new MyFrame ("wxWindows rotate sample",
+                                  wxPoint(20,20), wxSize(600,450));

 
     frame->Show (TRUE);
     SetTopWindow (frame);
 
     frame->Show (TRUE);
     SetTopWindow (frame);


@@ -69,8 +112,14 @@ bool MyApp::OnInit()
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     : wxFrame((wxFrame *)NULL, -1, title, pos, size)
 {
 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;
     wxMenu *menuFile = new wxMenu;

-    menuFile->Append (ID_Quit, "E&xit");
+    menuFile->Append (ID_Angle, "Set &angle\tCtrl-A");
+    menuFile->AppendSeparator();
+    menuFile->Append (ID_Quit, "E&xit\tAlt-X");

 
     wxMenuBar *menuBar = new wxMenuBar;
     menuBar->Append (menuFile, "&File");
 
     wxMenuBar *menuBar = new wxMenuBar;
     menuBar->Append (menuFile, "&File");


@@ -78,47 +127,56 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     SetMenuBar (menuBar);
 }
 
     SetMenuBar (menuBar);
 }
 

+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;
+}
+

 void MyFrame::OnQuit (wxCommandEvent &)
 {
     Close (TRUE);
 }
 
 void MyFrame::OnQuit (wxCommandEvent &)
 {
     Close (TRUE);
 }
 

+MyCanvas::MyCanvas(wxWindow* parent):
+  wxScrolledWindow(parent, -1)
+{
+    SetBackgroundColour (wxColour (0,80,60));
+    Clear();
+}

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

-void MyFrame::OnMouseLeftUp (wxMouseEvent & event)
+void MyCanvas::OnMouseLeftUp (wxMouseEvent & event)

 {
 {

-    static double angle = 0.1;
-    const double pi = 3.14159265359;
-
-    wxImage img ("kclub.bmp", wxBITMAP_TYPE_BMP);
+    MyFrame* frame = (MyFrame*) GetParent();

 
     wxPoint offset;
 
     wxPoint offset;

-    wxImage img2 = img.Rotate(angle, wxPoint(img.GetWidth()/2, img.GetHeight()/2), TRUE, &offset);
-    angle += 0.05;
+    const wxImage& img = wxGetApp().GetImage();
+    wxImage img2 = img.Rotate(frame->m_angle, wxPoint(img.GetWidth()/2, img.GetHeight()/2), TRUE, &offset);

 
     wxBitmap bmp = img2.ConvertToBitmap ();
 
     wxClientDC dc (this);
 
     wxBitmap bmp = img2.ConvertToBitmap ();
 
     wxClientDC dc (this);

-    dc.DrawBitmap (bmp, event.m_x + offset.x, event.m_y + offset.y);
-
-    return;
+    dc.DrawBitmap (img2.ConvertToBitmap(), event.m_x + offset.x, event.m_y + offset.y, TRUE);

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

-void MyFrame::OnMouseRightUp (wxMouseEvent & event)
+void MyCanvas::OnMouseRightUp (wxMouseEvent & event)

 {
 {

-    static double angle = 0.1;
-    const double pi = 3.14159265359;
+    MyFrame* frame = (MyFrame*) GetParent();

 
 

-    wxImage img ("kclub.bmp", wxBITMAP_TYPE_BMP);
-
-    wxImage img2 = img.Rotate(angle, wxPoint(img.GetWidth()/2, img.GetHeight()/2), FALSE);
-    angle += 0.05;
+    const wxImage& img = wxGetApp().GetImage();
+    wxImage img2 = img.Rotate(frame->m_angle, wxPoint(img.GetWidth()/2, img.GetHeight()/2), FALSE);

 
     wxBitmap bmp = img2.ConvertToBitmap ();
 
     wxClientDC dc (this);
 
     wxBitmap bmp = img2.ConvertToBitmap ();
 
     wxClientDC dc (this);

-    dc.DrawBitmap (bmp, event.m_x, event.m_y);
-
-    return;
+    dc.DrawBitmap (bmp, event.m_x, event.m_y, TRUE);

 }
 }