From 547cbfd201056b88ab40d22959112e5486d0fd7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 15 May 2013 08:26:58 +0300 Subject: Shadow quality adjustment via API added Added adjustment option to widget and mapdata examples Change-Id: I18d06b171c8caf9c4d21aad588d460447eb8edc3 Change-Id: I18d06b171c8caf9c4d21aad588d460447eb8edc3 Reviewed-by: Miikka Heikkinen --- examples/mapdata/main.cpp | 12 ++++++++++++ examples/mapdata/mapdata.cpp | 9 +++++++-- examples/mapdata/mapdata.h | 1 + 3 files changed, 20 insertions(+), 2 deletions(-) (limited to 'examples/mapdata') diff --git a/examples/mapdata/main.cpp b/examples/mapdata/main.cpp index 34d9bec6..68648c3d 100644 --- a/examples/mapdata/main.cpp +++ b/examples/mapdata/main.cpp @@ -133,6 +133,13 @@ int main(int argc, char **argv) valueDimension->addItem(QStringLiteral("All")); valueDimension->setCurrentIndex(0); + QComboBox *shadowQuality = new QComboBox(widget); + shadowQuality->addItem(QStringLiteral("None")); + shadowQuality->addItem(QStringLiteral("Low")); + shadowQuality->addItem(QStringLiteral("Medium")); + shadowQuality->addItem(QStringLiteral("High")); + shadowQuality->setCurrentIndex(1); + QFontComboBox *fontList = new QFontComboBox(widget); QSlider *fontSizeSlider = new QSlider(Qt::Horizontal, widget); @@ -156,6 +163,8 @@ int main(int argc, char **argv) vLayout->addWidget(valueDimension, 0, Qt::AlignTop); // vLayout->addWidget(selectionButton, 0, Qt::AlignTop); // vLayout->addWidget(gridCheckBox); + vLayout->addWidget(new QLabel(QStringLiteral("Adjust shadow quality"))); + vLayout->addWidget(shadowQuality); vLayout->addWidget(new QLabel(QStringLiteral("Change font"))); vLayout->addWidget(fontList); vLayout->addWidget(new QLabel(QStringLiteral("Adjust font size"))); @@ -188,6 +197,9 @@ int main(int argc, char **argv) QObject::connect(valueDimension, SIGNAL(currentIndexChanged(int)), modifier, SLOT(changeValueDimension(int))); + QObject::connect(shadowQuality, SIGNAL(currentIndexChanged(int)), modifier, + SLOT(changeShadowQuality(int))); + QObject::connect(fontList, &QFontComboBox::currentFontChanged, modifier, &MapsModifier::changeFont); diff --git a/examples/mapdata/mapdata.cpp b/examples/mapdata/mapdata.cpp index fe1ffdcf..a991ed95 100644 --- a/examples/mapdata/mapdata.cpp +++ b/examples/mapdata/mapdata.cpp @@ -54,8 +54,8 @@ MapsModifier::MapsModifier(Q3DMaps *maps) QImage image = QImage(QStringLiteral(":/images/suomi")); m_imageRect = image.rect(); m_chart->setAreaSpecs(m_imageRect, image); - //m_chart->setBarType(Cones, false); - m_chart->setMeshFileName(QStringLiteral(":/meshes/weirdthing")); + m_chart->setBarType(Cones, false); + //m_chart->setMeshFileName(QStringLiteral(":/meshes/weirdthing")); } MapsModifier::~MapsModifier() @@ -279,6 +279,11 @@ void MapsModifier::changeFontSize(int fontsize) m_chart->setFontSize((GLfloat)m_fontSize); } +void MapsModifier::changeShadowQuality(int quality) +{ + m_chart->setShadowQuality((ShadowQuality)quality); +} + //void MapsModifier::setGridEnabled(int enabled) //{ // m_chart->setGridEnabled((bool)enabled); diff --git a/examples/mapdata/mapdata.h b/examples/mapdata/mapdata.h index 00ba8e68..3b3c7219 100644 --- a/examples/mapdata/mapdata.h +++ b/examples/mapdata/mapdata.h @@ -73,6 +73,7 @@ public: public slots: void changeValueDimension(int dimension); + void changeShadowQuality(int quality); private: Q3DMaps *m_chart; -- cgit v1.2.3