Changeset 11158 in ntrip for trunk/BNC/qwt/qwt_transform.cpp


Ignore:
Timestamp:
Nov 3, 2026, 10:53:35 AM (2 weeks ago)
Author:
stuerze
Message:

deprecated functions exchanged libs updated

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/qwt/qwt_transform.cpp

    r9383 r11158  
    1 /* -*- mode: C++ ; c-file-style: "stroustrup" -*- *****************************
     1/******************************************************************************
    22 * Qwt Widget Library
    33 * Copyright (C) 1997   Josef Wilgen
    … …  
    1111#include "qwt_math.h"
    1212
    13 #if QT_VERSION < 0x040601
    14 #define qExp(x) ::exp(x)
    15 #endif
    16 
    17 #if QT_VERSION >= 0x050400
    18 
    1913//! Smallest allowed value for logarithmic scales: 1.0e-150
    2014const double QwtLogTransform::LogMin = 1.0e-150;
    … …  
    2216//! Largest allowed value for logarithmic scales: 1.0e150
    2317const double QwtLogTransform::LogMax = 1.0e150;
    24 
    25 #else
    26 
    27 //! Smallest allowed value for logarithmic scales: 1.0e-150
    28 QT_STATIC_CONST_IMPL double QwtLogTransform::LogMin = 1.0e-150;
    29 
    30 //! Largest allowed value for logarithmic scales: 1.0e150
    31 QT_STATIC_CONST_IMPL double QwtLogTransform::LogMax = 1.0e150;
    32 
    33 #endif
    3418
    3519//! Constructor
    … …  
    4428
    4529/*!
    46   \param value Value to be bounded
    47   \return value unmodified
     30   \param value Value to be bounded
     31   \return value unmodified
    4832 */
    4933double QwtTransform::bounded( double value ) const
    … …  
    6448
    6549/*!
    66   \param value Value to be transformed
    67   \return value unmodified
     50   \param value Value to be transformed
     51   \return value unmodified
    6852 */
    6953double QwtNullTransform::transform( double value ) const
    … …  
    7357
    7458/*!
    75   \param value Value to be transformed
    76   \return value unmodified
     59   \param value Value to be transformed
     60   \return value unmodified
    7761 */
    7862double QwtNullTransform::invTransform( double value ) const
    … …  
    8266
    8367//! \return Clone of the transformation
    84 QwtTransform *QwtNullTransform::copy() const
     68QwtTransform* QwtNullTransform::copy() const
    8569{
    8670    return new QwtNullTransform();
    … …  
    9983
    10084/*!
    101   \param value Value to be transformed
    102   \return log( value )
     85   \param value Value to be transformed
     86   \return log( value )
    10387 */
    10488double QwtLogTransform::transform( double value ) const
    10589{
    106     return ::log( value );
     90    return std::log( value );
    10791}
    10892
    10993/*!
    110   \param value Value to be transformed
    111   \return exp( value )
     94   \param value Value to be transformed
     95   \return exp( value )
    11296 */
    11397double QwtLogTransform::invTransform( double value ) const
    11498{
    115     return qExp( value );
     99    return std::exp( value );
    116100}
    117101
    118102/*!
    119   \param value Value to be bounded
    120   \return qBound( LogMin, value, LogMax )
     103   \param value Value to be bounded
     104   \return qBound( LogMin, value, LogMax )
    121105 */
    122106double QwtLogTransform::bounded( double value ) const
    … …  
    126110
    127111//! \return Clone of the transformation
    128 QwtTransform *QwtLogTransform::copy() const
     112QwtTransform* QwtLogTransform::copy() const
    129113{
    130114    return new QwtLogTransform();
    … …  
    132116
    133117/*!
    134   Constructor
    135   \param exponent Exponent
    136 */
     118   Constructor
     119   \param exponent Exponent
     120 */
    137121QwtPowerTransform::QwtPowerTransform( double exponent ):
    138122    QwtTransform(),
    139     d_exponent( exponent )
     123    m_exponent( exponent )
    140124{
    141125}
    … …  
    147131
    148132/*!
    149   \param value Value to be transformed
    150   \return Exponentiation preserving the sign
     133   \param value Value to be transformed
     134   \return Exponentiation preserving the sign
    151135 */
    152136double QwtPowerTransform::transform( double value ) const
    153137{
    154138    if ( value < 0.0 )
    155         return -qPow( -value, 1.0 / d_exponent );
     139        return -std::pow( -value, 1.0 / m_exponent );
    156140    else
    157         return qPow( value, 1.0 / d_exponent );
     141        return std::pow( value, 1.0 / m_exponent );
    158142
    159143}
    160144
    161145/*!
    162   \param value Value to be transformed
    163   \return Inverse exponentiation preserving the sign
     146   \param value Value to be transformed
     147   \return Inverse exponentiation preserving the sign
    164148 */
    165149double QwtPowerTransform::invTransform( double value ) const
    166150{
    167151    if ( value < 0.0 )
    168         return -qPow( -value, d_exponent );
     152        return -std::pow( -value, m_exponent );
    169153    else
    170         return qPow( value, d_exponent );
     154        return std::pow( value, m_exponent );
    171155}
    172156
    173157//! \return Clone of the transformation
    174 QwtTransform *QwtPowerTransform::copy() const
     158QwtTransform* QwtPowerTransform::copy() const
    175159{
    176     return new QwtPowerTransform( d_exponent );
     160    return new QwtPowerTransform( m_exponent );
    177161}
Note: See TracChangeset for help on using the changeset viewer.