Add Qt DataVisualization

Task-number: PYSIDE-487
Change-Id: I7e4e8b617b95ec4008dc0fc4bea9974871425b2d
Reviewed-by: Christian Tismer <tismer@stackless.com>

5 files changed, 349 insertions, 0 deletions

diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt
index ac4669deb..d4bb023a0 100644
--- a/sources/pyside2/CMakeLists.txt
+++ b/sources/pyside2/CMakeLists.txt
@@ -290,6 +290,7 @@ ENDIF()
 COLLECT_MODULE_IF_FOUND(TextToSpeech opt)
 COLLECT_MODULE_IF_FOUND(Charts opt)
 COLLECT_MODULE_IF_FOUND(Svg opt)
+COLLECT_MODULE_IF_FOUND(DataVisualization opt)
 find_package(Qt5UiTools)
 if(Qt5UiTools_FOUND)
     COLLECT_MODULE_IF_FOUND(UiTools opt)
diff --git a/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt b/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt
new file mode 100644
index 000000000..4e0aecb62
--- /dev/null
+++ b/sources/pyside2/PySide2/QtDataVisualization/CMakeLists.txt
@@ -0,0 +1,82 @@
+project(QtDataVisualization)
+
+set(QtDataVisualization_SRC
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qabstract3daxis_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qcategory3daxis_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qlogvalue3daxisformatter_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qvalue3daxis_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qvalue3daxisformatter_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qabstract3dseries_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qabstractdataproxy_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qbar3dseries_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qbardataitem_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qbardataproxy_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qcustom3ditem_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qcustom3dlabel_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qcustom3dvolume_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qheightmapsurfacedataproxy_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qitemmodelbardataproxy_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qitemmodelscatterdataproxy_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qitemmodelsurfacedataproxy_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qscatter3dseries_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qscatterdataitem_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qscatterdataproxy_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qsurface3dseries_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qsurfacedataitem_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qsurfacedataproxy_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dbars_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dcamera_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dlight_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dobject_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dscatter_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dscene_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dsurface_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qabstract3dgraph_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dinputhandler_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qabstract3dinputhandler_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_qtouch3dinputhandler_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dtheme_wrapper.cpp
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_wrapper.cpp
+# module is always needed
+${QtDataVisualization_GEN_DIR}/qtdatavisualization_module_wrapper.cpp
+)
+
+# Sanitize windows.h as pulled by gl.h to prevent clashes with QAbstract3dAxis::min(), etc.
+if (WIN32)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOMINMAX")
+endif()
+
+make_path(QtDataVisualization_typesystem_path
+    ${QtCore_SOURCE_DIR}
+    ${QtCore_BINARY_DIR}
+    ${QtGui_SOURCE_DIR}
+    ${QtGui_BINARY_DIR}
+    ${QtDataVisualization_SOURCE_DIR})
+
+set(QtDataVisualization_include_dirs ${QtDataVisualization_SOURCE_DIR}
+                          ${QtDataVisualization_BINARY_DIR}
+                          ${Qt5Core_INCLUDE_DIRS}
+                          ${Qt5Gui_INCLUDE_DIRS}
+                          ${Qt5DataVisualization_INCLUDE_DIRS}
+                          ${SHIBOKEN_INCLUDE_DIR}
+                          ${libpyside_SOURCE_DIR}
+                          ${SHIBOKEN_PYTHON_INCLUDE_DIR}
+                          ${QtCore_GEN_DIR}
+                          ${QtGui_GEN_DIR})
+
+set(QtDataVisualization_libraries    pyside2
+                          ${SHIBOKEN_PYTHON_LIBRARIES}
+                          ${SHIBOKEN_LIBRARY}
+                          ${Qt5DataVisualization_LIBRARIES}
+                          ${Qt5Core_LIBRARIES}
+                          ${Qt5Gui_LIBRARIES})
+
+set(QtDataVisualization_deps QtCore QtGui)
+
+create_pyside_module(QtDataVisualization
+                     QtDataVisualization_include_dirs
+                     QtDataVisualization_libraries
+                     QtDataVisualization_deps
+                     QtDataVisualization_typesystem_path
+                     QtDataVisualization_SRC
+                     "")
diff --git a/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml b/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml
new file mode 100644
index 000000000..ce2968fb2
--- /dev/null
+++ b/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0"?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of PySide2.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+-->
+<typesystem package="PySide2.QtDataVisualization">
+  <rejection class="^.*Proxy.*$" argument-type="^Q.*(DataRow|DataArray)\*.*$"/>
+
+  <template name="cppqlistofptrtoqvectors_to_py_conversion">
+  const int rowCount = %in.size();
+  PyObject* %out = PyList_New(rowCount);
+  for (int r = 0; r &lt; rowCount; ++r) {
+      const QVector&lt;%INTYPE_0&gt; *row = %in.at(r);
+      const int columnCount = row->size();
+      PyObject *pyRow = PyList_New(columnCount);
+      for (int c = 0; c &lt; columnCount; ++c) {
+          const %INTYPE_0 &amp;cppItem = row->at(c);
+          PyList_SET_ITEM(pyRow, c, %CONVERTTOPYTHON[%INTYPE_0](cppItem));
+      }
+      PyList_SET_ITEM(%out, r, pyRow);
+  }
+  return %out;
+  </template>
+  <template name="py_to_cppqlistofptrtoqvectors_conversion">
+  const int rowCount = int(PySequence_Size(%in));
+  %OUTTYPE &amp;result = %out;
+  result.reserve(rowCount);
+  for (int r = 0; r &lt; rowCount; ++r) {
+      Shiboken::AutoDecRef rowItem(PySequence_GetItem(%in, r));
+      const int columnCount = int(PySequence_Size(rowItem));
+      QVector&lt;%OUTTYPE_0&gt; *row = new QVector&lt;%OUTTYPE_0&gt;;
+      row->reserve(columnCount);
+      for (int c = 0; c &lt; columnCount; ++c) {
+         Shiboken::AutoDecRef pyItem(PySequence_GetItem(rowItem, c));
+         %OUTTYPE_0 v = %CONVERTTOCPP[%OUTTYPE_0](pyItem);
+         row->append(v);
+      }
+      result.append(row);
+  }
+  </template>
+  <load-typesystem name="typesystem_gui.xml" generate="no" />
+  <namespace-type name="QtDataVisualization">
+    <primitive-type name="QBarDataArray">
+      <include file-name="qbardataproxy.h" location="global"/>
+      <conversion-rule>
+          <native-to-target>
+              <insert-template name="cppqlistofptrtoqvectors_to_py_conversion">
+                <replace from="%INTYPE_0" to="QtDataVisualization::QBarDataItem"/>
+              </insert-template>
+          </native-to-target>
+          <target-to-native>
+              <add-conversion type="PySequence">
+                  <insert-template name="py_to_cppqlistofptrtoqvectors_conversion">
+                      <replace from="%OUTTYPE_0" to="QtDataVisualization::QBarDataItem"/>
+                  </insert-template>
+              </add-conversion>
+          </target-to-native>
+      </conversion-rule>
+    </primitive-type>
+    <primitive-type name="QSurfaceDataArray">
+      <include file-name="qsurfacedataproxy.h" location="global"/>
+      <conversion-rule>
+          <native-to-target>
+              <insert-template name="cppqlistofptrtoqvectors_to_py_conversion">
+                <replace from="%INTYPE_0" to="QtDataVisualization::QSurfaceDataItem"/>
+              </insert-template>
+          </native-to-target>
+          <target-to-native>
+              <add-conversion type="PySequence">
+                  <insert-template name="py_to_cppqlistofptrtoqvectors_conversion">
+                      <replace from="%OUTTYPE_0" to="QtDataVisualization::QSurfaceDataItem"/>
+                  </insert-template>
+              </add-conversion>
+          </target-to-native>
+      </conversion-rule>
+    </primitive-type>
+
+    <object-type name="QAbstract3DAxis">
+      <enum-type name="AxisOrientation"/>
+      <enum-type name="AxisType"/>
+    </object-type>
+    <object-type name="QCategory3DAxis"/>
+    <object-type name="QLogValue3DAxisFormatter"/>
+    <object-type name="QValue3DAxis"/>
+    <object-type name="QValue3DAxisFormatter"/>
+    <object-type name="QAbstract3DSeries">
+      <enum-type name="Mesh"/>
+      <enum-type name="SeriesType"/>
+    </object-type>
+    <object-type name="QAbstractDataProxy">
+      <enum-type name="DataType"/>
+    </object-type>
+    <object-type name="QBar3DSeries"/>
+    <value-type name="QBarDataItem"/>
+    <object-type name="QBarDataProxy"/>
+    <object-type name="QCustom3DItem"/>
+    <object-type name="QCustom3DLabel"/>
+    <object-type name="QCustom3DVolume"/>
+    <object-type name="QHeightMapSurfaceDataProxy"/>
+    <object-type name="QItemModelBarDataProxy">
+      <enum-type name="MultiMatchBehavior"/>
+    </object-type>
+    <object-type name="QItemModelScatterDataProxy"/>
+    <object-type name="QItemModelSurfaceDataProxy">
+      <enum-type name="MultiMatchBehavior"/>
+    </object-type>
+    <object-type name="QScatter3DSeries"/>
+    <value-type name="QScatterDataItem"/>
+    <object-type name="QScatterDataProxy"/>
+    <object-type name="QSurface3DSeries">
+       <enum-type name="DrawFlag" flags="DrawFlags"/>
+    </object-type>
+    <value-type name="QSurfaceDataItem"/>
+    <object-type name="QSurfaceDataProxy"/>
+    <object-type name="Q3DBars"/>
+    <object-type name="Q3DCamera">
+      <enum-type name="CameraPreset"/>
+    </object-type>
+    <object-type name="Q3DLight"/>
+    <object-type name="Q3DObject"/>
+    <object-type name="Q3DScatter"/>
+    <object-type name="Q3DScene"/>
+    <object-type name="Q3DSurface"/>
+    <object-type name="QAbstract3DGraph">
+      <enum-type name="ElementType"/>
+      <enum-type name="OptimizationHint" flags="OptimizationHints"/>
+      <enum-type name="SelectionFlag" flags="SelectionFlags"/>
+      <enum-type name="ShadowQuality"/>
+    </object-type>
+    <object-type name="Q3DInputHandler"/>
+    <object-type name="QAbstract3DInputHandler">
+      <enum-type name="InputView"/>
+    </object-type>
+    <object-type name="QTouch3DInputHandler"/>
+    <object-type name="Q3DTheme">
+      <enum-type name="ColorStyle"/>
+      <enum-type name="Theme"/>
+    </object-type>
+    <extra-includes>
+      <include file-name="qutils.h" location="global"/>
+    </extra-includes>
+  </namespace-type>
+</typesystem>
diff --git a/sources/pyside2/tests/QtDataVisualization/CMakeLists.txt b/sources/pyside2/tests/QtDataVisualization/CMakeLists.txt
new file mode 100644
index 000000000..80f6751c4
--- /dev/null
+++ b/sources/pyside2/tests/QtDataVisualization/CMakeLists.txt
@@ -0,0 +1 @@
+PYSIDE_TEST(datavisualization_test.py.py)
diff --git a/sources/pyside2/tests/QtDataVisualization/datavisualization_test.py b/sources/pyside2/tests/QtDataVisualization/datavisualization_test.py
new file mode 100644
index 000000000..7efd6122d
--- /dev/null
+++ b/sources/pyside2/tests/QtDataVisualization/datavisualization_test.py
@@ -0,0 +1,85 @@
+#!/usr/bin/python
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the test suite of PySide2.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## 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 https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+'''Test cases for QtDataVisualization'''
+
+from helper import UsesQGuiApplication
+from PySide2.QtCore import QTimer
+from PySide2.QtDataVisualization import QtDataVisualization
+import unittest
+
+def dataToBarDataRow(data):
+    result = []
+    for d in data:
+        result.append(QtDataVisualization.QBarDataItem(d))
+    return result
+
+def dataToBarDataArray(data):
+    result = []
+    for row in data:
+        result.append(dataToBarDataRow(row))
+    return result
+
+class QtDataVisualizationTestCase(UsesQGuiApplication):
+    '''Tests related to QtDataVisualization'''
+
+    def testBars(self):
+        self.bars = QtDataVisualization.Q3DBars()
+        self.columnAxis = QtDataVisualization.QCategory3DAxis()
+        self.columnAxis.setTitle('Columns')
+        self.columnAxis.setTitleVisible(True)
+        self.columnAxis.setLabels(['Column1', 'Column2'])
+
+        self.rowAxis = QtDataVisualization.QCategory3DAxis()
+        self.rowAxis.setTitle('Rows')
+        self.rowAxis.setTitleVisible(True)
+        self.rowAxis.setLabels(['Row1', 'Row2'])
+
+        self.valueAxis = QtDataVisualization.QValue3DAxis()
+        self.valueAxis.setTitle('Values')
+        self.valueAxis.setTitleVisible(True)
+        self.valueAxis.setRange(0, 5);
+
+        self.bars.setRowAxis(self.rowAxis)
+        self.bars.setColumnAxis(self.columnAxis)
+        self.bars.setValueAxis(self.valueAxis)
+
+        self.series = QtDataVisualization.QBar3DSeries()
+        self.arrayData = [[1, 2], [3, 4]]
+        self.series.dataProxy().addRows(dataToBarDataArray(self.arrayData))
+
+        self.bars.setPrimarySeries(self.series)
+
+        self.bars.show()
+        QTimer.singleShot(500, self.app.quit)
+        self.app.exec_()
+
+if __name__ == '__main__':
+    unittest.main()