From 527113321ff103835b89543c5d6f670f55b5b0d5 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 28 Nov 2013 08:19:37 +0200 Subject: Move series specific visual elements to series, part 1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Meshes moved to series. Task-number: QTRD-2557 Change-Id: I80050e413faf3bc942eb5a5627a66747de5805d8 Reviewed-by: Tomi Korpipää --- src/datavisualization/engine/q3dscatter.cpp | 33 ----------------------------- 1 file changed, 33 deletions(-) (limited to 'src/datavisualization/engine/q3dscatter.cpp') diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp index acacaa8f..a71bdb18 100644 --- a/src/datavisualization/engine/q3dscatter.cpp +++ b/src/datavisualization/engine/q3dscatter.cpp @@ -90,8 +90,6 @@ Q3DScatter::Q3DScatter() &Q3DScatter::selectionModeChanged); QObject::connect(d_ptr->m_shared, &Abstract3DController::shadowQualityChanged, this, &Q3DScatter::shadowQualityChanged); - QObject::connect(d_ptr->m_shared, &Abstract3DController::meshFileNameChanged, this, - &Q3DScatter::meshFileNameChanged); QObject::connect(d_ptr->m_shared, &Abstract3DController::themeChanged, this, &Q3DScatter::themeChanged); QObject::connect(d_ptr->m_shared, &Abstract3DController::colorStyleChanged, this, @@ -220,18 +218,6 @@ void Q3DScatter::setHeight(const int height) QWindow::setHeight(height); } -/*! - * Sets the item \a style to one of the values in \c QDataVis::MeshStyle. It is preset to - * \c QDataVis::MeshStyleSpheres by default. A \a smooth flag can be used to set shading to smooth. - * It is \c false by default. - * - * \sa setMeshFileName() - */ -void Q3DScatter::setObjectType(QDataVis::MeshStyle style, bool smooth) -{ - d_ptr->m_shared->setObjectType(style, smooth); -} - /*! * \property Q3DScatter::theme * @@ -265,25 +251,6 @@ QDataVis::SelectionFlags Q3DScatter::selectionMode() const return d_ptr->m_shared->selectionMode(); } -/*! - * \property Q3DScatter::meshFileName - * - * Override item type with a mesh object located in \a objFileName. - * \note Object needs to be in Wavefront obj format and include vertices, normals and UVs. - * It also needs to be in triangles. - * - * \sa setObjectType() - */ -void Q3DScatter::setMeshFileName(const QString &objFileName) -{ - d_ptr->m_shared->setMeshFileName(objFileName); -} - -QString Q3DScatter::meshFileName() const -{ - return d_ptr->m_shared->meshFileName(); -} - /*! * \property Q3DScatter::scene * -- cgit v1.2.3