From d6b9ea45258fb7eb7569cb9cad65ffb26bbc4719 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Wed, 9 Oct 2024 07:45:20 +0200 Subject: [PATCH] assertions weakened to warnings to prevent property inspectors ( f.e gammaray ), that do not know about the specific semantics of the gradient direction, from crashing --- src/common/QskGradient.cpp | 15 +++++++++------ src/common/QskGradientDirection.h | 2 -- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/common/QskGradient.cpp b/src/common/QskGradient.cpp index 7d5520764..17c99557f 100644 --- a/src/common/QskGradient.cpp +++ b/src/common/QskGradient.cpp @@ -615,10 +615,11 @@ void QskGradient::setLinearDirection( const QskLinearDirection& direction ) QskLinearDirection QskGradient::linearDirection() const { - Q_ASSERT( m_type == Linear ); - if ( m_type != Linear ) + { + qWarning() << "Requesting linear attributes from a non linear gradient."; return QskLinearDirection( 0.0, 0.0, 0.0, 0.0 ); + } return QskLinearDirection( m_values[0], m_values[1], m_values[2], m_values[3] ); } @@ -644,10 +645,11 @@ void QskGradient::setRadialDirection( const QskRadialDirection& direction ) QskRadialDirection QskGradient::radialDirection() const { - Q_ASSERT( m_type == Radial ); - if ( m_type != Radial ) + { + qWarning() << "Requesting radial attributes from a non radial gradient."; return QskRadialDirection( 0.5, 0.5, 0.0 ); + } return QskRadialDirection( m_values[0], m_values[1], m_values[2], m_values[3] ); } @@ -683,10 +685,11 @@ void QskGradient::setConicDirection( const QskConicDirection& direction ) QskConicDirection QskGradient::conicDirection() const { - Q_ASSERT( m_type == Conic ); - if ( m_type != Conic ) + { + qWarning() << "Requesting conic attributes from a non conic gradient."; return QskConicDirection( 0.5, 0.5, 0.0, 0.0 ); + } QskConicDirection dir( m_values[0], m_values[1], m_values[2], m_values[3] ); dir.setAspectRatio( m_values[4] ); diff --git a/src/common/QskGradientDirection.h b/src/common/QskGradientDirection.h index 68cc99a52..62a2da52c 100644 --- a/src/common/QskGradientDirection.h +++ b/src/common/QskGradientDirection.h @@ -12,8 +12,6 @@ #include #include -class QLineF; - class QSK_EXPORT QskLinearDirection { Q_GADGET