From d7b2422ba2773e4e70e2c87f1ac3d38640df2c37 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Mon, 20 Sep 2010 22:10:17 +0000 Subject: [PATCH] 2010-09-20 15:07 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbqt/qtgui/doc/en/class_qpainter.txt * contrib/hbqt/qtgui/doc/en/class_qpainterpath.txt * contrib/hbqt/qtgui/g/QPainter.cpp * contrib/hbqt/qtgui/g/QPainterPath.cpp * contrib/hbqt/qtgui/g/TQPainter.prg * contrib/hbqt/qtgui/g/TQPainterPath.prg * Re-generated. * contrib/hbqt/qtgui/qth/QPainter.qth ! Implemented remaining methods - many-to-one. NOTE: :fillRect() with Qt_BrushStyle is omitted. This omission goes in favour of Qt_GlbalColor because fill with a color is mostly used call. * contrib/hbqt/qtgui/qth/QPainterPath.qth + Implemented: many-to-one method synchronization. * contrib/hbide/hbqreportsmanager.prg ! Modified to honor above changes. WARNING: 3rd Party Developers - Please revisit your printing functions. --- harbour/ChangeLog | 24 + harbour/contrib/hbide/hbqreportsmanager.prg | 48 +- .../hbqt/qtgui/doc/en/class_qpainter.txt | 26 +- .../hbqt/qtgui/doc/en/class_qpainterpath.txt | 38 +- harbour/contrib/hbqt/qtgui/g/QPainter.cpp | 413 ++++++++---------- harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp | 366 +++++++--------- harbour/contrib/hbqt/qtgui/g/TQPainter.prg | 130 ++---- .../contrib/hbqt/qtgui/g/TQPainterPath.prg | 190 ++++---- harbour/contrib/hbqt/qtgui/qth/QPainter.qth | 232 ++++++++-- .../contrib/hbqt/qtgui/qth/QPainterPath.qth | 262 +++++++++-- 10 files changed, 960 insertions(+), 769 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ae02a51c94..59b1971410 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,30 @@ The license applies to all entries newer than 2009-04-28. */ +2010-09-20 15:07 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbqt/qtgui/doc/en/class_qpainter.txt + * contrib/hbqt/qtgui/doc/en/class_qpainterpath.txt + * contrib/hbqt/qtgui/g/QPainter.cpp + * contrib/hbqt/qtgui/g/QPainterPath.cpp + * contrib/hbqt/qtgui/g/TQPainter.prg + * contrib/hbqt/qtgui/g/TQPainterPath.prg + * Re-generated. + + * contrib/hbqt/qtgui/qth/QPainter.qth + ! Implemented remaining methods - many-to-one. + + NOTE: :fillRect() with Qt_BrushStyle is omitted. + This omission goes in favour of Qt_GlbalColor + because fill with a color is mostly used call. + + * contrib/hbqt/qtgui/qth/QPainterPath.qth + + Implemented: many-to-one method synchronization. + + * contrib/hbide/hbqreportsmanager.prg + ! Modified to honor above changes. + + WARNING: 3rd Party Developers - Please revisit your printing functions. + 2010-09-20 13:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) - contrib/hbqt/qtcore/g/THBEvents.prg + contrib/hbqt/qtcore/g/THBQEvents.prg diff --git a/harbour/contrib/hbide/hbqreportsmanager.prg b/harbour/contrib/hbide/hbqreportsmanager.prg index 2b8a4482a4..3d9693d9f0 100644 --- a/harbour/contrib/hbide/hbqreportsmanager.prg +++ b/harbour/contrib/hbide/hbqreportsmanager.prg @@ -1550,7 +1550,7 @@ METHOD HbqReportsManager:printReport( qPrinter ) qPainter:begin( qPrinter ) qPainter:setWindow( QRectF():from( ::qScene:paperRect() ) ) - qPainter:setViewPort_1( 0, 0, qPrinter:width(), qPrinter:height() ) + qPainter:setViewPort( 0, 0, qPrinter:width(), qPrinter:height() ) FOR EACH a_ IN ::aObjects IF hb_hHasKey( ::hItems, a_[ 3 ] ) oHqrObject := ::hItems[ a_[ 3 ] ] @@ -2225,27 +2225,27 @@ METHOD HqrGraphicsItem:drawSelection( qPainter, qRect ) qPainter:drawRect( qRect ) ENDIF lt := QPainterPath() - lt:moveTo_1( 0,0 ) - lt:lineTo_1( 0, iResizeHandle ) - lt:lineTo_1( iResizeHandle, 0 ) + lt:moveTo( 0,0 ) + lt:lineTo( 0, iResizeHandle ) + lt:lineTo( iResizeHandle, 0 ) qPainter:fillPath( lt, a ) rt := QPainterPath() - rt:moveTo_1( nW,0 ) - rt:lineTo_1( nW, iResizeHandle ) - rt:lineTo_1( nW-iResizeHandle, 0 ) + rt:moveTo( nW,0 ) + rt:lineTo( nW, iResizeHandle ) + rt:lineTo( nW-iResizeHandle, 0 ) qPainter:fillPath( rt,a ) lb := QPainterPath() - lb:moveTo_1( 0, nH ) - lb:lineTo_1( 0, nH - iResizeHandle ) - lb:lineTo_1( iResizeHandle, nH ) + lb:moveTo( 0, nH ) + lb:lineTo( 0, nH - iResizeHandle ) + lb:lineTo( iResizeHandle, nH ) qPainter:fillPath( lb,a ) rb := QPainterPath() - rb:moveTo_1( nW, nH ) - rb:lineTo_1( nW, nH - iResizeHandle ) - rb:lineTo_1( nW-iResizeHandle, nH ) + rb:moveTo( nW, nH ) + rb:lineTo( nW, nH - iResizeHandle ) + rb:lineTo( nW-iResizeHandle, nH ) qPainter:fillPath( rb,a ) ELSE IF drawSelectionBorder @@ -2358,11 +2358,11 @@ METHOD HqrGraphicsItem:drawDiamond( qPainter, qRect ) LOCAL p := QPainterPath() LOCAL x := qRect:x(), y := qRect:y(), w := qRect:width(), h := qRect:height() - p:moveTo_1( x, y + h / 2 ) - p:lineTo_1( x + w / 2, y ) - p:lineTo_1( x + w, y + h / 2 ) - p:lineTo_1( x + w / 2, y + h ) - p:lineTo_1( x, y + h / 2 ) + p:moveTo( x, y + h / 2 ) + p:lineTo( x + w / 2, y ) + p:lineTo( x + w, y + h / 2 ) + p:lineTo( x + w / 2, y + h ) + p:lineTo( x, y + h / 2 ) qPainter:drawPath( p ) @@ -2373,10 +2373,10 @@ METHOD HqrGraphicsItem:drawDiamond( qPainter, qRect ) METHOD HqrGraphicsItem:drawTriangle( qPainter, qRect ) LOCAL p := QPainterPath() - p:moveTo_1( qRect:x(), qRect:y() + qRect:height() ) - p:lineTo_1( qRect:x() + qRect:width() / 2, qRect:y() ) - p:lineTo_1( qRect:x() + qRect:width(), qRect:y() + qRect:height() ) - p:lineTo_1( qRect:x(), qRect:y() + qRect:height() ) + p:moveTo( qRect:x(), qRect:y() + qRect:height() ) + p:lineTo( qRect:x() + qRect:width() / 2, qRect:y() ) + p:lineTo( qRect:x() + qRect:width(), qRect:y() + qRect:height() ) + p:lineTo( qRect:x(), qRect:y() + qRect:height() ) qPainter:drawPath( p ) @@ -2428,9 +2428,9 @@ METHOD HqrGraphicsItem:drawBarcode( qPainter, qRect ) FOR i := 1 TO len( cCode ) IF substr( cCode, i, 1 ) == "1" - qPainter:fillRect_6( QRectF( rc:x() + x, rc:y(), w, rc:height() ), clr ) + qPainter:fillRect( QRectF( rc:x() + x, rc:y(), w, rc:height() ), clr ) ELSE - qPainter:fillRect_6( QRectF( rc:x() + x, rc:y(), w, rc:height() ), fl ) + qPainter:fillRect( QRectF( rc:x() + x, rc:y(), w, rc:height() ), fl ) ENDIF x += w NEXT diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qpainter.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qpainter.txt index 578eff33e3..01726ddec4 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qpainter.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qpainter.txt @@ -29,10 +29,7 @@ * :background() -> pQBrush * :backgroundMode() -> nQt::BGMode * :begin( pDevice ) -> lBool - * :boundingRect( pRectangle, nFlags, cText ) -> pQRectF - * :boundingRect_1( pRectangle, nFlags, cText ) -> pQRect - * :boundingRect_2( nX, nY, nW, nH, nFlags, cText ) -> pQRect - * :boundingRect_3( pRectangle, cText, pOption ) -> pQRectF + * :boundingRect( ... ) -> NIL * :brush() -> pQBrush * :brushOrigin() -> pQPoint * :clipPath() -> Path @@ -49,10 +46,7 @@ * :drawEllipse( ... ) -> NIL * :drawImage( ... ) -> NIL * :drawLine( ... ) -> NIL - * :drawLines( pLines, nLineCount ) -> NIL - * :drawLines_1( pLines, nLineCount ) -> NIL - * :drawLines_2( pPointPairs, nLineCount ) -> NIL - * :drawLines_3( pPointPairs, nLineCount ) -> NIL + * :drawLines( ... ) -> NIL * :drawPath( pPath ) -> NIL * :drawPicture( ... ) -> NIL * :drawPie( ... ) -> NIL @@ -62,26 +56,14 @@ * :drawPolygon( ... ) -> NIL * :drawPolyline( ... ) -> NIL * :drawRect( ... ) -> NIL - * :drawRects( pRectangles, nRectCount ) -> NIL - * :drawRects_1( pRectangles, nRectCount ) -> NIL + * :drawRects( ... ) -> NIL * :drawRoundedRect( ... ) -> NIL * :drawText( ... ) -> NIL * :drawTiledPixmap( ... ) -> NIL * :end() -> lBool * :eraseRect( ... ) -> NIL * :fillPath( pPath, pBrush ) -> NIL - * :fillRect( pRectangle, pBrush ) -> NIL - * :fillRect_1( nX, nY, nWidth, nHeight, nStyle ) -> NIL - * :fillRect_2( pRectangle, nStyle ) -> NIL - * :fillRect_3( pRectangle, nStyle ) -> NIL - * :fillRect_4( pRectangle, pBrush ) -> NIL - * :fillRect_5( pRectangle, pColor ) -> NIL - * :fillRect_6( pRectangle, pColor ) -> NIL - * :fillRect_7( nX, nY, nWidth, nHeight, pBrush ) -> NIL - * :fillRect_8( nX, nY, nWidth, nHeight, pColor ) -> NIL - * :fillRect_9( nX, nY, nWidth, nHeight, nColor ) -> NIL - * :fillRect_10( pRectangle, nColor ) -> NIL - * :fillRect_11( pRectangle, nColor ) -> NIL + * :fillRect( ... ) -> NIL * :font() -> pQFont * :fontInfo() -> pQFontInfo * :fontMetrics() -> pQFontMetrics diff --git a/harbour/contrib/hbqt/qtgui/doc/en/class_qpainterpath.txt b/harbour/contrib/hbqt/qtgui/doc/en/class_qpainterpath.txt index 65f61924fb..22bf09242f 100644 --- a/harbour/contrib/hbqt/qtgui/doc/en/class_qpainterpath.txt +++ b/harbour/contrib/hbqt/qtgui/doc/en/class_qpainterpath.txt @@ -26,47 +26,33 @@ * $RETURNS$ * An instance of the object of type QPainterPath * $METHODS$ - * :addEllipse( pBoundingRectangle ) -> NIL - * :addEllipse_1( nX, nY, nWidth, nHeight ) -> NIL - * :addEllipse_2( pCenter, nRx, nRy ) -> NIL + * :addEllipse( ... ) -> NIL * :addPath( pPath ) -> NIL * :addPolygon( pPolygon ) -> NIL - * :addRect( pRectangle ) -> NIL - * :addRect_1( nX, nY, nWidth, nHeight ) -> NIL + * :addRect( ... ) -> NIL * :addRegion( pRegion ) -> NIL - * :addRoundedRect( pRect, nXRadius, nYRadius, nMode ) -> NIL - * :addRoundedRect_1( nX, nY, nW, nH, nXRadius, nYRadius, nMode ) -> NIL - * :addText( pPoint, pFont, cText ) -> NIL - * :addText_1( nX, nY, pFont, cText ) -> NIL + * :addRoundedRect( ... ) -> NIL + * :addText( ... ) -> NIL * :angleAtPercent( nT ) -> nQreal - * :arcMoveTo( pRectangle, nAngle ) -> NIL - * :arcMoveTo_1( nX, nY, nWidth, nHeight, nAngle ) -> NIL - * :arcTo( pRectangle, nStartAngle, nSweepLength ) -> NIL - * :arcTo_1( nX, nY, nWidth, nHeight, nStartAngle, nSweepLength ) -> NIL + * :arcMoveTo( ... ) -> NIL + * :arcTo( ... ) -> NIL * :boundingRect() -> pQRectF * :closeSubpath() -> NIL * :connectPath( pPath ) -> NIL - * :contains( pPoint ) -> lBool - * :contains_1( pRectangle ) -> lBool - * :contains_2( pP ) -> lBool + * :contains( ... ) -> NIL * :controlPointRect() -> pQRectF - * :cubicTo( pC1, pC2, pEndPoint ) -> NIL - * :cubicTo_1( nC1X, nC1Y, nC2X, nC2Y, nEndPointX, nEndPointY ) -> NIL + * :cubicTo( ... ) -> NIL * :currentPosition() -> pQPointF * :elementCount() -> nInt * :fillRule() -> nQt::FillRule - * :intersects( pRectangle ) -> lBool - * :intersects_1( pP ) -> lBool + * :intersects( ... ) -> NIL * :isEmpty() -> lBool * :length() -> nQreal - * :lineTo( pEndPoint ) -> NIL - * :lineTo_1( nX, nY ) -> NIL - * :moveTo( pPoint ) -> NIL - * :moveTo_1( nX, nY ) -> NIL + * :lineTo( ... ) -> NIL + * :moveTo( ... ) -> NIL * :percentAtLength( nLen ) -> nQreal * :pointAtPercent( nT ) -> pQPointF - * :quadTo( pC, pEndPoint ) -> NIL - * :quadTo_1( nCx, nCy, nEndPointX, nEndPointY ) -> NIL + * :quadTo( ... ) -> NIL * :setElementPositionAt( nIndex, nX, nY ) -> NIL * :setFillRule( nFillRule ) -> NIL * :slopeAtPercent( nT ) -> nQreal diff --git a/harbour/contrib/hbqt/qtgui/g/QPainter.cpp b/harbour/contrib/hbqt/qtgui/g/QPainter.cpp index caa5e21229..91ce708137 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPainter.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPainter.cpp @@ -73,7 +73,7 @@ */ /* - * Constructed[ 109/238 [ 45.80% ] ] + * Constructed[ 91/266 [ 34.21% ] ] * * *** Unconvered Prototypes *** * ----------------------------- @@ -84,10 +84,6 @@ * } * } * } - * void drawLines ( const QVector & pointPairs ) - * void drawLines ( const QVector & pointPairs ) - * void drawLines ( const QVector & lines ) - * void drawLines ( const QVector & lines ) * } * } * } @@ -96,8 +92,10 @@ * } * } * } - * void drawRects ( const QVector & rectangles ) - * void drawRects ( const QVector & rectangles ) + * } + * } + * } + * } * } * } * } @@ -112,6 +110,10 @@ * * *** Commented out protos which construct fine but do not compile *** * + * //QRectF boundingRect ( const QRectF & rectangle, int flags, const QString & text ) + * //QRect boundingRect ( const QRect & rectangle, int flags, const QString & text ) + * //QRect boundingRect ( int x, int y, int w, int h, int flags, const QString & text ) + * //QRectF boundingRect ( const QRectF & rectangle, const QString & text, const QTextOption & option = QTextOption() ) * //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 ) @@ -141,6 +143,15 @@ * //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 drawLines ( const QLineF * lines, int lineCount ) + * //void drawLines ( const QLine * lines, int lineCount ) + * //void drawLines ( const QPointF * pointPairs, int lineCount ) + * //void drawLines ( const QPoint * pointPairs, int lineCount ) + * // + * //void drawLines ( const QVector & pointPairs ) + * //void drawLines ( const QVector & pointPairs ) + * //void drawLines ( const QVector & lines ) + * //void drawLines ( const QVector & lines ) * //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 ) @@ -176,6 +187,11 @@ * //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 ) @@ -192,6 +208,36 @@ * //void eraseRect ( const QRectF & rectangle ) * //void eraseRect ( const QRect & rectangle ) * //void eraseRect ( int x, int y, int width, int height ) + * // void fillRect ( const QRectF & rectangle, const QBrush & brush ) + * // void fillRect ( const QRectF & rectangle, const QColor & color ) + * // void fillRect ( const QRectF & rectangle, Qt::GlobalColor color ) + * // // + * // void fillRect ( const QRect & rectangle, const QBrush & brush ) + * // void fillRect ( const QRect & rectangle, const QColor & color ) + * // void fillRect ( const QRect & rectangle, Qt::GlobalColor color ) + * // // + * // void fillRect ( int x, int y, int width, int height, const QBrush & brush ) + * // void fillRect ( int x, int y, int width, int height, const QColor & color ) + * // void fillRect ( int x, int y, int width, int height, Qt::GlobalColor color ) + * // + * // NOT IMPLEMENTED + * // void fillRect ( const QRectF & rectangle, Qt::BrushStyle style ) + * // void fillRect ( const QRect & rectangle, Qt::BrushStyle style ) + * // void fillRect ( int x, int y, int width, int height, Qt::BrushStyle style ) + * // + * // original order + * // void fillRect ( const QRectF & rectangle, const QBrush & brush ) + * // void fillRect ( int x, int y, int width, int height, Qt::BrushStyle style ) + * // void fillRect ( const QRect & rectangle, Qt::BrushStyle style ) + * // void fillRect ( const QRectF & rectangle, Qt::BrushStyle style ) + * // void fillRect ( const QRect & rectangle, const QBrush & brush ) + * // void fillRect ( const QRect & rectangle, const QColor & color ) + * // void fillRect ( const QRectF & rectangle, const QColor & color ) + * // void fillRect ( int x, int y, int width, int height, const QBrush & brush ) + * // void fillRect ( int x, int y, int width, int height, const QColor & color ) + * // void fillRect ( int x, int y, int width, int height, Qt::GlobalColor color ) + * // void fillRect ( const QRect & rectangle, Qt::GlobalColor color ) + * // void fillRect ( const QRectF & rectangle, Qt::GlobalColor color ) * //void setBrush ( const QBrush & brush ) * //void setBrush ( Qt::BrushStyle style ) * //void setBrushOrigin ( const QPointF & position ) @@ -329,58 +375,41 @@ HB_FUNC( QT_QPAINTER_BEGIN ) } /* - * QRectF boundingRect ( const QRectF & rectangle, int flags, const QString & text ) + * void boundingRect ( ... ) */ HB_FUNC( QT_QPAINTER_BOUNDINGRECT ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - void * pText; - hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( ( p )->boundingRect( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hb_parstr_utf8( 4, &pText, NULL ) ) ), true ) ); - hb_strfree( pText ); - } -} + if( hb_pcount() == 4 ) + { + if( HB_ISCHAR( 4 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * QRect boundingRect ( const QRect & rectangle, int flags, const QString & text ) - */ -HB_FUNC( QT_QPAINTER_BOUNDINGRECT_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - void * pText; - hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( ( p )->boundingRect( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hb_parstr_utf8( 4, &pText, NULL ) ) ), true ) ); - hb_strfree( pText ); - } -} - -/* - * QRect boundingRect ( int x, int y, int w, int h, int flags, const QString & text ) - */ -HB_FUNC( QT_QPAINTER_BOUNDINGRECT_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - void * pText; - hb_retptrGC( hbqt_gcAllocate_QRect( new QRect( ( p )->boundingRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hb_parstr_utf8( 7, &pText, NULL ) ) ), true ) ); - hb_strfree( pText ); - } -} - -/* - * QRectF boundingRect ( const QRectF & rectangle, const QString & text, const QTextOption & option = QTextOption() ) - */ -HB_FUNC( QT_QPAINTER_BOUNDINGRECT_3 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - void * pText; - hb_retptrGC( hbqt_gcAllocate_QRectF( new QRectF( ( p )->boundingRect( *hbqt_par_QRectF( 2 ), hb_parstr_utf8( 3, &pText, NULL ), ( HB_ISPOINTER( 4 ) ? *hbqt_par_QTextOption( 4 ) : QTextOption() ) ) ), true ) ); - hb_strfree( pText ); + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->boundingRect( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->boundingRect( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ) ); + } + } + else if( HB_ISPOINTER( 4 ) ) + { + ( p )->boundingRect( *hbqt_par_QRectF( 2 ), hbqt_par_QString( 3 ), *hbqt_par_QTextOption( 4 ) ); + } + } + else if( hb_pcount() == 3 ) + { + ( p )->boundingRect( *hbqt_par_QRectF( 2 ), hbqt_par_QString( 3 ), QTextOption() ); + } + else if( hb_pcount() == 7 ) + { + ( p )->boundingRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hbqt_par_QString( 7 ) ); + } } } @@ -747,50 +776,34 @@ HB_FUNC( QT_QPAINTER_DRAWLINE ) } /* - * void drawLines ( const QLineF * lines, int lineCount ) + * void drawLines ( ... ) */ HB_FUNC( QT_QPAINTER_DRAWLINES ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->drawLines( hbqt_par_QLineF( 2 ), hb_parni( 3 ) ); - } -} + if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * void drawLines ( const QLine * lines, int lineCount ) - */ -HB_FUNC( QT_QPAINTER_DRAWLINES_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawLines( hbqt_par_QLine( 2 ), hb_parni( 3 ) ); - } -} - -/* - * void drawLines ( const QPointF * pointPairs, int lineCount ) - */ -HB_FUNC( QT_QPAINTER_DRAWLINES_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawLines( hbqt_par_QPointF( 2 ), hb_parni( 3 ) ); - } -} - -/* - * void drawLines ( const QPoint * pointPairs, int lineCount ) - */ -HB_FUNC( QT_QPAINTER_DRAWLINES_3 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawLines( hbqt_par_QPoint( 2 ), hb_parni( 3 ) ); + if( q->type == HBQT_TYPE_QLineF ) + { + ( p )->drawLines( hbqt_par_QLineF( 2 ), hb_parni( 3 ) ); + } + else if( q->type == HBQT_TYPE_QLine ) + { + ( p )->drawLines( hbqt_par_QLine( 2 ), hb_parni( 3 ) ); + } + else if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->drawLines( hbqt_par_QPointF( 2 ), hb_parni( 3 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->drawLines( hbqt_par_QPoint( 2 ), hb_parni( 3 ) ); + } + } } } @@ -1096,26 +1109,26 @@ HB_FUNC( QT_QPAINTER_DRAWRECT ) } /* - * void drawRects ( const QRectF * rectangles, int rectCount ) + * void drawRects ( ... ) */ HB_FUNC( QT_QPAINTER_DRAWRECTS ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->drawRects( hbqt_par_QRectF( 2 ), hb_parni( 3 ) ); - } -} + if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * void drawRects ( const QRect * rectangles, int rectCount ) - */ -HB_FUNC( QT_QPAINTER_DRAWRECTS_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->drawRects( hbqt_par_QRect( 2 ), hb_parni( 3 ) ); + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->drawRects( hbqt_par_QRectF( 2 ), hb_parni( 3 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->drawRects( hbqt_par_QRect( 2 ), hb_parni( 3 ) ); + } + } } } @@ -1247,9 +1260,9 @@ HB_FUNC( QT_QPAINTER_ERASERECT ) QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - if( hb_pcount() == 4 && HB_ISNUM( 2 ) ) + if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) { - ( p )->eraseRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 3 ), hb_parni( 4 ) ); + ( p )->eraseRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); } else if( hb_pcount() == 2 ) { @@ -1280,146 +1293,76 @@ HB_FUNC( QT_QPAINTER_FILLPATH ) } /* - * void fillRect ( const QRectF & rectangle, const QBrush & brush ) + * void fillRect ( ... ) */ HB_FUNC( QT_QPAINTER_FILLRECT ) { QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - ( p )->fillRect( *hbqt_par_QRectF( 2 ), *hbqt_par_QBrush( 3 ) ); - } -} + if( hb_pcount() == 6 && HB_ISNUM( 2 ) ) + { + if( HB_ISNUM( 6 ) ) + { + ( p )->fillRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), ( Qt::GlobalColor ) hb_parni( 6 ) ); + } + else if( HB_ISPOINTER( 6 ) ) + { + HBQT_GC_T * r = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 6 ); -/* - * void fillRect ( int x, int y, int width, int height, Qt::BrushStyle style ) - */ -HB_FUNC( QT_QPAINTER_FILLRECT_1 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->fillRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), ( Qt::BrushStyle ) hb_parni( 6 ) ); - } -} + if( r->type == HBQT_TYPE_QBrush ) + { + ( p )->fillRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), *hbqt_par_QBrush( 6 ) ); + } + if( r->type == HBQT_TYPE_QColor ) + { + ( p )->fillRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), *hbqt_par_QColor( 6 ) ); + } + } + } + else if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * void fillRect ( const QRect & rectangle, Qt::BrushStyle style ) - */ -HB_FUNC( QT_QPAINTER_FILLRECT_2 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->fillRect( *hbqt_par_QRect( 2 ), ( Qt::BrushStyle ) hb_parni( 3 ) ); - } -} + if( HB_ISNUM( 3 ) ) + { + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->fillRect( *hbqt_par_QRectF( 2 ), ( Qt::GlobalColor ) hb_parni( 3 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->fillRect( *hbqt_par_QRect( 2 ), ( Qt::GlobalColor ) hb_parni( 3 ) ); + } + } + else if( HB_ISPOINTER( 3 ) ) + { + HBQT_GC_T * r = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); -/* - * void fillRect ( const QRectF & rectangle, Qt::BrushStyle style ) - */ -HB_FUNC( QT_QPAINTER_FILLRECT_3 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->fillRect( *hbqt_par_QRectF( 2 ), ( Qt::BrushStyle ) hb_parni( 3 ) ); - } -} - -/* - * void fillRect ( const QRect & rectangle, const QBrush & brush ) - */ -HB_FUNC( QT_QPAINTER_FILLRECT_4 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->fillRect( *hbqt_par_QRect( 2 ), *hbqt_par_QBrush( 3 ) ); - } -} - -/* - * void fillRect ( const QRect & rectangle, const QColor & color ) - */ -HB_FUNC( QT_QPAINTER_FILLRECT_5 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->fillRect( *hbqt_par_QRect( 2 ), *hbqt_par_QColor( 3 ) ); - } -} - -/* - * void fillRect ( const QRectF & rectangle, const QColor & color ) - */ -HB_FUNC( QT_QPAINTER_FILLRECT_6 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->fillRect( *hbqt_par_QRectF( 2 ), *hbqt_par_QColor( 3 ) ); - } -} - -/* - * void fillRect ( int x, int y, int width, int height, const QBrush & brush ) - */ -HB_FUNC( QT_QPAINTER_FILLRECT_7 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->fillRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), *hbqt_par_QBrush( 6 ) ); - } -} - -/* - * void fillRect ( int x, int y, int width, int height, const QColor & color ) - */ -HB_FUNC( QT_QPAINTER_FILLRECT_8 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->fillRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), *hbqt_par_QColor( 6 ) ); - } -} - -/* - * void fillRect ( int x, int y, int width, int height, Qt::GlobalColor color ) - */ -HB_FUNC( QT_QPAINTER_FILLRECT_9 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->fillRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), ( Qt::GlobalColor ) hb_parni( 6 ) ); - } -} - -/* - * void fillRect ( const QRect & rectangle, Qt::GlobalColor color ) - */ -HB_FUNC( QT_QPAINTER_FILLRECT_10 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->fillRect( *hbqt_par_QRect( 2 ), ( Qt::GlobalColor ) hb_parni( 3 ) ); - } -} - -/* - * void fillRect ( const QRectF & rectangle, Qt::GlobalColor color ) - */ -HB_FUNC( QT_QPAINTER_FILLRECT_11 ) -{ - QPainter * p = hbqt_par_QPainter( 1 ); - if( p ) - { - ( p )->fillRect( *hbqt_par_QRectF( 2 ), ( Qt::GlobalColor ) hb_parni( 3 ) ); + if( q->type == HBQT_TYPE_QRectF ) + { + if( r->type == HBQT_TYPE_QBrush ) + { + ( p )->fillRect( *hbqt_par_QRectF( 2 ), *hbqt_par_QBrush( 3 ) ); + } + if( r->type == HBQT_TYPE_QColor ) + { + ( p )->fillRect( *hbqt_par_QRectF( 2 ), *hbqt_par_QColor( 3 ) ); + } + } + else if( q->type == HBQT_TYPE_QRect ) + { + if( r->type == HBQT_TYPE_QBrush ) + { + ( p )->fillRect( *hbqt_par_QRect( 2 ), *hbqt_par_QBrush( 3 ) ); + } + if( r->type == HBQT_TYPE_QColor ) + { + ( p )->fillRect( *hbqt_par_QRect( 2 ), *hbqt_par_QColor( 3 ) ); + } + } + } + } } } diff --git a/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp b/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp index 34bbb96c47..7fe517fd5c 100644 --- a/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp +++ b/harbour/contrib/hbqt/qtgui/g/QPainterPath.cpp @@ -70,6 +70,56 @@ * enum ElementType { MoveToElement, LineToElement, CurveToElement, CurveToDataElement } */ +/* + * Constructed[ 41/80 [ 51.25% ] ] + * + * *** Unconvered Prototypes *** + * ----------------------------- + * + * } + * } + * } + * } + * } + * } + * } + * } + * } + * } + * } + * } + * + * *** Commented out protos which construct fine but do not compile *** + * + * //void addEllipse ( const QRectF & boundingRectangle ) + * //void addEllipse ( qreal x, qreal y, qreal width, qreal height ) + * //void addEllipse ( const QPointF & center, qreal rx, qreal ry ) + * //void addRect ( const QRectF & rectangle ) + * //void addRect ( qreal x, qreal y, qreal width, qreal height ) + * //void addRoundedRect ( const QRectF & rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) + * //void addRoundedRect ( qreal x, qreal y, qreal w, qreal h, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) + * //void addText ( const QPointF & point, const QFont & font, const QString & text ) + * //void addText ( qreal x, qreal y, const QFont & font, const QString & text ) + * //void arcMoveTo ( const QRectF & rectangle, qreal angle ) + * //void arcMoveTo ( qreal x, qreal y, qreal width, qreal height, qreal angle ) + * //void arcTo ( const QRectF & rectangle, qreal startAngle, qreal sweepLength ) + * //void arcTo ( qreal x, qreal y, qreal width, qreal height, qreal startAngle, qreal sweepLength ) + * //bool contains ( const QPointF & point ) const + * //bool contains ( const QRectF & rectangle ) const + * //bool contains ( const QPainterPath & p ) const + * //void cubicTo ( const QPointF & c1, const QPointF & c2, const QPointF & endPoint ) + * //void cubicTo ( qreal c1X, qreal c1Y, qreal c2X, qreal c2Y, qreal endPointX, qreal endPointY ) + * // const QPainterPath::Element & elementAt ( int index ) const + * //bool intersects ( const QRectF & rectangle ) const + * //bool intersects ( const QPainterPath & p ) const + * //void lineTo ( const QPointF & endPoint ) + * //void lineTo ( qreal x, qreal y ) + * //void moveTo ( const QPointF & point ) + * //void moveTo ( qreal x, qreal y ) + * //void quadTo ( const QPointF & c, const QPointF & endPoint ) + * //void quadTo ( qreal cx, qreal cy, qreal endPointX, qreal endPointY ) + */ + #include #include @@ -145,38 +195,25 @@ HB_FUNC( QT_QPAINTERPATH ) } /* - * void addEllipse ( const QRectF & boundingRectangle ) + * void addEllipse ( ... ) */ HB_FUNC( QT_QPAINTERPATH_ADDELLIPSE ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - ( p )->addEllipse( *hbqt_par_QRectF( 2 ) ); - } -} - -/* - * void addEllipse ( qreal x, qreal y, qreal width, qreal height ) - */ -HB_FUNC( QT_QPAINTERPATH_ADDELLIPSE_1 ) -{ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - ( p )->addEllipse( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); - } -} - -/* - * void addEllipse ( const QPointF & center, qreal rx, qreal ry ) - */ -HB_FUNC( QT_QPAINTERPATH_ADDELLIPSE_2 ) -{ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - ( p )->addEllipse( *hbqt_par_QPointF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ); + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->addEllipse( *hbqt_par_QRectF( 2 ) ); + } + else if( hb_pcount() == 4 && HB_ISPOINTER( 2 ) ) + { + ( p )->addEllipse( *hbqt_par_QPointF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ); + } + else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) + { + ( p )->addEllipse( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); + } } } @@ -205,26 +242,21 @@ HB_FUNC( QT_QPAINTERPATH_ADDPOLYGON ) } /* - * void addRect ( const QRectF & rectangle ) + * void addRect ( ... ) */ HB_FUNC( QT_QPAINTERPATH_ADDRECT ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - ( p )->addRect( *hbqt_par_QRectF( 2 ) ); - } -} - -/* - * void addRect ( qreal x, qreal y, qreal width, qreal height ) - */ -HB_FUNC( QT_QPAINTERPATH_ADDRECT_1 ) -{ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - ( p )->addRect( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->addRect( *hbqt_par_QRectF( 2 ) ); + } + else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) + { + ( p )->addRect( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); + } } } @@ -241,54 +273,40 @@ HB_FUNC( QT_QPAINTERPATH_ADDREGION ) } /* - * void addRoundedRect ( const QRectF & rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) + * void addRoundedRect ( ... ) */ HB_FUNC( QT_QPAINTERPATH_ADDROUNDEDRECT ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - ( p )->addRoundedRect( *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() >= 4 && HB_ISPOINTER( 2 ) ) + { + ( p )->addRoundedRect( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( Qt::SizeMode ) ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : Qt::AbsoluteSize ) ); + } + else if( hb_pcount() >= 7 && HB_ISNUM( 2 ) ) + { + ( p )->addRoundedRect( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ), ( Qt::SizeMode ) ( HB_ISNUM( 8 ) ? hb_parni( 8 ) : Qt::AbsoluteSize ) ); + } } } /* - * void addRoundedRect ( qreal x, qreal y, qreal w, qreal h, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) - */ -HB_FUNC( QT_QPAINTERPATH_ADDROUNDEDRECT_1 ) -{ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - ( p )->addRoundedRect( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ), ( HB_ISNUM( 8 ) ? ( Qt::SizeMode ) hb_parni( 8 ) : ( Qt::SizeMode ) Qt::AbsoluteSize ) ); - } -} - -/* - * void addText ( const QPointF & point, const QFont & font, const QString & text ) + * void addText ( ... ) */ HB_FUNC( QT_QPAINTERPATH_ADDTEXT ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - void * pText; - ( p )->addText( *hbqt_par_QPointF( 2 ), *hbqt_par_QFont( 3 ), hb_parstr_utf8( 4, &pText, NULL ) ); - hb_strfree( pText ); - } -} - -/* - * void addText ( qreal x, qreal y, const QFont & font, const QString & text ) - */ -HB_FUNC( QT_QPAINTERPATH_ADDTEXT_1 ) -{ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - void * pText; - ( p )->addText( hb_parnd( 2 ), hb_parnd( 3 ), *hbqt_par_QFont( 4 ), hb_parstr_utf8( 5, &pText, NULL ) ); - hb_strfree( pText ); + if( hb_pcount() == 4 && HB_ISPOINTER( 2 ) ) + { + ( p )->addText( *hbqt_par_QPointF( 2 ), *hbqt_par_QFont( 3 ), hbqt_par_QString( 4 ) ); + } + else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) + { + ( p )->addText( hb_parnd( 2 ), hb_parnd( 3 ), *hbqt_par_QFont( 4 ), hbqt_par_QString( 5 ) ); + } } } @@ -305,50 +323,40 @@ HB_FUNC( QT_QPAINTERPATH_ANGLEATPERCENT ) } /* - * void arcMoveTo ( const QRectF & rectangle, qreal angle ) + * void arcMoveTo ( ... ) */ HB_FUNC( QT_QPAINTERPATH_ARCMOVETO ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - ( p )->arcMoveTo( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ) ); + if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) ) + { + ( p )->arcMoveTo( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ) ); + } + else if( hb_pcount() == 6 && HB_ISNUM( 2 ) ) + { + ( p )->arcMoveTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ) ); + } } } /* - * void arcMoveTo ( qreal x, qreal y, qreal width, qreal height, qreal angle ) - */ -HB_FUNC( QT_QPAINTERPATH_ARCMOVETO_1 ) -{ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - ( p )->arcMoveTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ) ); - } -} - -/* - * void arcTo ( const QRectF & rectangle, qreal startAngle, qreal sweepLength ) + * void arcTo ( ... ) */ HB_FUNC( QT_QPAINTERPATH_ARCTO ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - ( p )->arcTo( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ); - } -} - -/* - * void arcTo ( qreal x, qreal y, qreal width, qreal height, qreal startAngle, qreal sweepLength ) - */ -HB_FUNC( QT_QPAINTERPATH_ARCTO_1 ) -{ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - ( p )->arcTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ) ); + if( hb_pcount() == 4 && HB_ISPOINTER( 2 ) ) + { + ( p )->arcTo( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ); + } + else if( hb_pcount() == 7 && HB_ISNUM( 2 ) ) + { + ( p )->arcTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ) ); + } } } @@ -389,38 +397,27 @@ HB_FUNC( QT_QPAINTERPATH_CONNECTPATH ) } /* - * bool contains ( const QPointF & point ) const + * void contains ( ... ) */ HB_FUNC( QT_QPAINTERPATH_CONTAINS ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) + if( p && hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) { - hb_retl( ( p )->contains( *hbqt_par_QPointF( 2 ) ) ); - } -} + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * bool contains ( const QRectF & rectangle ) const - */ -HB_FUNC( QT_QPAINTERPATH_CONTAINS_1 ) -{ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - hb_retl( ( p )->contains( *hbqt_par_QRectF( 2 ) ) ); - } -} - -/* - * bool contains ( const QPainterPath & p ) const - */ -HB_FUNC( QT_QPAINTERPATH_CONTAINS_2 ) -{ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - hb_retl( ( p )->contains( *hbqt_par_QPainterPath( 2 ) ) ); + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->contains( *hbqt_par_QPointF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->contains( *hbqt_par_QRectF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QPainterPath ) + { + ( p )->contains( *hbqt_par_QPainterPath( 2 ) ); + } } } @@ -437,26 +434,21 @@ HB_FUNC( QT_QPAINTERPATH_CONTROLPOINTRECT ) } /* - * void cubicTo ( const QPointF & c1, const QPointF & c2, const QPointF & endPoint ) + * void cubicTo ( ... ) */ HB_FUNC( QT_QPAINTERPATH_CUBICTO ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - ( p )->cubicTo( *hbqt_par_QPointF( 2 ), *hbqt_par_QPointF( 3 ), *hbqt_par_QPointF( 4 ) ); - } -} - -/* - * void cubicTo ( qreal c1X, qreal c1Y, qreal c2X, qreal c2Y, qreal endPointX, qreal endPointY ) - */ -HB_FUNC( QT_QPAINTERPATH_CUBICTO_1 ) -{ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - ( p )->cubicTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ) ); + if( hb_pcount() == 4 && HB_ISPOINTER( 2 ) ) + { + ( p )->cubicTo( *hbqt_par_QPointF( 2 ), *hbqt_par_QPointF( 3 ), *hbqt_par_QPointF( 4 ) ); + } + else if( hb_pcount() == 7 && HB_ISNUM( 2 ) ) + { + ( p )->cubicTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ) ); + } } } @@ -509,26 +501,23 @@ HB_FUNC( QT_QPAINTERPATH_INTERSECTED ) } /* - * bool intersects ( const QRectF & rectangle ) const + * void intersects ( ... ) */ HB_FUNC( QT_QPAINTERPATH_INTERSECTS ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) + if( p && hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) { - hb_retl( ( p )->intersects( *hbqt_par_QRectF( 2 ) ) ); - } -} + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); -/* - * bool intersects ( const QPainterPath & p ) const - */ -HB_FUNC( QT_QPAINTERPATH_INTERSECTS_1 ) -{ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - hb_retl( ( p )->intersects( *hbqt_par_QPainterPath( 2 ) ) ); + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->intersects( *hbqt_par_QRectF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QPainterPath ) + { + ( p )->intersects( *hbqt_par_QPainterPath( 2 ) ); + } } } @@ -557,50 +546,40 @@ HB_FUNC( QT_QPAINTERPATH_LENGTH ) } /* - * void lineTo ( const QPointF & endPoint ) + * void lineTo ( ... ) */ HB_FUNC( QT_QPAINTERPATH_LINETO ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - ( p )->lineTo( *hbqt_par_QPointF( 2 ) ); + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->lineTo( *hbqt_par_QPointF( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->lineTo( hb_parnd( 2 ), hb_parnd( 3 ) ); + } } } /* - * void lineTo ( qreal x, qreal y ) - */ -HB_FUNC( QT_QPAINTERPATH_LINETO_1 ) -{ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - ( p )->lineTo( hb_parnd( 2 ), hb_parnd( 3 ) ); - } -} - -/* - * void moveTo ( const QPointF & point ) + * void moveTo ( ... ) */ HB_FUNC( QT_QPAINTERPATH_MOVETO ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - ( p )->moveTo( *hbqt_par_QPointF( 2 ) ); - } -} - -/* - * void moveTo ( qreal x, qreal y ) - */ -HB_FUNC( QT_QPAINTERPATH_MOVETO_1 ) -{ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - ( p )->moveTo( hb_parnd( 2 ), hb_parnd( 3 ) ); + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->moveTo( *hbqt_par_QPointF( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->moveTo( hb_parnd( 2 ), hb_parnd( 3 ) ); + } } } @@ -629,26 +608,21 @@ HB_FUNC( QT_QPAINTERPATH_POINTATPERCENT ) } /* - * void quadTo ( const QPointF & c, const QPointF & endPoint ) + * void quadTo ( ... ) */ HB_FUNC( QT_QPAINTERPATH_QUADTO ) { QPainterPath * p = hbqt_par_QPainterPath( 1 ); if( p ) { - ( p )->quadTo( *hbqt_par_QPointF( 2 ), *hbqt_par_QPointF( 3 ) ); - } -} - -/* - * void quadTo ( qreal cx, qreal cy, qreal endPointX, qreal endPointY ) - */ -HB_FUNC( QT_QPAINTERPATH_QUADTO_1 ) -{ - QPainterPath * p = hbqt_par_QPainterPath( 1 ); - if( p ) - { - ( p )->quadTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); + if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) ) + { + ( p )->quadTo( *hbqt_par_QPointF( 2 ), *hbqt_par_QPointF( 3 ) ); + } + else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) + { + ( p )->quadTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); + } } } diff --git a/harbour/contrib/hbqt/qtgui/g/TQPainter.prg b/harbour/contrib/hbqt/qtgui/g/TQPainter.prg index 03f78d258d..d75fd7e86c 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQPainter.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQPainter.prg @@ -74,10 +74,7 @@ CREATE CLASS QPainter INHERIT HbQtObjectHandler FUNCTION HB_QPainter METHOD background() METHOD backgroundMode() METHOD begin( pDevice ) - METHOD boundingRect( pRectangle, nFlags, cText ) - METHOD boundingRect_1( pRectangle, nFlags, cText ) - METHOD boundingRect_2( nX, nY, nW, nH, nFlags, cText ) - METHOD boundingRect_3( pRectangle, cText, pOption ) + METHOD boundingRect( ... ) METHOD brush() METHOD brushOrigin() METHOD clipPath() @@ -94,10 +91,7 @@ CREATE CLASS QPainter INHERIT HbQtObjectHandler FUNCTION HB_QPainter METHOD drawEllipse( ... ) METHOD drawImage( ... ) METHOD drawLine( ... ) - METHOD drawLines( pLines, nLineCount ) - METHOD drawLines_1( pLines, nLineCount ) - METHOD drawLines_2( pPointPairs, nLineCount ) - METHOD drawLines_3( pPointPairs, nLineCount ) + METHOD drawLines( ... ) METHOD drawPath( pPath ) METHOD drawPicture( ... ) METHOD drawPie( ... ) @@ -107,26 +101,14 @@ CREATE CLASS QPainter INHERIT HbQtObjectHandler FUNCTION HB_QPainter METHOD drawPolygon( ... ) METHOD drawPolyline( ... ) METHOD drawRect( ... ) - METHOD drawRects( pRectangles, nRectCount ) - METHOD drawRects_1( pRectangles, nRectCount ) + METHOD drawRects( ... ) METHOD drawRoundedRect( ... ) METHOD drawText( ... ) METHOD drawTiledPixmap( ... ) METHOD end() METHOD eraseRect( ... ) METHOD fillPath( pPath, pBrush ) - METHOD fillRect( pRectangle, pBrush ) - METHOD fillRect_1( nX, nY, nWidth, nHeight, nStyle ) - METHOD fillRect_2( pRectangle, nStyle ) - METHOD fillRect_3( pRectangle, nStyle ) - METHOD fillRect_4( pRectangle, pBrush ) - METHOD fillRect_5( pRectangle, pColor ) - METHOD fillRect_6( pRectangle, pColor ) - METHOD fillRect_7( nX, nY, nWidth, nHeight, pBrush ) - METHOD fillRect_8( nX, nY, nWidth, nHeight, pColor ) - METHOD fillRect_9( nX, nY, nWidth, nHeight, nColor ) - METHOD fillRect_10( pRectangle, nColor ) - METHOD fillRect_11( pRectangle, nColor ) + METHOD fillRect( ... ) METHOD font() METHOD fontInfo() METHOD fontMetrics() @@ -205,20 +187,12 @@ METHOD QPainter:begin( pDevice ) RETURN Qt_QPainter_begin( ::pPtr, hbqt_ptr( pDevice ) ) -METHOD QPainter:boundingRect( pRectangle, nFlags, cText ) - RETURN Qt_QPainter_boundingRect( ::pPtr, hbqt_ptr( pRectangle ), nFlags, cText ) - - -METHOD QPainter:boundingRect_1( pRectangle, nFlags, cText ) - RETURN Qt_QPainter_boundingRect_1( ::pPtr, hbqt_ptr( pRectangle ), nFlags, cText ) - - -METHOD QPainter:boundingRect_2( nX, nY, nW, nH, nFlags, cText ) - RETURN Qt_QPainter_boundingRect_2( ::pPtr, nX, nY, nW, nH, nFlags, cText ) - - -METHOD QPainter:boundingRect_3( pRectangle, cText, pOption ) - RETURN Qt_QPainter_boundingRect_3( ::pPtr, hbqt_ptr( pRectangle ), cText, hbqt_ptr( pOption ) ) +METHOD QPainter:boundingRect( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_boundingRect( ::pPtr, ... ) METHOD QPainter:brush() @@ -309,20 +283,12 @@ METHOD QPainter:drawLine( ... ) RETURN Qt_QPainter_drawLine( ::pPtr, ... ) -METHOD QPainter:drawLines( pLines, nLineCount ) - RETURN Qt_QPainter_drawLines( ::pPtr, hbqt_ptr( pLines ), nLineCount ) - - -METHOD QPainter:drawLines_1( pLines, nLineCount ) - RETURN Qt_QPainter_drawLines_1( ::pPtr, hbqt_ptr( pLines ), nLineCount ) - - -METHOD QPainter:drawLines_2( pPointPairs, nLineCount ) - RETURN Qt_QPainter_drawLines_2( ::pPtr, hbqt_ptr( pPointPairs ), nLineCount ) - - -METHOD QPainter:drawLines_3( pPointPairs, nLineCount ) - RETURN Qt_QPainter_drawLines_3( ::pPtr, hbqt_ptr( pPointPairs ), nLineCount ) +METHOD QPainter:drawLines( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_drawLines( ::pPtr, ... ) METHOD QPainter:drawPath( pPath ) @@ -393,12 +359,12 @@ METHOD QPainter:drawRect( ... ) RETURN Qt_QPainter_drawRect( ::pPtr, ... ) -METHOD QPainter:drawRects( pRectangles, nRectCount ) - RETURN Qt_QPainter_drawRects( ::pPtr, hbqt_ptr( pRectangles ), nRectCount ) - - -METHOD QPainter:drawRects_1( pRectangles, nRectCount ) - RETURN Qt_QPainter_drawRects_1( ::pPtr, hbqt_ptr( pRectangles ), nRectCount ) +METHOD QPainter:drawRects( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_drawRects( ::pPtr, ... ) METHOD QPainter:drawRoundedRect( ... ) @@ -441,52 +407,12 @@ METHOD QPainter:fillPath( pPath, pBrush ) RETURN Qt_QPainter_fillPath( ::pPtr, hbqt_ptr( pPath ), hbqt_ptr( pBrush ) ) -METHOD QPainter:fillRect( pRectangle, pBrush ) - RETURN Qt_QPainter_fillRect( ::pPtr, hbqt_ptr( pRectangle ), hbqt_ptr( pBrush ) ) - - -METHOD QPainter:fillRect_1( nX, nY, nWidth, nHeight, nStyle ) - RETURN Qt_QPainter_fillRect_1( ::pPtr, nX, nY, nWidth, nHeight, nStyle ) - - -METHOD QPainter:fillRect_2( pRectangle, nStyle ) - RETURN Qt_QPainter_fillRect_2( ::pPtr, hbqt_ptr( pRectangle ), nStyle ) - - -METHOD QPainter:fillRect_3( pRectangle, nStyle ) - RETURN Qt_QPainter_fillRect_3( ::pPtr, hbqt_ptr( pRectangle ), nStyle ) - - -METHOD QPainter:fillRect_4( pRectangle, pBrush ) - RETURN Qt_QPainter_fillRect_4( ::pPtr, hbqt_ptr( pRectangle ), hbqt_ptr( pBrush ) ) - - -METHOD QPainter:fillRect_5( pRectangle, pColor ) - RETURN Qt_QPainter_fillRect_5( ::pPtr, hbqt_ptr( pRectangle ), hbqt_ptr( pColor ) ) - - -METHOD QPainter:fillRect_6( pRectangle, pColor ) - RETURN Qt_QPainter_fillRect_6( ::pPtr, hbqt_ptr( pRectangle ), hbqt_ptr( pColor ) ) - - -METHOD QPainter:fillRect_7( nX, nY, nWidth, nHeight, pBrush ) - RETURN Qt_QPainter_fillRect_7( ::pPtr, nX, nY, nWidth, nHeight, hbqt_ptr( pBrush ) ) - - -METHOD QPainter:fillRect_8( nX, nY, nWidth, nHeight, pColor ) - RETURN Qt_QPainter_fillRect_8( ::pPtr, nX, nY, nWidth, nHeight, hbqt_ptr( pColor ) ) - - -METHOD QPainter:fillRect_9( nX, nY, nWidth, nHeight, nColor ) - RETURN Qt_QPainter_fillRect_9( ::pPtr, nX, nY, nWidth, nHeight, nColor ) - - -METHOD QPainter:fillRect_10( pRectangle, nColor ) - RETURN Qt_QPainter_fillRect_10( ::pPtr, hbqt_ptr( pRectangle ), nColor ) - - -METHOD QPainter:fillRect_11( pRectangle, nColor ) - RETURN Qt_QPainter_fillRect_11( ::pPtr, hbqt_ptr( pRectangle ), nColor ) +METHOD QPainter:fillRect( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainter_fillRect( ::pPtr, ... ) METHOD QPainter:font() diff --git a/harbour/contrib/hbqt/qtgui/g/TQPainterPath.prg b/harbour/contrib/hbqt/qtgui/g/TQPainterPath.prg index d0b5c694c6..af4eb48cef 100644 --- a/harbour/contrib/hbqt/qtgui/g/TQPainterPath.prg +++ b/harbour/contrib/hbqt/qtgui/g/TQPainterPath.prg @@ -71,48 +71,34 @@ CREATE CLASS QPainterPath INHERIT HbQtObjectHandler FUNCTION HB_QPainterPath METHOD new( ... ) - METHOD addEllipse( pBoundingRectangle ) - METHOD addEllipse_1( nX, nY, nWidth, nHeight ) - METHOD addEllipse_2( pCenter, nRx, nRy ) + METHOD addEllipse( ... ) METHOD addPath( pPath ) METHOD addPolygon( pPolygon ) - METHOD addRect( pRectangle ) - METHOD addRect_1( nX, nY, nWidth, nHeight ) + METHOD addRect( ... ) METHOD addRegion( pRegion ) - METHOD addRoundedRect( pRect, nXRadius, nYRadius, nMode ) - METHOD addRoundedRect_1( nX, nY, nW, nH, nXRadius, nYRadius, nMode ) - METHOD addText( pPoint, pFont, cText ) - METHOD addText_1( nX, nY, pFont, cText ) + METHOD addRoundedRect( ... ) + METHOD addText( ... ) METHOD angleAtPercent( nT ) - METHOD arcMoveTo( pRectangle, nAngle ) - METHOD arcMoveTo_1( nX, nY, nWidth, nHeight, nAngle ) - METHOD arcTo( pRectangle, nStartAngle, nSweepLength ) - METHOD arcTo_1( nX, nY, nWidth, nHeight, nStartAngle, nSweepLength ) + METHOD arcMoveTo( ... ) + METHOD arcTo( ... ) METHOD boundingRect() METHOD closeSubpath() METHOD connectPath( pPath ) - METHOD contains( pPoint ) - METHOD contains_1( pRectangle ) - METHOD contains_2( pP ) + METHOD contains( ... ) METHOD controlPointRect() - METHOD cubicTo( pC1, pC2, pEndPoint ) - METHOD cubicTo_1( nC1X, nC1Y, nC2X, nC2Y, nEndPointX, nEndPointY ) + METHOD cubicTo( ... ) METHOD currentPosition() METHOD elementCount() METHOD fillRule() METHOD intersected( pP ) - METHOD intersects( pRectangle ) - METHOD intersects_1( pP ) + METHOD intersects( ... ) METHOD isEmpty() METHOD length() - METHOD lineTo( pEndPoint ) - METHOD lineTo_1( nX, nY ) - METHOD moveTo( pPoint ) - METHOD moveTo_1( nX, nY ) + METHOD lineTo( ... ) + METHOD moveTo( ... ) METHOD percentAtLength( nLen ) METHOD pointAtPercent( nT ) - METHOD quadTo( pC, pEndPoint ) - METHOD quadTo_1( nCx, nCy, nEndPointX, nEndPointY ) + METHOD quadTo( ... ) METHOD setElementPositionAt( nIndex, nX, nY ) METHOD setFillRule( nFillRule ) METHOD simplified() @@ -139,16 +125,12 @@ METHOD QPainterPath:new( ... ) RETURN Self -METHOD QPainterPath:addEllipse( pBoundingRectangle ) - RETURN Qt_QPainterPath_addEllipse( ::pPtr, hbqt_ptr( pBoundingRectangle ) ) - - -METHOD QPainterPath:addEllipse_1( nX, nY, nWidth, nHeight ) - RETURN Qt_QPainterPath_addEllipse_1( ::pPtr, nX, nY, nWidth, nHeight ) - - -METHOD QPainterPath:addEllipse_2( pCenter, nRx, nRy ) - RETURN Qt_QPainterPath_addEllipse_2( ::pPtr, hbqt_ptr( pCenter ), nRx, nRy ) +METHOD QPainterPath:addEllipse( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainterPath_addEllipse( ::pPtr, ... ) METHOD QPainterPath:addPath( pPath ) @@ -159,52 +141,52 @@ METHOD QPainterPath:addPolygon( pPolygon ) RETURN Qt_QPainterPath_addPolygon( ::pPtr, hbqt_ptr( pPolygon ) ) -METHOD QPainterPath:addRect( pRectangle ) - RETURN Qt_QPainterPath_addRect( ::pPtr, hbqt_ptr( pRectangle ) ) - - -METHOD QPainterPath:addRect_1( nX, nY, nWidth, nHeight ) - RETURN Qt_QPainterPath_addRect_1( ::pPtr, nX, nY, nWidth, nHeight ) +METHOD QPainterPath:addRect( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainterPath_addRect( ::pPtr, ... ) METHOD QPainterPath:addRegion( pRegion ) RETURN Qt_QPainterPath_addRegion( ::pPtr, hbqt_ptr( pRegion ) ) -METHOD QPainterPath:addRoundedRect( pRect, nXRadius, nYRadius, nMode ) - RETURN Qt_QPainterPath_addRoundedRect( ::pPtr, hbqt_ptr( pRect ), nXRadius, nYRadius, nMode ) +METHOD QPainterPath:addRoundedRect( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainterPath_addRoundedRect( ::pPtr, ... ) -METHOD QPainterPath:addRoundedRect_1( nX, nY, nW, nH, nXRadius, nYRadius, nMode ) - RETURN Qt_QPainterPath_addRoundedRect_1( ::pPtr, nX, nY, nW, nH, nXRadius, nYRadius, nMode ) - - -METHOD QPainterPath:addText( pPoint, pFont, cText ) - RETURN Qt_QPainterPath_addText( ::pPtr, hbqt_ptr( pPoint ), hbqt_ptr( pFont ), cText ) - - -METHOD QPainterPath:addText_1( nX, nY, pFont, cText ) - RETURN Qt_QPainterPath_addText_1( ::pPtr, nX, nY, hbqt_ptr( pFont ), cText ) +METHOD QPainterPath:addText( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainterPath_addText( ::pPtr, ... ) METHOD QPainterPath:angleAtPercent( nT ) RETURN Qt_QPainterPath_angleAtPercent( ::pPtr, nT ) -METHOD QPainterPath:arcMoveTo( pRectangle, nAngle ) - RETURN Qt_QPainterPath_arcMoveTo( ::pPtr, hbqt_ptr( pRectangle ), nAngle ) +METHOD QPainterPath:arcMoveTo( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainterPath_arcMoveTo( ::pPtr, ... ) -METHOD QPainterPath:arcMoveTo_1( nX, nY, nWidth, nHeight, nAngle ) - RETURN Qt_QPainterPath_arcMoveTo_1( ::pPtr, nX, nY, nWidth, nHeight, nAngle ) - - -METHOD QPainterPath:arcTo( pRectangle, nStartAngle, nSweepLength ) - RETURN Qt_QPainterPath_arcTo( ::pPtr, hbqt_ptr( pRectangle ), nStartAngle, nSweepLength ) - - -METHOD QPainterPath:arcTo_1( nX, nY, nWidth, nHeight, nStartAngle, nSweepLength ) - RETURN Qt_QPainterPath_arcTo_1( ::pPtr, nX, nY, nWidth, nHeight, nStartAngle, nSweepLength ) +METHOD QPainterPath:arcTo( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainterPath_arcTo( ::pPtr, ... ) METHOD QPainterPath:boundingRect() @@ -219,28 +201,24 @@ METHOD QPainterPath:connectPath( pPath ) RETURN Qt_QPainterPath_connectPath( ::pPtr, hbqt_ptr( pPath ) ) -METHOD QPainterPath:contains( pPoint ) - RETURN Qt_QPainterPath_contains( ::pPtr, hbqt_ptr( pPoint ) ) - - -METHOD QPainterPath:contains_1( pRectangle ) - RETURN Qt_QPainterPath_contains_1( ::pPtr, hbqt_ptr( pRectangle ) ) - - -METHOD QPainterPath:contains_2( pP ) - RETURN Qt_QPainterPath_contains_2( ::pPtr, hbqt_ptr( pP ) ) +METHOD QPainterPath:contains( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainterPath_contains( ::pPtr, ... ) METHOD QPainterPath:controlPointRect() RETURN Qt_QPainterPath_controlPointRect( ::pPtr ) -METHOD QPainterPath:cubicTo( pC1, pC2, pEndPoint ) - RETURN Qt_QPainterPath_cubicTo( ::pPtr, hbqt_ptr( pC1 ), hbqt_ptr( pC2 ), hbqt_ptr( pEndPoint ) ) - - -METHOD QPainterPath:cubicTo_1( nC1X, nC1Y, nC2X, nC2Y, nEndPointX, nEndPointY ) - RETURN Qt_QPainterPath_cubicTo_1( ::pPtr, nC1X, nC1Y, nC2X, nC2Y, nEndPointX, nEndPointY ) +METHOD QPainterPath:cubicTo( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainterPath_cubicTo( ::pPtr, ... ) METHOD QPainterPath:currentPosition() @@ -259,12 +237,12 @@ METHOD QPainterPath:intersected( pP ) RETURN Qt_QPainterPath_intersected( ::pPtr, hbqt_ptr( pP ) ) -METHOD QPainterPath:intersects( pRectangle ) - RETURN Qt_QPainterPath_intersects( ::pPtr, hbqt_ptr( pRectangle ) ) - - -METHOD QPainterPath:intersects_1( pP ) - RETURN Qt_QPainterPath_intersects_1( ::pPtr, hbqt_ptr( pP ) ) +METHOD QPainterPath:intersects( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainterPath_intersects( ::pPtr, ... ) METHOD QPainterPath:isEmpty() @@ -275,20 +253,20 @@ METHOD QPainterPath:length() RETURN Qt_QPainterPath_length( ::pPtr ) -METHOD QPainterPath:lineTo( pEndPoint ) - RETURN Qt_QPainterPath_lineTo( ::pPtr, hbqt_ptr( pEndPoint ) ) +METHOD QPainterPath:lineTo( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainterPath_lineTo( ::pPtr, ... ) -METHOD QPainterPath:lineTo_1( nX, nY ) - RETURN Qt_QPainterPath_lineTo_1( ::pPtr, nX, nY ) - - -METHOD QPainterPath:moveTo( pPoint ) - RETURN Qt_QPainterPath_moveTo( ::pPtr, hbqt_ptr( pPoint ) ) - - -METHOD QPainterPath:moveTo_1( nX, nY ) - RETURN Qt_QPainterPath_moveTo_1( ::pPtr, nX, nY ) +METHOD QPainterPath:moveTo( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainterPath_moveTo( ::pPtr, ... ) METHOD QPainterPath:percentAtLength( nLen ) @@ -299,12 +277,12 @@ METHOD QPainterPath:pointAtPercent( nT ) RETURN Qt_QPainterPath_pointAtPercent( ::pPtr, nT ) -METHOD QPainterPath:quadTo( pC, pEndPoint ) - RETURN Qt_QPainterPath_quadTo( ::pPtr, hbqt_ptr( pC ), hbqt_ptr( pEndPoint ) ) - - -METHOD QPainterPath:quadTo_1( nCx, nCy, nEndPointX, nEndPointY ) - RETURN Qt_QPainterPath_quadTo_1( ::pPtr, nCx, nCy, nEndPointX, nEndPointY ) +METHOD QPainterPath:quadTo( ... ) + LOCAL p + FOR EACH p IN { ... } + hb_pvalue( p:__enumIndex(), hbqt_ptr( p ) ) + NEXT + RETURN Qt_QPainterPath_quadTo( ::pPtr, ... ) METHOD QPainterPath:setElementPositionAt( nIndex, nX, nY ) diff --git a/harbour/contrib/hbqt/qtgui/qth/QPainter.qth b/harbour/contrib/hbqt/qtgui/qth/QPainter.qth index 8c77996a57..c563e65f2f 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPainter.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPainter.qth @@ -90,10 +90,46 @@ enum RenderHints const QBrush & background () const Qt::BGMode backgroundMode () const bool begin ( QPaintDevice * device ) -QRectF boundingRect ( const QRectF & rectangle, int flags, const QString & text ) -QRect boundingRect ( const QRect & rectangle, int flags, const QString & text ) -QRect boundingRect ( int x, int y, int w, int h, int flags, const QString & text ) -QRectF boundingRect ( const QRectF & rectangle, const QString & text, const QTextOption & option = QTextOption() ) + +void boundingRect ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 4 ) + { + if( HB_ISCHAR( 4 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->boundingRect( *hbqt_par_QRectF( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->boundingRect( *hbqt_par_QRect( 2 ), hb_parni( 3 ), hbqt_par_QString( 4 ) ); + } + } + else if( HB_ISPOINTER( 4 ) ) + { + ( p )->boundingRect( *hbqt_par_QRectF( 2 ), hbqt_par_QString( 3 ), *hbqt_par_QTextOption( 4 ) ); + } + } + else if( hb_pcount() == 3 ) + { + ( p )->boundingRect( *hbqt_par_QRectF( 2 ), hbqt_par_QString( 3 ), QTextOption() ); + } + else if( hb_pcount() == 7 ) + { + ( p )->boundingRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), hb_parni( 6 ), hbqt_par_QString( 7 ) ); + } + } +} +//QRectF boundingRect ( const QRectF & rectangle, int flags, const QString & text ) +//QRect boundingRect ( const QRect & rectangle, int flags, const QString & text ) +//QRect boundingRect ( int x, int y, int w, int h, int flags, const QString & text ) +//QRectF boundingRect ( const QRectF & rectangle, const QString & text, const QTextOption & option = QTextOption() ) + const QBrush & brush () const QPoint brushOrigin () const QPainterPath clipPath () const @@ -353,14 +389,42 @@ void drawLine ( ... ){ //void drawLine ( const QPointF & p1, const QPointF & p2 ) //void drawLine ( int x1, int y1, int x2, int y2 ) -void drawLines ( const QLineF * lines, int lineCount ) -void drawLines ( const QLine * lines, int lineCount ) -void drawLines ( const QPointF * pointPairs, int lineCount ) -void drawLines ( const QPoint * pointPairs, int lineCount ) -void drawLines ( const QVector & pointPairs ) -void drawLines ( const QVector & pointPairs ) -void drawLines ( const QVector & lines ) -void drawLines ( const QVector & lines ) +void drawLines ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QLineF ) + { + ( p )->drawLines( hbqt_par_QLineF( 2 ), hb_parni( 3 ) ); + } + else if( q->type == HBQT_TYPE_QLine ) + { + ( p )->drawLines( hbqt_par_QLine( 2 ), hb_parni( 3 ) ); + } + else if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->drawLines( hbqt_par_QPointF( 2 ), hb_parni( 3 ) ); + } + else if( q->type == HBQT_TYPE_QPoint ) + { + ( p )->drawLines( hbqt_par_QPoint( 2 ), hb_parni( 3 ) ); + } + } + } +} +//void drawLines ( const QLineF * lines, int lineCount ) +//void drawLines ( const QLine * lines, int lineCount ) +//void drawLines ( const QPointF * pointPairs, int lineCount ) +//void drawLines ( const QPoint * pointPairs, int lineCount ) +// +//void drawLines ( const QVector & pointPairs ) +//void drawLines ( const QVector & pointPairs ) +//void drawLines ( const QVector & lines ) +//void drawLines ( const QVector & lines ) void drawPath ( const QPainterPath & path ) @@ -657,10 +721,30 @@ void drawRect ( ... ){ //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 drawRects ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->drawRects( hbqt_par_QRectF( 2 ), hb_parni( 3 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->drawRects( hbqt_par_QRect( 2 ), hb_parni( 3 ) ); + } + } + } +} +//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 ( ... ){ QPainter * p = hbqt_par_QPainter( 1 ); @@ -777,9 +861,9 @@ void eraseRect ( ... ){ QPainter * p = hbqt_par_QPainter( 1 ); if( p ) { - if( hb_pcount() == 4 && HB_ISNUM( 2 ) ) + if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) { - ( p )->eraseRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 3 ), hb_parni( 4 ) ); + ( p )->eraseRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ) ); } else if( hb_pcount() == 2 ) { @@ -802,18 +886,106 @@ void eraseRect ( ... ){ void fillPath ( const QPainterPath & path, const QBrush & brush ) -void fillRect ( const QRectF & rectangle, const QBrush & brush ) -void fillRect ( int x, int y, int width, int height, Qt::BrushStyle style ) -void fillRect ( const QRect & rectangle, Qt::BrushStyle style ) -void fillRect ( const QRectF & rectangle, Qt::BrushStyle style ) -void fillRect ( const QRect & rectangle, const QBrush & brush ) -void fillRect ( const QRect & rectangle, const QColor & color ) -void fillRect ( const QRectF & rectangle, const QColor & color ) -void fillRect ( int x, int y, int width, int height, const QBrush & brush ) -void fillRect ( int x, int y, int width, int height, const QColor & color ) -void fillRect ( int x, int y, int width, int height, Qt::GlobalColor color ) -void fillRect ( const QRect & rectangle, Qt::GlobalColor color ) -void fillRect ( const QRectF & rectangle, Qt::GlobalColor color ) + +void fillRect ( ... ){ + QPainter * p = hbqt_par_QPainter( 1 ); + if( p ) + { + if( hb_pcount() == 6 && HB_ISNUM( 2 ) ) + { + if( HB_ISNUM( 6 ) ) + { + ( p )->fillRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), ( Qt::GlobalColor ) hb_parni( 6 ) ); + } + else if( HB_ISPOINTER( 6 ) ) + { + HBQT_GC_T * r = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 6 ); + + if( r->type == HBQT_TYPE_QBrush ) + { + ( p )->fillRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), *hbqt_par_QBrush( 6 ) ); + } + if( r->type == HBQT_TYPE_QColor ) + { + ( p )->fillRect( hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ), hb_parni( 5 ), *hbqt_par_QColor( 6 ) ); + } + } + } + else if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( HB_ISNUM( 3 ) ) + { + if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->fillRect( *hbqt_par_QRectF( 2 ), ( Qt::GlobalColor ) hb_parni( 3 ) ); + } + else if( q->type == HBQT_TYPE_QRect ) + { + ( p )->fillRect( *hbqt_par_QRect( 2 ), ( Qt::GlobalColor ) hb_parni( 3 ) ); + } + } + else if( HB_ISPOINTER( 3 ) ) + { + HBQT_GC_T * r = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 3 ); + + if( q->type == HBQT_TYPE_QRectF ) + { + if( r->type == HBQT_TYPE_QBrush ) + { + ( p )->fillRect( *hbqt_par_QRectF( 2 ), *hbqt_par_QBrush( 3 ) ); + } + if( r->type == HBQT_TYPE_QColor ) + { + ( p )->fillRect( *hbqt_par_QRectF( 2 ), *hbqt_par_QColor( 3 ) ); + } + } + else if( q->type == HBQT_TYPE_QRect ) + { + if( r->type == HBQT_TYPE_QBrush ) + { + ( p )->fillRect( *hbqt_par_QRect( 2 ), *hbqt_par_QBrush( 3 ) ); + } + if( r->type == HBQT_TYPE_QColor ) + { + ( p )->fillRect( *hbqt_par_QRect( 2 ), *hbqt_par_QColor( 3 ) ); + } + } + } + } + } +} +// void fillRect ( const QRectF & rectangle, const QBrush & brush ) +// void fillRect ( const QRectF & rectangle, const QColor & color ) +// void fillRect ( const QRectF & rectangle, Qt::GlobalColor color ) +// // +// void fillRect ( const QRect & rectangle, const QBrush & brush ) +// void fillRect ( const QRect & rectangle, const QColor & color ) +// void fillRect ( const QRect & rectangle, Qt::GlobalColor color ) +// // +// void fillRect ( int x, int y, int width, int height, const QBrush & brush ) +// void fillRect ( int x, int y, int width, int height, const QColor & color ) +// void fillRect ( int x, int y, int width, int height, Qt::GlobalColor color ) +// +// NOT IMPLEMENTED +// void fillRect ( const QRectF & rectangle, Qt::BrushStyle style ) +// void fillRect ( const QRect & rectangle, Qt::BrushStyle style ) +// void fillRect ( int x, int y, int width, int height, Qt::BrushStyle style ) +// +// original order +// void fillRect ( const QRectF & rectangle, const QBrush & brush ) +// void fillRect ( int x, int y, int width, int height, Qt::BrushStyle style ) +// void fillRect ( const QRect & rectangle, Qt::BrushStyle style ) +// void fillRect ( const QRectF & rectangle, Qt::BrushStyle style ) +// void fillRect ( const QRect & rectangle, const QBrush & brush ) +// void fillRect ( const QRect & rectangle, const QColor & color ) +// void fillRect ( const QRectF & rectangle, const QColor & color ) +// void fillRect ( int x, int y, int width, int height, const QBrush & brush ) +// void fillRect ( int x, int y, int width, int height, const QColor & color ) +// void fillRect ( int x, int y, int width, int height, Qt::GlobalColor color ) +// void fillRect ( const QRect & rectangle, Qt::GlobalColor color ) +// void fillRect ( const QRectF & rectangle, Qt::GlobalColor color ) const QFont & font () const QFontInfo fontInfo () const diff --git a/harbour/contrib/hbqt/qtgui/qth/QPainterPath.qth b/harbour/contrib/hbqt/qtgui/qth/QPainterPath.qth index 8f97b2b3cd..8d1ff547df 100644 --- a/harbour/contrib/hbqt/qtgui/qth/QPainterPath.qth +++ b/harbour/contrib/hbqt/qtgui/qth/QPainterPath.qth @@ -56,10 +56,10 @@ QObject = no -Inherits = +Inherits = Type = Core New = -Destructor = +Destructor = @@ -82,61 +82,267 @@ enum ElementType { MoveToElement, LineToElement, CurveToElement, CurveToDataElem -void addEllipse ( const QRectF & boundingRectangle ) -void addEllipse ( qreal x, qreal y, qreal width, qreal height ) -void addEllipse ( const QPointF & center, qreal rx, qreal ry ) + +void addEllipse ( ... ){ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->addEllipse( *hbqt_par_QRectF( 2 ) ); + } + else if( hb_pcount() == 4 && HB_ISPOINTER( 2 ) ) + { + ( p )->addEllipse( *hbqt_par_QPointF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ); + } + else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) + { + ( p )->addEllipse( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); + } + } +} +//void addEllipse ( const QRectF & boundingRectangle ) +//void addEllipse ( qreal x, qreal y, qreal width, qreal height ) +//void addEllipse ( const QPointF & center, qreal rx, qreal ry ) + void addPath ( const QPainterPath & path ) void addPolygon ( const QPolygonF & polygon ) -void addRect ( const QRectF & rectangle ) -void addRect ( qreal x, qreal y, qreal width, qreal height ) + +void addRect ( ... ){ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->addRect( *hbqt_par_QRectF( 2 ) ); + } + else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) + { + ( p )->addRect( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); + } + } +} +//void addRect ( const QRectF & rectangle ) +//void addRect ( qreal x, qreal y, qreal width, qreal height ) + void addRegion ( const QRegion & region ) -void addRoundedRect ( const QRectF & rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) -void addRoundedRect ( qreal x, qreal y, qreal w, qreal h, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) -void addText ( const QPointF & point, const QFont & font, const QString & text ) -void addText ( qreal x, qreal y, const QFont & font, const QString & text ) + +void addRoundedRect ( ... ){ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + if( hb_pcount() >= 4 && HB_ISPOINTER( 2 ) ) + { + ( p )->addRoundedRect( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), ( Qt::SizeMode ) ( HB_ISNUM( 5 ) ? hb_parni( 5 ) : Qt::AbsoluteSize ) ); + } + else if( hb_pcount() >= 7 && HB_ISNUM( 2 ) ) + { + ( p )->addRoundedRect( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ), ( Qt::SizeMode ) ( HB_ISNUM( 8 ) ? hb_parni( 8 ) : Qt::AbsoluteSize ) ); + } + } +} +//void addRoundedRect ( const QRectF & rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) +//void addRoundedRect ( qreal x, qreal y, qreal w, qreal h, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize ) + +void addText ( ... ){ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + if( hb_pcount() == 4 && HB_ISPOINTER( 2 ) ) + { + ( p )->addText( *hbqt_par_QPointF( 2 ), *hbqt_par_QFont( 3 ), hbqt_par_QString( 4 ) ); + } + else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) + { + ( p )->addText( hb_parnd( 2 ), hb_parnd( 3 ), *hbqt_par_QFont( 4 ), hbqt_par_QString( 5 ) ); + } + } +} +//void addText ( const QPointF & point, const QFont & font, const QString & text ) +//void addText ( qreal x, qreal y, const QFont & font, const QString & text ) + qreal angleAtPercent ( qreal t ) const -void arcMoveTo ( const QRectF & rectangle, qreal angle ) -void arcMoveTo ( qreal x, qreal y, qreal width, qreal height, qreal angle ) -void arcTo ( const QRectF & rectangle, qreal startAngle, qreal sweepLength ) -void arcTo ( qreal x, qreal y, qreal width, qreal height, qreal startAngle, qreal sweepLength ) + +void arcMoveTo ( ... ){ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) ) + { + ( p )->arcMoveTo( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ) ); + } + else if( hb_pcount() == 6 && HB_ISNUM( 2 ) ) + { + ( p )->arcMoveTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ) ); + } + } +} +//void arcMoveTo ( const QRectF & rectangle, qreal angle ) +//void arcMoveTo ( qreal x, qreal y, qreal width, qreal height, qreal angle ) + +void arcTo ( ... ){ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + if( hb_pcount() == 4 && HB_ISPOINTER( 2 ) ) + { + ( p )->arcTo( *hbqt_par_QRectF( 2 ), hb_parnd( 3 ), hb_parnd( 4 ) ); + } + else if( hb_pcount() == 7 && HB_ISNUM( 2 ) ) + { + ( p )->arcTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ) ); + } + } +} +//void arcTo ( const QRectF & rectangle, qreal startAngle, qreal sweepLength ) +//void arcTo ( qreal x, qreal y, qreal width, qreal height, qreal startAngle, qreal sweepLength ) + QRectF boundingRect () const void closeSubpath () void connectPath ( const QPainterPath & path ) -bool contains ( const QPointF & point ) const -bool contains ( const QRectF & rectangle ) const -bool contains ( const QPainterPath & p ) const + +void contains ( ... ){ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p && hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + HBQT_GC_T * q = ( HBQT_GC_T * ) hb_parptrGC( hbqt_gcFuncs(), 2 ); + + if( q->type == HBQT_TYPE_QPointF ) + { + ( p )->contains( *hbqt_par_QPointF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QRectF ) + { + ( p )->contains( *hbqt_par_QRectF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QPainterPath ) + { + ( p )->contains( *hbqt_par_QPainterPath( 2 ) ); + } + } +} +//bool contains ( const QPointF & point ) const +//bool contains ( const QRectF & rectangle ) const +//bool contains ( const QPainterPath & p ) const + QRectF controlPointRect () const -void cubicTo ( const QPointF & c1, const QPointF & c2, const QPointF & endPoint ) -void cubicTo ( qreal c1X, qreal c1Y, qreal c2X, qreal c2Y, qreal endPointX, qreal endPointY ) + +void cubicTo ( ... ){ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + if( hb_pcount() == 4 && HB_ISPOINTER( 2 ) ) + { + ( p )->cubicTo( *hbqt_par_QPointF( 2 ), *hbqt_par_QPointF( 3 ), *hbqt_par_QPointF( 4 ) ); + } + else if( hb_pcount() == 7 && HB_ISNUM( 2 ) ) + { + ( p )->cubicTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ), hb_parnd( 6 ), hb_parnd( 7 ) ); + } + } +} +//void cubicTo ( const QPointF & c1, const QPointF & c2, const QPointF & endPoint ) +//void cubicTo ( qreal c1X, qreal c1Y, qreal c2X, qreal c2Y, qreal endPointX, qreal endPointY ) + QPointF currentPosition () const // const QPainterPath::Element & elementAt ( int index ) const int elementCount () const Qt::FillRule fillRule () const QPainterPath intersected ( const QPainterPath & p ) const -bool intersects ( const QRectF & rectangle ) const -bool intersects ( const QPainterPath & p ) const + +void intersects ( ... ){ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p && 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 )->intersects( *hbqt_par_QRectF( 2 ) ); + } + else if( q->type == HBQT_TYPE_QPainterPath ) + { + ( p )->intersects( *hbqt_par_QPainterPath( 2 ) ); + } + } +} +//bool intersects ( const QRectF & rectangle ) const +//bool intersects ( const QPainterPath & p ) const + bool isEmpty () const qreal length () const -void lineTo ( const QPointF & endPoint ) -void lineTo ( qreal x, qreal y ) -void moveTo ( const QPointF & point ) -void moveTo ( qreal x, qreal y ) + +void lineTo ( ... ){ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->lineTo( *hbqt_par_QPointF( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->lineTo( hb_parnd( 2 ), hb_parnd( 3 ) ); + } + } +} +//void lineTo ( const QPointF & endPoint ) +//void lineTo ( qreal x, qreal y ) + +void moveTo ( ... ){ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + if( hb_pcount() == 2 && HB_ISPOINTER( 2 ) ) + { + ( p )->moveTo( *hbqt_par_QPointF( 2 ) ); + } + else if( hb_pcount() == 3 && HB_ISNUM( 2 ) ) + { + ( p )->moveTo( hb_parnd( 2 ), hb_parnd( 3 ) ); + } + } +} +//void moveTo ( const QPointF & point ) +//void moveTo ( qreal x, qreal y ) + qreal percentAtLength ( qreal len ) const QPointF pointAtPercent ( qreal t ) const -void quadTo ( const QPointF & c, const QPointF & endPoint ) -void quadTo ( qreal cx, qreal cy, qreal endPointX, qreal endPointY ) + +void quadTo ( ... ){ + QPainterPath * p = hbqt_par_QPainterPath( 1 ); + if( p ) + { + if( hb_pcount() == 3 && HB_ISPOINTER( 2 ) ) + { + ( p )->quadTo( *hbqt_par_QPointF( 2 ), *hbqt_par_QPointF( 3 ) ); + } + else if( hb_pcount() == 5 && HB_ISNUM( 2 ) ) + { + ( p )->quadTo( hb_parnd( 2 ), hb_parnd( 3 ), hb_parnd( 4 ), hb_parnd( 5 ) ); + } + } +} +//void quadTo ( const QPointF & c, const QPointF & endPoint ) +//void quadTo ( qreal cx, qreal cy, qreal endPointX, qreal endPointY ) + void setElementPositionAt ( int index, qreal x, qreal y ) void setFillRule ( Qt::FillRule fillRule ) QPainterPath simplified () const qreal slopeAtPercent ( qreal t ) const QPainterPath subtracted ( const QPainterPath & p ) const + QPolygonF toFillPolygon ( const QTransform & matrix ) const QPolygonF toFillPolygon ( const QMatrix & matrix = QMatrix() ) const + QList toFillPolygons ( const QTransform & matrix ) const QList toFillPolygons ( const QMatrix & matrix = QMatrix() ) const + QPainterPath toReversed () const + QList toSubpathPolygons ( const QTransform & matrix ) const QList toSubpathPolygons ( const QMatrix & matrix = QMatrix() ) const + QPainterPath united ( const QPainterPath & p ) const