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/barstest/chart.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/barstest/chart.h')
-rw-r--r-- | tests/barstest/chart.h | 190 |
1 files changed, 0 insertions, 190 deletions
diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h deleted file mode 100644 index 16bf82a3..00000000 --- a/tests/barstest/chart.h +++ /dev/null @@ -1,190 +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$ -** -******************************************************************************/ - -#ifndef CHARTMODIFIER_H -#define CHARTMODIFIER_H - -#include <QtDataVisualization/q3dbars.h> -#include <QtDataVisualization/q3dinputhandler.h> -#include <QtDataVisualization/qbar3dseries.h> -#include <QtDataVisualization/q3dtheme.h> -#include <QFont> -#include <QDebug> -#include <QStringList> -#include <QPointer> -#include <QColorDialog> -#include <QTimer> -#include <QLabel> - -using namespace QtDataVisualization; - -class GraphModifier : public QObject -{ - Q_OBJECT -public: - explicit GraphModifier(Q3DBars *barchart, QColorDialog *colorDialog); - ~GraphModifier(); - - void resetTemperatureData(); - void addRow(); - void addRows(); - void insertRow(); - void insertRows(); - void changeItem(); - void changeRow(); - void changeRows(); - void removeRow(); - void removeRows(); - void changeStyle(); - void changePresetCamera(); - void changeTheme(); - void changeLabelStyle(); - void changeSelectionMode(); - void changeFont(const QFont &font); - void changeFontSize(int fontsize); - void rotateX(int rotation); - void rotateY(int rotation); - void setFpsMeasurement(bool enable); - void setBackgroundEnabled(int enabled); - void setGridEnabled(int enabled); - void setSpecsRatio(int barwidth); - void setSpecsZ(int bardepth); - void setSpacingSpecsX(int spacing); - void setSpacingSpecsZ(int spacing); - void setSampleCountX(int samples); - void setSampleCountZ(int samples); - void setMinX(int min); - void setMinZ(int min); - void setMinY(int min); - void setMaxY(int max); - void start(); - void restart(bool dynamicData); - void selectBar(); - void swapAxis(); - void releaseAxes(); - void releaseSeries(); - void createMassiveArray(); - void useOwnTheme(); - void changeBaseColor(const QColor &color); - void changeColorStyle(); - void showFiveSeries(); - QBarDataArray *makeDummyData(); - void primarySeriesTest(); - void insertRemoveTestToggle(); - void toggleRotation(); - void useLogAxis(); - void changeValueAxisFormat(const QString & text); - void changeLogBase(const QString & text); - void setFpsLabel(QLabel *fpsLabel) { m_fpsLabel = fpsLabel; } - void addRemoveSeries(); - void testItemAndRowChanges(); - void reverseValueAxis(int enabled); - void setInputHandlerRotationEnabled(int enabled); - void setInputHandlerZoomEnabled(int enabled); - void setInputHandlerSelectionEnabled(int enabled); - void setInputHandlerZoomAtTargetEnabled(int enabled); - void setReflection(bool enabled); - void setReflectivity(int value); - void toggleCustomItem(); - -public Q_SLOTS: - void flipViews(); - void setGradient(); - void toggleMultiseriesScaling(); - void changeShadowQuality(int quality); - void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality); - void handleSelectionChange(const QPoint &position); - void setUseNullInputHandler(bool useNull); - void changeValueAxisSegments(int value); - - void handleRowAxisChanged(QCategory3DAxis *axis); - void handleColumnAxisChanged(QCategory3DAxis *axis); - void handleValueAxisChanged(QValue3DAxis *axis); - void handlePrimarySeriesChanged(QBar3DSeries *series); - - void insertRemoveTimerTimeout(); - void triggerSelection(); - void triggerRotation(); - void handleValueAxisLabelsChanged(); - void handleFpsChange(qreal fps); - void setCameraTargetX(int value); - void setCameraTargetY(int value); - void setCameraTargetZ(int value); - void setFloorLevel(int value); - void setGraphMargin(int value); - -Q_SIGNALS: - void shadowQualityChanged(int quality); - -private: - void populateFlatSeries(QBar3DSeries *series, int rows, int columns, float value); - QBarDataRow *createFlatRow(int columns, float value); - - Q3DBars *m_graph; - QColorDialog *m_colorDialog; - int m_columnCount; - int m_rowCount; - float m_xRotation; - float m_yRotation; - bool m_static; - float m_barSpacingX; - float m_barSpacingZ; - int m_fontSize; - int m_segments; - int m_subSegments; - float m_minval; - float m_maxval; - QStringList m_months; - QStringList m_years; - QPoint m_selectedBar; - QBar3DSeries *m_selectedSeries; - QValue3DAxis *m_autoAdjustingAxis; - QValue3DAxis *m_fixedRangeAxis; - QValue3DAxis *m_temperatureAxis; - QCategory3DAxis *m_yearAxis; - QCategory3DAxis *m_monthAxis; - QCategory3DAxis *m_genericRowAxis; - QCategory3DAxis *m_genericColumnAxis; - QBar3DSeries *m_temperatureData; - QBar3DSeries *m_temperatureData2; - QBar3DSeries *m_genericData; - QBar3DSeries *m_dummyData; - QBar3DSeries *m_dummyData2; - QBar3DSeries *m_dummyData3; - QBar3DSeries *m_dummyData4; - QBar3DSeries *m_dummyData5; - QValue3DAxis *m_currentAxis; - bool m_negativeValuesOn; - bool m_useNullInputHandler; - Q3DInputHandler *m_defaultInputHandler; - Q3DTheme *m_ownTheme; - Q3DTheme *m_builtinTheme; - QTimer m_insertRemoveTimer; - int m_insertRemoveStep; - QAbstract3DInputHandler *m_customInputHandler; - QTimer m_selectionTimer; - QTimer m_rotationTimer; - QLabel *m_fpsLabel; - QBar3DSeries *m_extraSeries; - QVector3D m_cameraTarget; -}; - -#endif |