Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[9004] trunk/drivers
|
From: <sm...@us...> - 2008-11-20 09:24:51
|
Revision: 9004
http://plplot.svn.sourceforge.net/plplot/?rev=9004&view=rev
Author: smekal
Date: 2008-11-20 09:24:38 +0000 (Thu, 20 Nov 2008)
Log Message:
-----------
Completely comment out debug messages to remove unnecessary functions calls (which are empty anyways).
Modified Paths:
--------------
trunk/drivers/wxwidgets.cpp
trunk/drivers/wxwidgets_app.cpp
Modified: trunk/drivers/wxwidgets.cpp
===================================================================
--- trunk/drivers/wxwidgets.cpp 2008-11-20 09:22:31 UTC (rev 9003)
+++ trunk/drivers/wxwidgets.cpp 2008-11-20 09:24:38 UTC (rev 9004)
@@ -24,6 +24,7 @@
/* TODO:
* - implement the GraphicsIn stuff (only part of it so far)
+ * - example 29 crashes on Win32, wxWidgets driver
*/
#include "plDevs.h"
@@ -122,7 +123,7 @@
wxPLDevBase::wxPLDevBase( void )
{
- Log_Verbose( "wxPLDevBase::wxPLDevBase()" );
+ // Log_Verbose( "wxPLDevBase::wxPLDevBase()" );
ready = false;
ownGUI = false;
@@ -290,7 +291,7 @@
void
plD_init_wxwidgets( PLStream *pls )
{
- Log_Verbose( "plD_init_wxwidgets()" );
+ // Log_Verbose( "plD_init_wxwidgets()" );
wxPLDevBase* dev;
@@ -397,7 +398,7 @@
pls->freeaspect = 1;
}
- Log_Verbose( "settings" );
+ // Log_Verbose( "settings" );
/* Set the number of pixels per mm */
plP_setpxl( (PLFLT)VIRTUAL_PIXELS_PER_MM, (PLFLT)VIRTUAL_PIXELS_PER_MM );
@@ -438,7 +439,7 @@
\*--------------------------------------------------------------------------*/
void plD_line_wxwidgets( PLStream *pls, short x1a, short y1a, short x2a, short y2a )
{
- Log_Verbose( "plD_line_wxwidgets(x1a=%d, y1a=%d, x2a=%d, y2a=%d)", x1a, y1a, x2a, y2a );
+ // Log_Verbose( "plD_line_wxwidgets(x1a=%d, y1a=%d, x2a=%d, y2a=%d)", x1a, y1a, x2a, y2a );
wxPLDevBase* dev = (wxPLDevBase*)pls->dev;
@@ -465,7 +466,7 @@
\*--------------------------------------------------------------------------*/
void plD_polyline_wxwidgets( PLStream *pls, short *xa, short *ya, PLINT npts )
{
- Log_Verbose( "plD_polyline_wxwidgets()" );
+ // Log_Verbose( "plD_polyline_wxwidgets()" );
/* should be changed to use the wxDC::DrawLines function? */
wxPLDevBase* dev = (wxPLDevBase*)pls->dev;
@@ -495,7 +496,7 @@
\*--------------------------------------------------------------------------*/
void plD_eop_wxwidgets( PLStream *pls )
{
- Log_Verbose( "plD_eop_wxwidgets()" );
+ // Log_Verbose( "plD_eop_wxwidgets()" );
wxPLDevBase* dev = (wxPLDevBase*)pls->dev;
@@ -518,7 +519,7 @@
\*--------------------------------------------------------------------------*/
void plD_bop_wxwidgets( PLStream *pls )
{
- Log_Verbose( "plD_bop_wxwidgets()" );
+ // Log_Verbose( "plD_bop_wxwidgets()" );
wxPLDevBase* dev = (wxPLDevBase*)pls->dev;
@@ -556,7 +557,7 @@
\*--------------------------------------------------------------------------*/
void plD_tidy_wxwidgets( PLStream *pls )
{
- Log_Verbose( "plD_tidy_wxwidgets()" );
+ // Log_Verbose( "plD_tidy_wxwidgets()" );
wxPLDevBase* dev = (wxPLDevBase*)pls->dev;
@@ -587,7 +588,7 @@
\*--------------------------------------------------------------------------*/
void plD_state_wxwidgets( PLStream *pls, PLINT op )
{
- Log_Verbose( "plD_state_wxwidgets(op=%d)", op );
+ // Log_Verbose( "plD_state_wxwidgets(op=%d)", op );
wxPLDevBase* dev = (wxPLDevBase*)pls->dev;
@@ -630,7 +631,7 @@
\*--------------------------------------------------------------------------*/
void plD_esc_wxwidgets( PLStream *pls, PLINT op, void *ptr )
{
- Log_Verbose( "plD_esc_wxwidgets(op=%d, ptr=%x)", op, ptr );
+ // Log_Verbose( "plD_esc_wxwidgets(op=%d, ptr=%x)", op, ptr );
wxPLDevBase* dev = (wxPLDevBase*)pls->dev;
@@ -704,7 +705,7 @@
\*--------------------------------------------------------------------------*/
static void fill_polygon( PLStream *pls )
{
- Log_Verbose( "fill_polygon(), npts=%d, x[0]=%d, y[0]=%d", pls->dev_npts, pls->dev_y[0], pls->dev_y[0] );
+ // Log_Verbose( "fill_polygon(), npts=%d, x[0]=%d, y[0]=%d", pls->dev_npts, pls->dev_y[0], pls->dev_y[0] );
wxPLDevBase* dev = (wxPLDevBase*)pls->dev;
@@ -732,7 +733,7 @@
void wx_set_size( PLStream* pls, int width, int height )
{
/* TODO: buffer must be resized here or in wxplotstream */
- Log_Verbose( "wx_set_size()" );
+ // Log_Verbose( "wx_set_size()" );
wxPLDevBase* dev = (wxPLDevBase*)pls->dev;
@@ -816,7 +817,7 @@
\*----------------------------------------------------------------------*/
static void plD_pixel_wxwidgets( PLStream *pls, short x, short y )
{
- Log_Verbose( "plD_pixel_wxwidgets" );
+ // Log_Verbose( "plD_pixel_wxwidgets" );
wxPLDevBase *dev=(wxPLDevBase*)pls->dev;
@@ -843,7 +844,7 @@
\*----------------------------------------------------------------------*/
static void plD_set_pixel_wxwidgets( PLStream *pls, short x, short y, PLINT colour)
{
- Log_Verbose( "plD_set_pixel_wxwidgets" );
+ // Log_Verbose( "plD_set_pixel_wxwidgets" );
wxPLDevBase *dev=(wxPLDevBase*)pls->dev;
@@ -870,7 +871,7 @@
\*--------------------------------------------------------------------------*/
static PLINT plD_read_pixel_wxwidgets ( PLStream *pls, short x, short y )
{
- Log_Verbose( "plD_read_pixel_wxwidgets" );
+ // Log_Verbose( "plD_read_pixel_wxwidgets" );
wxPLDevBase *dev=(wxPLDevBase*)pls->dev;
@@ -891,7 +892,7 @@
\*----------------------------------------------------------------------*/
static void init_freetype_lv1( PLStream *pls )
{
- Log_Verbose( "init_freetype_lv1" );
+ // Log_Verbose( "init_freetype_lv1" );
wxPLDevBase *dev=(wxPLDevBase*)pls->dev;
@@ -939,7 +940,7 @@
static void init_freetype_lv2( PLStream *pls )
{
- Log_Verbose( "init_freetype_lv2" );
+ // Log_Verbose( "init_freetype_lv2" );
wxPLDevBase *dev=(wxPLDevBase *)pls->dev;
FT_Data *FT=(FT_Data *)pls->FT;
@@ -991,7 +992,7 @@
\*--------------------------------------------------------------------------*/
static void GetCursorCmd( PLStream* pls, PLGraphicsIn* ptr)
{
- Log_Verbose( "GetCursorCmd" );
+ // Log_Verbose( "GetCursorCmd" );
wxPLDevBase *dev=(wxPLDevBase *)pls->dev;
PLGraphicsIn *gin = &(dev->gin);
@@ -1029,7 +1030,7 @@
\*----------------------------------------------------------------------*/
static void install_buffer( PLStream *pls )
{
- Log_Verbose( "install_buffer" );
+ // Log_Verbose( "install_buffer" );
wxPLDevBase* dev = (wxPLDevBase*)pls->dev;
static bool initApp=false;
@@ -1082,7 +1083,7 @@
\*----------------------------------------------------------------------*/
static void wxRunApp( PLStream *pls, bool runonce )
{
- Log_Verbose( "wxRunApp" );
+ // Log_Verbose( "wxRunApp" );
wxPLDevBase* dev = (wxPLDevBase*)pls->dev;
Modified: trunk/drivers/wxwidgets_app.cpp
===================================================================
--- trunk/drivers/wxwidgets_app.cpp 2008-11-20 09:22:31 UTC (rev 9003)
+++ trunk/drivers/wxwidgets_app.cpp 2008-11-20 09:24:38 UTC (rev 9004)
@@ -111,7 +111,7 @@
\*----------------------------------------------------------------------*/
bool wxPLplotApp::OnInit()
{
- Log_Verbose( "wxPLplotApp::OnInit" );
+ // Log_Verbose( "wxPLplotApp::OnInit" );
exit=false;
advance=false;
@@ -127,7 +127,7 @@
\*----------------------------------------------------------------------*/
void wxPLplotApp::SetRefreshFlag( bool flag )
{
- Log_Verbose( "wxPLplotApp::SetRefreshFlag" );
+ // Log_Verbose( "wxPLplotApp::SetRefreshFlag" );
for( size_t i=0; i<FrameArray.GetCount(); i++)
FrameArray[i]->SetRefreshFlag( flag );
@@ -141,7 +141,7 @@
\*----------------------------------------------------------------------*/
void wxPLplotApp::OnIdle( wxIdleEvent& WXUNUSED(event) )
{
- Log_Verbose( "wxPLplotApp::OnIdle" );
+ // Log_Verbose( "wxPLplotApp::OnIdle" );
bool refresh=false;
@@ -167,7 +167,8 @@
wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxSYSTEM_MENU | wxCAPTION |
wxCLOSE_BOX | wxRESIZE_BORDER | wxCLIP_CHILDREN )
{
- Log_Verbose( "wxPLplotFrame::wxPLplotFrame" );
+ // Log_Verbose( "wxPLplotFrame::wxPLplotFrame" );
+
m_dev=(wxPLDevBase*)pls->dev;
m_panel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN );
@@ -208,7 +209,7 @@
\*----------------------------------------------------------------------*/
void wxPLplotFrame::OnMenu( wxCommandEvent& event )
{
- Log_Verbose( "wxPLplotFrame::OnMenu" );
+ // Log_Verbose( "wxPLplotFrame::OnMenu" );
switch( event.GetId() )
{
@@ -242,7 +243,7 @@
\*----------------------------------------------------------------------*/
void wxPLplotFrame::OnClose( wxCloseEvent& event )
{
- Log_Verbose( "wxPLplotFrame::OnClose" );
+ // Log_Verbose( "wxPLplotFrame::OnClose" );
m_dev->exit=true;
wxGetApp().ExitMainLoop();
@@ -305,7 +306,7 @@
: wxWindow( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxNO_BORDER|wxWANTS_CHARS|wxCLIP_CHILDREN )
{
- Log_Verbose( "wxPLplotWindow::wxPLplotWindow" );
+ // Log_Verbose( "wxPLplotWindow::wxPLplotWindow" );
m_pls=pls;
m_dev=(wxPLDevBase*)pls->dev;
@@ -328,7 +329,7 @@
\*----------------------------------------------------------------------*/
void wxPLplotWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
{
- Log_Verbose( "wxPLplotWindow::OnPaint" );
+ // Log_Verbose( "wxPLplotWindow::OnPaint" );
/* copy bitmap into client area */
wxPaintDC dc( this );
@@ -368,7 +369,7 @@
void wxPLplotWindow::OnChar( wxKeyEvent& event )
{
- Log_Verbose( "wxPLplotWindow::OnChar" );
+ // Log_Verbose( "wxPLplotWindow::OnChar" );
int keycode = event.GetKeyCode();
switch( keycode ) {
@@ -396,7 +397,7 @@
void wxPLplotWindow::OnIdle( wxIdleEvent& WXUNUSED(event) )
{
- Log_Verbose( "wxPLplotWindow::OnIdle" );
+ // Log_Verbose( "wxPLplotWindow::OnIdle" );
if( refresh ) {
if(!m_dev->newclipregion) {
@@ -424,13 +425,13 @@
void wxPLplotWindow::OnErase( wxEraseEvent &WXUNUSED(event) )
{
- Log_Verbose( "wxPLplotWindow::OnErase" );
+ // Log_Verbose( "wxPLplotWindow::OnErase" );
}
void wxPLplotWindow::OnSize( wxSizeEvent & WXUNUSED(event) )
{
- Log_Verbose( "wxPLplotWindow::OnSize" );
+ // Log_Verbose( "wxPLplotWindow::OnSize" );
int width, height;
GetClientSize( &width, &height );
@@ -455,7 +456,7 @@
void wxPLplotWindow::OnMaximize( wxMaximizeEvent & WXUNUSED(event) )
{
- Log_Verbose( "wxPLplotWindow::OnMax" );
+ // Log_Verbose( "wxPLplotWindow::OnMax" );
wxSizeEvent event( GetClientSize() );
AddPendingEvent( event );
@@ -463,7 +464,7 @@
void wxPLplotWindow::OnMouse( wxMouseEvent &event )
{
- Log_Verbose( "wxPLplotWindow::OnMouse" );
+ // Log_Verbose( "wxPLplotWindow::OnMouse" );
PLGraphicsIn *gin = &(m_dev->gin);
wxPoint pos( event.GetPosition() );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
