Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_interval.cpp

Timestamp:

May 10, 2017, 3:20:54 PM (7 years ago)

Author:

stoecker

Message:

update qwt and qwtpolar, many QT5 fixes (unfinished)

File:

• trunk/BNC/qwt/qwt_interval.cpp (modified) (8 diffs)

trunk/BNC/qwt/qwt_interval.cpp

@@ -13 +13 @@
 
 /*!
-   \brief Normalize the limits of the interval
-
-   If maxValue() < minValue() the limits will be inverted.
-   \return Normalized interval
-
-   \sa isValid(), inverted()
+  \brief Normalize the limits of the interval
+
+  If maxValue() < minValue() the limits will be inverted.
+  \return Normalized interval
+
+  \sa isValid(), inverted()
 */
 QwtInterval QwtInterval::normalized() const
@@ -35 +35 @@
 
 /*!
-   Invert the limits of the interval
-   \return Inverted interval
-   \sa normalized()
+  Invert the limits of the interval
+  \return Inverted interval
+  \sa normalized()
 */
 QwtInterval QwtInterval::inverted() const
@@ -131 +131 @@
 }
 
-//! Intersect 2 intervals
+/*! 
+  \brief Intersect 2 intervals
+  
+  \param other Interval to be intersect with
+  \return Intersection
+ */
 QwtInterval QwtInterval::intersect( const QwtInterval &other ) const
 {
@@ -193 +198 @@
 }
 
-//! Unites this interval with the given interval.
-QwtInterval& QwtInterval::operator|=( const QwtInterval & interval )
-{
-    *this = *this | interval;
+/*! 
+  \brief Unite this interval with the given interval.
+
+  \param other Interval to be united with
+  \return This interval
+ */
+QwtInterval& QwtInterval::operator|=( const QwtInterval &other )
+{
+    *this = *this | other;
     return *this;
 }
 
-//! Intersects this interval with the given interval.
-QwtInterval& QwtInterval::operator&=( const QwtInterval & interval )
-{
-    *this = *this & interval;
+/*! 
+  \brief Intersect this interval with the given interval.
+
+  \param other Interval to be intersected with
+  \return This interval
+ */
+QwtInterval& QwtInterval::operator&=( const QwtInterval &other )
+{
+    *this = *this & other;
     return *this;
 }
 
 /*!
-   Test if two intervals overlap
+  \brief Test if two intervals overlap
+
+  \param other Interval
+  \return True, when the intervals are intersecting
 */
 bool QwtInterval::intersects( const QwtInterval &other ) const
@@ -244 +262 @@
 
 /*!
-   Adjust the limit that is closer to value, so that value becomes
-   the center of the interval.
-
-   \param value Center
-   \return Interval with value as center
+  Adjust the limit that is closer to value, so that value becomes
+  the center of the interval.
+
+  \param value Center
+  \return Interval with value as center
 */
 QwtInterval QwtInterval::symmetrize( double value ) const
@@ -262 +280 @@
 
 /*!
-   Limit the interval, keeping the border modes
-
-   \param lowerBound Lower limit
-   \param upperBound Upper limit
-
-   \return Limited interval
+  Limit the interval, keeping the border modes
+
+  \param lowerBound Lower limit
+  \param upperBound Upper limit
+
+  \return Limited interval
 */
 QwtInterval QwtInterval::limited( double lowerBound, double upperBound ) const
@@ -284 +302 @@
 
 /*!
-   Extend the interval
-
-   If value is below minValue, value becomes the lower limit.
-   If value is above maxValue, value becomes the upper limit.
-
-   extend has no effect for invalid intervals
-
-   \param value Value
-   \sa isValid()
+  \brief Extend the interval
+
+  If value is below minValue(), value becomes the lower limit.
+  If value is above maxValue(), value becomes the upper limit.
+
+  extend() has no effect for invalid intervals
+
+  \param value Value
+  \return extended interval
+
+  \sa isValid()
 */
 QwtInterval QwtInterval::extend( double value ) const
@@ -304 +324 @@
 
 /*!
-   Extend an interval
-
-   \param value Value
-   \return Reference of the extended interval
-
-   \sa extend()
+  Extend an interval
+
+  \param value Value
+  \return Reference of the extended interval
+
+  \sa extend()
 */
 QwtInterval& QwtInterval::operator|=( double value )