Changeset 561 for trunk/src/gui/widgets/qlcdnumber.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/widgets/qlcdnumber.cpp (modified) (22 diffs)

trunk/src/gui/widgets/qlcdnumber.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -75 +75 @@
 
     \ingroup basicwidgets
-    \mainclass
+
 
     It can display a number in just about any size. It can display
@@ -86 +86 @@
 
     QLCDNumber emits the overflow() signal when it is asked to display
-    something beyond its range. The range is set by setNumDigits(),
+    something beyond its range. The range is set by setDigitCount(),
     but setSmallDecimalPoint() also influences it. If the display is
     set to hexadecimal, octal or binary, the integer equivalent of the
@@ -161 +161 @@
     a too-large number or a too-long string.
 
-    It is never emitted by setNumDigits().
+    It is never emitted by setDigitCount().
 */
 
@@ -346 +346 @@
     constructor.
 
-    \sa setNumDigits(), setSmallDecimalPoint()
+    \sa setDigitCount(), setSmallDecimalPoint()
 */
 
@@ -368 +368 @@
     constructor.
 
-    \sa setNumDigits(), setSmallDecimalPoint()
+    \sa setDigitCount(), setSmallDecimalPoint()
 */
 
@@ -388 +388 @@
     The \a parent argument is passed to the QFrame constructor.
 
-    \sa setNumDigits(), setSmallDecimalPoint()
+    \sa setDigitCount(), setSmallDecimalPoint()
 */
 
@@ -404 +404 @@
     numDigits, the base to decimal, the decimal point mode to 'small'
     and the frame style to a raised box. The segmentStyle() is set to
-    \c Outline.
+    \c Filled.
 
     The \a parent argument is passed to the QFrame constructor.
 
-    \sa setNumDigits(), setSmallDecimalPoint()
+    \sa setDigitCount(), setSmallDecimalPoint()
 */
 
@@ -427 +427 @@
     base       = QLCDNumber::Dec;
     smallPoint = false;
-    q->setNumDigits(ndigits);
-    q->setSegmentStyle(QLCDNumber::Outline);
+    q->setDigitCount(ndigits);
+    q->setSegmentStyle(QLCDNumber::Filled);
     q->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
 }
@@ -442 +442 @@
 
 /*!
+    \deprecated
     \property QLCDNumber::numDigits
+    \brief the current number of digits displayed
+    \sa digitCount
+*/
+
+void QLCDNumber::setNumDigits(int numDigits)
+{
+    setDigitCount(numDigits);
+}
+
+/*!
+    \since 4.6
+    \property QLCDNumber::digitCount
     \brief the current number of digits displayed
 
@@ -454 +467 @@
 */
 
-void QLCDNumber::setNumDigits(int numDigits)
+/*!
+  Sets the current number of digits to \a numDigits. Must
+  be in the range 0..99.
+ */
+void QLCDNumber::setDigitCount(int numDigits)
 {
     Q_D(QLCDNumber);
@@ -471 +488 @@
         d->digitStr.fill(QLatin1Char(' '), d->ndigits);
         d->points.fill(0, d->ndigits);
-        d->digitStr[d->ndigits - 1] = QLatin1Char('0');            // "0" is the default number
+        d->digitStr[d->ndigits - 1] = QLatin1Char('0'); // "0" is the default number
     } else {
         bool doDisplay = d->ndigits == 0;
@@ -510 +527 @@
 
 /*!
+  Returns the current number of digits.
+ */
+int QLCDNumber::digitCount() const
+{
+    Q_D(const QLCDNumber);
+    return d->ndigits;
+}
+
+/*!
     \overload
 
@@ -515 +541 @@
     otherwise returns false.
 
-    \sa display(), numDigits(), smallDecimalPoint()
+    \sa display(), digitCount(), smallDecimalPoint()
 */
 
@@ -531 +557 @@
     otherwise returns false.
 
-    \sa display(), numDigits(), smallDecimalPoint()
+    \sa display(), digitCount(), smallDecimalPoint()
 */
 
@@ -757 +783 @@
     QPainter p(this);
     drawFrame(&p);
+    p.setRenderHint(QPainter::Antialiasing);
+    if (d->shadow)
+        p.translate(0.5, 0.5);
+
     if (d->smallPoint)
         d->drawString(d->digitStr, p, &d->points, false);
@@ -1071 +1101 @@
         }
         // End exact copy
-        p.setPen(fgColor);
+        p.setPen(Qt::NoPen);
         p.setBrush(fgColor);
         p.drawPolygon(a);
@@ -1219 +1249 @@
     \row \i \c Outline
          \i Produces raised segments filled with the background color
+    \row \i \c Filled
             (this is the default).
-    \row \i \c Filled
          \i Produces raised segments filled with the foreground color.
     \row \i \c Flat
@@ -1253 +1283 @@
 QSize QLCDNumber::sizeHint() const
 {
-    return QSize(10 + 9 * (numDigits() + (smallDecimalPoint() ? 0 : 1)), 23);
+    return QSize(10 + 9 * (digitCount() + (smallDecimalPoint() ? 0 : 1)), 23);
 }
 
@@ -1272 +1302 @@
 /*!
     \fn int QLCDNumber::margin() const
-    Returns the with of the the margin around the contents of the widget.
+    Returns the width of the margin around the contents of the widget.
     
     Use QWidget::getContentsMargins() instead.