Changeset 561 for trunk/examples/widgets/tablet/tabletcanvas.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)
• examples/widgets/tablet/tabletcanvas.cpp (modified) (12 diffs)

trunk/examples/widgets/tablet/tabletcanvas.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the examples 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -51 +51 @@
     myBrush = QBrush();
     myPen = QPen();
-    initImage();
+    init();
     setAutoFillBackground(true);
     deviceDown = false;
@@ -61 +61 @@
 }
 
-void TabletCanvas::initImage()
-{
-    QImage newImage = QImage(width(), height(), QImage::Format_ARGB32);
-    QPainter painter(&newImage);
-    painter.fillRect(0, 0, newImage.width(), newImage.height(), Qt::white);
-    if (!image.isNull())
-        painter.drawImage(0, 0, image);
+void TabletCanvas::init()
+{
+    Q);
+    e);
+    );
+    if (!.isNull())
+        painter.draw);
     painter.end();
-    image = newImage;
+    ;
 }
 //! [0]
@@ -76 +76 @@
 bool TabletCanvas::saveImage(const QString &file)
 {
-    return image.save(file);
+    return .save(file);
 }
 //! [1]
@@ -83 +83 @@
 bool TabletCanvas::loadImage(const QString &file)
 {
-    bool success = image.load(file);
+    bool success = .load(file);
 
     if (success) {
@@ -99 +99 @@
     switch (event->type()) {
         case QEvent::TabletPress:
-            if (!deviceDown)
+            if (!deviceDown)
                 deviceDown = true;
+
+
             break;
         case QEvent::TabletRelease:
@@ -113 +115 @@
             if (deviceDown) {
                 updateBrush(event);
-                QPainter painter(&image);
-                paintImage(painter, event);
+                QPainter painter(&);
+                paint(painter, event);
             }
             break;
@@ -128 +130 @@
 {
     QPainter painter(this);
-    painter.drawImage(QPoint(0, 0), image);
+    painter.draw);
 }
 //! [4]
 
 //! [5]
-void TabletCanvas::paintImage(QPainter &painter, QTabletEvent *event)
+void TabletCanvas::paint(QPainter &painter, QTabletEvent *event)
 {
     QPoint brushAdjust(10, 10);
 
     switch (myTabletDevice) {
-        case QTabletEvent::Stylus:
-            painter.setBrush(myBrush);
-            painter.setPen(myPen);
-            painter.drawLine(polyLine[1], event->pos());
-            break;
         case QTabletEvent::Airbrush:
             myBrush.setColor(myColor);
@@ -157 +154 @@
         case QTabletEvent::FourDMouse:
         case QTabletEvent::RotationStylus:
-            qWarning("This input device is not supported by the example.");
-            break;
-        default:
-            qWarning("Unknown tablet device.");
+            {
+                const QString error(tr("This input device is not supported by the example."));
+#ifndef QT_NO_STATUSTIP
+                QStatusTipEvent status(error);
+                QApplication::sendEvent(this, &status);
+#else
+                qWarning() << error;
+#endif
+            }
+            break;
+        default:
+            {
+                const QString error(tr("Unknown tablet device - treating as stylus"));
+#ifndef QT_NO_STATUSTIP
+                QStatusTipEvent status(error);
+                QApplication::sendEvent(this, &status);
+#else
+                qWarning() << error;
+#endif
+            }
+            // FALL-THROUGH
+        case QTabletEvent::Stylus:
+            painter.setBrush(myBrush);
+            painter.setPen(myPen);
+            painter.drawLine(polyLine[1], event->pos());
+            break;
     }
 }
@@ -251 +270 @@
 //! [11]
 
-void TabletCanvas::resizeEvent(QResizeEvent *event)
-{
-    initImage();
+void TabletCanvas::resizeEvent(QResizeEvent *)
+{
+    init();
     polyLine[0] = polyLine[1] = polyLine[2] = QPoint();
 }