Directory structure reorganized

Unnecessary subdirectory levels deleted from examples and src

Change-Id: I88892b4fc92784e706be2264eeb7d6208250a50f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

1 files changed, 0 insertions, 226 deletions

diff --git a/src/datavis3d/utils/utils.cpp b/src/datavis3d/utils/utils.cpp
deleted file mode 100644
index 7b4cb6f6..00000000
--- a/src/datavis3d/utils/utils.cpp
+++ /dev/null
@@ -1,226 +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 QtDataVis3D module.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "utils_p.h"
-
-#include <QVector3D>
-#include <QColor>
-#include <QPainter>
-#include <QPoint>
-#include <QImage>
-
-#include <qmath.h>
-
-#include <QDebug>
-
-QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE
-
-QVector3D Utils::vectorFromColor(const QColor &color)
-{
-    return QVector3D(color.redF(), color.greenF(), color.blueF());
-}
-
-void Utils::printText(QPainter *painter, const QString &text, const QSize &position,
-                      bool absoluteCoords, qreal rotation, qreal scale)
-{
-    painter->save();
-    painter->setCompositionMode(QPainter::CompositionMode_Source);
-    painter->setPen(Qt::black); // TODO: Use black, as nothing works
-    QFont bgrFont = QFont(QStringLiteral("Arial"), 17);
-    QFont valueFont = QFont(QStringLiteral("Arial"), 11);
-    valueFont.setBold(true);
-    painter->setFont(bgrFont);
-    QFontMetrics valueFM(valueFont);
-    QFontMetrics bgrFM(bgrFont);
-    int valueStrLen = valueFM.width(text);
-    int bgrStrLen = 0;
-    int bgrHeight = valueFM.height() + 8;
-    QString bgrStr = QString();
-    do {
-        bgrStr.append(QStringLiteral("I"));
-        bgrStrLen = bgrFM.width(bgrStr);
-    } while (bgrStrLen <= (valueStrLen + 8));
-#if 0
-    // Hack solution, as drawRect doesn't work
-    painter->drawText(position.width() - (bgrStrLen / 2),
-                      position.height() - bgrHeight,
-                      bgrStrLen, bgrHeight,
-                      Qt::AlignCenter | Qt::AlignVCenter,
-                      bgrStr);
-    //painter->setPen(d_ptr->m_textColor);
-    painter->setPen(Qt::lightGray); // TODO: Use lightGray, as nothing works
-    painter->setFont(valueFont);
-    painter->drawText(position.width() - (valueStrLen / 2),
-                      position.height() - bgrHeight,
-                      valueStrLen, bgrHeight,
-                      Qt::AlignCenter | Qt::AlignVCenter,
-                      text);
-#else
-    //qDebug() << painter->window() << painter->viewport();
-    painter->scale(scale, scale);
-    if (absoluteCoords) {
-        // This assumes absolute screen coordinates
-        painter->translate(position.width() - (((float)bgrStrLen / 2.0f)
-                                               * cos(rotation * m_pi / 180.0f))
-                           + (((float)bgrHeight / 2.0f) * sin(rotation * m_pi / 180.0f)),
-                           position.height()
-                           - ((((float)bgrHeight / 2.0f) * cos(rotation * m_pi / 180.0f))
-                              + (((float)bgrStrLen / 2.0f) * sin(rotation * m_pi / 180.0f))));
-    } else {
-        // This calculates y as a distance from screen bottom
-        painter->translate(position.width() - (((float)bgrStrLen / 2.0f)
-                                               * cos(rotation * m_pi / 180.0f))
-                           + (((float)bgrHeight / 2.0f) * sin(rotation * m_pi / 180.0f)),
-                           painter->window().height() - position.height()
-                           - ((((float)bgrHeight / 2.0f) * cos(rotation * m_pi / 180.0f))
-                              + (((float)bgrStrLen / 2.0f) * sin(rotation * m_pi / 180.0f))));
-    }
-    //qDebug() << painter->window().height() - position.height()
-    //            - ((((float)bgrHeight / 2.0f) * cos(rotation * m_pi / 180.0f))
-    //               + (((float)bgrStrLen / 2.0f) * sin(rotation * m_pi / 180.0f)));
-    painter->rotate(rotation);
-    painter->drawText(0, 0,
-                      bgrStrLen, bgrHeight,
-                      Qt::AlignCenter | Qt::AlignVCenter,
-                      bgrStr);
-    painter->setPen(Qt::lightGray); // TODO: Use lightGray, as nothing works
-    painter->setFont(valueFont);
-    painter->drawText(6, 0,
-                      valueStrLen, bgrHeight,
-                      Qt::AlignCenter | Qt::AlignVCenter,
-                      text);
-    painter->resetTransform();
-#endif
-    painter->restore();
-}
-
-QImage Utils::printTextToImage(const QFont &font, const QString &text, const QColor &bgrColor,
-                               const QColor &txtColor, LabelTransparency transparency)
-{
-    // Calculate text dimensions
-    QFont valueFont = font;
-    valueFont.setPointSize(30);
-    QFontMetrics valueFM(valueFont);
-    int valueStrWidth = valueFM.width(text);
-    int valueStrHeight = valueFM.height();
-    QSize labelSize;
-    if (TransparencyNoBackground == transparency)
-        labelSize = QSize(valueStrWidth, valueStrHeight);
-    else
-        labelSize = QSize(valueStrWidth + 30, valueStrHeight + 30);
-
-    // Create image
-    QImage image = QImage(labelSize, QImage::Format_ARGB32);
-    image.fill(Qt::transparent);
-
-    // Init painter
-    QPainter painter(&image);
-    // Paint text
-    painter.setRenderHint(QPainter::Antialiasing, true);
-    painter.setCompositionMode(QPainter::CompositionMode_Source);
-    switch (transparency) {
-    case TransparencyNoBackground: {
-        painter.setFont(valueFont);
-        painter.setPen(txtColor);
-        painter.drawText(0, 0,
-                         valueStrWidth, valueStrHeight,
-                         Qt::AlignCenter | Qt::AlignVCenter,
-                         text);
-        break;
-    }
-    case TransparencyFromTheme: {
-        painter.setBrush(QBrush(bgrColor));
-        painter.setPen(bgrColor);
-        painter.drawRoundedRect(0, 0, labelSize.width(), labelSize.height(), 10.0, 10.0f);
-        painter.setFont(valueFont);
-        painter.setPen(txtColor);
-        painter.drawText(15, 15,
-                         valueStrWidth, valueStrHeight,
-                         Qt::AlignCenter | Qt::AlignVCenter,
-                         text);
-        break;
-    }
-    case TransparencyNone: {
-        painter.setBrush(QBrush(bgrColor));
-        painter.setPen(bgrColor);
-        painter.drawRect(0, 0, labelSize.width(), labelSize.height());
-        painter.setFont(valueFont);
-        painter.setPen(txtColor);
-        painter.drawText(15, 15,
-                         valueStrWidth, valueStrHeight,
-                         Qt::AlignCenter | Qt::AlignVCenter,
-                         text);
-        break;
-    }
-    }
-    return image;
-}
-
-QVector3D Utils::getSelection(QPoint mousepos, int height)
-{
-    QVector3D selectedColor;
-
-    // This is the only one that works with ANGLE (ES 2.0)
-    // Item count will be limited to 256*256*256
-    GLubyte pixel[4];
-    glReadPixels(mousepos.x(), height - mousepos.y(), 1, 1,
-                 GL_RGBA, GL_UNSIGNED_BYTE, (void *)pixel);
-
-    // These work with desktop OpenGL
-    // They offer a lot higher possible object count and a possibility to use object id's
-    //GLuint pixel2[3];
-    //glReadPixels(mousepos.x(), height - mousepos.y(), 1, 1,
-    //             GL_RGB, GL_UNSIGNED_INT, (void *)pixel2);
-
-    //GLfloat pixel3[3];
-    //glReadPixels(mousepos.x(), height - mousepos.y(), 1, 1,
-    //             GL_RGB, GL_FLOAT, (void *)pixel3);
-
-    //qDebug() << "rgba" << pixel[0] << pixel[1] << pixel[2];// << pixel[3];
-    //qDebug() << "rgba2" << pixel2[0] << pixel2[1] << pixel2[2];
-    //qDebug() << "rgba3" << pixel3[0] << pixel3[1] << pixel3[2];
-    selectedColor = QVector3D(pixel[0], pixel[1], pixel[2]);
-    //qDebug() << selectedColor;
-
-    return selectedColor;
-}
-
-QTCOMMERCIALDATAVIS3D_END_NAMESPACE