Remove wasm-qt-mandelbrot demo
...that had been added with f90c68316c "WASM: add
Emscripten demo application". Whatever the original intention, it has probably
served its purpose by now---and now only negatively impacts (re-)build times.
Change-Id: I2bda8d12b91e741c4d0f7d3f02597e0e9505a73a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172087
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
This commit is contained in:
@@ -85,7 +85,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
|
||||
listglyphs \
|
||||
$(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \
|
||||
$(if $(and $(ENABLE_GTKTILEDVIEWER), $(filter WNT,$(OS))), gtktiledviewer) \
|
||||
$(if $(filter EMSCRIPTEN,$(OS)),wasm-qt5-mandelbrot) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
||||
#
|
||||
# This file is part of the LibreOffice project.
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
|
||||
$(eval $(call gb_CustomTarget_CustomTarget,static/qt5-mandelbrot))
|
||||
|
||||
$(call gb_CustomTarget_get_target,static/qt5-mandelbrot) : \
|
||||
$(gb_CustomTarget_workdir)/static/qt5-mandelbrot/renderthread.moc \
|
||||
$(gb_CustomTarget_workdir)/static/qt5-mandelbrot/mandelbrotwidget.moc \
|
||||
|
||||
qt5_mandelbrot_MOCDEFS_H := $(gb_CustomTarget_workdir)/static/qt5-mandelbrot/moc_predefs.h
|
||||
qt5_mandelbrot_MOCDEFS_CXX := $(gb_CustomTarget_workdir)/static/qt5-mandelbrot/moc_dummy.cxx
|
||||
qt5_mandelbrot_WORKDIR := $(gb_CustomTarget_workdir)/static/qt5-mandelbrot/.dir
|
||||
|
||||
$(qt5_mandelbrot_MOCDEFS_CXX): | $(qt5_mandelbrot_WORKDIR)
|
||||
touch $@
|
||||
|
||||
$(qt5_mandelbrot_MOCDEFS_H): $(qt5_mandelbrot_MOCDEFS_CXX) | $(qt5_mandelbrot_WORKDIR)
|
||||
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CXX,1)
|
||||
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),CXX)
|
||||
$(CXX) -pipe -O2 -std=gnu++11 -fno-exceptions $(gb_EMSCRIPTEN_CPPFLAGS) -dM -E -o $@ $<
|
||||
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),CXX)
|
||||
|
||||
$(gb_CustomTarget_workdir)/static/qt5-mandelbrot/%.moc : \
|
||||
$(SRCDIR)/static/source/qt5-mandelbrot/%.h \
|
||||
$(qt5_mandelbrot_MOCDEFS_H) | $(qt5_mandelbrot_WORKDIR)
|
||||
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
|
||||
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),MOC)
|
||||
$(MOC5) --include $(qt5_mandelbrot_MOCDEFS_H) $(gb_EMSCRIPTEN_QTDEFS) $< -o $@
|
||||
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),MOC)
|
||||
|
||||
# vim: set noet sw=4:
|
||||
@@ -1,32 +0,0 @@
|
||||
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
||||
#
|
||||
# This file is part of the LibreOffice project.
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
|
||||
$(eval $(call gb_Executable_Executable,wasm-qt5-mandelbrot))
|
||||
|
||||
$(eval $(call gb_Executable_use_custom_headers,wasm-qt5-mandelbrot,static/qt5-mandelbrot))
|
||||
|
||||
$(eval $(call gb_Executable_use_externals,wasm-qt5-mandelbrot,\
|
||||
graphite \
|
||||
freetype \
|
||||
harfbuzz \
|
||||
libpng \
|
||||
qt5 \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_exception_objects,wasm-qt5-mandelbrot,\
|
||||
static/source/qt5-mandelbrot/main \
|
||||
static/source/qt5-mandelbrot/mandelbrotwidget \
|
||||
static/source/qt5-mandelbrot/renderthread \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_defs,wasm-qt5-mandelbrot,\
|
||||
-DVCL_INTERNALS \
|
||||
))
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
@@ -22,10 +22,6 @@ $(eval $(call gb_Module_add_targets,static,\
|
||||
Package_favicon \
|
||||
Package_unoembind \
|
||||
StaticLibrary_unoembind \
|
||||
$(if $(ENABLE_QT5), \
|
||||
CustomTarget_wasm-qt5-mandelbrot_moc \
|
||||
Executable_wasm-qt5-mandelbrot \
|
||||
) \
|
||||
))
|
||||
endif
|
||||
|
||||
|
||||
@@ -22,7 +22,6 @@ The build generates a Writer-only LO build. You should be able to run either
|
||||
|
||||
$ emrun --serve_after_close workdir/installation/LibreOffice/emscripten/qt_soffice.html
|
||||
$ emrun --serve_after_close workdir/LinkTarget/Executable/qt_vcldemo.html
|
||||
$ emrun --serve_after_close workdir/LinkTarget/Executable/qt_wasm-qt5-mandelbrot.html
|
||||
|
||||
REMINDER: Always start new tabs in the browser, reload might fail / cache!
|
||||
INFO: latest browser won't work anymore with 0.0.0.0 and need 127.0.0.1.
|
||||
|
||||
@@ -1,66 +0,0 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the examples of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:BSD$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** BSD License Usage
|
||||
** Alternatively, 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 The Qt Company Ltd 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 "mandelbrotwidget.h"
|
||||
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtCore/QtPlugin>
|
||||
|
||||
Q_IMPORT_PLUGIN(QWasmIntegrationPlugin)
|
||||
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
|
||||
QApplication app(argc, argv);
|
||||
MandelbrotWidget widget;
|
||||
widget.show();
|
||||
return app.exec();
|
||||
}
|
||||
@@ -1,228 +0,0 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the examples of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:BSD$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** BSD License Usage
|
||||
** Alternatively, 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 The Qt Company Ltd 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 "mandelbrotwidget.h"
|
||||
#include "mandelbrotwidget.moc"
|
||||
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QKeyEvent>
|
||||
|
||||
#include <math.h>
|
||||
|
||||
const double DefaultCenterX = -0.637011;
|
||||
const double DefaultCenterY = -0.0395159;
|
||||
const double DefaultScale = 0.00403897;
|
||||
|
||||
const double ZoomInFactor = 0.8;
|
||||
const double ZoomOutFactor = 1 / ZoomInFactor;
|
||||
const int ScrollStep = 20;
|
||||
|
||||
MandelbrotWidget::MandelbrotWidget(QWidget* parent)
|
||||
: QWidget(parent)
|
||||
, centerX(DefaultCenterX)
|
||||
, centerY(DefaultCenterY)
|
||||
, pixmapScale(DefaultScale)
|
||||
, curScale(DefaultScale)
|
||||
{
|
||||
connect(&thread, &RenderThread::renderedImage, this, &MandelbrotWidget::updatePixmap);
|
||||
|
||||
setWindowTitle(tr("Mandelbrot"));
|
||||
#if QT_CONFIG(cursor)
|
||||
setCursor(Qt::CrossCursor);
|
||||
#endif
|
||||
resize(550, 400);
|
||||
}
|
||||
|
||||
void MandelbrotWidget::paintEvent(QPaintEvent* /* event */)
|
||||
{
|
||||
QPainter painter(this);
|
||||
painter.fillRect(rect(), Qt::black);
|
||||
|
||||
if (pixmap.isNull())
|
||||
{
|
||||
painter.setPen(Qt::white);
|
||||
painter.drawText(rect(), Qt::AlignCenter, tr("Rendering initial image, please wait..."));
|
||||
return;
|
||||
}
|
||||
|
||||
if (qFuzzyCompare(curScale, pixmapScale))
|
||||
{
|
||||
painter.drawPixmap(pixmapOffset, pixmap);
|
||||
}
|
||||
else
|
||||
{
|
||||
auto previewPixmap = qFuzzyCompare(pixmap.devicePixelRatioF(), qreal(1))
|
||||
? pixmap
|
||||
: pixmap.scaled(pixmap.size() / pixmap.devicePixelRatioF(),
|
||||
Qt::KeepAspectRatio, Qt::SmoothTransformation);
|
||||
double scaleFactor = pixmapScale / curScale;
|
||||
int newWidth = int(previewPixmap.width() * scaleFactor);
|
||||
int newHeight = int(previewPixmap.height() * scaleFactor);
|
||||
int newX = pixmapOffset.x() + (previewPixmap.width() - newWidth) / 2;
|
||||
int newY = pixmapOffset.y() + (previewPixmap.height() - newHeight) / 2;
|
||||
|
||||
painter.save();
|
||||
painter.translate(newX, newY);
|
||||
painter.scale(scaleFactor, scaleFactor);
|
||||
|
||||
QRectF exposed = painter.transform().inverted().mapRect(rect()).adjusted(-1, -1, 1, 1);
|
||||
painter.drawPixmap(exposed, previewPixmap, exposed);
|
||||
painter.restore();
|
||||
}
|
||||
|
||||
QString text = tr("Use mouse wheel or the '+' and '-' keys to zoom. "
|
||||
"Press and hold left mouse button to scroll.");
|
||||
QFontMetrics metrics = painter.fontMetrics();
|
||||
int textWidth = metrics.horizontalAdvance(text);
|
||||
|
||||
painter.setPen(Qt::NoPen);
|
||||
painter.setBrush(QColor(0, 0, 0, 127));
|
||||
painter.drawRect((width() - textWidth) / 2 - 5, 0, textWidth + 10, metrics.lineSpacing() + 5);
|
||||
painter.setPen(Qt::white);
|
||||
painter.drawText((width() - textWidth) / 2, metrics.leading() + metrics.ascent(), text);
|
||||
}
|
||||
|
||||
void MandelbrotWidget::resizeEvent(QResizeEvent* /* event */)
|
||||
{
|
||||
thread.render(centerX, centerY, curScale, size(), devicePixelRatioF());
|
||||
}
|
||||
|
||||
void MandelbrotWidget::keyPressEvent(QKeyEvent* event)
|
||||
{
|
||||
switch (event->key())
|
||||
{
|
||||
case Qt::Key_Plus:
|
||||
zoom(ZoomInFactor);
|
||||
break;
|
||||
case Qt::Key_Minus:
|
||||
zoom(ZoomOutFactor);
|
||||
break;
|
||||
case Qt::Key_Left:
|
||||
scroll(-ScrollStep, 0);
|
||||
break;
|
||||
case Qt::Key_Right:
|
||||
scroll(+ScrollStep, 0);
|
||||
break;
|
||||
case Qt::Key_Down:
|
||||
scroll(0, -ScrollStep);
|
||||
break;
|
||||
case Qt::Key_Up:
|
||||
scroll(0, +ScrollStep);
|
||||
break;
|
||||
default:
|
||||
QWidget::keyPressEvent(event);
|
||||
}
|
||||
}
|
||||
|
||||
#if QT_CONFIG(wheelevent)
|
||||
void MandelbrotWidget::wheelEvent(QWheelEvent* event)
|
||||
{
|
||||
const int numDegrees = event->angleDelta().y() / 8;
|
||||
const double numSteps = numDegrees / double(15);
|
||||
zoom(pow(ZoomInFactor, numSteps));
|
||||
}
|
||||
#endif
|
||||
|
||||
void MandelbrotWidget::mousePressEvent(QMouseEvent* event)
|
||||
{
|
||||
if (event->button() == Qt::LeftButton)
|
||||
lastDragPos = event->pos();
|
||||
}
|
||||
|
||||
void MandelbrotWidget::mouseMoveEvent(QMouseEvent* event)
|
||||
{
|
||||
if (event->buttons() & Qt::LeftButton)
|
||||
{
|
||||
pixmapOffset += event->pos() - lastDragPos;
|
||||
lastDragPos = event->pos();
|
||||
update();
|
||||
}
|
||||
}
|
||||
|
||||
void MandelbrotWidget::mouseReleaseEvent(QMouseEvent* event)
|
||||
{
|
||||
if (event->button() == Qt::LeftButton)
|
||||
{
|
||||
pixmapOffset += event->pos() - lastDragPos;
|
||||
lastDragPos = QPoint();
|
||||
|
||||
const auto pixmapSize = pixmap.size() / pixmap.devicePixelRatioF();
|
||||
int deltaX = (width() - pixmapSize.width()) / 2 - pixmapOffset.x();
|
||||
int deltaY = (height() - pixmapSize.height()) / 2 - pixmapOffset.y();
|
||||
scroll(deltaX, deltaY);
|
||||
}
|
||||
}
|
||||
|
||||
void MandelbrotWidget::updatePixmap(const QImage& image, double scaleFactor)
|
||||
{
|
||||
if (!lastDragPos.isNull())
|
||||
return;
|
||||
|
||||
pixmap = QPixmap::fromImage(image);
|
||||
pixmapOffset = QPoint();
|
||||
lastDragPos = QPoint();
|
||||
pixmapScale = scaleFactor;
|
||||
update();
|
||||
}
|
||||
|
||||
void MandelbrotWidget::zoom(double zoomFactor)
|
||||
{
|
||||
curScale *= zoomFactor;
|
||||
update();
|
||||
thread.render(centerX, centerY, curScale, size(), devicePixelRatioF());
|
||||
}
|
||||
|
||||
void MandelbrotWidget::scroll(int deltaX, int deltaY)
|
||||
{
|
||||
centerX += deltaX * curScale;
|
||||
centerY += deltaY * curScale;
|
||||
update();
|
||||
thread.render(centerX, centerY, curScale, size(), devicePixelRatioF());
|
||||
}
|
||||
@@ -1,91 +0,0 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the examples of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:BSD$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** BSD License Usage
|
||||
** Alternatively, 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 The Qt Company Ltd 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$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QtGui/QPixmap>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
#include "renderthread.h"
|
||||
|
||||
class MandelbrotWidget : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
MandelbrotWidget(QWidget* parent = nullptr);
|
||||
|
||||
protected:
|
||||
void paintEvent(QPaintEvent* event) override;
|
||||
void resizeEvent(QResizeEvent* event) override;
|
||||
void keyPressEvent(QKeyEvent* event) override;
|
||||
#if QT_CONFIG(wheelevent)
|
||||
void wheelEvent(QWheelEvent* event) override;
|
||||
#endif
|
||||
void mousePressEvent(QMouseEvent* event) override;
|
||||
void mouseMoveEvent(QMouseEvent* event) override;
|
||||
void mouseReleaseEvent(QMouseEvent* event) override;
|
||||
|
||||
private slots:
|
||||
void updatePixmap(const QImage& image, double scaleFactor);
|
||||
void zoom(double zoomFactor);
|
||||
|
||||
private:
|
||||
void scroll(int deltaX, int deltaY);
|
||||
|
||||
RenderThread thread;
|
||||
QPixmap pixmap;
|
||||
QPoint pixmapOffset;
|
||||
QPoint lastDragPos;
|
||||
double centerX;
|
||||
double centerY;
|
||||
double pixmapScale;
|
||||
double curScale;
|
||||
};
|
||||
@@ -1,232 +0,0 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the examples of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:BSD$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** BSD License Usage
|
||||
** Alternatively, 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 The Qt Company Ltd 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"
|
||||
#include "renderthread.moc"
|
||||
|
||||
#include <QtGui/QImage>
|
||||
#include <cmath>
|
||||
|
||||
RenderThread::RenderThread(QObject* parent)
|
||||
: QThread(parent)
|
||||
{
|
||||
for (int i = 0; i < ColormapSize; ++i)
|
||||
m_colormap[i] = rgbFromWaveLength(380.0 + (i * 400.0 / ColormapSize));
|
||||
}
|
||||
|
||||
RenderThread::~RenderThread()
|
||||
{
|
||||
m_mutex.lock();
|
||||
m_abort = true;
|
||||
m_condition.wakeOne();
|
||||
m_mutex.unlock();
|
||||
|
||||
wait();
|
||||
}
|
||||
|
||||
void RenderThread::render(double centerX, double centerY, double scaleFactor, QSize resultSize,
|
||||
double devicePixelRatio)
|
||||
{
|
||||
QMutexLocker locker(&m_mutex);
|
||||
|
||||
m_centerX = centerX;
|
||||
m_centerY = centerY;
|
||||
m_scaleFactor = scaleFactor;
|
||||
m_devicePixelRatio = devicePixelRatio;
|
||||
m_resultSize = resultSize;
|
||||
|
||||
if (!isRunning())
|
||||
{
|
||||
start(LowPriority);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_restart = true;
|
||||
m_condition.wakeOne();
|
||||
}
|
||||
}
|
||||
|
||||
void RenderThread::run()
|
||||
{
|
||||
forever
|
||||
{
|
||||
m_mutex.lock();
|
||||
const double devicePixelRatio = m_devicePixelRatio;
|
||||
const QSize resultSize = m_resultSize * devicePixelRatio;
|
||||
const double requestedScaleFactor = m_scaleFactor;
|
||||
const double scaleFactor = requestedScaleFactor / devicePixelRatio;
|
||||
const double centerX = m_centerX;
|
||||
const double centerY = m_centerY;
|
||||
m_mutex.unlock();
|
||||
|
||||
int halfWidth = resultSize.width() / 2;
|
||||
int halfHeight = resultSize.height() / 2;
|
||||
QImage image(resultSize, QImage::Format_RGB32);
|
||||
image.setDevicePixelRatio(devicePixelRatio);
|
||||
|
||||
const int NumPasses = 8;
|
||||
int pass = 0;
|
||||
while (pass < NumPasses)
|
||||
{
|
||||
const int MaxIterations = (1 << (2 * pass + 6)) + 32;
|
||||
const int Limit = 4;
|
||||
bool allBlack = true;
|
||||
|
||||
for (int y = -halfHeight; y < halfHeight; ++y)
|
||||
{
|
||||
if (m_restart)
|
||||
break;
|
||||
if (m_abort)
|
||||
return;
|
||||
|
||||
auto scanLine = reinterpret_cast<uint*>(image.scanLine(y + halfHeight));
|
||||
const double ay = centerY + (y * scaleFactor);
|
||||
|
||||
for (int x = -halfWidth; x < halfWidth; ++x)
|
||||
{
|
||||
const double ax = centerX + (x * scaleFactor);
|
||||
double a1 = ax;
|
||||
double b1 = ay;
|
||||
int numIterations = 0;
|
||||
|
||||
do
|
||||
{
|
||||
++numIterations;
|
||||
const double a2 = (a1 * a1) - (b1 * b1) + ax;
|
||||
const double b2 = (2 * a1 * b1) + ay;
|
||||
if ((a2 * a2) + (b2 * b2) > Limit)
|
||||
break;
|
||||
|
||||
++numIterations;
|
||||
a1 = (a2 * a2) - (b2 * b2) + ax;
|
||||
b1 = (2 * a2 * b2) + ay;
|
||||
if ((a1 * a1) + (b1 * b1) > Limit)
|
||||
break;
|
||||
} while (numIterations < MaxIterations);
|
||||
|
||||
if (numIterations < MaxIterations)
|
||||
{
|
||||
*scanLine++ = m_colormap[numIterations % ColormapSize];
|
||||
allBlack = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
*scanLine++ = qRgb(0, 0, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (allBlack && pass == 0)
|
||||
{
|
||||
pass = 4;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!m_restart)
|
||||
emit renderedImage(image, requestedScaleFactor);
|
||||
++pass;
|
||||
}
|
||||
}
|
||||
|
||||
m_mutex.lock();
|
||||
if (!m_restart)
|
||||
m_condition.wait(&m_mutex);
|
||||
m_restart = false;
|
||||
m_mutex.unlock();
|
||||
}
|
||||
}
|
||||
|
||||
uint RenderThread::rgbFromWaveLength(double wave)
|
||||
{
|
||||
double r = 0;
|
||||
double g = 0;
|
||||
double b = 0;
|
||||
|
||||
if (wave >= 380.0 && wave <= 440.0)
|
||||
{
|
||||
r = -1.0 * (wave - 440.0) / (440.0 - 380.0);
|
||||
b = 1.0;
|
||||
}
|
||||
else if (wave >= 440.0 && wave <= 490.0)
|
||||
{
|
||||
g = (wave - 440.0) / (490.0 - 440.0);
|
||||
b = 1.0;
|
||||
}
|
||||
else if (wave >= 490.0 && wave <= 510.0)
|
||||
{
|
||||
g = 1.0;
|
||||
b = -1.0 * (wave - 510.0) / (510.0 - 490.0);
|
||||
}
|
||||
else if (wave >= 510.0 && wave <= 580.0)
|
||||
{
|
||||
r = (wave - 510.0) / (580.0 - 510.0);
|
||||
g = 1.0;
|
||||
}
|
||||
else if (wave >= 580.0 && wave <= 645.0)
|
||||
{
|
||||
r = 1.0;
|
||||
g = -1.0 * (wave - 645.0) / (645.0 - 580.0);
|
||||
}
|
||||
else if (wave >= 645.0 && wave <= 780.0)
|
||||
{
|
||||
r = 1.0;
|
||||
}
|
||||
|
||||
double s = 1.0;
|
||||
if (wave > 700.0)
|
||||
s = 0.3 + 0.7 * (780.0 - wave) / (780.0 - 700.0);
|
||||
else if (wave < 420.0)
|
||||
s = 0.3 + 0.7 * (wave - 380.0) / (420.0 - 380.0);
|
||||
|
||||
r = std::pow(r * s, 0.8);
|
||||
g = std::pow(g * s, 0.8);
|
||||
b = std::pow(b * s, 0.8);
|
||||
return qRgb(int(r * 255), int(g * 255), int(b * 255));
|
||||
}
|
||||
@@ -1,94 +0,0 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the examples of the Qt Toolkit.
|
||||
**
|
||||
** $QT_BEGIN_LICENSE:BSD$
|
||||
** Commercial License Usage
|
||||
** Licensees holding valid commercial Qt licenses may use this file in
|
||||
** accordance with the commercial license agreement provided with the
|
||||
** Software or, alternatively, in accordance with the terms contained in
|
||||
** a written agreement between you and The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** BSD License Usage
|
||||
** Alternatively, 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 The Qt Company Ltd 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$
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QMutex>
|
||||
#include <QtCore/QSize>
|
||||
#include <QtCore/QThread>
|
||||
#include <QtCore/QWaitCondition>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
class QImage;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
class RenderThread : public QThread
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
RenderThread(QObject* parent = nullptr);
|
||||
~RenderThread();
|
||||
|
||||
void render(double centerX, double centerY, double scaleFactor, QSize resultSize,
|
||||
double devicePixelRatio);
|
||||
|
||||
signals:
|
||||
void renderedImage(const QImage& image, double scaleFactor);
|
||||
|
||||
protected:
|
||||
void run() override;
|
||||
|
||||
private:
|
||||
static uint rgbFromWaveLength(double wave);
|
||||
|
||||
QMutex m_mutex;
|
||||
QWaitCondition m_condition;
|
||||
double m_centerX;
|
||||
double m_centerY;
|
||||
double m_scaleFactor;
|
||||
double m_devicePixelRatio;
|
||||
QSize m_resultSize;
|
||||
bool m_restart = false;
|
||||
bool m_abort = false;
|
||||
|
||||
static constexpr int ColormapSize = 512;
|
||||
uint m_colormap[ColormapSize];
|
||||
};
|
||||
Reference in New Issue
Block a user