diff options
author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-10-20 13:18:59 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-10-22 10:08:51 +0000 |
commit | 31f9c57bc50ae053cfaf039a1dfdb128e2494458 (patch) | |
tree | 316138cb73c49877f5a80a8496c2f1b737122fb5 /tests/galaxy/cumulativedistributor.h | |
parent | 4162ddeb02ee41fd4217d7f3d93d45cab3313ba8 (diff) |
Fix issues with COIN builds
-Fix miscellaneous compile errors
-Move manual tests to manual folder and enable export of autotests
-Added widgets requirement
-Fixed autotests
-Fixed renderer and controller synchronization in QML case
-Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL
Change-Id: If6619733725d079e339bef16262e5ea1450ab20f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
Diffstat (limited to 'tests/galaxy/cumulativedistributor.h')
-rw-r--r-- | tests/galaxy/cumulativedistributor.h | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/tests/galaxy/cumulativedistributor.h b/tests/galaxy/cumulativedistributor.h deleted file mode 100644 index d2dbe5b1..00000000 --- a/tests/galaxy/cumulativedistributor.h +++ /dev/null @@ -1,79 +0,0 @@ -/****************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Data Visualization module. -** -** $QT_BEGIN_LICENSE:COMM$ -** -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** $QT_END_LICENSE$ -** -******************************************************************************/ - -/* - * Galaxy creation code obtained from http://beltoforion.de/galaxy/galaxy_en.html - * Thanks to Ingo Berg, great work. - * Licensed under a Creative Commons Attribution 3.0 License - * http://creativecommons.org/licenses/by/3.0/ - */ - -#ifndef CUMULATIVEDISTRIBUTOR_H -#define CUMULATIVEDISTRIBUTOR_H - -#include <QtCore/qglobal.h> -#include <QtGui/QVector2D> -#include <QtCore/QVector> - -class CumulativeDistributor -{ -public: - typedef qreal (CumulativeDistributor::*dist_fun_t)(qreal x); - - CumulativeDistributor(); - virtual ~CumulativeDistributor(); - - qreal PropFromVal(qreal fVal); - qreal ValFromProp(qreal fVal); - - void setupRealistic(qreal I0, qreal k, qreal a, qreal RBulge, qreal min, - qreal max, int nSteps); - qreal valFromProp(qreal fVal); - -private: - dist_fun_t m_pDistFun; - qreal m_fMin; - qreal m_fMax; - qreal m_fWidth; - int m_nSteps; - - // parameters for realistic star distribution - qreal m_I0; - qreal m_k; - qreal m_a; - qreal m_RBulge; - - QVector<qreal> m_vM1; - QVector<qreal> m_vY1; - QVector<qreal> m_vX1; - - QVector<qreal> m_vM2; - QVector<qreal> m_vY2; - QVector<qreal> m_vX2; - - void buildCDF(int nSteps); - - qreal IntensityBulge(qreal R, qreal I0, qreal k); - qreal IntensityDisc(qreal R, qreal I0, qreal a); - qreal Intensity(qreal x); -}; - -#endif // CUMULATIVEDISTRIBUTOR_H |