Moved text printing to Utils -class

Fixed examples

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

2 files changed, 174 insertions, 174 deletions

diff --git a/examples/datavis3d/barchart/main.cpp b/examples/datavis3d/barchart/main.cpp
index ad43a826..3a7db1df 100644
--- a/examples/datavis3d/barchart/main.cpp
+++ b/examples/datavis3d/barchart/main.cpp
@@ -95,7 +95,7 @@ ChartDataGenerator::ChartDataGenerator(Q3DBars *barchart)
 
     // Set bar type to smooth bar
 #ifndef CYCLE_THROUGH_STYLES
-    m_chart->setBarType(Q3DBars::Bars, false);
+    m_chart->setBarType(Q3DBars::Pyramids, false);
 #endif
 
 #ifndef USE_STATIC_DATA
@@ -109,7 +109,7 @@ ChartDataGenerator::ChartDataGenerator(Q3DBars *barchart)
 
 #ifndef CYCLE_THROUGH_THEMES
     // Set bar colors
-    m_chart->setBarColor(QColor(Qt::black), QColor(Qt::red), QColor(Qt::darkBlue));
+    m_chart->setBarColor(QColor(Qt::gray), QColor(Qt::red), QColor(Qt::darkBlue));
 #endif
 
     // Set preset camera position
@@ -213,10 +213,10 @@ void ChartDataGenerator::addDataSet()
     weeks << "week 1" << "week 2" << "week 3" << "week 4" << "week 5";
 
     // Set up data
-    float hours[5][7] = {{2, 1, 3, 0, 1, 5, 7}
-                        , {0, 1, 3, 1, 2, 2, 3}
+    float hours[5][7] = {{2, 1, 3, 0.25, 1, 5, 7}
+                        , {0.5, 1, 3, 1, 2, 2, 3}
                         , {1, 1, 2, 1, 4, 4, 4}
-                        , {0, 0, 0, 0, 2, 2, 0}
+                        , {0, 0, 0, 0, 2, 2, 0.25}
                         , {3, 3, 6, 2, 2, 1, 1}};
 
     // Create data set
diff --git a/examples/datavis3d/rainfall/main.cpp b/examples/datavis3d/rainfall/main.cpp
index 4139228a..38432e7a 100644
--- a/examples/datavis3d/rainfall/main.cpp
+++ b/examples/datavis3d/rainfall/main.cpp
@@ -108,199 +108,199 @@ void ChartDataGenerator::addDataSet()
     QVector< QVector<QDataItem*> > data;
     QVector<QDataItem*> row;
     // 2000
-    row.prepend(new QDataItem(72, "mm, January 2000"));
-    row.prepend(new QDataItem(47, "mm, February 2000"));
-    row.prepend(new QDataItem(37, "mm, March 2000"));
-    row.prepend(new QDataItem(79, "mm, April 2000"));
-    row.prepend(new QDataItem(42, "mm, May 2000"));
-    row.prepend(new QDataItem(73, "mm, June 2000"));
-    row.prepend(new QDataItem(94, "mm, July 2000"));
-    row.prepend(new QDataItem(37, "mm, August 2000"));
-    row.prepend(new QDataItem(17, "mm, September 2000"));
-    row.prepend(new QDataItem(69, "mm, October 2000"));
-    row.prepend(new QDataItem(42, "mm, November 2000"));
-    row.prepend(new QDataItem(42, "mm, December 2000"));
-    data.prepend(row);
+    row.append(new QDataItem(72, "mm, January 2000"));
+    row.append(new QDataItem(47, "mm, February 2000"));
+    row.append(new QDataItem(37, "mm, March 2000"));
+    row.append(new QDataItem(79, "mm, April 2000"));
+    row.append(new QDataItem(42, "mm, May 2000"));
+    row.append(new QDataItem(73, "mm, June 2000"));
+    row.append(new QDataItem(94, "mm, July 2000"));
+    row.append(new QDataItem(37, "mm, August 2000"));
+    row.append(new QDataItem(17, "mm, September 2000"));
+    row.append(new QDataItem(69, "mm, October 2000"));
+    row.append(new QDataItem(42, "mm, November 2000"));
+    row.append(new QDataItem(42, "mm, December 2000"));
+    data.append(row);
     row.clear();
     // 2001
-    row.prepend(new QDataItem(25, "mm, January 2001"));
-    row.prepend(new QDataItem(47, "mm, February 2001"));
-    row.prepend(new QDataItem(20, "mm, March 2001"));
-    row.prepend(new QDataItem(70, "mm, April 2001"));
-    row.prepend(new QDataItem(27, "mm, May 2001"));
-    row.prepend(new QDataItem(40, "mm, June 2001"));
-    row.prepend(new QDataItem(123, "mm, July 2001"));
-    row.prepend(new QDataItem(39, "mm, August 2001"));
-    row.prepend(new QDataItem(66, "mm, September 2001"));
-    row.prepend(new QDataItem(55, "mm, October 2001"));
-    row.prepend(new QDataItem(29, "mm, November 2001"));
-    row.prepend(new QDataItem(12, "mm, December 2001"));
-    data.prepend(row);
+    row.append(new QDataItem(25, "mm, January 2001"));
+    row.append(new QDataItem(47, "mm, February 2001"));
+    row.append(new QDataItem(20, "mm, March 2001"));
+    row.append(new QDataItem(70, "mm, April 2001"));
+    row.append(new QDataItem(27, "mm, May 2001"));
+    row.append(new QDataItem(40, "mm, June 2001"));
+    row.append(new QDataItem(123, "mm, July 2001"));
+    row.append(new QDataItem(39, "mm, August 2001"));
+    row.append(new QDataItem(66, "mm, September 2001"));
+    row.append(new QDataItem(55, "mm, October 2001"));
+    row.append(new QDataItem(29, "mm, November 2001"));
+    row.append(new QDataItem(12, "mm, December 2001"));
+    data.append(row);
     row.clear();
     // 2002
-    row.prepend(new QDataItem(24, "mm, January 2002"));
-    row.prepend(new QDataItem(45, "mm, February 2002"));
-    row.prepend(new QDataItem(27, "mm, March 2002"));
-    row.prepend(new QDataItem(30, "mm, April 2002"));
-    row.prepend(new QDataItem(16, "mm, May 2002"));
-    row.prepend(new QDataItem(98, "mm, June 2002"));
-    row.prepend(new QDataItem(122, "mm, July 2002"));
-    row.prepend(new QDataItem(20, "mm, August 2002"));
-    row.prepend(new QDataItem(50, "mm, September 2002"));
-    row.prepend(new QDataItem(24, "mm, October 2002"));
-    row.prepend(new QDataItem(22, "mm, November 2002"));
-    row.prepend(new QDataItem(12, "mm, December 2002"));
-    data.prepend(row);
+    row.append(new QDataItem(24, "mm, January 2002"));
+    row.append(new QDataItem(45, "mm, February 2002"));
+    row.append(new QDataItem(27, "mm, March 2002"));
+    row.append(new QDataItem(30, "mm, April 2002"));
+    row.append(new QDataItem(16, "mm, May 2002"));
+    row.append(new QDataItem(98, "mm, June 2002"));
+    row.append(new QDataItem(122, "mm, July 2002"));
+    row.append(new QDataItem(20, "mm, August 2002"));
+    row.append(new QDataItem(50, "mm, September 2002"));
+    row.append(new QDataItem(24, "mm, October 2002"));
+    row.append(new QDataItem(22, "mm, November 2002"));
+    row.append(new QDataItem(12, "mm, December 2002"));
+    data.append(row);
     row.clear();
     // 2003
-    row.prepend(new QDataItem(43, "mm, January 2003"));
-    row.prepend(new QDataItem(17, "mm, February 2003"));
-    row.prepend(new QDataItem(26, "mm, March 2003"));
-    row.prepend(new QDataItem(22, "mm, April 2003"));
-    row.prepend(new QDataItem(60, "mm, May 2003"));
-    row.prepend(new QDataItem(14, "mm, June 2003"));
-    row.prepend(new QDataItem(86, "mm, July 2003"));
-    row.prepend(new QDataItem(77, "mm, August 2003"));
-    row.prepend(new QDataItem(69, "mm, September 2003"));
-    row.prepend(new QDataItem(49, "mm, October 2003"));
-    row.prepend(new QDataItem(23, "mm, November 2003"));
-    row.prepend(new QDataItem(44, "mm, December 2003"));
-    data.prepend(row);
+    row.append(new QDataItem(43, "mm, January 2003"));
+    row.append(new QDataItem(17, "mm, February 2003"));
+    row.append(new QDataItem(26, "mm, March 2003"));
+    row.append(new QDataItem(22, "mm, April 2003"));
+    row.append(new QDataItem(60, "mm, May 2003"));
+    row.append(new QDataItem(14, "mm, June 2003"));
+    row.append(new QDataItem(86, "mm, July 2003"));
+    row.append(new QDataItem(77, "mm, August 2003"));
+    row.append(new QDataItem(69, "mm, September 2003"));
+    row.append(new QDataItem(49, "mm, October 2003"));
+    row.append(new QDataItem(23, "mm, November 2003"));
+    row.append(new QDataItem(44, "mm, December 2003"));
+    data.append(row);
     row.clear();
     // 2004
-    row.prepend(new QDataItem(15, "mm, January 2004"));
-    row.prepend(new QDataItem(19, "mm, February 2004"));
-    row.prepend(new QDataItem(10, "mm, March 2004"));
-    row.prepend(new QDataItem(11, "mm, April 2004"));
-    row.prepend(new QDataItem(41, "mm, May 2004"));
-    row.prepend(new QDataItem(29, "mm, June 2004"));
-    row.prepend(new QDataItem(49, "mm, July 2004"));
-    row.prepend(new QDataItem(72, "mm, August 2004"));
-    row.prepend(new QDataItem(50, "mm, September 2004"));
-    row.prepend(new QDataItem(18, "mm, October 2004"));
-    row.prepend(new QDataItem(19, "mm, November 2004"));
-    row.prepend(new QDataItem(40, "mm, December 2004"));
-    data.prepend(row);
+    row.append(new QDataItem(15, "mm, January 2004"));
+    row.append(new QDataItem(19, "mm, February 2004"));
+    row.append(new QDataItem(10, "mm, March 2004"));
+    row.append(new QDataItem(11, "mm, April 2004"));
+    row.append(new QDataItem(41, "mm, May 2004"));
+    row.append(new QDataItem(29, "mm, June 2004"));
+    row.append(new QDataItem(49, "mm, July 2004"));
+    row.append(new QDataItem(72, "mm, August 2004"));
+    row.append(new QDataItem(50, "mm, September 2004"));
+    row.append(new QDataItem(18, "mm, October 2004"));
+    row.append(new QDataItem(19, "mm, November 2004"));
+    row.append(new QDataItem(40, "mm, December 2004"));
+    data.append(row);
     row.clear();
     // 2005
-    row.prepend(new QDataItem(60, "mm, January 2005"));
-    row.prepend(new QDataItem(24, "mm, February 2005"));
-    row.prepend(new QDataItem(12, "mm, March 2005"));
-    row.prepend(new QDataItem(50, "mm, April 2005"));
-    row.prepend(new QDataItem(88, "mm, May 2005"));
-    row.prepend(new QDataItem(32, "mm, June 2005"));
-    row.prepend(new QDataItem(76, "mm, July 2005"));
-    row.prepend(new QDataItem(55, "mm, August 2005"));
-    row.prepend(new QDataItem(92, "mm, September 2005"));
-    row.prepend(new QDataItem(35, "mm, October 2005"));
-    row.prepend(new QDataItem(105, "mm, November 2005"));
-    row.prepend(new QDataItem(59, "mm, December 2005"));
-    data.prepend(row);
+    row.append(new QDataItem(60, "mm, January 2005"));
+    row.append(new QDataItem(24, "mm, February 2005"));
+    row.append(new QDataItem(12, "mm, March 2005"));
+    row.append(new QDataItem(50, "mm, April 2005"));
+    row.append(new QDataItem(88, "mm, May 2005"));
+    row.append(new QDataItem(32, "mm, June 2005"));
+    row.append(new QDataItem(76, "mm, July 2005"));
+    row.append(new QDataItem(55, "mm, August 2005"));
+    row.append(new QDataItem(92, "mm, September 2005"));
+    row.append(new QDataItem(35, "mm, October 2005"));
+    row.append(new QDataItem(105, "mm, November 2005"));
+    row.append(new QDataItem(59, "mm, December 2005"));
+    data.append(row);
     row.clear();
     // 2006
-    row.prepend(new QDataItem(27, "mm, January 2006"));
-    row.prepend(new QDataItem(18, "mm, February 2006"));
-    row.prepend(new QDataItem(17, "mm, March 2006"));
-    row.prepend(new QDataItem(26, "mm, April 2006"));
-    row.prepend(new QDataItem(24, "mm, May 2006"));
-    row.prepend(new QDataItem(18, "mm, June 2006"));
-    row.prepend(new QDataItem(35, "mm, July 2006"));
-    row.prepend(new QDataItem(28, "mm, August 2006"));
-    row.prepend(new QDataItem(80, "mm, September 2006"));
-    row.prepend(new QDataItem(52, "mm, October 2006"));
-    row.prepend(new QDataItem(43, "mm, November 2006"));
-    row.prepend(new QDataItem(44, "mm, December 2006"));
-    data.prepend(row);
+    row.append(new QDataItem(27, "mm, January 2006"));
+    row.append(new QDataItem(18, "mm, February 2006"));
+    row.append(new QDataItem(17, "mm, March 2006"));
+    row.append(new QDataItem(26, "mm, April 2006"));
+    row.append(new QDataItem(24, "mm, May 2006"));
+    row.append(new QDataItem(18, "mm, June 2006"));
+    row.append(new QDataItem(35, "mm, July 2006"));
+    row.append(new QDataItem(28, "mm, August 2006"));
+    row.append(new QDataItem(80, "mm, September 2006"));
+    row.append(new QDataItem(52, "mm, October 2006"));
+    row.append(new QDataItem(43, "mm, November 2006"));
+    row.append(new QDataItem(44, "mm, December 2006"));
+    data.append(row);
     row.clear();
     // 2007
-    row.prepend(new QDataItem(41, "mm, January 2007"));
-    row.prepend(new QDataItem(21, "mm, February 2007"));
-    row.prepend(new QDataItem(30, "mm, March 2007"));
-    row.prepend(new QDataItem(20, "mm, April 2007"));
-    row.prepend(new QDataItem(53, "mm, May 2007"));
-    row.prepend(new QDataItem(29, "mm, June 2007"));
-    row.prepend(new QDataItem(139, "mm, July 2007"));
-    row.prepend(new QDataItem(52, "mm, August 2007"));
-    row.prepend(new QDataItem(51, "mm, September 2007"));
-    row.prepend(new QDataItem(24, "mm, October 2007"));
-    row.prepend(new QDataItem(47, "mm, November 2007"));
-    row.prepend(new QDataItem(33, "mm, December 2007"));
-    data.prepend(row);
+    row.append(new QDataItem(41, "mm, January 2007"));
+    row.append(new QDataItem(21, "mm, February 2007"));
+    row.append(new QDataItem(30, "mm, March 2007"));
+    row.append(new QDataItem(20, "mm, April 2007"));
+    row.append(new QDataItem(53, "mm, May 2007"));
+    row.append(new QDataItem(29, "mm, June 2007"));
+    row.append(new QDataItem(139, "mm, July 2007"));
+    row.append(new QDataItem(52, "mm, August 2007"));
+    row.append(new QDataItem(51, "mm, September 2007"));
+    row.append(new QDataItem(24, "mm, October 2007"));
+    row.append(new QDataItem(47, "mm, November 2007"));
+    row.append(new QDataItem(33, "mm, December 2007"));
+    data.append(row);
     row.clear();
     // 2008
-    row.prepend(new QDataItem(67, "mm, January 2008"));
-    row.prepend(new QDataItem(19, "mm, February 2008"));
-    row.prepend(new QDataItem(30, "mm, March 2008"));
-    row.prepend(new QDataItem(31, "mm, April 2008"));
-    row.prepend(new QDataItem(29, "mm, May 2008"));
-    row.prepend(new QDataItem(79, "mm, June 2008"));
-    row.prepend(new QDataItem(75, "mm, July 2008"));
-    row.prepend(new QDataItem(99, "mm, August 2008"));
-    row.prepend(new QDataItem(34, "mm, September 2008"));
-    row.prepend(new QDataItem(52, "mm, October 2008"));
-    row.prepend(new QDataItem(60, "mm, November 2008"));
-    row.prepend(new QDataItem(20, "mm, December 2008"));
-    data.prepend(row);
+    row.append(new QDataItem(67, "mm, January 2008"));
+    row.append(new QDataItem(19, "mm, February 2008"));
+    row.append(new QDataItem(30, "mm, March 2008"));
+    row.append(new QDataItem(31, "mm, April 2008"));
+    row.append(new QDataItem(29, "mm, May 2008"));
+    row.append(new QDataItem(79, "mm, June 2008"));
+    row.append(new QDataItem(75, "mm, July 2008"));
+    row.append(new QDataItem(99, "mm, August 2008"));
+    row.append(new QDataItem(34, "mm, September 2008"));
+    row.append(new QDataItem(52, "mm, October 2008"));
+    row.append(new QDataItem(60, "mm, November 2008"));
+    row.append(new QDataItem(20, "mm, December 2008"));
+    data.append(row);
     row.clear();
     // 2009
-    row.prepend(new QDataItem(9, "mm, January 2009"));
-    row.prepend(new QDataItem(22, "mm, February 2009"));
-    row.prepend(new QDataItem(11, "mm, March 2009"));
-    row.prepend(new QDataItem(10, "mm, April 2009"));
-    row.prepend(new QDataItem(69, "mm, May 2009"));
-    row.prepend(new QDataItem(30, "mm, June 2009"));
-    row.prepend(new QDataItem(78, "mm, July 2009"));
-    row.prepend(new QDataItem(93, "mm, August 2009"));
-    row.prepend(new QDataItem(70, "mm, September 2009"));
-    row.prepend(new QDataItem(32, "mm, October 2009"));
-    row.prepend(new QDataItem(56, "mm, November 2009"));
-    row.prepend(new QDataItem(23, "mm, December 2009"));
-    data.prepend(row);
+    row.append(new QDataItem(9, "mm, January 2009"));
+    row.append(new QDataItem(22, "mm, February 2009"));
+    row.append(new QDataItem(11, "mm, March 2009"));
+    row.append(new QDataItem(10, "mm, April 2009"));
+    row.append(new QDataItem(69, "mm, May 2009"));
+    row.append(new QDataItem(30, "mm, June 2009"));
+    row.append(new QDataItem(78, "mm, July 2009"));
+    row.append(new QDataItem(93, "mm, August 2009"));
+    row.append(new QDataItem(70, "mm, September 2009"));
+    row.append(new QDataItem(32, "mm, October 2009"));
+    row.append(new QDataItem(56, "mm, November 2009"));
+    row.append(new QDataItem(23, "mm, December 2009"));
+    data.append(row);
     row.clear();
     // 2010
-    row.prepend(new QDataItem(12, "mm, January 2010"));
-    row.prepend(new QDataItem(28, "mm, February 2010"));
-    row.prepend(new QDataItem(55, "mm, March 2010"));
-    row.prepend(new QDataItem(20, "mm, April 2010"));
-    row.prepend(new QDataItem(65, "mm, May 2010"));
-    row.prepend(new QDataItem(26, "mm, June 2010"));
-    row.prepend(new QDataItem(134, "mm, July 2010"));
-    row.prepend(new QDataItem(57, "mm, August 2010"));
-    row.prepend(new QDataItem(51, "mm, September 2010"));
-    row.prepend(new QDataItem(53, "mm, October 2010"));
-    row.prepend(new QDataItem(8, "mm, November 2010"));
-    row.prepend(new QDataItem(9, "mm, December 2010"));
-    data.prepend(row);
+    row.append(new QDataItem(12, "mm, January 2010"));
+    row.append(new QDataItem(28, "mm, February 2010"));
+    row.append(new QDataItem(55, "mm, March 2010"));
+    row.append(new QDataItem(20, "mm, April 2010"));
+    row.append(new QDataItem(65, "mm, May 2010"));
+    row.append(new QDataItem(26, "mm, June 2010"));
+    row.append(new QDataItem(134, "mm, July 2010"));
+    row.append(new QDataItem(57, "mm, August 2010"));
+    row.append(new QDataItem(51, "mm, September 2010"));
+    row.append(new QDataItem(53, "mm, October 2010"));
+    row.append(new QDataItem(8, "mm, November 2010"));
+    row.append(new QDataItem(9, "mm, December 2010"));
+    data.append(row);
     row.clear();
     // 2011
-    row.prepend(new QDataItem(34, "mm, January 2011"));
-    row.prepend(new QDataItem(20, "mm, February 2011"));
-    row.prepend(new QDataItem(30, "mm, March 2011"));
-    row.prepend(new QDataItem(31, "mm, April 2011"));
-    row.prepend(new QDataItem(42, "mm, May 2011"));
-    row.prepend(new QDataItem(78, "mm, June 2011"));
-    row.prepend(new QDataItem(85, "mm, July 2011"));
-    row.prepend(new QDataItem(33, "mm, August 2011"));
-    row.prepend(new QDataItem(42, "mm, September 2011"));
-    row.prepend(new QDataItem(87, "mm, October 2011"));
-    row.prepend(new QDataItem(41, "mm, November 2011"));
-    row.prepend(new QDataItem(72, "mm, December 2011"));
-    data.prepend(row);
+    row.append(new QDataItem(34, "mm, January 2011"));
+    row.append(new QDataItem(20, "mm, February 2011"));
+    row.append(new QDataItem(30, "mm, March 2011"));
+    row.append(new QDataItem(31, "mm, April 2011"));
+    row.append(new QDataItem(42, "mm, May 2011"));
+    row.append(new QDataItem(78, "mm, June 2011"));
+    row.append(new QDataItem(85, "mm, July 2011"));
+    row.append(new QDataItem(33, "mm, August 2011"));
+    row.append(new QDataItem(42, "mm, September 2011"));
+    row.append(new QDataItem(87, "mm, October 2011"));
+    row.append(new QDataItem(41, "mm, November 2011"));
+    row.append(new QDataItem(72, "mm, December 2011"));
+    data.append(row);
     row.clear();
     // 2012
-    row.prepend(new QDataItem(32, "mm, January 2012"));
-    row.prepend(new QDataItem(42, "mm, February 2012"));
-    row.prepend(new QDataItem(30, "mm, March 2012"));
-    row.prepend(new QDataItem(50, "mm, April 2012"));
-    row.prepend(new QDataItem(30, "mm, May 2012"));
-    row.prepend(new QDataItem(70, "mm, June 2012"));
-    row.prepend(new QDataItem(52, "mm, July 2012"));
-    row.prepend(new QDataItem(20, "mm, August 2012"));
-    row.prepend(new QDataItem(99, "mm, September 2012"));
-    row.prepend(new QDataItem(70, "mm, October 2012"));
-    row.prepend(new QDataItem(69, "mm, November 2012"));
-    row.prepend(new QDataItem(49, "mm, December 2012"));
-    data.prepend(row);
+    row.append(new QDataItem(32, "mm, January 2012"));
+    row.append(new QDataItem(42, "mm, February 2012"));
+    row.append(new QDataItem(30, "mm, March 2012"));
+    row.append(new QDataItem(50, "mm, April 2012"));
+    row.append(new QDataItem(30, "mm, May 2012"));
+    row.append(new QDataItem(70, "mm, June 2012"));
+    row.append(new QDataItem(52, "mm, July 2012"));
+    row.append(new QDataItem(20, "mm, August 2012"));
+    row.append(new QDataItem(99, "mm, September 2012"));
+    row.append(new QDataItem(70, "mm, October 2012"));
+    row.append(new QDataItem(69, "mm, November 2012"));
+    row.append(new QDataItem(49, "mm, December 2012"));
+    data.append(row);
     row.clear();
     // Set up row and column names
     QVector<QString> months;