From 2e5a774b51f855d9ee7a9af28b358506888db9aa Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Mon, 20 Sep 2010 08:37:19 +0000 Subject: [PATCH] 2010-09-20 01:30 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/hbqreportsmanager.prg * contrib/hbide/idemisc.prg * contrib/hbqt/qtgui/doc/en/class_qpainter.txt * contrib/hbqt/qtgui/g/QPainter.cpp * contrib/hbqt/qtgui/g/TQPainter.prg * contrib/hbqt/qtgui/qth/QPainter.qth + Implemented: all multiple entry functions of QPainter() class under single function call. Only exception is :fillRect() which accepts similar parameters for different overloadings. --- harbour/ChangeLog | 12 + harbour/contrib/hbide/hbqreportsmanager.prg | 6 +- harbour/contrib/hbide/idemisc.prg | 2 +- .../hbqt/qtgui/doc/en/class_qpainter.txt | 87 +- harbour/contrib/hbqt/qtgui/g/QPainter.cpp | 1051 ++++++++--------- harbour/contrib/hbqt/qtgui/g/TQPainter.prg | 435 +++---- harbour/contrib/hbqt/qtgui/qth/QPainter.qth | 642 ++++++++-- 7 files changed, 1237 insertions(+), 998 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index d1d5d0b98a..ac7374d1a8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,18 @@ The license applies to all entries newer than 2009-04-28. */ +2010-09-20 01:30 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/hbqreportsmanager.prg + * contrib/hbide/idemisc.prg + + * contrib/hbqt/qtgui/doc/en/class_qpainter.txt + * contrib/hbqt/qtgui/g/QPainter.cpp + * contrib/hbqt/qtgui/g/TQPainter.prg + * contrib/hbqt/qtgui/qth/QPainter.qth + + Implemented: all multiple entry functions of QPainter() class + under single function call. Only exception is :fillRect() + which accepts similar parameters for different overloadings. + 2010-09-19 17:48 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + contrib/hbqt/qtcore/g/THBQEvents.prg + contrib/hbqt/qtcore/g/THBQSlots.prg diff --git a/harbour/contrib/hbide/hbqreportsmanager.prg b/harbour/contrib/hbide/hbqreportsmanager.prg index 7a5cdceced..2b8a4482a4 100644 --- a/harbour/contrib/hbide/hbqreportsmanager.prg +++ b/harbour/contrib/hbide/hbqreportsmanager.prg @@ -2397,14 +2397,12 @@ METHOD HqrGraphicsItem:drawChord( qPainter, qRect ) /*----------------------------------------------------------------------*/ METHOD HqrGraphicsItem:drawText( qPainter, qRect ) - //qPainter:drawText_2( qRect, ::textFlags(), ::text() ) qPainter:drawText( qRect, ::textFlags(), ::text() ) RETURN Self /*----------------------------------------------------------------------*/ METHOD HqrGraphicsItem:drawField( qPainter, qRect ) - //qPainter:drawText_2( qRect, ::textFlags(), ::text() ) qPainter:drawText( qRect, ::textFlags(), ::text() ) RETURN Self @@ -2602,8 +2600,8 @@ METHOD HqrGraphicsItem:drawChart( qPainter, qRect ) valstep := maxHeight / ( maxVal / chartStep ) IF ( valstep < nFHeight ) - chartStep *= ( ( ( nFHeight / valstep ) ) + 1 ) - valstep := ( ( ( nFHeight / valstep ) ) + 1 ) * valstep + chartStep *= ( ( ( nFHeight / valstep ) ) + 1 ) + valstep := ( ( ( nFHeight / valstep ) ) + 1 ) * valstep ENDIF nPlanes := maxVal / chartStep + 1 + iif( maxVal % chartStep != 0, 1, 0 ) diff --git a/harbour/contrib/hbide/idemisc.prg b/harbour/contrib/hbide/idemisc.prg index 0974d4b05b..82ff7740e0 100644 --- a/harbour/contrib/hbide/idemisc.prg +++ b/harbour/contrib/hbide/idemisc.prg @@ -586,7 +586,7 @@ FUNCTION hbide_isValidSource( cSourceFile ) hb_fNameSplit( cSourceFile, , , @cExt ) - RETURN ( lower( cExt ) $ ".c,.cpp,.prg,.res,.rc" ) + RETURN ( lower( cExt ) $ ".c,.cpp,.prg,.res,.rc,.hbs" ) /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qpainter.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qpainter.txt index f92852f7db..578eff33e3 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qpainter.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qpainter.txt @@ -43,21 +43,10 @@ * :device() -> pQPaintDevice * :deviceMatrix() -> pQMatrix * :deviceTransform() -> pQTransform - * :drawArc( pRectangle, nStartAngle, nSpanAngle ) -> NIL - * :drawArc_1( pRectangle, nStartAngle, nSpanAngle ) -> NIL - * :drawArc_2( nX, nY, nWidth, nHeight, nStartAngle, nSpanAngle ) -> NIL - * :drawChord( pRectangle, nStartAngle, nSpanAngle ) -> NIL - * :drawChord_1( pRectangle, nStartAngle, nSpanAngle ) -> NIL - * :drawChord_2( nX, nY, nWidth, nHeight, nStartAngle, nSpanAngle ) -> NIL - * :drawConvexPolygon( pPoints, nPointCount ) -> NIL - * :drawConvexPolygon_1( pPoints, nPointCount ) -> NIL - * :drawConvexPolygon_2( pPolygon ) -> NIL - * :drawConvexPolygon_3( pPolygon ) -> NIL - * :drawEllipse( pRectangle ) -> NIL - * :drawEllipse_1( pRectangle ) -> NIL - * :drawEllipse_2( nX, nY, nWidth, nHeight ) -> NIL - * :drawEllipse_3( pCenter, nRx, nRy ) -> NIL - * :drawEllipse_4( pCenter, nRx, nRy ) -> NIL + * :drawArc( ... ) -> NIL + * :drawChord( ... ) -> NIL + * :drawConvexPolygon( ... ) -> NIL + * :drawEllipse( ... ) -> NIL * :drawImage( ... ) -> NIL * :drawLine( ... ) -> NIL * :drawLines( pLines, nLineCount ) -> NIL @@ -65,44 +54,21 @@ * :drawLines_2( pPointPairs, nLineCount ) -> NIL * :drawLines_3( pPointPairs, nLineCount ) -> NIL * :drawPath( pPath ) -> NIL - * :drawPicture( pPoint, pPicture ) -> NIL - * :drawPicture_1( pPoint, pPicture ) -> NIL - * :drawPicture_2( nX, nY, pPicture ) -> NIL - * :drawPie( pRectangle, nStartAngle, nSpanAngle ) -> NIL - * :drawPie_1( pRectangle, nStartAngle, nSpanAngle ) -> NIL - * :drawPie_2( nX, nY, nWidth, nHeight, nStartAngle, nSpanAngle ) -> NIL + * :drawPicture( ... ) -> NIL + * :drawPie( ... ) -> NIL * :drawPixmap( ... ) -> NIL - * :drawPoint( pPosition ) -> NIL - * :drawPoint_1( pPosition ) -> NIL - * :drawPoint_2( nX, nY ) -> NIL - * :drawPoints( pPoints, nPointCount ) -> NIL - * :drawPoints_1( pPoints, nPointCount ) -> NIL - * :drawPoints_2( pPoints ) -> NIL - * :drawPoints_3( pPoints ) -> NIL - * :drawPolygon( pPoints, nPointCount, nFillRule ) -> NIL - * :drawPolygon_1( pPoints, nPointCount, nFillRule ) -> NIL - * :drawPolygon_2( pPoints, nFillRule ) -> NIL - * :drawPolygon_3( pPoints, nFillRule ) -> NIL - * :drawPolyline( pPoints, nPointCount ) -> NIL - * :drawPolyline_1( pPoints, nPointCount ) -> NIL - * :drawPolyline_2( pPoints ) -> NIL - * :drawPolyline_3( pPoints ) -> NIL - * :drawRect( pRectangle ) -> NIL - * :drawRect_1( pRectangle ) -> NIL - * :drawRect_2( nX, nY, nWidth, nHeight ) -> NIL + * :drawPoint( ... ) -> NIL + * :drawPoints( ... ) -> NIL + * :drawPolygon( ... ) -> NIL + * :drawPolyline( ... ) -> NIL + * :drawRect( ... ) -> NIL * :drawRects( pRectangles, nRectCount ) -> NIL * :drawRects_1( pRectangles, nRectCount ) -> NIL - * :drawRoundedRect( pRect, nXRadius, nYRadius, nMode ) -> NIL - * :drawRoundedRect_1( pRect, nXRadius, nYRadius, nMode ) -> NIL - * :drawRoundedRect_2( nX, nY, nW, nH, nXRadius, nYRadius, nMode ) -> NIL + * :drawRoundedRect( ... ) -> NIL * :drawText( ... ) -> NIL - * :drawTiledPixmap( pRectangle, pPixmap, pPosition ) -> NIL - * :drawTiledPixmap_1( pRectangle, pPixmap, pPosition ) -> NIL - * :drawTiledPixmap_2( nX, nY, nWidth, nHeight, pPixmap, nSx, nSy ) -> NIL + * :drawTiledPixmap( ... ) -> NIL * :end() -> lBool - * :eraseRect( pRectangle ) -> NIL - * :eraseRect_1( pRectangle ) -> NIL - * :eraseRect_2( nX, nY, nWidth, nHeight ) -> NIL + * :eraseRect( ... ) -> NIL * :fillPath( pPath, pBrush ) -> NIL * :fillRect( pRectangle, pBrush ) -> NIL * :fillRect_1( nX, nY, nWidth, nHeight, nStyle ) -> NIL @@ -135,32 +101,23 @@ * :scale( nSx, nSy ) -> NIL * :setBackground( pBrush ) -> NIL * :setBackgroundMode( nMode ) -> NIL - * :setBrush( pBrush ) -> NIL - * :setBrush_1( nStyle ) -> NIL - * :setBrushOrigin( pPosition ) -> NIL - * :setBrushOrigin_1( pPosition ) -> NIL - * :setBrushOrigin_2( nX, nY ) -> NIL + * :setBrush( ... ) -> NIL + * :setBrushOrigin( ... ) -> NIL * :setClipPath( pPath, nOperation ) -> NIL - * :setClipRect( pRectangle, nOperation ) -> NIL - * :setClipRect_1( nX, nY, nWidth, nHeight, nOperation ) -> NIL - * :setClipRect_2( pRectangle, nOperation ) -> NIL + * :setClipRect( ... ) -> NIL * :setClipRegion( pRegion, nOperation ) -> NIL * :setClipping( lEnable ) -> NIL * :setCompositionMode( nMode ) -> NIL * :setFont( pFont ) -> NIL * :setLayoutDirection( nDirection ) -> NIL * :setOpacity( nOpacity ) -> NIL - * :setPen( pPen ) -> NIL - * :setPen_1( pColor ) -> NIL - * :setPen_2( nStyle ) -> NIL + * :setPen( ... ) -> NIL * :setRenderHint( nHint, lOn ) -> NIL * :setRenderHints( nHints, lOn ) -> NIL * :setTransform( pTransform, lCombine ) -> NIL * :setViewTransformEnabled( lEnable ) -> NIL - * :setViewport( pRectangle ) -> NIL - * :setViewport_1( nX, nY, nWidth, nHeight ) -> NIL - * :setWindow( pRectangle ) -> NIL - * :setWindow_1( nX, nY, nWidth, nHeight ) -> NIL + * :setViewport( ... ) -> NIL + * :setWindow( ... ) -> NIL * :setWorldMatrix( pMatrix, lCombine ) -> NIL * :setWorldMatrixEnabled( lEnable ) -> NIL * :setWorldTransform( pMatrix, lCombine ) -> NIL @@ -168,9 +125,7 @@ * :strokePath( pPath, pPen ) -> NIL * :testRenderHint( nHint ) -> lBool * :transform() -> pQTransform - * :translate( pOffset ) -> NIL - * :translate_1( pOffset ) -> NIL - * :translate_2( nDx, nDy ) -> NIL + * :translate( ... ) -> NIL * :viewTransformEnabled() -> lBool * :viewport() -> pQRect * :window() -> pQRect diff --git a/harbour/contrib/hbqt/qtgui/g/QPainter.cpp b/harbour/contrib/hbqt/qtgui/g/QPainter.cpp index 80b7af3e46..caa5e21229 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPainter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPainter.cpp @@ -73,7 +73,7 @@ */ /* - * Constructed[ 154/197 [ 78.17% ] ] + * Constructed[ 109/238 [ 45.80% ] ] * * *** Unconvered Prototypes *** * ----------------------------- @@ -81,17 +81,52 @@ * } * } * } + * } + * } + * } * void drawLines ( const QVector & pointPairs ) * void drawLines ( const QVector & pointPairs ) * void drawLines ( const QVector & lines ) * void drawLines ( const QVector & lines ) * } + * } + * } + * } + * } + * } + * } + * } * void drawRects ( const QVector & rectangles ) * void drawRects ( const QVector & rectangles ) * } + * } + * } + * } + * } + * } + * } + * } + * } + * } + * } * * *** Commented out protos which construct fine but do not compile *** * + * //void drawArc ( const QRectF & rectangle, int startAngle, int spanAngle ) + * //void drawArc ( const QRect & rectangle, int startAngle, int spanAngle ) + * //void drawArc ( int x, int y, int width, int height, int startAngle, int spanAngle ) + * //void drawChord ( const QRectF & rectangle, int startAngle, int spanAngle ) + * //void drawChord ( const QRect & rectangle, int startAngle, int spanAngle ) + * //void drawChord ( int x, int y, int width, int height, int startAngle, int spanAngle ) + * //void drawConvexPolygon ( const QPointF * points, int pointCount ) + * //void drawConvexPolygon ( const QPoint * points, int pointCount ) + * //void drawConvexPolygon ( const QPolygonF & polygon ) + * //void drawConvexPolygon ( const QPolygon & polygon ) + * //void drawEllipse ( const QRectF & rectangle ) + * //void drawEllipse ( const QRect & rectangle ) + * //void drawEllipse ( int x, int y, int width, int height ) + * //void drawEllipse ( const QPointF & center, qreal rx, qreal ry ) + * //void drawEllipse ( const QPoint & center, int rx, int ry ) * //void drawImage ( const QRectF & target, const QImage & image, const QRectF & source, Qt::ImageConversionFlags flags = Qt::AutoColor ) * //void drawImage ( const QRect & target, const QImage & image, const QRect & source, Qt::ImageConversionFlags flags = Qt::AutoColor ) * //void drawImage ( const QPointF & point, const QImage & image ) @@ -106,6 +141,12 @@ * //void drawLine ( const QPoint & p1, const QPoint & p2 ) * //void drawLine ( const QPointF & p1, const QPointF & p2 ) * //void drawLine ( int x1, int y1, int x2, int y2 ) + * //void drawPicture ( const QPointF & point, const QPicture & picture ) + * //void drawPicture ( const QPoint & point, const QPicture & picture ) + * //void drawPicture ( int x, int y, const QPicture & picture ) + * //void drawPie ( const QRectF & rectangle, int startAngle, int spanAngle ) + * //void drawPie ( const QRect & rectangle, int startAngle, int spanAngle ) + * //void drawPie ( int x, int y, int width, int height, int startAngle, int spanAngle ) * //void drawPixmap ( const QRectF & target, const QPixmap & pixmap, const QRectF & source ) * //void drawPixmap ( const QRect & target, const QPixmap & pixmap, const QRect & source ) * //void drawPixmap ( const QPointF & point, const QPixmap & pixmap, const QRectF & source ) @@ -117,6 +158,27 @@ * //void drawPixmap ( int x, int y, int width, int height, const QPixmap & pixmap ) * //void drawPixmap ( int x, int y, int w, int h, const QPixmap & pixmap, int sx, int sy, int sw, int sh ) * //void drawPixmap ( int x, int y, const QPixmap & pixmap, int sx, int sy, int sw, int sh ) + * //void drawPoint ( const QPointF & position ) + * //void drawPoint ( const QPoint & position ) + * //void drawPoint ( int x, int y ) + * //void drawPoints ( const QPointF * points, int pointCount ) + * //void drawPoints ( const QPoint * points, int pointCount ) + * //void drawPoints ( const QPolygonF & points ) + * //void drawPoints ( const QPolygon & points ) + * //void drawPolygon ( const QPointF * points, int pointCount, Qt::FillRule fillRule = Qt::OddEvenFill ) + * //void drawPolygon ( const QPoint * points, int pointCount, Qt::FillRule fillRule = Qt::OddEvenFill ) + * //void drawPolygon ( const QPolygonF & points, Qt::FillRule fillRule = Qt::OddEvenFill ) + * //void drawPolygon ( const QPolygon & points, Qt::FillRule fillRule = Qt::OddEvenFill ) + * //void drawPolyline ( const QPointF * points, int pointCount ) + * //void drawPolyline ( const QPoint * points, int pointCount ) + * //void drawPolyline ( const QPolygonF & points ) + * //void drawPolyline ( const QPolygon & points ) + * //void drawRect ( const QRectF & rectangle ) + * //void drawRect ( const QRect & rectangle ) + * //void drawRect ( int x, int y, int width, int height ) + * //void drawRoundedRect ( const QRectF & rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) + * //void drawRoundedRect ( const QRect & rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) + * //void drawRoundedRect ( int x, int y, int w, int h, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) * //void drawText ( const QPointF & position, const QString & text ) * //void drawText ( const QPoint & position, const QString & text ) * //void drawText ( const QRectF & rectangle, int flags, const QString & text, QRectF * boundingRect = 0 ) @@ -124,6 +186,30 @@ * //void drawText ( int x, int y, const QString & text ) * //void drawText ( int x, int y, int width, int height, int flags, const QString & text, QRect * boundingRect = 0 ) * //void drawText ( const QRectF & rectangle, const QString & text, const QTextOption & option = QTextOption() ) + * //void drawTiledPixmap ( const QRectF & rectangle, const QPixmap & pixmap, const QPointF & position = QPointF() ) + * //void drawTiledPixmap ( const QRect & rectangle, const QPixmap & pixmap, const QPoint & position = QPoint() ) + * //void drawTiledPixmap ( int x, int y, int width, int height, const QPixmap & pixmap, int sx = 0, int sy = 0 ) + * //void eraseRect ( const QRectF & rectangle ) + * //void eraseRect ( const QRect & rectangle ) + * //void eraseRect ( int x, int y, int width, int height ) + * //void setBrush ( const QBrush & brush ) + * //void setBrush ( Qt::BrushStyle style ) + * //void setBrushOrigin ( const QPointF & position ) + * //void setBrushOrigin ( const QPoint & position ) + * //void setBrushOrigin ( int x, int y ) + * //void setClipRect ( const QRectF & rectangle, Qt::ClipOperation operation = Qt::ReplaceClip ) + * //void setClipRect ( int x, int y, int width, int height, Qt::ClipOperation operation = Qt::ReplaceClip ) + * //void setClipRect ( const QRect & rectangle, Qt::ClipOperation operation = Qt::ReplaceClip ) + * //void setPen ( const QPen & pen ) + * //void setPen ( const QColor & color ) + * //void setPen ( Qt::PenStyle style ) + * //void setViewport ( const QRect & rectangle ) + * //void setViewport ( int x, int y, int width, int height ) + * //void setWindow ( const QRect & rectangle ) + * //void setWindow ( int x, int y, int width, int height ) + * //void translate ( const QPointF & offset ) + * //void translate ( const QPoint & offset ) + * //void translate ( qreal dx, qreal dy ) */ #include @@ -419,182 +505,139 @@ HB_FUNC( QT_QPAINTER_DEVICETRANSFORM ) } /* - * void drawArc ( const QRectF & rectangle, int startAngle, int spanAngle ) + * void drawArc ( ... ) */ HB_FUNC( QT_QPAINTER_DRAWARC ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->drawArc( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); + if( hb_pcount() == 4 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->drawArc( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->drawArc( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); + } + } + else if( hb_pcount() == 6 ) + { + ( p )->drawArc( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hb_parni( 7 ) ); + } } } /* - * void drawArc ( const QRect & rectangle, int startAngle, int spanAngle ) - */ -HB_FUNC( QT_QPAINTER_DRAWARC_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawArc( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); - } -} - -/* - * void drawArc ( int x, int y, int width, int height, int startAngle, int spanAngle ) - */ -HB_FUNC( QT_QPAINTER_DRAWARC_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawArc( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hb_parni( 7 ) ); - } -} - -/* - * void drawChord ( const QRectF & rectangle, int startAngle, int spanAngle ) + * void drawChord ( ... ) */ HB_FUNC( QT_QPAINTER_DRAWCHORD ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->drawChord( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); + if( hb_pcount() == 4 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->drawChord( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->drawChord( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); + } + } + else if( hb_pcount() == 6 ) + { + ( p )->drawChord( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hb_parni( 7 ) ); + } } } /* - * void drawChord ( const QRect & rectangle, int startAngle, int spanAngle ) - */ -HB_FUNC( QT_QPAINTER_DRAWCHORD_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawChord( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); - } -} - -/* - * void drawChord ( int x, int y, int width, int height, int startAngle, int spanAngle ) - */ -HB_FUNC( QT_QPAINTER_DRAWCHORD_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawChord( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hb_parni( 7 ) ); - } -} - -/* - * void drawConvexPolygon ( const QPointF * points, int pointCount ) + * void drawConvexPolygon ( ... ) */ HB_FUNC( QT_QPAINTER_DRAWCONVEXPOLYGON ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->drawConvexPolygon( hbqt_par_QPointF( 2 ), hb_parni( 3 ) ); + if( hb_pcount() == 3 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->drawConvexPolygon( hbqt_par_QPointF( 2 ), hb_parni( 3 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->drawConvexPolygon( hbqt_par_QPoint( 2 ), hb_parni( 3 ) ); + } + } + else if( hb_pcount() == 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPolygonF ) + { + ( p )->drawConvexPolygon( *hbqt_par_QPolygonF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QPolygon ) + { + ( p )->drawConvexPolygon( *hbqt_par_QPolygon( 2 ) ); + } + } } } /* - * void drawConvexPolygon ( const QPoint * points, int pointCount ) - */ -HB_FUNC( QT_QPAINTER_DRAWCONVEXPOLYGON_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawConvexPolygon( hbqt_par_QPoint( 2 ), hb_parni( 3 ) ); - } -} - -/* - * void drawConvexPolygon ( const QPolygonF & polygon ) - */ -HB_FUNC( QT_QPAINTER_DRAWCONVEXPOLYGON_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawConvexPolygon( *hbqt_par_QPolygonF( 2 ) ); - } -} - -/* - * void drawConvexPolygon ( const QPolygon & polygon ) - */ -HB_FUNC( QT_QPAINTER_DRAWCONVEXPOLYGON_3 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawConvexPolygon( *hbqt_par_QPolygon( 2 ) ); - } -} - -/* - * void drawEllipse ( const QRectF & rectangle ) + * void drawEllipse ( ... ) */ HB_FUNC( QT_QPAINTER_DRAWELLIPSE ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->drawEllipse( *hbqt_par_QRectF( 2 ) ); - } -} + if( hb_pcount() >= 4 ) + { + if( HB_ISNUM( 2 ) ) + { + ( p )->drawEllipse( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 3 ), hb_parni( 4 ) ); + } + else + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * void drawEllipse ( const QRect & rectangle ) - */ -HB_FUNC( QT_QPAINTER_DRAWELLIPSE_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawEllipse( *hbqt_par_QRect( 2 ) ); - } -} + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->drawEllipse( *hbqt_par_QPointF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->drawEllipse( *hbqt_par_QPoint( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); + } + } + } + else if( hb_pcount() == 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * void drawEllipse ( int x, int y, int width, int height ) - */ -HB_FUNC( QT_QPAINTER_DRAWELLIPSE_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawEllipse( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); - } -} - -/* - * void drawEllipse ( const QPointF & center, qreal rx, qreal ry ) - */ -HB_FUNC( QT_QPAINTER_DRAWELLIPSE_3 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawEllipse( *hbqt_par_QPointF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ); - } -} - -/* - * void drawEllipse ( const QPoint & center, int rx, int ry ) - */ -HB_FUNC( QT_QPAINTER_DRAWELLIPSE_4 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawEllipse( *hbqt_par_QPoint( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->drawEllipse( *hbqt_par_QRectF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->drawEllipse( *hbqt_par_QRect( 2 ) ); + } + } } } @@ -764,74 +807,58 @@ HB_FUNC( QT_QPAINTER_DRAWPATH ) } /* - * void drawPicture ( const QPointF & point, const QPicture & picture ) + * void drawPicture ( ... ) */ HB_FUNC( QT_QPAINTER_DRAWPICTURE ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->drawPicture( *hbqt_par_QPointF( 2 ), *hbqt_par_QPicture( 3 ) ); + if( hb_pcount() == 4 ) + { + ( p )->drawPicture( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QPicture( 4 ) ); + } + else if( hb_pcount() == 3 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->drawPicture( *hbqt_par_QPointF( 2 ), *hbqt_par_QPicture( 3 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->drawPicture( *hbqt_par_QPoint( 2 ), *hbqt_par_QPicture( 3 ) ); + } + } } } /* - * void drawPicture ( const QPoint & point, const QPicture & picture ) - */ -HB_FUNC( QT_QPAINTER_DRAWPICTURE_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawPicture( *hbqt_par_QPoint( 2 ), *hbqt_par_QPicture( 3 ) ); - } -} - -/* - * void drawPicture ( int x, int y, const QPicture & picture ) - */ -HB_FUNC( QT_QPAINTER_DRAWPICTURE_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawPicture( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QPicture( 4 ) ); - } -} - -/* - * void drawPie ( const QRectF & rectangle, int startAngle, int spanAngle ) + * void drawPie ( ... ) */ HB_FUNC( QT_QPAINTER_DRAWPIE ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->drawPie( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); - } -} + if( hb_pcount() == 6 && HB_ISNUM( 2 ) ) + { + ( p )->drawPie( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hb_parni( 7 ) ); + } + else if( hb_pcount() == 4 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * void drawPie ( const QRect & rectangle, int startAngle, int spanAngle ) - */ -HB_FUNC( QT_QPAINTER_DRAWPIE_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawPie( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); - } -} - -/* - * void drawPie ( int x, int y, int width, int height, int startAngle, int spanAngle ) - */ -HB_FUNC( QT_QPAINTER_DRAWPIE_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawPie( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hb_parni( 7 ) ); + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->drawPie( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->drawPie( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); + } + } } } @@ -902,218 +929,169 @@ HB_FUNC( QT_QPAINTER_DRAWPIXMAP ) } /* - * void drawPoint ( const QPointF & position ) + * void drawPoint ( ... ) */ HB_FUNC( QT_QPAINTER_DRAWPOINT ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->drawPoint( *hbqt_par_QPointF( 2 ) ); + if( hb_pcount() == 3 ) + { + ( p )->drawPoint( hb_parni( 2 ), hb_parni( 3 ) ); + } + else if( hb_pcount() == 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->drawPoint( *hbqt_par_QPointF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->drawPoint( *hbqt_par_QPoint( 2 ) ); + } + } } } /* - * void drawPoint ( const QPoint & position ) - */ -HB_FUNC( QT_QPAINTER_DRAWPOINT_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawPoint( *hbqt_par_QPoint( 2 ) ); - } -} - -/* - * void drawPoint ( int x, int y ) - */ -HB_FUNC( QT_QPAINTER_DRAWPOINT_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawPoint( hb_parni( 2 ), hb_parni( 3 ) ); - } -} - -/* - * void drawPoints ( const QPointF * points, int pointCount ) + * void drawPoints ( ... ) */ HB_FUNC( QT_QPAINTER_DRAWPOINTS ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->drawPoints( hbqt_par_QPointF( 2 ), hb_parni( 3 ) ); + if( hb_pcount() == 3 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->drawPoints( hbqt_par_QPointF( 2 ), hb_parni( 3 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->drawPoints( hbqt_par_QPoint( 2 ), hb_parni( 3 ) ); + } + } + else if( hb_pcount() == 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPolygonF ) + { + ( p )->drawPoints( *hbqt_par_QPolygonF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QPolygon ) + { + ( p )->drawPoints( *hbqt_par_QPolygon( 2 ) ); + } + } } } /* - * void drawPoints ( const QPoint * points, int pointCount ) - */ -HB_FUNC( QT_QPAINTER_DRAWPOINTS_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawPoints( hbqt_par_QPoint( 2 ), hb_parni( 3 ) ); - } -} - -/* - * void drawPoints ( const QPolygonF & points ) - */ -HB_FUNC( QT_QPAINTER_DRAWPOINTS_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawPoints( *hbqt_par_QPolygonF( 2 ) ); - } -} - -/* - * void drawPoints ( const QPolygon & points ) - */ -HB_FUNC( QT_QPAINTER_DRAWPOINTS_3 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawPoints( *hbqt_par_QPolygon( 2 ) ); - } -} - -/* - * void drawPolygon ( const QPointF * points, int pointCount, Qt::FillRule fillRule = Qt::OddEvenFill ) + * void drawPolygon ( ... ) */ HB_FUNC( QT_QPAINTER_DRAWPOLYGON ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->drawPolygon( hbqt_par_QPointF( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( Qt::FillRule ) hb_parni( 4 ) : ( Qt::FillRule ) Qt::OddEvenFill ) ); + if( hb_pcount() >= 3 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->drawPolygon( hbqt_par_QPointF( 2 ), hb_parni( 3 ), ( Qt::FillRule ) ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : Qt::OddEvenFill ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->drawPolygon( hbqt_par_QPoint( 2 ), hb_parni( 3 ), ( Qt::FillRule ) ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : Qt::OddEvenFill ) ); + } + } + else if( hb_pcount() >= 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPolygonF ) + { + ( p )->drawPolygon( *hbqt_par_QPolygonF( 2 ), ( Qt::FillRule ) ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::OddEvenFill ) ); + } + else if( q->type == HBQT_TYPE_QPolygon ) + { + ( p )->drawPolygon( *hbqt_par_QPolygonF( 2 ), ( Qt::FillRule ) ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::OddEvenFill ) ); + } + } } } /* - * void drawPolygon ( const QPoint * points, int pointCount, Qt::FillRule fillRule = Qt::OddEvenFill ) - */ -HB_FUNC( QT_QPAINTER_DRAWPOLYGON_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawPolygon( hbqt_par_QPoint( 2 ), hb_parni( 3 ), ( HB_ISNUM( 4 ) ? ( Qt::FillRule ) hb_parni( 4 ) : ( Qt::FillRule ) Qt::OddEvenFill ) ); - } -} - -/* - * void drawPolygon ( const QPolygonF & points, Qt::FillRule fillRule = Qt::OddEvenFill ) - */ -HB_FUNC( QT_QPAINTER_DRAWPOLYGON_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawPolygon( *hbqt_par_QPolygonF( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::FillRule ) hb_parni( 3 ) : ( Qt::FillRule ) Qt::OddEvenFill ) ); - } -} - -/* - * void drawPolygon ( const QPolygon & points, Qt::FillRule fillRule = Qt::OddEvenFill ) - */ -HB_FUNC( QT_QPAINTER_DRAWPOLYGON_3 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawPolygon( *hbqt_par_QPolygon( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::FillRule ) hb_parni( 3 ) : ( Qt::FillRule ) Qt::OddEvenFill ) ); - } -} - -/* - * void drawPolyline ( const QPointF * points, int pointCount ) + * void drawPolyline ( ... ) */ HB_FUNC( QT_QPAINTER_DRAWPOLYLINE ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->drawPolyline( hbqt_par_QPointF( 2 ), hb_parni( 3 ) ); + if( hb_pcount() == 3 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->drawPolyline( hbqt_par_QPointF( 2 ), hb_parni( 3 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->drawPolyline( hbqt_par_QPoint( 2 ), hb_parni( 3 ) ); + } + } + else if( hb_pcount() == 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPolygonF ) + { + ( p )->drawPolyline( *hbqt_par_QPolygonF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QPolygon ) + { + ( p )->drawPolyline( *hbqt_par_QPolygon( 2 ) ); + } + } } } /* - * void drawPolyline ( const QPoint * points, int pointCount ) - */ -HB_FUNC( QT_QPAINTER_DRAWPOLYLINE_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawPolyline( hbqt_par_QPoint( 2 ), hb_parni( 3 ) ); - } -} - -/* - * void drawPolyline ( const QPolygonF & points ) - */ -HB_FUNC( QT_QPAINTER_DRAWPOLYLINE_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawPolyline( *hbqt_par_QPolygonF( 2 ) ); - } -} - -/* - * void drawPolyline ( const QPolygon & points ) - */ -HB_FUNC( QT_QPAINTER_DRAWPOLYLINE_3 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawPolyline( *hbqt_par_QPolygon( 2 ) ); - } -} - -/* - * void drawRect ( const QRectF & rectangle ) + * void drawRect ( ... ) */ HB_FUNC( QT_QPAINTER_DRAWRECT ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->drawRect( *hbqt_par_QRectF( 2 ) ); - } -} + if( hb_pcount() == 4 && HB_ISNUM( 2 ) ) + { + ( p )->drawRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 3 ), hb_parni( 4 ) ); + } + else if( hb_pcount() == 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * void drawRect ( const QRect & rectangle ) - */ -HB_FUNC( QT_QPAINTER_DRAWRECT_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawRect( *hbqt_par_QRect( 2 ) ); - } -} - -/* - * void drawRect ( int x, int y, int width, int height ) - */ -HB_FUNC( QT_QPAINTER_DRAWRECT_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->drawRect( *hbqt_par_QRectF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->drawRect( *hbqt_par_QRect( 2 ) ); + } + } } } @@ -1142,38 +1120,30 @@ HB_FUNC( QT_QPAINTER_DRAWRECTS_1 ) } /* - * void drawRoundedRect ( const QRectF & rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) + * void drawRoundedRect ( ... ) */ HB_FUNC( QT_QPAINTER_DRAWROUNDEDRECT ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->drawRoundedRect( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISNUM( 5 ) ? ( Qt::SizeMode ) hb_parni( 5 ) : ( Qt::SizeMode ) Qt::AbsoluteSize ) ); - } -} + if( hb_pcount() >= 6 && HB_ISNUM( 2 ) ) + { + ( p )->drawRoundedRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parnd( 6 ), ( Qt::SizeMode ) ( HB_ISNUM( 7 ) ? hb_parni( 7 ) : Qt::AbsoluteSize ) ); + } + else if( hb_pcount() >= 4 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * void drawRoundedRect ( const QRect & rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) - */ -HB_FUNC( QT_QPAINTER_DRAWROUNDEDRECT_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawRoundedRect( *hbqt_par_QRect( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( HB_ISNUM( 5 ) ? ( Qt::SizeMode ) hb_parni( 5 ) : ( Qt::SizeMode ) Qt::AbsoluteSize ) ); - } -} - -/* - * void drawRoundedRect ( int x, int y, int w, int h, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) - */ -HB_FUNC( QT_QPAINTER_DRAWROUNDEDRECT_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawRoundedRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parnd( 6 ), hb_parnd( 7 ), ( HB_ISNUM( 8 ) ? ( Qt::SizeMode ) hb_parni( 8 ) : ( Qt::SizeMode ) Qt::AbsoluteSize ) ); + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->drawRoundedRect( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( Qt::SizeMode ) ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : Qt::AbsoluteSize ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->drawRoundedRect( *hbqt_par_QRect( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( Qt::SizeMode ) ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : Qt::AbsoluteSize ) ); + } + } } } @@ -1230,38 +1200,30 @@ HB_FUNC( QT_QPAINTER_DRAWTEXT ) } /* - * void drawTiledPixmap ( const QRectF & rectangle, const QPixmap & pixmap, const QPointF & position = QPointF() ) + * void drawTiledPixmap ( ... ) */ HB_FUNC( QT_QPAINTER_DRAWTILEDPIXMAP ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->drawTiledPixmap( *hbqt_par_QRectF( 2 ), *hbqt_par_QPixmap( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QPointF( 4 ) : QPointF() ) ); - } -} + if( hb_pcount() >= 6 && HB_ISNUM( 2 ) ) + { + ( p )->drawTiledPixmap( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), *hbqt_par_QPixmap( 6 ), ( HB_ISNUM( 7 ) ? hb_parni( 7 ) : 0 ), ( HB_ISNUM( 8 ) ? hb_parni( 8 ) : 0 ) ); + } + else if( hb_pcount() >= 3 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * void drawTiledPixmap ( const QRect & rectangle, const QPixmap & pixmap, const QPoint & position = QPoint() ) - */ -HB_FUNC( QT_QPAINTER_DRAWTILEDPIXMAP_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawTiledPixmap( *hbqt_par_QRect( 2 ), *hbqt_par_QPixmap( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QPoint( 4 ) : QPoint() ) ); - } -} - -/* - * void drawTiledPixmap ( int x, int y, int width, int height, const QPixmap & pixmap, int sx = 0, int sy = 0 ) - */ -HB_FUNC( QT_QPAINTER_DRAWTILEDPIXMAP_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawTiledPixmap( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), *hbqt_par_QPixmap( 6 ), hb_parni( 7 ), hb_parni( 8 ) ); + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->drawTiledPixmap( *hbqt_par_QRectF( 2 ), *hbqt_par_QPixmap( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QPointF( 4 ) : QPointF() ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->drawTiledPixmap( *hbqt_par_QRect( 2 ), *hbqt_par_QPixmap( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QPointF( 4 ) : QPointF() ) ); + } + } } } @@ -1278,38 +1240,30 @@ HB_FUNC( QT_QPAINTER_END ) } /* - * void eraseRect ( const QRectF & rectangle ) + * void eraseRect ( ... ) */ HB_FUNC( QT_QPAINTER_ERASERECT ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->eraseRect( *hbqt_par_QRectF( 2 ) ); - } -} + if( hb_pcount() == 4 && HB_ISNUM( 2 ) ) + { + ( p )->eraseRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 3 ), hb_parni( 4 ) ); + } + else if( hb_pcount() == 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * void eraseRect ( const QRect & rectangle ) - */ -HB_FUNC( QT_QPAINTER_ERASERECT_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->eraseRect( *hbqt_par_QRect( 2 ) ); - } -} - -/* - * void eraseRect ( int x, int y, int width, int height ) - */ -HB_FUNC( QT_QPAINTER_ERASERECT_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->eraseRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->eraseRect( *hbqt_par_QRectF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->eraseRect( *hbqt_par_QRect( 2 ) ); + } + } } } @@ -1698,62 +1652,49 @@ HB_FUNC( QT_QPAINTER_SETBACKGROUNDMODE ) } /* - * void setBrush ( const QBrush & brush ) + * void setBrush ( ... ) */ HB_FUNC( QT_QPAINTER_SETBRUSH ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->setBrush( *hbqt_par_QBrush( 2 ) ); + if( hb_pcount() == 2 && HB_ISNUM( 2 ) ) + { + ( p )->setBrush( ( Qt::BrushStyle ) hb_parni( 2 ) ); + } + else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setBrush( *hbqt_par_QBrush( 2 ) ); + } } } /* - * void setBrush ( Qt::BrushStyle style ) - */ -HB_FUNC( QT_QPAINTER_SETBRUSH_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->setBrush( ( Qt::BrushStyle ) hb_parni( 2 ) ); - } -} - -/* - * void setBrushOrigin ( const QPointF & position ) + * void setBrushOrigin ( ... ) */ HB_FUNC( QT_QPAINTER_SETBRUSHORIGIN ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->setBrushOrigin( *hbqt_par_QPointF( 2 ) ); - } -} + if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->setBrushOrigin( hb_parni( 2 ), hb_parni( 3 ) ); + } + else if( hb_pcount() == 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * void setBrushOrigin ( const QPoint & position ) - */ -HB_FUNC( QT_QPAINTER_SETBRUSHORIGIN_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->setBrushOrigin( *hbqt_par_QPoint( 2 ) ); - } -} - -/* - * void setBrushOrigin ( int x, int y ) - */ -HB_FUNC( QT_QPAINTER_SETBRUSHORIGIN_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->setBrushOrigin( hb_parni( 2 ), hb_parni( 3 ) ); + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->setBrushOrigin( *hbqt_par_QPointF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->setBrushOrigin( *hbqt_par_QPoint( 2 ) ); + } + } } } @@ -1770,38 +1711,30 @@ HB_FUNC( QT_QPAINTER_SETCLIPPATH ) } /* - * void setClipRect ( const QRectF & rectangle, Qt::ClipOperation operation = Qt::ReplaceClip ) + * void setClipRect ( ... ) */ HB_FUNC( QT_QPAINTER_SETCLIPRECT ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->setClipRect( *hbqt_par_QRectF( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ClipOperation ) hb_parni( 3 ) : ( Qt::ClipOperation ) Qt::ReplaceClip ) ); - } -} + if( hb_pcount() >= 5 && HB_ISNUM( 2 ) ) + { + ( p )->setClipRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), ( Qt::ClipOperation ) ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : Qt::ReplaceClip ) ); + } + else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * void setClipRect ( int x, int y, int width, int height, Qt::ClipOperation operation = Qt::ReplaceClip ) - */ -HB_FUNC( QT_QPAINTER_SETCLIPRECT_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->setClipRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), ( HB_ISNUM( 6 ) ? ( Qt::ClipOperation ) hb_parni( 6 ) : ( Qt::ClipOperation ) Qt::ReplaceClip ) ); - } -} - -/* - * void setClipRect ( const QRect & rectangle, Qt::ClipOperation operation = Qt::ReplaceClip ) - */ -HB_FUNC( QT_QPAINTER_SETCLIPRECT_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->setClipRect( *hbqt_par_QRect( 2 ), ( HB_ISNUM( 3 ) ? ( Qt::ClipOperation ) hb_parni( 3 ) : ( Qt::ClipOperation ) Qt::ReplaceClip ) ); + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->setClipRect( *hbqt_par_QRectF( 2 ), ( Qt::ClipOperation ) ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::ReplaceClip ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->setClipRect( *hbqt_par_QRect( 2 ), ( Qt::ClipOperation ) ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::ReplaceClip ) ); + } + } } } @@ -1878,38 +1811,30 @@ HB_FUNC( QT_QPAINTER_SETOPACITY ) } /* - * void setPen ( const QPen & pen ) + * void setPen ( ... ) */ HB_FUNC( QT_QPAINTER_SETPEN ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->setPen( *hbqt_par_QPen( 2 ) ); - } -} + if( hb_pcount() == 2 && HB_ISNUM( 2 ) ) + { + ( p )->setPen( ( Qt::PenStyle ) hb_parni( 2 ) ); + } + else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * void setPen ( const QColor & color ) - */ -HB_FUNC( QT_QPAINTER_SETPEN_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->setPen( *hbqt_par_QColor( 2 ) ); - } -} - -/* - * void setPen ( Qt::PenStyle style ) - */ -HB_FUNC( QT_QPAINTER_SETPEN_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->setPen( ( Qt::PenStyle ) hb_parni( 2 ) ); + if( q->type == HBQT_TYPE_QPen ) + { + ( p )->setPen( *hbqt_par_QPen( 2 ) ); + } + else if( q->type == HBQT_TYPE_QColor ) + { + ( p )->setPen( *hbqt_par_QColor( 2 ) ); + } + } } } @@ -1962,50 +1887,40 @@ HB_FUNC( QT_QPAINTER_SETVIEWTRANSFORMENABLED ) } /* - * void setViewport ( const QRect & rectangle ) + * void setViewport ( ... ) */ HB_FUNC( QT_QPAINTER_SETVIEWPORT ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->setViewport( *hbqt_par_QRect( 2 ) ); + if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) + { + ( p )->setViewport( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); + } + else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setViewport( *hbqt_par_QRect( 2 ) ); + } } } /* - * void setViewport ( int x, int y, int width, int height ) - */ -HB_FUNC( QT_QPAINTER_SETVIEWPORT_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->setViewport( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); - } -} - -/* - * void setWindow ( const QRect & rectangle ) + * void setWindow ( ... ) */ HB_FUNC( QT_QPAINTER_SETWINDOW ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->setWindow( *hbqt_par_QRect( 2 ) ); - } -} - -/* - * void setWindow ( int x, int y, int width, int height ) - */ -HB_FUNC( QT_QPAINTER_SETWINDOW_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->setWindow( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); + if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) + { + ( p )->setWindow( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); + } + else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setWindow( *hbqt_par_QRect( 2 ) ); + } } } @@ -2094,38 +2009,30 @@ HB_FUNC( QT_QPAINTER_TRANSFORM ) } /* - * void translate ( const QPointF & offset ) + * void translate ( ... ) */ HB_FUNC( QT_QPAINTER_TRANSLATE ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->translate( *hbqt_par_QPointF( 2 ) ); - } -} + if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->translate( hb_parni( 2 ), hb_parni( 3 ) ); + } + else if( hb_pcount() == 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * void translate ( const QPoint & offset ) - */ -HB_FUNC( QT_QPAINTER_TRANSLATE_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->translate( *hbqt_par_QPoint( 2 ) ); - } -} - -/* - * void translate ( qreal dx, qreal dy ) - */ -HB_FUNC( QT_QPAINTER_TRANSLATE_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->translate( hb_parnd( 2 ), hb_parnd( 3 ) ); + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->translate( *hbqt_par_QPointF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->translate( *hbqt_par_QPoint( 2 ) ); + } + } } } diff --git a/harbour/contrib/hbqt/qtgui/g/TQPainter.prg b/harbour/contrib/hbqt/qtgui/g/TQPainter.prg index 5e9c3f082d..03f78d258d 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQPainter.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQPainter.prg @@ -88,21 +88,10 @@ CREATE CLASS QPainter INHERIT HbQtObjectHandler FUNCTION HB_QPainter METHOD device() METHOD deviceMatrix() METHOD deviceTransform() - METHOD drawArc( pRectangle, nStartAngle, nSpanAngle ) - METHOD drawArc_1( pRectangle, nStartAngle, nSpanAngle ) - METHOD drawArc_2( nX, nY, nWidth, nHeight, nStartAngle, nSpanAngle ) - METHOD drawChord( pRectangle, nStartAngle, nSpanAngle ) - METHOD drawChord_1( pRectangle, nStartAngle, nSpanAngle ) - METHOD drawChord_2( nX, nY, nWidth, nHeight, nStartAngle, nSpanAngle ) - METHOD drawConvexPolygon( pPoints, nPointCount ) - METHOD drawConvexPolygon_1( pPoints, nPointCount ) - METHOD drawConvexPolygon_2( pPolygon ) - METHOD drawConvexPolygon_3( pPolygon ) - METHOD drawEllipse( pRectangle ) - METHOD drawEllipse_1( pRectangle ) - METHOD drawEllipse_2( nX, nY, nWidth, nHeight ) - METHOD drawEllipse_3( pCenter, nRx, nRy ) - METHOD drawEllipse_4( pCenter, nRx, nRy ) + METHOD drawArc( ... ) + METHOD drawChord( ... ) + METHOD drawConvexPolygon( ... ) + METHOD drawEllipse( ... ) METHOD drawImage( ... ) METHOD drawLine( ... ) METHOD drawLines( pLines, nLineCount ) @@ -110,44 +99,21 @@ CREATE CLASS QPainter INHERIT HbQtObjectHandler FUNCTION HB_QPainter METHOD drawLines_2( pPointPairs, nLineCount ) METHOD drawLines_3( pPointPairs, nLineCount ) METHOD drawPath( pPath ) - METHOD drawPicture( pPoint, pPicture ) - METHOD drawPicture_1( pPoint, pPicture ) - METHOD drawPicture_2( nX, nY, pPicture ) - METHOD drawPie( pRectangle, nStartAngle, nSpanAngle ) - METHOD drawPie_1( pRectangle, nStartAngle, nSpanAngle ) - METHOD drawPie_2( nX, nY, nWidth, nHeight, nStartAngle, nSpanAngle ) + METHOD drawPicture( ... ) + METHOD drawPie( ... ) METHOD drawPixmap( ... ) - METHOD drawPoint( pPosition ) - METHOD drawPoint_1( pPosition ) - METHOD drawPoint_2( nX, nY ) - METHOD drawPoints( pPoints, nPointCount ) - METHOD drawPoints_1( pPoints, nPointCount ) - METHOD drawPoints_2( pPoints ) - METHOD drawPoints_3( pPoints ) - METHOD drawPolygon( pPoints, nPointCount, nFillRule ) - METHOD drawPolygon_1( pPoints, nPointCount, nFillRule ) - METHOD drawPolygon_2( pPoints, nFillRule ) - METHOD drawPolygon_3( pPoints, nFillRule ) - METHOD drawPolyline( pPoints, nPointCount ) - METHOD drawPolyline_1( pPoints, nPointCount ) - METHOD drawPolyline_2( pPoints ) - METHOD drawPolyline_3( pPoints ) - METHOD drawRect( pRectangle ) - METHOD drawRect_1( pRectangle ) - METHOD drawRect_2( nX, nY, nWidth, nHeight ) + METHOD drawPoint( ... ) + METHOD drawPoints( ... ) + METHOD drawPolygon( ... ) + METHOD drawPolyline( ... ) + METHOD drawRect( ... ) METHOD drawRects( pRectangles, nRectCount ) METHOD drawRects_1( pRectangles, nRectCount ) - METHOD drawRoundedRect( pRect, nXRadius, nYRadius, nMode ) - METHOD drawRoundedRect_1( pRect, nXRadius, nYRadius, nMode ) - METHOD drawRoundedRect_2( nX, nY, nW, nH, nXRadius, nYRadius, nMode ) + METHOD drawRoundedRect( ... ) METHOD drawText( ... ) - METHOD drawTiledPixmap( pRectangle, pPixmap, pPosition ) - METHOD drawTiledPixmap_1( pRectangle, pPixmap, pPosition ) - METHOD drawTiledPixmap_2( nX, nY, nWidth, nHeight, pPixmap, nSx, nSy ) + METHOD drawTiledPixmap( ... ) METHOD end() - METHOD eraseRect( pRectangle ) - METHOD eraseRect_1( pRectangle ) - METHOD eraseRect_2( nX, nY, nWidth, nHeight ) + METHOD eraseRect( ... ) METHOD fillPath( pPath, pBrush ) METHOD fillRect( pRectangle, pBrush ) METHOD fillRect_1( nX, nY, nWidth, nHeight, nStyle ) @@ -180,32 +146,23 @@ CREATE CLASS QPainter INHERIT HbQtObjectHandler FUNCTION HB_QPainter METHOD scale( nSx, nSy ) METHOD setBackground( pBrush ) METHOD setBackgroundMode( nMode ) - METHOD setBrush( pBrush ) - METHOD setBrush_1( nStyle ) - METHOD setBrushOrigin( pPosition ) - METHOD setBrushOrigin_1( pPosition ) - METHOD setBrushOrigin_2( nX, nY ) + METHOD setBrush( ... ) + METHOD setBrushOrigin( ... ) METHOD setClipPath( pPath, nOperation ) - METHOD setClipRect( pRectangle, nOperation ) - METHOD setClipRect_1( nX, nY, nWidth, nHeight, nOperation ) - METHOD setClipRect_2( pRectangle, nOperation ) + METHOD setClipRect( ... ) METHOD setClipRegion( pRegion, nOperation ) METHOD setClipping( lEnable ) METHOD setCompositionMode( nMode ) METHOD setFont( pFont ) METHOD setLayoutDirection( nDirection ) METHOD setOpacity( nOpacity ) - METHOD setPen( pPen ) - METHOD setPen_1( pColor ) - METHOD setPen_2( nStyle ) + METHOD setPen( ... ) METHOD setRenderHint( nHint, lOn ) METHOD setRenderHints( nHints, lOn ) METHOD setTransform( pTransform, lCombine ) METHOD setViewTransformEnabled( lEnable ) - METHOD setViewport( pRectangle ) - METHOD setViewport_1( nX, nY, nWidth, nHeight ) - METHOD setWindow( pRectangle ) - METHOD setWindow_1( nX, nY, nWidth, nHeight ) + METHOD setViewport( ... ) + METHOD setWindow( ... ) METHOD setWorldMatrix( pMatrix, lCombine ) METHOD setWorldMatrixEnabled( lEnable ) METHOD setWorldTransform( pMatrix, lCombine ) @@ -213,9 +170,7 @@ CREATE CLASS QPainter INHERIT HbQtObjectHandler FUNCTION HB_QPainter METHOD strokePath( pPath, pPen ) METHOD testRenderHint( nHint ) METHOD transform() - METHOD translate( pOffset ) - METHOD translate_1( pOffset ) - METHOD translate_2( nDx, nDy ) + METHOD translate( ... ) METHOD viewTransformEnabled() METHOD viewport() METHOD window() @@ -306,64 +261,36 @@ METHOD QPainter:deviceTransform() RETURN Qt_QPainter_deviceTransform( ::pPtr ) -METHOD QPainter:drawArc( pRectangle, nStartAngle, nSpanAngle ) - RETURN Qt_QPainter_drawArc( ::pPtr, hbqt_ptr( pRectangle ), nStartAngle, nSpanAngle ) +METHOD QPainter:drawArc( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_drawArc( ::pPtr, ... ) -METHOD QPainter:drawArc_1( pRectangle, nStartAngle, nSpanAngle ) - RETURN Qt_QPainter_drawArc_1( ::pPtr, hbqt_ptr( pRectangle ), nStartAngle, nSpanAngle ) +METHOD QPainter:drawChord( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_drawChord( ::pPtr, ... ) -METHOD QPainter:drawArc_2( nX, nY, nWidth, nHeight, nStartAngle, nSpanAngle ) - RETURN Qt_QPainter_drawArc_2( ::pPtr, nX, nY, nWidth, nHeight, nStartAngle, nSpanAngle ) +METHOD QPainter:drawConvexPolygon( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_drawConvexPolygon( ::pPtr, ... ) -METHOD QPainter:drawChord( pRectangle, nStartAngle, nSpanAngle ) - RETURN Qt_QPainter_drawChord( ::pPtr, hbqt_ptr( pRectangle ), nStartAngle, nSpanAngle ) - - -METHOD QPainter:drawChord_1( pRectangle, nStartAngle, nSpanAngle ) - RETURN Qt_QPainter_drawChord_1( ::pPtr, hbqt_ptr( pRectangle ), nStartAngle, nSpanAngle ) - - -METHOD QPainter:drawChord_2( nX, nY, nWidth, nHeight, nStartAngle, nSpanAngle ) - RETURN Qt_QPainter_drawChord_2( ::pPtr, nX, nY, nWidth, nHeight, nStartAngle, nSpanAngle ) - - -METHOD QPainter:drawConvexPolygon( pPoints, nPointCount ) - RETURN Qt_QPainter_drawConvexPolygon( ::pPtr, hbqt_ptr( pPoints ), nPointCount ) - - -METHOD QPainter:drawConvexPolygon_1( pPoints, nPointCount ) - RETURN Qt_QPainter_drawConvexPolygon_1( ::pPtr, hbqt_ptr( pPoints ), nPointCount ) - - -METHOD QPainter:drawConvexPolygon_2( pPolygon ) - RETURN Qt_QPainter_drawConvexPolygon_2( ::pPtr, hbqt_ptr( pPolygon ) ) - - -METHOD QPainter:drawConvexPolygon_3( pPolygon ) - RETURN Qt_QPainter_drawConvexPolygon_3( ::pPtr, hbqt_ptr( pPolygon ) ) - - -METHOD QPainter:drawEllipse( pRectangle ) - RETURN Qt_QPainter_drawEllipse( ::pPtr, hbqt_ptr( pRectangle ) ) - - -METHOD QPainter:drawEllipse_1( pRectangle ) - RETURN Qt_QPainter_drawEllipse_1( ::pPtr, hbqt_ptr( pRectangle ) ) - - -METHOD QPainter:drawEllipse_2( nX, nY, nWidth, nHeight ) - RETURN Qt_QPainter_drawEllipse_2( ::pPtr, nX, nY, nWidth, nHeight ) - - -METHOD QPainter:drawEllipse_3( pCenter, nRx, nRy ) - RETURN Qt_QPainter_drawEllipse_3( ::pPtr, hbqt_ptr( pCenter ), nRx, nRy ) - - -METHOD QPainter:drawEllipse_4( pCenter, nRx, nRy ) - RETURN Qt_QPainter_drawEllipse_4( ::pPtr, hbqt_ptr( pCenter ), nRx, nRy ) +METHOD QPainter:drawEllipse( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_drawEllipse( ::pPtr, ... ) METHOD QPainter:drawImage( ... ) @@ -402,28 +329,20 @@ METHOD QPainter:drawPath( pPath ) RETURN Qt_QPainter_drawPath( ::pPtr, hbqt_ptr( pPath ) ) -METHOD QPainter:drawPicture( pPoint, pPicture ) - RETURN Qt_QPainter_drawPicture( ::pPtr, hbqt_ptr( pPoint ), hbqt_ptr( pPicture ) ) +METHOD QPainter:drawPicture( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_drawPicture( ::pPtr, ... ) -METHOD QPainter:drawPicture_1( pPoint, pPicture ) - RETURN Qt_QPainter_drawPicture_1( ::pPtr, hbqt_ptr( pPoint ), hbqt_ptr( pPicture ) ) - - -METHOD QPainter:drawPicture_2( nX, nY, pPicture ) - RETURN Qt_QPainter_drawPicture_2( ::pPtr, nX, nY, hbqt_ptr( pPicture ) ) - - -METHOD QPainter:drawPie( pRectangle, nStartAngle, nSpanAngle ) - RETURN Qt_QPainter_drawPie( ::pPtr, hbqt_ptr( pRectangle ), nStartAngle, nSpanAngle ) - - -METHOD QPainter:drawPie_1( pRectangle, nStartAngle, nSpanAngle ) - RETURN Qt_QPainter_drawPie_1( ::pPtr, hbqt_ptr( pRectangle ), nStartAngle, nSpanAngle ) - - -METHOD QPainter:drawPie_2( nX, nY, nWidth, nHeight, nStartAngle, nSpanAngle ) - RETURN Qt_QPainter_drawPie_2( ::pPtr, nX, nY, nWidth, nHeight, nStartAngle, nSpanAngle ) +METHOD QPainter:drawPie( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_drawPie( ::pPtr, ... ) METHOD QPainter:drawPixmap( ... ) @@ -434,76 +353,44 @@ METHOD QPainter:drawPixmap( ... ) RETURN Qt_QPainter_drawPixmap( ::pPtr, ... ) -METHOD QPainter:drawPoint( pPosition ) - RETURN Qt_QPainter_drawPoint( ::pPtr, hbqt_ptr( pPosition ) ) +METHOD QPainter:drawPoint( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_drawPoint( ::pPtr, ... ) -METHOD QPainter:drawPoint_1( pPosition ) - RETURN Qt_QPainter_drawPoint_1( ::pPtr, hbqt_ptr( pPosition ) ) +METHOD QPainter:drawPoints( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_drawPoints( ::pPtr, ... ) -METHOD QPainter:drawPoint_2( nX, nY ) - RETURN Qt_QPainter_drawPoint_2( ::pPtr, nX, nY ) +METHOD QPainter:drawPolygon( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_drawPolygon( ::pPtr, ... ) -METHOD QPainter:drawPoints( pPoints, nPointCount ) - RETURN Qt_QPainter_drawPoints( ::pPtr, hbqt_ptr( pPoints ), nPointCount ) +METHOD QPainter:drawPolyline( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_drawPolyline( ::pPtr, ... ) -METHOD QPainter:drawPoints_1( pPoints, nPointCount ) - RETURN Qt_QPainter_drawPoints_1( ::pPtr, hbqt_ptr( pPoints ), nPointCount ) - - -METHOD QPainter:drawPoints_2( pPoints ) - RETURN Qt_QPainter_drawPoints_2( ::pPtr, hbqt_ptr( pPoints ) ) - - -METHOD QPainter:drawPoints_3( pPoints ) - RETURN Qt_QPainter_drawPoints_3( ::pPtr, hbqt_ptr( pPoints ) ) - - -METHOD QPainter:drawPolygon( pPoints, nPointCount, nFillRule ) - RETURN Qt_QPainter_drawPolygon( ::pPtr, hbqt_ptr( pPoints ), nPointCount, nFillRule ) - - -METHOD QPainter:drawPolygon_1( pPoints, nPointCount, nFillRule ) - RETURN Qt_QPainter_drawPolygon_1( ::pPtr, hbqt_ptr( pPoints ), nPointCount, nFillRule ) - - -METHOD QPainter:drawPolygon_2( pPoints, nFillRule ) - RETURN Qt_QPainter_drawPolygon_2( ::pPtr, hbqt_ptr( pPoints ), nFillRule ) - - -METHOD QPainter:drawPolygon_3( pPoints, nFillRule ) - RETURN Qt_QPainter_drawPolygon_3( ::pPtr, hbqt_ptr( pPoints ), nFillRule ) - - -METHOD QPainter:drawPolyline( pPoints, nPointCount ) - RETURN Qt_QPainter_drawPolyline( ::pPtr, hbqt_ptr( pPoints ), nPointCount ) - - -METHOD QPainter:drawPolyline_1( pPoints, nPointCount ) - RETURN Qt_QPainter_drawPolyline_1( ::pPtr, hbqt_ptr( pPoints ), nPointCount ) - - -METHOD QPainter:drawPolyline_2( pPoints ) - RETURN Qt_QPainter_drawPolyline_2( ::pPtr, hbqt_ptr( pPoints ) ) - - -METHOD QPainter:drawPolyline_3( pPoints ) - RETURN Qt_QPainter_drawPolyline_3( ::pPtr, hbqt_ptr( pPoints ) ) - - -METHOD QPainter:drawRect( pRectangle ) - RETURN Qt_QPainter_drawRect( ::pPtr, hbqt_ptr( pRectangle ) ) - - -METHOD QPainter:drawRect_1( pRectangle ) - RETURN Qt_QPainter_drawRect_1( ::pPtr, hbqt_ptr( pRectangle ) ) - - -METHOD QPainter:drawRect_2( nX, nY, nWidth, nHeight ) - RETURN Qt_QPainter_drawRect_2( ::pPtr, nX, nY, nWidth, nHeight ) +METHOD QPainter:drawRect( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_drawRect( ::pPtr, ... ) METHOD QPainter:drawRects( pRectangles, nRectCount ) @@ -514,16 +401,12 @@ METHOD QPainter:drawRects_1( pRectangles, nRectCount ) RETURN Qt_QPainter_drawRects_1( ::pPtr, hbqt_ptr( pRectangles ), nRectCount ) -METHOD QPainter:drawRoundedRect( pRect, nXRadius, nYRadius, nMode ) - RETURN Qt_QPainter_drawRoundedRect( ::pPtr, hbqt_ptr( pRect ), nXRadius, nYRadius, nMode ) - - -METHOD QPainter:drawRoundedRect_1( pRect, nXRadius, nYRadius, nMode ) - RETURN Qt_QPainter_drawRoundedRect_1( ::pPtr, hbqt_ptr( pRect ), nXRadius, nYRadius, nMode ) - - -METHOD QPainter:drawRoundedRect_2( nX, nY, nW, nH, nXRadius, nYRadius, nMode ) - RETURN Qt_QPainter_drawRoundedRect_2( ::pPtr, nX, nY, nW, nH, nXRadius, nYRadius, nMode ) +METHOD QPainter:drawRoundedRect( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_drawRoundedRect( ::pPtr, ... ) METHOD QPainter:drawText( ... ) @@ -534,32 +417,24 @@ METHOD QPainter:drawText( ... ) RETURN Qt_QPainter_drawText( ::pPtr, ... ) -METHOD QPainter:drawTiledPixmap( pRectangle, pPixmap, pPosition ) - RETURN Qt_QPainter_drawTiledPixmap( ::pPtr, hbqt_ptr( pRectangle ), hbqt_ptr( pPixmap ), hbqt_ptr( pPosition ) ) - - -METHOD QPainter:drawTiledPixmap_1( pRectangle, pPixmap, pPosition ) - RETURN Qt_QPainter_drawTiledPixmap_1( ::pPtr, hbqt_ptr( pRectangle ), hbqt_ptr( pPixmap ), hbqt_ptr( pPosition ) ) - - -METHOD QPainter:drawTiledPixmap_2( nX, nY, nWidth, nHeight, pPixmap, nSx, nSy ) - RETURN Qt_QPainter_drawTiledPixmap_2( ::pPtr, nX, nY, nWidth, nHeight, hbqt_ptr( pPixmap ), nSx, nSy ) +METHOD QPainter:drawTiledPixmap( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_drawTiledPixmap( ::pPtr, ... ) METHOD QPainter:end() RETURN Qt_QPainter_end( ::pPtr ) -METHOD QPainter:eraseRect( pRectangle ) - RETURN Qt_QPainter_eraseRect( ::pPtr, hbqt_ptr( pRectangle ) ) - - -METHOD QPainter:eraseRect_1( pRectangle ) - RETURN Qt_QPainter_eraseRect_1( ::pPtr, hbqt_ptr( pRectangle ) ) - - -METHOD QPainter:eraseRect_2( nX, nY, nWidth, nHeight ) - RETURN Qt_QPainter_eraseRect_2( ::pPtr, nX, nY, nWidth, nHeight ) +METHOD QPainter:eraseRect( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_eraseRect( ::pPtr, ... ) METHOD QPainter:fillPath( pPath, pBrush ) @@ -690,40 +565,32 @@ METHOD QPainter:setBackgroundMode( nMode ) RETURN Qt_QPainter_setBackgroundMode( ::pPtr, nMode ) -METHOD QPainter:setBrush( pBrush ) - RETURN Qt_QPainter_setBrush( ::pPtr, hbqt_ptr( pBrush ) ) +METHOD QPainter:setBrush( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_setBrush( ::pPtr, ... ) -METHOD QPainter:setBrush_1( nStyle ) - RETURN Qt_QPainter_setBrush_1( ::pPtr, nStyle ) - - -METHOD QPainter:setBrushOrigin( pPosition ) - RETURN Qt_QPainter_setBrushOrigin( ::pPtr, hbqt_ptr( pPosition ) ) - - -METHOD QPainter:setBrushOrigin_1( pPosition ) - RETURN Qt_QPainter_setBrushOrigin_1( ::pPtr, hbqt_ptr( pPosition ) ) - - -METHOD QPainter:setBrushOrigin_2( nX, nY ) - RETURN Qt_QPainter_setBrushOrigin_2( ::pPtr, nX, nY ) +METHOD QPainter:setBrushOrigin( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_setBrushOrigin( ::pPtr, ... ) METHOD QPainter:setClipPath( pPath, nOperation ) RETURN Qt_QPainter_setClipPath( ::pPtr, hbqt_ptr( pPath ), nOperation ) -METHOD QPainter:setClipRect( pRectangle, nOperation ) - RETURN Qt_QPainter_setClipRect( ::pPtr, hbqt_ptr( pRectangle ), nOperation ) - - -METHOD QPainter:setClipRect_1( nX, nY, nWidth, nHeight, nOperation ) - RETURN Qt_QPainter_setClipRect_1( ::pPtr, nX, nY, nWidth, nHeight, nOperation ) - - -METHOD QPainter:setClipRect_2( pRectangle, nOperation ) - RETURN Qt_QPainter_setClipRect_2( ::pPtr, hbqt_ptr( pRectangle ), nOperation ) +METHOD QPainter:setClipRect( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_setClipRect( ::pPtr, ... ) METHOD QPainter:setClipRegion( pRegion, nOperation ) @@ -750,16 +617,12 @@ METHOD QPainter:setOpacity( nOpacity ) RETURN Qt_QPainter_setOpacity( ::pPtr, nOpacity ) -METHOD QPainter:setPen( pPen ) - RETURN Qt_QPainter_setPen( ::pPtr, hbqt_ptr( pPen ) ) - - -METHOD QPainter:setPen_1( pColor ) - RETURN Qt_QPainter_setPen_1( ::pPtr, hbqt_ptr( pColor ) ) - - -METHOD QPainter:setPen_2( nStyle ) - RETURN Qt_QPainter_setPen_2( ::pPtr, nStyle ) +METHOD QPainter:setPen( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_setPen( ::pPtr, ... ) METHOD QPainter:setRenderHint( nHint, lOn ) @@ -778,20 +641,20 @@ METHOD QPainter:setViewTransformEnabled( lEnable ) RETURN Qt_QPainter_setViewTransformEnabled( ::pPtr, lEnable ) -METHOD QPainter:setViewport( pRectangle ) - RETURN Qt_QPainter_setViewport( ::pPtr, hbqt_ptr( pRectangle ) ) +METHOD QPainter:setViewport( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_setViewport( ::pPtr, ... ) -METHOD QPainter:setViewport_1( nX, nY, nWidth, nHeight ) - RETURN Qt_QPainter_setViewport_1( ::pPtr, nX, nY, nWidth, nHeight ) - - -METHOD QPainter:setWindow( pRectangle ) - RETURN Qt_QPainter_setWindow( ::pPtr, hbqt_ptr( pRectangle ) ) - - -METHOD QPainter:setWindow_1( nX, nY, nWidth, nHeight ) - RETURN Qt_QPainter_setWindow_1( ::pPtr, nX, nY, nWidth, nHeight ) +METHOD QPainter:setWindow( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_setWindow( ::pPtr, ... ) METHOD QPainter:setWorldMatrix( pMatrix, lCombine ) @@ -822,16 +685,12 @@ METHOD QPainter:transform() RETURN Qt_QPainter_transform( ::pPtr ) -METHOD QPainter:translate( pOffset ) - RETURN Qt_QPainter_translate( ::pPtr, hbqt_ptr( pOffset ) ) - - -METHOD QPainter:translate_1( pOffset ) - RETURN Qt_QPainter_translate_1( ::pPtr, hbqt_ptr( pOffset ) ) - - -METHOD QPainter:translate_2( nDx, nDy ) - RETURN Qt_QPainter_translate_2( ::pPtr, nDx, nDy ) +METHOD QPainter:translate( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_translate( ::pPtr, ... ) METHOD QPainter:viewTransformEnabled() diff --git a/harbour/contrib/hbqt/qtgui/qth/QPainter.qth b/harbour/contrib/hbqt/qtgui/qth/QPainter.qth index 31f598fb3e..8c77996a57 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPainter.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPainter.qth @@ -105,24 +105,141 @@ QPaintDevice * device () const const QMatrix & deviceMatrix () const const QTransform & deviceTransform () const -void drawArc ( const QRectF & rectangle, int startAngle, int spanAngle ) -void drawArc ( const QRect & rectangle, int startAngle, int spanAngle ) -void drawArc ( int x, int y, int width, int height, int startAngle, int spanAngle ) +void drawArc ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 4 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -void drawChord ( const QRectF & rectangle, int startAngle, int spanAngle ) -void drawChord ( const QRect & rectangle, int startAngle, int spanAngle ) -void drawChord ( int x, int y, int width, int height, int startAngle, int spanAngle ) + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->drawArc( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->drawArc( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); + } + } + else if( hb_pcount() == 6 ) + { + ( p )->drawArc( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hb_parni( 7 ) ); + } + } +} +//void drawArc ( const QRectF & rectangle, int startAngle, int spanAngle ) +//void drawArc ( const QRect & rectangle, int startAngle, int spanAngle ) +//void drawArc ( int x, int y, int width, int height, int startAngle, int spanAngle ) -void drawConvexPolygon ( const QPointF * points, int pointCount ) -void drawConvexPolygon ( const QPoint * points, int pointCount ) -void drawConvexPolygon ( const QPolygonF & polygon ) -void drawConvexPolygon ( const QPolygon & polygon ) +void drawChord ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 4 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -void drawEllipse ( const QRectF & rectangle ) -void drawEllipse ( const QRect & rectangle ) -void drawEllipse ( int x, int y, int width, int height ) -void drawEllipse ( const QPointF & center, qreal rx, qreal ry ) -void drawEllipse ( const QPoint & center, int rx, int ry ) + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->drawChord( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->drawChord( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); + } + } + else if( hb_pcount() == 6 ) + { + ( p )->drawChord( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hb_parni( 7 ) ); + } + } +} +//void drawChord ( const QRectF & rectangle, int startAngle, int spanAngle ) +//void drawChord ( const QRect & rectangle, int startAngle, int spanAngle ) +//void drawChord ( int x, int y, int width, int height, int startAngle, int spanAngle ) + +void drawConvexPolygon ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 3 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->drawConvexPolygon( hbqt_par_QPointF( 2 ), hb_parni( 3 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->drawConvexPolygon( hbqt_par_QPoint( 2 ), hb_parni( 3 ) ); + } + } + else if( hb_pcount() == 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPolygonF ) + { + ( p )->drawConvexPolygon( *hbqt_par_QPolygonF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QPolygon ) + { + ( p )->drawConvexPolygon( *hbqt_par_QPolygon( 2 ) ); + } + } + } +} +//void drawConvexPolygon ( const QPointF * points, int pointCount ) +//void drawConvexPolygon ( const QPoint * points, int pointCount ) +//void drawConvexPolygon ( const QPolygonF & polygon ) +//void drawConvexPolygon ( const QPolygon & polygon ) + +void drawEllipse ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() >= 4 ) + { + if( HB_ISNUM( 2 ) ) + { + ( p )->drawEllipse( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 3 ), hb_parni( 4 ) ); + } + else + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->drawEllipse( *hbqt_par_QPointF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->drawEllipse( *hbqt_par_QPoint( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); + } + } + } + else if( hb_pcount() == 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->drawEllipse( *hbqt_par_QRectF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->drawEllipse( *hbqt_par_QRect( 2 ) ); + } + } + } +} +//void drawEllipse ( const QRectF & rectangle ) +//void drawEllipse ( const QRect & rectangle ) +//void drawEllipse ( int x, int y, int width, int height ) +//void drawEllipse ( const QPointF & center, qreal rx, qreal ry ) +//void drawEllipse ( const QPoint & center, int rx, int ry ) void drawImage ( ... ){ QPainter * p = hbqt_par_QPainter( 1 ); @@ -179,7 +296,7 @@ void drawImage ( ... ){ } } } -} + //void drawImage ( const QRectF & target, const QImage & image, const QRectF & source, Qt::ImageConversionFlags flags = Qt::AutoColor ) //void drawImage ( const QRect & target, const QImage & image, const QRect & source, Qt::ImageConversionFlags flags = Qt::AutoColor ) //void drawImage ( const QPointF & point, const QImage & image ) @@ -247,13 +364,59 @@ void drawLines ( const QVector & lines ) void drawPath ( const QPainterPath & path ) -void drawPicture ( const QPointF & point, const QPicture & picture ) -void drawPicture ( const QPoint & point, const QPicture & picture ) -void drawPicture ( int x, int y, const QPicture & picture ) +void drawPicture ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 4 ) + { + ( p )->drawPicture( hb_parni( 2 ), hb_parni( 3 ), *hbqt_par_QPicture( 4 ) ); + } + else if( hb_pcount() == 3 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -void drawPie ( const QRectF & rectangle, int startAngle, int spanAngle ) -void drawPie ( const QRect & rectangle, int startAngle, int spanAngle ) -void drawPie ( int x, int y, int width, int height, int startAngle, int spanAngle ) + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->drawPicture( *hbqt_par_QPointF( 2 ), *hbqt_par_QPicture( 3 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->drawPicture( *hbqt_par_QPoint( 2 ), *hbqt_par_QPicture( 3 ) ); + } + } + } +} +//void drawPicture ( const QPointF & point, const QPicture & picture ) +//void drawPicture ( const QPoint & point, const QPicture & picture ) +//void drawPicture ( int x, int y, const QPicture & picture ) + +void drawPie ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 6 && HB_ISNUM( 2 ) ) + { + ( p )->drawPie( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hb_parni( 7 ) ); + } + else if( hb_pcount() == 4 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->drawPie( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->drawPie( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hb_parni( 4 ) ); + } + } + } +} +//void drawPie ( const QRectF & rectangle, int startAngle, int spanAngle ) +//void drawPie ( const QRect & rectangle, int startAngle, int spanAngle ) +//void drawPie ( int x, int y, int width, int height, int startAngle, int spanAngle ) void drawPixmap ( ... ){ QPainter * p = hbqt_par_QPainter( 1 ); @@ -329,37 +492,202 @@ void drawPixmap ( ... ){ //void drawPixmap ( int x, int y, const QPixmap & pixmap, int sx, int sy, int sw, int sh ) -void drawPoint ( const QPointF & position ) -void drawPoint ( const QPoint & position ) -void drawPoint ( int x, int y ) +void drawPoint ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 3 ) + { + ( p )->drawPoint( hb_parni( 2 ), hb_parni( 3 ) ); + } + else if( hb_pcount() == 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -void drawPoints ( const QPointF * points, int pointCount ) -void drawPoints ( const QPoint * points, int pointCount ) -void drawPoints ( const QPolygonF & points ) -void drawPoints ( const QPolygon & points ) + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->drawPoint( *hbqt_par_QPointF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->drawPoint( *hbqt_par_QPoint( 2 ) ); + } + } + } +} +//void drawPoint ( const QPointF & position ) +//void drawPoint ( const QPoint & position ) +//void drawPoint ( int x, int y ) -void drawPolygon ( const QPointF * points, int pointCount, Qt::FillRule fillRule = Qt::OddEvenFill ) -void drawPolygon ( const QPoint * points, int pointCount, Qt::FillRule fillRule = Qt::OddEvenFill ) -void drawPolygon ( const QPolygonF & points, Qt::FillRule fillRule = Qt::OddEvenFill ) -void drawPolygon ( const QPolygon & points, Qt::FillRule fillRule = Qt::OddEvenFill ) +void drawPoints ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 3 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -void drawPolyline ( const QPointF * points, int pointCount ) -void drawPolyline ( const QPoint * points, int pointCount ) -void drawPolyline ( const QPolygonF & points ) -void drawPolyline ( const QPolygon & points ) + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->drawPoints( hbqt_par_QPointF( 2 ), hb_parni( 3 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->drawPoints( hbqt_par_QPoint( 2 ), hb_parni( 3 ) ); + } + } + else if( hb_pcount() == 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -void drawRect ( const QRectF & rectangle ) -void drawRect ( const QRect & rectangle ) -void drawRect ( int x, int y, int width, int height ) + if( q->type == HBQT_TYPE_QPolygonF ) + { + ( p )->drawPoints( *hbqt_par_QPolygonF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QPolygon ) + { + ( p )->drawPoints( *hbqt_par_QPolygon( 2 ) ); + } + } + } +} +//void drawPoints ( const QPointF * points, int pointCount ) +//void drawPoints ( const QPoint * points, int pointCount ) +//void drawPoints ( const QPolygonF & points ) +//void drawPoints ( const QPolygon & points ) + +void drawPolygon ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() >= 3 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->drawPolygon( hbqt_par_QPointF( 2 ), hb_parni( 3 ), ( Qt::FillRule ) ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : Qt::OddEvenFill ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->drawPolygon( hbqt_par_QPoint( 2 ), hb_parni( 3 ), ( Qt::FillRule ) ( HB_ISNUM( 4 ) ? hb_parni( 4 ) : Qt::OddEvenFill ) ); + } + } + else if( hb_pcount() >= 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPolygonF ) + { + ( p )->drawPolygon( *hbqt_par_QPolygonF( 2 ), ( Qt::FillRule ) ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::OddEvenFill ) ); + } + else if( q->type == HBQT_TYPE_QPolygon ) + { + ( p )->drawPolygon( *hbqt_par_QPolygonF( 2 ), ( Qt::FillRule ) ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::OddEvenFill ) ); + } + } + } +} +//void drawPolygon ( const QPointF * points, int pointCount, Qt::FillRule fillRule = Qt::OddEvenFill ) +//void drawPolygon ( const QPoint * points, int pointCount, Qt::FillRule fillRule = Qt::OddEvenFill ) +//void drawPolygon ( const QPolygonF & points, Qt::FillRule fillRule = Qt::OddEvenFill ) +//void drawPolygon ( const QPolygon & points, Qt::FillRule fillRule = Qt::OddEvenFill ) + +void drawPolyline ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 3 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->drawPolyline( hbqt_par_QPointF( 2 ), hb_parni( 3 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->drawPolyline( hbqt_par_QPoint( 2 ), hb_parni( 3 ) ); + } + } + else if( hb_pcount() == 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPolygonF ) + { + ( p )->drawPolyline( *hbqt_par_QPolygonF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QPolygon ) + { + ( p )->drawPolyline( *hbqt_par_QPolygon( 2 ) ); + } + } + } +} +//void drawPolyline ( const QPointF * points, int pointCount ) +//void drawPolyline ( const QPoint * points, int pointCount ) +//void drawPolyline ( const QPolygonF & points ) +//void drawPolyline ( const QPolygon & points ) + +void drawRect ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 4 && HB_ISNUM( 2 ) ) + { + ( p )->drawRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 3 ), hb_parni( 4 ) ); + } + else if( hb_pcount() == 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->drawRect( *hbqt_par_QRectF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->drawRect( *hbqt_par_QRect( 2 ) ); + } + } + } +} +//void drawRect ( const QRectF & rectangle ) +//void drawRect ( const QRect & rectangle ) +//void drawRect ( int x, int y, int width, int height ) void drawRects ( const QRectF * rectangles, int rectCount ) void drawRects ( const QRect * rectangles, int rectCount ) void drawRects ( const QVector & rectangles ) void drawRects ( const QVector & rectangles ) -void drawRoundedRect ( const QRectF & rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) -void drawRoundedRect ( const QRect & rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) -void drawRoundedRect ( int x, int y, int w, int h, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) +void drawRoundedRect ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() >= 6 && HB_ISNUM( 2 ) ) + { + ( p )->drawRoundedRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parnd( 6 ), ( Qt::SizeMode ) ( HB_ISNUM( 7 ) ? hb_parni( 7 ) : Qt::AbsoluteSize ) ); + } + else if( hb_pcount() >= 4 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->drawRoundedRect( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( Qt::SizeMode ) ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : Qt::AbsoluteSize ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->drawRoundedRect( *hbqt_par_QRect( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( Qt::SizeMode ) ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : Qt::AbsoluteSize ) ); + } + } + } +} +//void drawRoundedRect ( const QRectF & rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) +//void drawRoundedRect ( const QRect & rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) +//void drawRoundedRect ( int x, int y, int w, int h, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) void drawText ( ... ){ QPainter * p = hbqt_par_QPainter( 1 ); @@ -416,15 +744,61 @@ void drawText ( ... ){ //void drawText ( int x, int y, int width, int height, int flags, const QString & text, QRect * boundingRect = 0 ) //void drawText ( const QRectF & rectangle, const QString & text, const QTextOption & option = QTextOption() ) -void drawTiledPixmap ( const QRectF & rectangle, const QPixmap & pixmap, const QPointF & position = QPointF() ) -void drawTiledPixmap ( const QRect & rectangle, const QPixmap & pixmap, const QPoint & position = QPoint() ) -void drawTiledPixmap ( int x, int y, int width, int height, const QPixmap & pixmap, int sx = 0, int sy = 0 ) +void drawTiledPixmap ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() >= 6 && HB_ISNUM( 2 ) ) + { + ( p )->drawTiledPixmap( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), *hbqt_par_QPixmap( 6 ), ( HB_ISNUM( 7 ) ? hb_parni( 7 ) : 0 ), ( HB_ISNUM( 8 ) ? hb_parni( 8 ) : 0 ) ); + } + else if( hb_pcount() >= 3 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->drawTiledPixmap( *hbqt_par_QRectF( 2 ), *hbqt_par_QPixmap( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QPointF( 4 ) : QPointF() ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->drawTiledPixmap( *hbqt_par_QRect( 2 ), *hbqt_par_QPixmap( 3 ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QPointF( 4 ) : QPointF() ) ); + } + } + } +} +//void drawTiledPixmap ( const QRectF & rectangle, const QPixmap & pixmap, const QPointF & position = QPointF() ) +//void drawTiledPixmap ( const QRect & rectangle, const QPixmap & pixmap, const QPoint & position = QPoint() ) +//void drawTiledPixmap ( int x, int y, int width, int height, const QPixmap & pixmap, int sx = 0, int sy = 0 ) bool end () -void eraseRect ( const QRectF & rectangle ) -void eraseRect ( const QRect & rectangle ) -void eraseRect ( int x, int y, int width, int height ) +void eraseRect ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 4 && HB_ISNUM( 2 ) ) + { + ( p )->eraseRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 3 ), hb_parni( 4 ) ); + } + else if( hb_pcount() == 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->eraseRect( *hbqt_par_QRectF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->eraseRect( *hbqt_par_QRect( 2 ) ); + } + } + } +} +//void eraseRect ( const QRectF & rectangle ) +//void eraseRect ( const QRect & rectangle ) +//void eraseRect ( int x, int y, int width, int height ) void fillPath ( const QPainterPath & path, const QBrush & brush ) @@ -461,18 +835,78 @@ void scale ( qreal sx, qreal sy ) void setBackground ( const QBrush & brush ) void setBackgroundMode ( Qt::BGMode mode ) -void setBrush ( const QBrush & brush ) -void setBrush ( Qt::BrushStyle style ) +void setBrush ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISNUM( 2 ) ) + { + ( p )->setBrush( ( Qt::BrushStyle ) hb_parni( 2 ) ); + } + else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setBrush( *hbqt_par_QBrush( 2 ) ); + } + } +} +//void setBrush ( const QBrush & brush ) +//void setBrush ( Qt::BrushStyle style ) -void setBrushOrigin ( const QPointF & position ) -void setBrushOrigin ( const QPoint & position ) -void setBrushOrigin ( int x, int y ) +void setBrushOrigin ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->setBrushOrigin( hb_parni( 2 ), hb_parni( 3 ) ); + } + else if( hb_pcount() == 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->setBrushOrigin( *hbqt_par_QPointF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->setBrushOrigin( *hbqt_par_QPoint( 2 ) ); + } + } + } +} +//void setBrushOrigin ( const QPointF & position ) +//void setBrushOrigin ( const QPoint & position ) +//void setBrushOrigin ( int x, int y ) void setClipPath ( const QPainterPath & path, Qt::ClipOperation operation = Qt::ReplaceClip ) -void setClipRect ( const QRectF & rectangle, Qt::ClipOperation operation = Qt::ReplaceClip ) -void setClipRect ( int x, int y, int width, int height, Qt::ClipOperation operation = Qt::ReplaceClip ) -void setClipRect ( const QRect & rectangle, Qt::ClipOperation operation = Qt::ReplaceClip ) +void setClipRect ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() >= 5 && HB_ISNUM( 2 ) ) + { + ( p )->setClipRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), ( Qt::ClipOperation ) ( HB_ISNUM( 6 ) ? hb_parni( 6 ) : Qt::ReplaceClip ) ); + } + else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->setClipRect( *hbqt_par_QRectF( 2 ), ( Qt::ClipOperation ) ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::ReplaceClip ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->setClipRect( *hbqt_par_QRect( 2 ), ( Qt::ClipOperation ) ( HB_ISNUM( 3 ) ? hb_parni( 3 ) : Qt::ReplaceClip ) ); + } + } + } +} +//void setClipRect ( const QRectF & rectangle, Qt::ClipOperation operation = Qt::ReplaceClip ) +//void setClipRect ( int x, int y, int width, int height, Qt::ClipOperation operation = Qt::ReplaceClip ) +//void setClipRect ( const QRect & rectangle, Qt::ClipOperation operation = Qt::ReplaceClip ) void setClipRegion ( const QRegion & region, Qt::ClipOperation operation = Qt::ReplaceClip ) void setClipping ( bool enable ) @@ -481,20 +915,71 @@ void setFont ( const QFont & font ) void setLayoutDirection ( Qt::LayoutDirection direction ) void setOpacity ( qreal opacity ) -void setPen ( const QPen & pen ) -void setPen ( const QColor & color ) -void setPen ( Qt::PenStyle style ) +void setPen ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISNUM( 2 ) ) + { + ( p )->setPen( ( Qt::PenStyle ) hb_parni( 2 ) ); + } + else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPen ) + { + ( p )->setPen( *hbqt_par_QPen( 2 ) ); + } + else if( q->type == HBQT_TYPE_QColor ) + { + ( p )->setPen( *hbqt_par_QColor( 2 ) ); + } + } + } +} +//void setPen ( const QPen & pen ) +//void setPen ( const QColor & color ) +//void setPen ( Qt::PenStyle style ) void setRenderHint ( RenderHint hint, bool on = true ) void setRenderHints ( RenderHints hints, bool on = true ) void setTransform ( const QTransform & transform, bool combine = false ) void setViewTransformEnabled ( bool enable ) -void setViewport ( const QRect & rectangle ) -void setViewport ( int x, int y, int width, int height ) +void setViewport ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) + { + ( p )->setViewport( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); + } + else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setViewport( *hbqt_par_QRect( 2 ) ); + } + } +} +//void setViewport ( const QRect & rectangle ) +//void setViewport ( int x, int y, int width, int height ) -void setWindow ( const QRect & rectangle ) -void setWindow ( int x, int y, int width, int height ) +void setWindow ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) + { + ( p )->setWindow( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); + } + else if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->setWindow( *hbqt_par_QRect( 2 ) ); + } + } +} +//void setWindow ( const QRect & rectangle ) +//void setWindow ( int x, int y, int width, int height ) void setWorldMatrix ( const QMatrix & matrix, bool combine = false ) void setWorldMatrixEnabled ( bool enable ) @@ -504,9 +989,32 @@ void strokePath ( const QPainterPath & path, const QPen & pen ) bool testRenderHint ( RenderHint hint ) const const QTransform & transform () const -void translate ( const QPointF & offset ) -void translate ( const QPoint & offset ) -void translate ( qreal dx, qreal dy ) +void translate ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->translate( hb_parni( 2 ), hb_parni( 3 ) ); + } + else if( hb_pcount() == 2 ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->translate( *hbqt_par_QPointF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->translate( *hbqt_par_QPoint( 2 ) ); + } + } + } +} +//void translate ( const QPointF & offset ) +//void translate ( const QPoint & offset ) +//void translate ( qreal dx, qreal dy ) bool viewTransformEnabled () const QRect viewport () const