diff options
author | Titta Heikkala <titta.heikkala@digia.com> | 2014-07-01 07:10:00 +0300 |
---|---|---|
committer | Titta Heikkala <titta.heikkala@theqtcompany.com> | 2014-10-14 13:04:52 +0300 |
commit | c544258484ff4fd5d2b88402fbaa5d154b89a3a2 (patch) | |
tree | 7659625abb566dec55d3783ed820b928542d9b2b /examples/charts/legend | |
parent | 76339f714f088645e911cee65bdb66055fe029aa (diff) |
Qt Charts project file structure change
Charts repository structure is changed to follow the structure of a
Qt Add-On module. The task includes following changes:
- All macros and definitions named 'commercial' have been renamed.
- Compile errors related to QString and qSort usage have been fixed.
- Old demos are moved under examples. The QML examples now support only
Qt Quick 2.0, the support for Qt Quick 1 is removed.
- The QML examples with multiple views are updated so that they are
usable also with touch devices.
- Unnecessary version checks are removed from examples.
- The build stamp has been removed as it was only meant for Charts
development purposes and it's no longer needed. Also development
build related debug prints are removed as __DATE__ can't be used
for all OS thus it doesn't make much sense.
- Documentation structure has been updated based on the new module
structure. The raw HTML files have been removed. Demos are
combined to examples.
- Unnecessary .qdocinc files are no longer needed. The content is
moved to the corresponding .cpp files.
- The Charts widget designer plugin is updated according to the module
change.
- The test cases updated according to the project structure change.
Tests are added also for version 2.0.
- cmake modules generation is not needed with Qt 5.4 and Qt Charts
so it's disabled.
- The new module name and version are updated to the plugin.qmltypes
file.
Task-number: QTRD-2844, QTRD-3217, QTRD-3218, QTRD-3277, QTRD-3228,
QTRD-2526, QTRD-3233, QTRD-3222
Change-Id: Ib7fb26057cde710ffaf6bc780c8bf52a16f45160
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'examples/charts/legend')
-rw-r--r-- | examples/charts/legend/legend.pro | 10 | ||||
-rw-r--r-- | examples/charts/legend/main.cpp | 37 | ||||
-rw-r--r-- | examples/charts/legend/mainwidget.cpp | 247 | ||||
-rw-r--r-- | examples/charts/legend/mainwidget.h | 78 |
4 files changed, 372 insertions, 0 deletions
diff --git a/examples/charts/legend/legend.pro b/examples/charts/legend/legend.pro new file mode 100644 index 00000000..5e22fb2a --- /dev/null +++ b/examples/charts/legend/legend.pro @@ -0,0 +1,10 @@ +!include( ../examples.pri ) { + error( "Couldn't find the examples.pri file!" ) +} + +TARGET = legend +SOURCES += main.cpp \ + mainwidget.cpp + +HEADERS += \ + mainwidget.h diff --git a/examples/charts/legend/main.cpp b/examples/charts/legend/main.cpp new file mode 100644 index 00000000..64d3903b --- /dev/null +++ b/examples/charts/legend/main.cpp @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the Qt Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "mainwidget.h" + +#include <QApplication> +#include <QMainWindow> + +QT_CHARTS_USE_NAMESPACE + +int main(int argc, char *argv[]) +{ + QApplication a(argc, argv); + + MainWidget w; + w.resize(720, 480); + w.show(); + + return a.exec(); +} diff --git a/examples/charts/legend/mainwidget.cpp b/examples/charts/legend/mainwidget.cpp new file mode 100644 index 00000000..32bc2ae9 --- /dev/null +++ b/examples/charts/legend/mainwidget.cpp @@ -0,0 +1,247 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the Qt Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "mainwidget.h" +#include <QChart> +#include <QChartView> +#include <QPushButton> +#include <QLabel> +#include <QDebug> +#include <QBarSet> +#include <QBarSeries> +#include <QLegend> +#include <QFormLayout> + +QT_CHARTS_USE_NAMESPACE + +MainWidget::MainWidget(QWidget *parent) : + QWidget(parent) +{ + // Create buttons for ui + m_buttonLayout = new QGridLayout(); + QPushButton *detachLegendButton = new QPushButton("Toggle attached"); + connect(detachLegendButton, SIGNAL(clicked()), this, SLOT(toggleAttached())); + m_buttonLayout->addWidget(detachLegendButton, 0, 0); + + QPushButton *addSetButton = new QPushButton("add barset"); + connect(addSetButton, SIGNAL(clicked()), this, SLOT(addBarset())); + m_buttonLayout->addWidget(addSetButton, 2, 0); + QPushButton *removeBarsetButton = new QPushButton("remove barset"); + connect(removeBarsetButton, SIGNAL(clicked()), this, SLOT(removeBarset())); + m_buttonLayout->addWidget(removeBarsetButton, 3, 0); + + QPushButton *alignButton = new QPushButton("Align (Bottom)"); + connect(alignButton, SIGNAL(clicked()), this, SLOT(setLegendAlignment())); + m_buttonLayout->addWidget(alignButton, 4, 0); + + QPushButton *boldButton = new QPushButton("Toggle bold"); + connect(boldButton, SIGNAL(clicked()), this, SLOT(toggleBold())); + m_buttonLayout->addWidget(boldButton, 8, 0); + + QPushButton *italicButton = new QPushButton("Toggle italic"); + connect(italicButton, SIGNAL(clicked()), this, SLOT(toggleItalic())); + m_buttonLayout->addWidget(italicButton, 9, 0); + + m_legendPosX = new QDoubleSpinBox(); + m_legendPosY = new QDoubleSpinBox(); + m_legendWidth = new QDoubleSpinBox(); + m_legendHeight = new QDoubleSpinBox(); + + connect(m_legendPosX, SIGNAL(valueChanged(double)), this, SLOT(updateLegendLayout())); + connect(m_legendPosY, SIGNAL(valueChanged(double)), this, SLOT(updateLegendLayout())); + connect(m_legendWidth, SIGNAL(valueChanged(double)), this, SLOT(updateLegendLayout())); + connect(m_legendHeight, SIGNAL(valueChanged(double)), this, SLOT(updateLegendLayout())); + + QFormLayout *legendLayout = new QFormLayout(); + legendLayout->addRow("HPos", m_legendPosX); + legendLayout->addRow("VPos", m_legendPosY); + legendLayout->addRow("Width", m_legendWidth); + legendLayout->addRow("Height", m_legendHeight); + m_legendSettings = new QGroupBox("Detached legend"); + m_legendSettings->setLayout(legendLayout); + m_buttonLayout->addWidget(m_legendSettings); + m_legendSettings->setVisible(false); + + // Create chart view with the chart + m_chart = new QChart(); + m_chartView = new QChartView(m_chart, this); + + // Create spinbox to modify font size + m_fontSize = new QDoubleSpinBox(); + m_fontSize->setValue(m_chart->legend()->font().pointSizeF()); + connect(m_fontSize, SIGNAL(valueChanged(double)), this, SLOT(fontSizeChanged())); + + QFormLayout *fontLayout = new QFormLayout(); + fontLayout->addRow("Legend font size", m_fontSize); + + // Create layout for grid and detached legend + m_mainLayout = new QGridLayout(); + m_mainLayout->addLayout(m_buttonLayout, 0, 0); + m_mainLayout->addLayout(fontLayout, 1, 0); + m_mainLayout->addWidget(m_chartView, 0, 1, 3, 1); + setLayout(m_mainLayout); + + createSeries(); +} + +void MainWidget::createSeries() +{ + m_series = new QBarSeries(); + addBarset(); + addBarset(); + addBarset(); + addBarset(); + + m_chart->addSeries(m_series); + m_chart->setTitle("Legend detach example"); + m_chart->createDefaultAxes(); +//![1] + m_chart->legend()->setVisible(true); + m_chart->legend()->setAlignment(Qt::AlignBottom); +//![1] + + m_chartView->setRenderHint(QPainter::Antialiasing); +} + +void MainWidget::showLegendSpinbox() +{ + m_legendSettings->setVisible(true); + QRectF chartViewRect = m_chartView->rect(); + + m_legendPosX->setMinimum(0); + m_legendPosX->setMaximum(chartViewRect.width()); + m_legendPosX->setValue(150); + + m_legendPosY->setMinimum(0); + m_legendPosY->setMaximum(chartViewRect.height()); + m_legendPosY->setValue(150); + + m_legendWidth->setMinimum(0); + m_legendWidth->setMaximum(chartViewRect.width()); + m_legendWidth->setValue(150); + + m_legendHeight->setMinimum(0); + m_legendHeight->setMaximum(chartViewRect.height()); + m_legendHeight->setValue(75); +} + +void MainWidget::hideLegendSpinbox() +{ + m_legendSettings->setVisible(false); +} + + +void MainWidget::toggleAttached() +{ + QLegend *legend = m_chart->legend(); + if (legend->isAttachedToChart()) { + //![2] + legend->detachFromChart(); + m_chart->legend()->setBackgroundVisible(true); + m_chart->legend()->setBrush(QBrush(QColor(128, 128, 128, 128))); + m_chart->legend()->setPen(QPen(QColor(192, 192, 192, 192))); + //![2] + showLegendSpinbox(); + updateLegendLayout(); + } else { + //![3] + legend->attachToChart(); + legend->setBackgroundVisible(false); + //![3] + hideLegendSpinbox(); + } + update(); +} + +void MainWidget::addBarset() +{ + QBarSet *barSet = new QBarSet(QString("set ") + QString::number(m_series->count())); + qreal delta = m_series->count() * 0.1; + *barSet << 1 + delta << 2 + delta << 3 + delta << 4 + delta; + m_series->append(barSet); +} + +void MainWidget::removeBarset() +{ + QList<QBarSet *> sets = m_series->barSets(); + if (sets.count() > 0) { + m_series->remove(sets.at(sets.count() - 1)); + } +} + +void MainWidget::setLegendAlignment() +{ + QPushButton *button = qobject_cast<QPushButton *>(sender()); + + switch (m_chart->legend()->alignment()) { + case Qt::AlignTop: + m_chart->legend()->setAlignment(Qt::AlignLeft); + if (button) + button->setText("Align (Left)"); + break; + case Qt::AlignLeft: + m_chart->legend()->setAlignment(Qt::AlignBottom); + if (button) + button->setText("Align (Bottom)"); + break; + case Qt::AlignBottom: + m_chart->legend()->setAlignment(Qt::AlignRight); + if (button) + button->setText("Align (Right)"); + break; + default: + if (button) + button->setText("Align (Top)"); + m_chart->legend()->setAlignment(Qt::AlignTop); + break; + } +} + +void MainWidget::toggleBold() +{ + QFont font = m_chart->legend()->font(); + font.setBold(!font.bold()); + m_chart->legend()->setFont(font); +} + +void MainWidget::toggleItalic() +{ + QFont font = m_chart->legend()->font(); + font.setItalic(!font.italic()); + m_chart->legend()->setFont(font); +} + +void MainWidget::fontSizeChanged() +{ + QFont font = m_chart->legend()->font(); + font.setPointSizeF(m_fontSize->value()); + m_chart->legend()->setFont(font); +} + +void MainWidget::updateLegendLayout() +{ +//![4] + m_chart->legend()->setGeometry(QRectF(m_legendPosX->value(), + m_legendPosY->value(), + m_legendWidth->value(), + m_legendHeight->value())); + m_chart->legend()->update(); +//![4] +} diff --git a/examples/charts/legend/mainwidget.h b/examples/charts/legend/mainwidget.h new file mode 100644 index 00000000..3a24d674 --- /dev/null +++ b/examples/charts/legend/mainwidget.h @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use contact form at http://qt.digia.com +** +** This file is part of the Qt Enterprise Charts Add-on. +** +** $QT_BEGIN_LICENSE$ +** Licensees holding valid Qt Enterprise licenses may use this file in +** accordance with the Qt Enterprise License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. +** +** If you have questions regarding the use of this file, please use +** contact form at http://qt.digia.com +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef MAINWIDGET_H +#define MAINWIDGET_H + +#include "qchartglobal.h" +#include "qchart.h" +#include "qchartview.h" +#include <QWidget> +#include <QGraphicsWidget> +#include <QGridLayout> +#include <QGraphicsGridLayout> +#include <QDoubleSpinBox> +#include <QGroupBox> +#include <QBarSeries> + +QT_CHARTS_USE_NAMESPACE + +class MainWidget : public QWidget +{ + Q_OBJECT +public: + explicit MainWidget(QWidget *parent = 0); + void createSeries(); + void showLegendSpinbox(); + void hideLegendSpinbox(); + +public Q_SLOTS: + void toggleAttached(); + void addBarset(); + void removeBarset(); + + void setLegendAlignment(); + + void toggleBold(); + void toggleItalic(); + void fontSizeChanged(); + + void updateLegendLayout(); + +private: + QChart *m_chart; + QBarSeries *m_series; + + QChartView *m_chartView; + QGridLayout *m_mainLayout; + QGridLayout *m_buttonLayout; + QGridLayout *m_fontLayout; + + QDoubleSpinBox *m_fontSize; + + // For detached layout + QGroupBox *m_legendSettings; + QDoubleSpinBox *m_legendPosX; + QDoubleSpinBox *m_legendPosY; + QDoubleSpinBox *m_legendWidth; + QDoubleSpinBox *m_legendHeight; +}; + +#endif // MAINWIDGET_H |