diff options
author | Topi Reinio <topi.reinio@digia.com> | 2014-10-15 13:50:27 +0200 |
---|---|---|
committer | Topi Reiniƶ <topi.reinio@digia.com> | 2014-10-17 14:57:13 +0200 |
commit | cf8f369f8575dcb9ca4d5116f3afc7cff4a080af (patch) | |
tree | a685f393b50786a892fcd3ad638b4c01e9002894 /examples/threads/queuedcustomtype | |
parent | 45485d9eb47d3129b8a74c2e9d854c07673161cd (diff) |
Move Qt Core examples under a common subdirectory
Qt Core examples were scattered into several subdirectories under
qtbase/examples. This caused an issue with the example manifest
file generated by QDoc; it expects to find all examples under a
common directory in order to produde correct paths to the example
.pro files. Qt Creator will not find the examples without a valid
manifest file.
This change moves the examples and edits the documentation files
accordingly.
Task-number: QTBUG-41963
Change-Id: I51d86782e0ba21c5c9bae5f15401ec774abe5cf8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Diffstat (limited to 'examples/threads/queuedcustomtype')
-rw-r--r-- | examples/threads/queuedcustomtype/block.cpp | 73 | ||||
-rw-r--r-- | examples/threads/queuedcustomtype/block.h | 70 | ||||
-rw-r--r-- | examples/threads/queuedcustomtype/main.cpp | 128 | ||||
-rw-r--r-- | examples/threads/queuedcustomtype/queuedcustomtype.pro | 14 | ||||
-rw-r--r-- | examples/threads/queuedcustomtype/renderthread.cpp | 109 | ||||
-rw-r--r-- | examples/threads/queuedcustomtype/renderthread.h | 76 | ||||
-rw-r--r-- | examples/threads/queuedcustomtype/window.cpp | 136 | ||||
-rw-r--r-- | examples/threads/queuedcustomtype/window.h | 76 |
8 files changed, 0 insertions, 682 deletions
diff --git a/examples/threads/queuedcustomtype/block.cpp b/examples/threads/queuedcustomtype/block.cpp deleted file mode 100644 index 07bd58cd97..0000000000 --- a/examples/threads/queuedcustomtype/block.cpp +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QColor> -#include <QRect> -#include "block.h" - -Block::Block() -{ -} - -Block::Block(const Block &other) -{ - m_rect = other.m_rect; - m_color = other.m_color; -} - -Block::~Block() -{ -} - -Block::Block(const QRect &rect, const QColor &color) -{ - m_rect = rect; - m_color = color; -} - -QColor Block::color() const -{ - return m_color; -} - -QRect Block::rect() const -{ - return m_rect; -} diff --git a/examples/threads/queuedcustomtype/block.h b/examples/threads/queuedcustomtype/block.h deleted file mode 100644 index f9930340e2..0000000000 --- a/examples/threads/queuedcustomtype/block.h +++ /dev/null @@ -1,70 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef BLOCK_H -#define BLOCK_H - -#include <QColor> -#include <QDebug> -#include <QMetaType> -#include <QRect> - -//! [custom type definition and meta-type declaration] -class Block -{ -public: - Block(); - Block(const Block &other); - ~Block(); - - Block(const QRect &rect, const QColor &color); - - QColor color() const; - QRect rect() const; - -private: - QRect m_rect; - QColor m_color; -}; - -Q_DECLARE_METATYPE(Block); -//! [custom type definition and meta-type declaration] - -#endif diff --git a/examples/threads/queuedcustomtype/main.cpp b/examples/threads/queuedcustomtype/main.cpp deleted file mode 100644 index 98933c66f3..0000000000 --- a/examples/threads/queuedcustomtype/main.cpp +++ /dev/null @@ -1,128 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QApplication> -#include <QPainter> -#include <QTime> -#include "block.h" -#include "window.h" - -QImage createImage(int width, int height) -{ - QImage image(width, height, QImage::Format_RGB16); - QPainter painter; - QPen pen; - pen.setStyle(Qt::NoPen); - QBrush brush(Qt::blue); - - painter.begin(&image); - painter.fillRect(image.rect(), brush); - brush.setColor(Qt::white); - painter.setPen(pen); - painter.setBrush(brush); - - static const QPointF points1[3] = { - QPointF(4, 4), - QPointF(7, 4), - QPointF(5.5, 1) - }; - - static const QPointF points2[3] = { - QPointF(1, 4), - QPointF(7, 4), - QPointF(10, 10) - }; - - static const QPointF points3[3] = { - QPointF(4, 4), - QPointF(10, 4), - QPointF(1, 10) - }; - - painter.setWindow(0, 0, 10, 10); - - int x = 0; - int y = 0; - int starWidth = image.width()/3; - int starHeight = image.height()/3; - - QRect rect(x, y, starWidth, starHeight); - - for (int i = 0; i < 9; ++i) { - - painter.setViewport(rect); - painter.drawPolygon(points1, 3); - painter.drawPolygon(points2, 3); - painter.drawPolygon(points3, 3); - - if (i % 3 == 2) { - y = y + starHeight; - rect.moveTop(y); - - x = 0; - rect.moveLeft(x); - - } else { - x = x + starWidth; - rect.moveLeft(x); - } - } - - painter.end(); - return image; -} - -//! [main function] //! [main start] -int main(int argc, char *argv[]) -{ - QApplication app(argc, argv); -//! [main start] //! [register meta-type for queued communications] - qRegisterMetaType<Block>(); -//! [register meta-type for queued communications] - qsrand(QTime::currentTime().elapsed()); - - Window window; - window.show(); - - window.loadImage(createImage(256, 256)); -//! [main finish] - return app.exec(); -} -//! [main finish] //! [main function] diff --git a/examples/threads/queuedcustomtype/queuedcustomtype.pro b/examples/threads/queuedcustomtype/queuedcustomtype.pro deleted file mode 100644 index 8b18b13ba6..0000000000 --- a/examples/threads/queuedcustomtype/queuedcustomtype.pro +++ /dev/null @@ -1,14 +0,0 @@ -HEADERS = block.h \ - renderthread.h \ - window.h -SOURCES = main.cpp \ - block.cpp \ - renderthread.cpp \ - window.cpp -QT += widgets - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot -INSTALLS += target - - diff --git a/examples/threads/queuedcustomtype/renderthread.cpp b/examples/threads/queuedcustomtype/renderthread.cpp deleted file mode 100644 index 50a638987f..0000000000 --- a/examples/threads/queuedcustomtype/renderthread.cpp +++ /dev/null @@ -1,109 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "renderthread.h" - -RenderThread::RenderThread(QObject *parent) - : QThread(parent) -{ - m_abort = false; -} - -RenderThread::~RenderThread() -{ - mutex.lock(); - m_abort = true; - mutex.unlock(); - - wait(); -} - -//![processing the image (start)] -void RenderThread::processImage(const QImage &image) -{ - if (image.isNull()) - return; - - m_image = image; - m_abort = false; - start(); -} - -void RenderThread::run() -{ - int size = qMax(m_image.width()/20, m_image.height()/20); - for (int s = size; s > 0; --s) { - for (int c = 0; c < 400; ++c) { -//![processing the image (start)] - int x1 = qMax(0, (qrand() % m_image.width()) - s/2); - int x2 = qMin(x1 + s/2 + 1, m_image.width()); - int y1 = qMax(0, (qrand() % m_image.height()) - s/2); - int y2 = qMin(y1 + s/2 + 1, m_image.height()); - int n = 0; - int red = 0; - int green = 0; - int blue = 0; - for (int i = y1; i < y2; ++i) { - for (int j = x1; j < x2; ++j) { - QRgb pixel = m_image.pixel(j, i); - red += qRed(pixel); - green += qGreen(pixel); - blue += qBlue(pixel); - n += 1; - } - } -//![processing the image (finish)] - Block block(QRect(x1, y1, x2 - x1 + 1, y2 - y1 + 1), - QColor(red/n, green/n, blue/n)); - emit sendBlock(block); - if (m_abort) - return; - msleep(10); - } - } -} -//![processing the image (finish)] - -void RenderThread::stopProcess() -{ - mutex.lock(); - m_abort = true; - mutex.unlock(); -} diff --git a/examples/threads/queuedcustomtype/renderthread.h b/examples/threads/queuedcustomtype/renderthread.h deleted file mode 100644 index 5630926d41..0000000000 --- a/examples/threads/queuedcustomtype/renderthread.h +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef RENDERTHREAD_H -#define RENDERTHREAD_H - -#include <QImage> -#include <QMutex> -#include <QThread> -#include "block.h" - -//! [RenderThread class definition] -class RenderThread : public QThread -{ - Q_OBJECT - -public: - RenderThread(QObject *parent = 0); - ~RenderThread(); - - void processImage(const QImage &image); - -signals: - void sendBlock(const Block &block); - -public slots: - void stopProcess(); - -protected: - void run(); - -private: - bool m_abort; - QImage m_image; - QMutex mutex; -}; -//! [RenderThread class definition] - -#endif diff --git a/examples/threads/queuedcustomtype/window.cpp b/examples/threads/queuedcustomtype/window.cpp deleted file mode 100644 index 8afb8b6782..0000000000 --- a/examples/threads/queuedcustomtype/window.cpp +++ /dev/null @@ -1,136 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <QtWidgets> -#include "window.h" - -//! [Window constructor start] -Window::Window() -{ - thread = new RenderThread(); -//! [Window constructor start] //! [set up widgets and connections] - - label = new QLabel(); - label->setAlignment(Qt::AlignCenter); - - loadButton = new QPushButton(tr("&Load image...")); - resetButton = new QPushButton(tr("&Stop")); - resetButton->setEnabled(false); - - connect(loadButton, SIGNAL(clicked()), this, SLOT(loadImage())); - connect(resetButton, SIGNAL(clicked()), thread, SLOT(stopProcess())); - connect(thread, SIGNAL(finished()), this, SLOT(resetUi())); -//! [set up widgets and connections] //! [connecting signal with custom type] - connect(thread, SIGNAL(sendBlock(Block)), this, SLOT(addBlock(Block))); -//! [connecting signal with custom type] - - QHBoxLayout *buttonLayout = new QHBoxLayout(); - buttonLayout->addStretch(); - buttonLayout->addWidget(loadButton); - buttonLayout->addWidget(resetButton); - buttonLayout->addStretch(); - - QVBoxLayout *layout = new QVBoxLayout(this); - layout->addWidget(label); - layout->addLayout(buttonLayout); - -//! [Window constructor finish] - setWindowTitle(tr("Queued Custom Type")); -} -//! [Window constructor finish] - -void Window::loadImage() -{ - QStringList formats; - foreach (QByteArray format, QImageReader::supportedImageFormats()) - if (format.toLower() == format) - formats.append("*." + format); - - QString newPath = QFileDialog::getOpenFileName(this, tr("Open Image"), - path, tr("Image files (%1)").arg(formats.join(' '))); - - if (newPath.isEmpty()) - return; - - QImage image(newPath); - if (!image.isNull()) { - loadImage(image); - path = newPath; - } -} - -void Window::loadImage(const QImage &image) -{ - QDesktopWidget desktop; - QImage useImage; - QRect space = desktop.availableGeometry(); - if (image.width() > 0.75*space.width() || image.height() > 0.75*space.height()) - useImage = image.scaled(0.75*space.width(), 0.75*space.height(), - Qt::KeepAspectRatio, Qt::SmoothTransformation); - else - useImage = image; - - pixmap = QPixmap(useImage.width(), useImage.height()); - pixmap.fill(qRgb(255, 255, 255)); - label->setPixmap(pixmap); - loadButton->setEnabled(false); - resetButton->setEnabled(true); - thread->processImage(useImage); -} - -//! [Adding blocks to the display] -void Window::addBlock(const Block &block) -{ - QColor color = block.color(); - color.setAlpha(64); - - QPainter painter; - painter.begin(&pixmap); - painter.fillRect(block.rect(), color); - painter.end(); - label->setPixmap(pixmap); -} -//! [Adding blocks to the display] - -void Window::resetUi() -{ - loadButton->setEnabled(true); - resetButton->setEnabled(false); -} diff --git a/examples/threads/queuedcustomtype/window.h b/examples/threads/queuedcustomtype/window.h deleted file mode 100644 index cb648f1be2..0000000000 --- a/examples/threads/queuedcustomtype/window.h +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef WINDOW_H -#define WINDOW_H - -#include <QWidget> -#include "renderthread.h" - -class QLabel; -class QPushButton; - -//! [Window class definition] -class Window : public QWidget -{ - Q_OBJECT - -public: - Window(); - void loadImage(const QImage &image); - -public slots: - void addBlock(const Block &block); - -private slots: - void loadImage(); - void resetUi(); - -private: - QLabel *label; - QPixmap pixmap; - QPushButton *loadButton; - QPushButton *resetButton; - QString path; - RenderThread *thread; -}; -//! [Window class definition] - -#endif |