168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some implementation for the closing ends of the borders in radial mode 

added
This commit is contained in:
Uwe Rathmann 2024-07-23 18:06:25 +02:00
parent ca38a1e46a
commit 38130ffb7b
2 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/nodes/QskArcNode.cpp
View File

@ -200,11 +200,26 @@ void QskArcNode::setArcData( const QRectF& rect, const QskArcMetrics& arcMetrics
borderNode->updateNode( rect, metricsArc, radial, borderNode->updateNode( rect, metricsArc, radial,
borderWidth, borderColor, QskGradient() ); borderWidth, borderColor, QskGradient() );
#else #else
QPen pen( borderColor, borderWidth ); {
pen.setCapStyle( Qt::FlatCap ); /*
Qt centers the border over the boundaries, while we
always want to have the complete borders inside.
So we have to subtract 0.5 * border.
*/
QPen pen( borderColor, borderWidth );
pen.setCapStyle( Qt::SquareCap );
pen.setJoinStyle( Qt::MiterJoin );
const auto path = metricsArc.painterPath( rect, radial ); const auto b2 = 0.5 * borderWidth;
borderNode->updateNode( path, QTransform(), pen ); const auto r = rect.adjusted( b2, b2, -b2, -b2 );
const auto m = QskArcMetrics( metricsArc.startAngle(), metricsArc.spanAngle(),
metricsArc.thickness() - borderWidth );
const auto path = m.painterPath( r, radial );
borderNode->updateNode( path, QTransform(), pen );
}
#endif #endif
} }
else else

39
src/nodes/QskArcRenderer.cpp
View File

@ -144,15 +144,16 @@ namespace
{ {
public: public:
RadialStroker( const QRectF& rect, qreal thickness, qreal border ) RadialStroker( const QRectF& rect, qreal thickness, qreal border )
: m_inner( thickness - 2 * border ) : m_sx( qMax( rect.width() / rect.height(), 1.0 ) )
, m_sy( qMax( rect.height() / rect.width(), 1.0 ) )
, m_rx1( 0.5 * rect.width() ) , m_rx1( 0.5 * rect.width() )
, m_ry1( 0.5 * rect.height() ) , m_ry1( 0.5 * rect.height() )
, m_rx2( m_rx1 - border ) , m_rx2( m_rx1 - m_sx * border )
, m_ry2( m_ry1 - border ) , m_ry2( m_ry1 - m_sy * border )
, m_rx3( m_rx2 - ( ( m_rx1 > m_ry1 ) ? m_inner * m_rx1 / m_ry1 : m_inner ) ) , m_rx3( m_rx1 - m_sx * ( thickness - border ) )
, m_ry3( m_ry2 - ( ( m_rx1 < m_ry1 ) ? m_inner * m_ry1 / m_rx1 : m_inner ) ) , m_ry3( m_ry1 - m_sy * ( thickness - border ) )
, m_rx4( m_rx3 - border ) , m_rx4( m_rx1 - m_sx * thickness )
, m_ry4( m_ry3 - border ) , m_ry4( m_ry1 - m_sy * thickness )
, m_cx( rect.x() + m_rx1 ) , m_cx( rect.x() + m_rx1 )
, m_cy( rect.y() + m_ry1 ) , m_cy( rect.y() + m_ry1 )
{ {
@ -178,30 +179,28 @@ namespace
outer.setLine( m_cx + m_rx1 * cos, m_cy - m_ry1 * sin, outer.setLine( m_cx + m_rx1 * cos, m_cy - m_ry1 * sin,
m_cx + m_rx2 * cos, m_cy - m_ry2 * sin, color ); m_cx + m_rx2 * cos, m_cy - m_ry2 * sin, color );
inner.setLine( m_cx + m_rx3 * cos, m_cy - m_ry3 * sin, inner.setLine( m_cx + m_rx4 * cos, m_cy - m_ry4 * sin,
m_cx + m_rx4 * cos, m_cy - m_ry4 * sin, color ); m_cx + m_rx3 * cos, m_cy - m_ry3 * sin, color );
} }
inline void setClosingBorderLines( const QSGGeometry::ColoredPoint2D& pos, inline void setClosingBorderLines( const QSGGeometry::ColoredPoint2D& pos,
QskVertex::ColoredLine* lines, qreal sign, const QskVertex::Color color ) const QskVertex::ColoredLine* lines, qreal sign, const QskVertex::Color color ) const
{ {
// TODO ... // Good enough until it is decided if we want to keep the radial mode.
#if 1
Q_UNUSED( pos );
Q_UNUSED( sign );
const auto& l0 = lines[0]; const auto& l0 = lines[0];
const qreal dx = 0.0;
const qreal dy = 0.0;
lines[-3].setLine( l0.x1() + dx, l0.y1() - dy, l0.x1(), l0.y1(), color ); const auto s = m_sx / m_sy;
lines[-2].setLine( l0.x1() + dx, l0.y1() - dy, l0.x1(), l0.y1(), color ); const auto dx = sign * l0.dy() * s;
const auto dy = sign * l0.dx() / s;
lines[-3].setLine( pos.x, pos.y, pos.x, pos.y, color );
lines[-2].setLine( pos.x + dx, pos.y - dy, pos.x, pos.y, color );
lines[-1].setLine( l0.x1() + dx, l0.y1() - dy, l0.x1(), l0.y1(), color ); lines[-1].setLine( l0.x1() + dx, l0.y1() - dy, l0.x1(), l0.y1(), color );
#endif
} }
private: private:
const qreal m_inner; // stretch factors of the ellipse
const qreal m_sx, m_sy;
// radii: out->in // radii: out->in
const qreal m_rx1, m_ry1, m_rx2, m_ry2, m_rx3, m_ry3, m_rx4, m_ry4; const qreal m_rx1, m_ry1, m_rx2, m_ry2, m_rx3, m_ry3, m_rx4, m_ry4;