From 12bdd77c85888f29ed94e23ba28d31d99a522598 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 15 Aug 2003 10:17:14 +0000 Subject: [PATCH] Can now switch between PostScript and WIN32 print dialogs by setting the value of wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW. Added first part of Peter Lenhard's WinCE DrawEllipticArc implementation. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dc.h | 48 ++++++ include/wx/msw/chkconf.h | 9 ++ include/wx/msw/setup0.h | 2 +- include/wx/print.h | 2 +- include/wx/printdlg.h | 4 +- include/wx/univ/setup0.h | 3 +- src/common/dcbase.cpp | 313 +++++++++++++++++++++++++++++++++++++++ src/generic/printps.cpp | 2 +- src/generic/prntdlgg.cpp | 2 +- src/msw/printdlg.cpp | 4 +- src/msw/printwin.cpp | 4 +- 11 files changed, 383 insertions(+), 10 deletions(-) diff --git a/include/wx/dc.h b/include/wx/dc.h index e073e3cd65..a54bf52361 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -301,6 +301,54 @@ public: void DrawSpline(wxList *points) { DoDrawSpline(points); } #endif // wxUSE_SPLINES + // Eventually we will have wxUSE_GENERIC_DRAWELLIPSE +#ifdef __WXWINCE__ + //! Generic method to draw ellipses, circles and arcs with current pen and brush. + /*! \param x Upper left corner of bounding box. + * \param y Upper left corner of bounding box. + * \param w Width of bounding box. + * \param h Height of bounding box. + * \param sa Starting angle of arc + * (counterclockwise, start at 3 o'clock, 360 is full circle). + * \param ea Ending angle of arc. + * \param angle Rotation angle, the Arc will be rotated after + * calculating begin and end. + */ + void DrawEllipticArcRot( wxCoord x, wxCoord y, + wxCoord width, wxCoord height, + double sa = 0, double ea = 0, double angle = 0 ) + { DoDrawEllipticArcRot( x, y, width, height, sa, ea, angle ); } + + void DrawEllipticArcRot( const wxPoint& pt, + const wxSize& sz, + double sa = 0, double ea = 0, double angle = 0 ) + { DoDrawEllipticArcRot( pt.x, pt.y, sz.x, sz.y, sa, ea, angle ); } + + void DrawEllipticArcRot( const wxRect& rect, + double sa = 0, double ea = 0, double angle = 0 ) + { DoDrawEllipticArcRot( rect.x, rect.y, rect.width, rect.height, sa, ea, angle ); } + + virtual void DoDrawEllipticArcRot( wxCoord x, wxCoord y, + wxCoord w, wxCoord h, + double sa = 0, double ea = 0, double angle = 0 ); + + //! Rotates points around center. + /*! This is a quite straight method, it calculates in pixels + * and so it produces rounding errors. + * \param points The points inside will be rotated. + * \param angle Rotating angle (counterclockwise, start at 3 o'clock, 360 is full circle). + * \param center Center of rotation. + */ + void Rotate( wxList* points, double angle, wxPoint center = wxPoint() ); + + // used by DrawEllipticArcRot + // Careful: wxList gets filled with points you have to delete later. + void CalculateEllipticPoints( wxList* points, + wxCoord xStart, wxCoord yStart, + wxCoord w, wxCoord h, + double sa, double ea ); +#endif + // global DC operations // -------------------- diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h index badd90155d..9bd8866cbf 100644 --- a/include/wx/msw/chkconf.h +++ b/include/wx/msw/chkconf.h @@ -16,6 +16,15 @@ * disable the settings which don't work for some compilers */ +/* + * If using PostScript-in-MSW in Univ, must enable PostScript + */ + +#if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT +#undef wxUSE_POSTSCRIPT +#define wxUSE_POSTSCRIPT 1 +#endif + #ifndef wxUSE_NORLANDER_HEADERS #if (defined(__WATCOMC__) && (__WATCOMC__ >= 1200)) || ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))) # define wxUSE_NORLANDER_HEADERS 1 diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index bf8af41876..135fc53ba6 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -874,7 +874,7 @@ #define wxUSE_POSTSCRIPT 0 // Set to 1 to use font metric files in GetTextExtent -#define wxUSE_AFM_FOR_POSTSCRIPT 0 +#define wxUSE_AFM_FOR_POSTSCRIPT 1 // Set to 0 to disable PostScript print/preview architecture code under Windows // (just use Windows printing). diff --git a/include/wx/print.h b/include/wx/print.h index 31c9588da2..e154348937 100644 --- a/include/wx/print.h +++ b/include/wx/print.h @@ -1,7 +1,7 @@ #ifndef _WX_PRINT_H_BASE_ #define _WX_PRINT_H_BASE_ -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) +#if defined(__WXMSW__) && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW) #include "wx/msw/printwin.h" #ifndef wxPrinter diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h index 859646589b..32d9821515 100644 --- a/include/wx/printdlg.h +++ b/include/wx/printdlg.h @@ -1,7 +1,7 @@ #ifndef _WX_PRINTDLG_H_BASE_ #define _WX_PRINTDLG_H_BASE_ -#if defined(__WXUNIVERSAL__) /* && !defined(__WXMSW__) */ +#if defined(__WXUNIVERSAL__) && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW) #include "wx/generic/prntdlgg.h" #elif defined(__WXMSW__) #include "wx/msw/printdlg.h" @@ -19,7 +19,7 @@ #include "wx/generic/prntdlgg.h" #endif -#if (defined(__WXUNIVERSAL__) /* && !defined(__WXMSW__) */ ) || (!defined(__WXMSW__) && !defined(__WXMAC__)) +#if (defined(__WXUNIVERSAL__) && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW) ) || (!defined(__WXMSW__) && !defined(__WXMAC__)) #define wxPrintDialog wxGenericPrintDialog #define sm_classwxPrintDialog sm_classwxGenericPrintDialog diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index d6e94ee8e0..babd59692a 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -818,8 +818,7 @@ // Set to 0 to disable print/preview architecture code // -// (doesn't compile anyhow right now (Aug 2003)) -#define wxUSE_PRINTING_ARCHITECTURE 0 +#define wxUSE_PRINTING_ARCHITECTURE 1 // wxHTML sublibrary allows to display HTML in wxWindow programs and much, // much more. diff --git a/src/common/dcbase.cpp b/src/common/dcbase.cpp index c525c04d8e..73653ffc7d 100644 --- a/src/common/dcbase.cpp +++ b/src/common/dcbase.cpp @@ -548,3 +548,316 @@ void wxDCBase::DrawLabel(const wxString& text, CalcBoundingBox(x0, y0); CalcBoundingBox(x0 + width0, y0 + height); } + +/* +Notes for wxWindows DrawEllipticArcRot(...) + +wxDCBase::DrawEllipticArcRot(...) draws a rotated elliptic arc or an ellipse. +It uses wxDCBase::CalculateEllipticPoints(...) and wxDCBase::Rotate(...), +which are also new. + +All methods are generic, so they can be implemented in wxDCBase. +DoDrawEllipticArcRot(...) is virtual, so it can be called from deeper +methods like (WinCE) wxDC::DoDrawArc(...). + +CalculateEllipticPoints(...) fills a given list of wxPoints with some points +of an elliptic arc. The algorithm is pixel-based: In every row (in flat +parts) or every column (in steep parts) only one pixel is calculated. +Trigonometric calculation (sin, cos, tan, atan) is only done if the +starting angle is not equal to the ending angle. The calculation of the +pixels is done using simple arithmetic only and should perform not too +bad even on devices without floating point processor. I didn't test this yet. + +Rotate(...) rotates a list of point pixel-based, you will see rounding errors. +For instance: an ellipse rotated 180 degrees is drawn +slightly different from the original. + +The points are then moved to an array and used to draw a polyline and/or polygon +(with center added, the pie). +The result looks quite similar to the native ellipse, only e few pixels differ. + +The performance on a desktop system (Athlon 1800, WinXP) is about 7 times +slower as DrawEllipse(...), which calls the native API. +An rotated ellipse outside the clipping region takes nearly the same time, +while an native ellipse outside takes nearly no time to draw. + +If you draw an arc with this new method, you will see the starting and ending angles +are calculated properly. +If you use DrawEllipticArc(...), you will see they are only correct for circles +and not properly calculated for ellipses. + +Peter Lenhard +p.lenhard@t-online.de +*/ + +#ifdef __WXWINCE__ +void wxDCBase::DoDrawEllipticArcRot( wxCoord x, wxCoord y, + wxCoord w, wxCoord h, + double sa, double ea, double angle ) +{ + wxList list; + + CalculateEllipticPoints( &list, x, y, w, h, sa, ea ); + Rotate( &list, angle, wxPoint( x+w/2, y+h/2 ) ); + + // Add center (for polygon/pie) + list.Append( (wxObject*) new wxPoint( x+w/2, y+h/2 ) ); + + // copy list into array and delete list elements + int n = list.Number(); + wxPoint *points = new wxPoint[n]; + int i = 0; + wxNode* node = 0; + for ( node = list.First(); node; node = node->Next(), i++ ) + { + wxPoint *point = (wxPoint *)node->Data(); + points[i].x = point->x; + points[i].y = point->y; + delete point; + } + + // first draw the pie without pen, if necessary + if( GetBrush() != *wxTRANSPARENT_BRUSH ) + { + wxPen tempPen( GetPen() ); + SetPen( *wxTRANSPARENT_PEN ); + DoDrawPolygon( n, points, 0, 0 ); + SetPen( tempPen ); + } + + // then draw the arc without brush, if necessary + if( GetPen() != *wxTRANSPARENT_PEN ) + { + // without center + DoDrawLines( n-1, points, 0, 0 ); + } + + delete [] points; + +} // DrawEllipticArcRot + +void wxDCBase::Rotate( wxList* points, double angle, wxPoint center ) +{ + if( angle != 0.0 ) + { + double pi(3.1415926536); + double dSinA = -sin(angle*2.0*pi/360.0); + double dCosA = cos(angle*2.0*pi/360.0); + for ( wxNode* node = points->First(); node; node = node->Next() ) + { + wxPoint* point = (wxPoint*)node->Data(); + + // transform coordinates, if necessary + if( center.x ) point->x -= center.x; + if( center.y ) point->y -= center.y; + + // calculate rotation, rounding simply by implicit cast to integer + int xTemp = point->x * dCosA - point->y * dSinA; + point->y = point->x * dSinA + point->y * dCosA; + point->x = xTemp; + + // back transform coordinates, if necessary + if( center.x ) point->x += center.x; + if( center.y ) point->y += center.y; + } + } +} + +void wxDCBase::CalculateEllipticPoints( wxList* points, + wxCoord xStart, wxCoord yStart, + wxCoord w, wxCoord h, + double sa, double ea ) +{ + double pi = 3.1415926535; + double sar = 0; + double ear = 0; + int xsa = 0; + int ysa = 0; + int xea = 0; + int yea = 0; + int sq = 0; + int eq = 0; + bool bUseAngles = false; + if( w<0 ) w = -w; + if( h<0 ) h = -h; + // half-axes + wxCoord a = w/2; + wxCoord b = h/2; + // decrement 1 pixel if ellipse is smaller than 2*a, 2*b + int decrX = 0; + if( 2*a == w ) decrX = 1; + int decrY = 0; + if( 2*b == h ) decrY = 1; + // center + wxCoord xCenter = xStart + a; + wxCoord yCenter = yStart + b; + // calculate data for start and end, if necessary + if( sa != ea ) + { + bUseAngles = true; + // normalisation of angles + while( sa<0 ) sa += 360; + while( ea<0 ) ea += 360; + while( sa>=360 ) sa -= 360; + while( ea>=360 ) ea -= 360; + // calculate quadrant numbers + if( sa > 270 ) sq = 3; + else if( sa > 180 ) sq = 2; + else if( sa > 90 ) sq = 1; + if( ea > 270 ) eq = 3; + else if( ea > 180 ) eq = 2; + else if( ea > 90 ) eq = 1; + sar = sa * pi / 180.0; + ear = ea * pi / 180.0; + // correct angle circle -> ellipse + sar = atan( -a/(double)b * tan( sar ) ); + if ( sq == 1 || sq == 2 ) sar += pi; + ear = atan( -a/(double)b * tan( ear ) ); + if ( eq == 1 || eq == 2 ) ear += pi; + // coordinates of points + xsa = xCenter + a * cos( sar ); + if( sq == 0 || sq == 3 ) xsa -= decrX; + ysa = yCenter + b * sin( sar ); + if( sq == 2 || sq == 3 ) ysa -= decrY; + xea = xCenter + a * cos( ear ); + if( eq == 0 || eq == 3 ) xea -= decrX; + yea = yCenter + b * sin( ear ); + if( eq == 2 || eq == 3 ) yea -= decrY; + } // if iUseAngles + // calculate c1 = b^2, c2 = b^2/a^2 with a = w/2, b = h/2 + double c1 = b * b; + double c2 = 2.0 / w; + c2 *= c2; + c2 *= c1; + wxCoord x = 0; + wxCoord y = b; + long x2 = 1; + long y2 = y*y; + long y2_old = 0; + long y_old = 0; + // Lists for quadrant 1 to 4 + wxList pointsarray[4]; + // Calculate points for first quadrant and set in all quadrants + for( x = 0; x <= a; ++x ) + { + x2 = x2+x+x-1; + y2_old = y2; + y_old = y; + bool bNewPoint = false; + while( y2 > c1 - c2 * x2 && y > 0 ) + { + bNewPoint = true; + y2 = y2-y-y+1; + --y; + } + // old y now to big: set point with old y, old x + if( bNewPoint && x>1) + { + int x1 = x - 1; + // remove points on the same line + pointsarray[0].Insert( (wxObject*) new wxPoint( xCenter + x1 - decrX, yCenter - y_old ) ); + pointsarray[1].Append( (wxObject*) new wxPoint( xCenter - x1, yCenter - y_old ) ); + pointsarray[2].Insert( (wxObject*) new wxPoint( xCenter - x1, yCenter + y_old - decrY ) ); + pointsarray[3].Append( (wxObject*) new wxPoint( xCenter + x1 - decrX, yCenter + y_old - decrY ) ); + } // set point + } // calculate point + + // Starting and/or ending points for the quadrants, first quadrant gets both. + pointsarray[0].Insert( (wxObject*) new wxPoint( xCenter + a - decrX, yCenter ) ); + pointsarray[0].Append( (wxObject*) new wxPoint( xCenter, yCenter - b ) ); + pointsarray[1].Append( (wxObject*) new wxPoint( xCenter - a, yCenter ) ); + pointsarray[2].Append( (wxObject*) new wxPoint( xCenter, yCenter + b - decrY ) ); + pointsarray[3].Append( (wxObject*) new wxPoint( xCenter + a - decrX, yCenter ) ); + + // copy quadrants in original list + if( bUseAngles ) + { + // Copy the right part of the points in the lists + // and delete the wxPoints, because they do not leave this method. + points->Append( (wxObject*) new wxPoint( xsa, ysa ) ); + int q = sq; + bool bStarted = false; + bool bReady = false; + bool bForceTurn = ( sq == eq && sa > ea ); + while( !bReady ) + { + for( wxNode *node = pointsarray[q].First(); node; node = node->Next() ) + { + // once: go to starting point in start quadrant + if( !bStarted && + ( + ( (wxPoint*) node->Data() )->x < xsa+1 && q <= 1 + || + ( (wxPoint*) node->Data() )->x > xsa-1 && q >= 2 + ) + ) + { + bStarted = true; + } + + // copy point, if not at ending point + if( bStarted ) + { + if( q != eq || bForceTurn + || + ( (wxPoint*) node->Data() )->x > xea+1 && q <= 1 + || + ( (wxPoint*) node->Data() )->x < xea-1 && q >= 2 + ) + { + // copy point + wxPoint* pPoint = new wxPoint( *((wxPoint*) node->Data() ) ); + points->Append( (wxObject*) pPoint ); + } + else if( q == eq && !bForceTurn || ( (wxPoint*) node->Data() )->x == xea) + { + bReady = true; + } + } + } // for node + ++q; + if( q > 3 ) q = 0; + bForceTurn = false; + bStarted = true; + } // while not bReady + points->Append( (wxObject*) new wxPoint( xea, yea ) ); + + // delete points + for( q = 0; q < 4; ++q ) + { + for( wxNode *node = pointsarray[q].First(); node; node = node->Next() ) + { + wxPoint *p = (wxPoint *)node->Data(); + delete p; + } + } + + } + else + { + // copy whole ellipse, wxPoints will be deleted outside + for( wxNode *node = pointsarray[0].First(); node; node = node->Next() ) + { + wxObject *p = node->Data(); + points->Append( p ); + } + for( node = pointsarray[1].First(); node; node = node->Next() ) + { + wxObject *p = node->Data(); + points->Append( p ); + } + for( node = pointsarray[2].First(); node; node = node->Next() ) + { + wxObject *p = node->Data(); + points->Append( p ); + } + for( node = pointsarray[3].First(); node; node = node->Next() ) + { + wxObject *p = node->Data(); + points->Append( p ); + } + } // not iUseAngles +} // CalculateEllipticPoints + +#endif + diff --git a/src/generic/printps.cpp b/src/generic/printps.cpp index 628b97a4b8..615fa7e615 100644 --- a/src/generic/printps.cpp +++ b/src/generic/printps.cpp @@ -30,7 +30,7 @@ #include "wx/defs.h" -#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT +#if wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW) #ifndef WX_PRECOMP #include "wx/utils.h" diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp index ec7a43453c..c949000fe0 100644 --- a/src/generic/prntdlgg.cpp +++ b/src/generic/prntdlgg.cpp @@ -28,7 +28,7 @@ #pragma hdrstop #endif -#if wxUSE_PRINTING_ARCHITECTURE +#if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXMSW__) || (defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)) #ifndef WX_PRECOMP #include "wx/utils.h" diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp index 1abcb390c8..d7387012f2 100644 --- a/src/msw/printdlg.cpp +++ b/src/msw/printdlg.cpp @@ -28,7 +28,9 @@ #pragma hdrstop #endif -#if wxUSE_PRINTING_ARCHITECTURE +// Don't use the Windows print dialog if we're in wxUniv mode and using +// the PostScript architecture +#if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW) #ifndef WX_PRECOMP #include "wx/app.h" diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp index 34ce8201a4..094c571fa4 100644 --- a/src/msw/printwin.cpp +++ b/src/msw/printwin.cpp @@ -30,7 +30,9 @@ #include "wx/defs.h" -#if wxUSE_PRINTING_ARCHITECTURE +// Don't use the Windows printer if we're in wxUniv mode and using +// the PostScript architecture +#if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW) #ifndef WX_PRECOMP #include "wx/window.h" -- 2.47.2