Moving public attributes from bars3drenderer to controller.

Change-Id: I6c3997d0d297fbfafdb51764dacff54937c64b46
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

3 files changed, 26 insertions, 18 deletions

diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp
index ab4c36e3..aa2b5424 100644
--- a/examples/widget/chart.cpp
+++ b/examples/widget/chart.cpp
@@ -253,6 +253,25 @@ void ChartModifier::changeFontSize(int fontsize)
     m_chart->setFontSize((GLfloat)m_fontSize);
 }
 
+void ChartModifier::shadowQualityUpdatedByVisual(ShadowQuality sq)
+{
+    int quality = 0;
+    switch (sq) {
+    case ShadowLow:
+        quality = 1;
+        break;
+    case ShadowMedium:
+        quality = 2;
+        break;
+    case ShadowHigh:
+        quality = 3;
+        break;
+    }
+
+    // Updates the UI component to show correct shadow quality
+    emit shadowQualityChanged(quality);
+}
+
 void ChartModifier::changeShadowQuality(int quality)
 {
     ShadowQuality sq = ShadowNone;
@@ -267,22 +286,8 @@ void ChartModifier::changeShadowQuality(int quality)
         sq = ShadowHigh;
         break;
     }
-    ShadowQuality realquality = m_chart->setShadowQuality(sq);
-    // Check if it setting quality was successful
-    if (realquality != sq) {
-        switch (realquality) {
-        case ShadowLow:
-            quality = 1;
-            break;
-        case ShadowMedium:
-            quality = 2;
-            break;
-        case ShadowHigh:
-            quality = 3;
-            break;
-        }
-        emit shadowQuality(quality);
-    }
+    m_chart->setShadowQuality(sq);
+    emit shadowQualityChanged(quality);
 }
 
 void ChartModifier::setBackgroundEnabled(int enabled)
diff --git a/examples/widget/chart.h b/examples/widget/chart.h
index cb6080b7..20748564 100644
--- a/examples/widget/chart.h
+++ b/examples/widget/chart.h
@@ -80,9 +80,10 @@ public:
 
 public slots:
     void changeShadowQuality(int quality);
+    void shadowQualityUpdatedByVisual(ShadowQuality shadowQuality);
 
 signals:
-    void shadowQuality(int quality);
+    void shadowQualityChanged(int quality);
 
 private:
     Q3DBars *m_chart;
diff --git a/examples/widget/main.cpp b/examples/widget/main.cpp
index f682d385..5b2ed631 100644
--- a/examples/widget/main.cpp
+++ b/examples/widget/main.cpp
@@ -222,8 +222,10 @@ int main(int argc, char **argv)
 
     QObject::connect(shadowQuality, SIGNAL(currentIndexChanged(int)), modifier,
                      SLOT(changeShadowQuality(int)));
-    QObject::connect(modifier, &ChartModifier::shadowQuality, shadowQuality,
+    QObject::connect(modifier, &ChartModifier::shadowQualityChanged, shadowQuality,
                      &QComboBox::setCurrentIndex);
+    QObject::connect(widgetchart, &Q3DBars::shadowQualityChanged, modifier,
+                     &ChartModifier::shadowQualityUpdatedByVisual);
 
     QObject::connect(fontSizeSlider, &QSlider::valueChanged, modifier,
                      &ChartModifier::changeFontSize);