code improved
This commit is contained in:
parent
d7eca19685
commit
0e2f9fd839
|
@ -184,7 +184,6 @@ namespace
|
||||||
|
|
||||||
QPainter painter( &identifier );
|
QPainter painter( &identifier );
|
||||||
painter.setPen( QPen( QskRgb::toTransparent( Qt::black, 100 ), 1 ) );
|
painter.setPen( QPen( QskRgb::toTransparent( Qt::black, 100 ), 1 ) );
|
||||||
painter.setBrush( gradient.toQGradient() );
|
|
||||||
|
|
||||||
QLinearGradient qGradient;
|
QLinearGradient qGradient;
|
||||||
qGradient.setStops( qskToQGradientStops( gradient.stops() ) );
|
qGradient.setStops( qskToQGradientStops( gradient.stops() ) );
|
||||||
|
|
|
@ -339,15 +339,6 @@ QSGNode* CircularChartSkinlet::updateArcSegmentNode(
|
||||||
QSGNode* node, qreal borderWidth, const QColor& borderColor,
|
QSGNode* node, qreal borderWidth, const QColor& borderColor,
|
||||||
const QskGradient& gradient, const QskArcMetrics& metrics ) const
|
const QskGradient& gradient, const QskArcMetrics& metrics ) const
|
||||||
{
|
{
|
||||||
auto fillGradient = gradient;
|
|
||||||
|
|
||||||
if ( fillGradient.type() == QskGradient::Stops )
|
|
||||||
{
|
|
||||||
fillGradient.setStretchMode( QskGradient::StretchToSize );
|
|
||||||
fillGradient.setConicDirection( 0.5, 0.5,
|
|
||||||
metrics.startAngle(), metrics.spanAngle() );
|
|
||||||
}
|
|
||||||
|
|
||||||
#if PAINTED_NODE
|
#if PAINTED_NODE
|
||||||
auto arcNode = static_cast< PaintedArcNode* >( node );
|
auto arcNode = static_cast< PaintedArcNode* >( node );
|
||||||
if ( arcNode == nullptr )
|
if ( arcNode == nullptr )
|
||||||
|
@ -356,10 +347,19 @@ QSGNode* CircularChartSkinlet::updateArcSegmentNode(
|
||||||
const auto chart = static_cast< const CircularChart* >( skinnable );
|
const auto chart = static_cast< const CircularChart* >( skinnable );
|
||||||
|
|
||||||
arcNode->setArcData( m_data->closedArcRect, metrics,
|
arcNode->setArcData( m_data->closedArcRect, metrics,
|
||||||
borderWidth, borderColor, fillGradient, chart->window() );
|
borderWidth, borderColor, gradient, chart->window() );
|
||||||
#else
|
#else
|
||||||
Q_UNUSED( skinnable )
|
Q_UNUSED( skinnable )
|
||||||
|
|
||||||
|
auto fillGradient = gradient;
|
||||||
|
|
||||||
|
if ( fillGradient.type() == QskGradient::Stops )
|
||||||
|
{
|
||||||
|
fillGradient.setStretchMode( QskGradient::StretchToSize );
|
||||||
|
fillGradient.setConicDirection( 0.5, 0.5,
|
||||||
|
metrics.startAngle(), metrics.spanAngle() );
|
||||||
|
}
|
||||||
|
|
||||||
auto arcNode = static_cast< QskArcNode* >( node );
|
auto arcNode = static_cast< QskArcNode* >( node );
|
||||||
if ( arcNode == nullptr )
|
if ( arcNode == nullptr )
|
||||||
arcNode = new QskArcNode();
|
arcNode = new QskArcNode();
|
||||||
|
|
Loading…
Reference in New Issue