qiurui
/
qtgraphs
mirror of https://github.com/qt/qtgraphs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add grabChanged signal to 3D graphs 

Allows the signal to be connected to for custom input handling

Fixes: QTBUG-122428
Change-Id: Ide9875454f9fee4431ed0fc8036b6cf967a01b94
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Dilek Akcay <dilek.akcay@qt.io>
This commit is contained in:
Sakaria Pouke 2024-02-29 14:20:48 +02:00
parent f83d157fd5
commit ddc76bb7ea
3 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/graphs/3d/widgetgraphgallery/scatterdatamodifier.cpp
View File

@ -48,10 +48,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter, QObject *parent)
&QAbstract3DGraph::selectedElementChanged,
this,
&ScatterDataModifier::handleElementSelected);
connect(m_graph,
&QAbstract3DGraph::dragged,
this,
&ScatterDataModifier::handleAxisDragging);
connect(m_graph, &QAbstract3DGraph::dragged, this, &ScatterDataModifier::handleAxisDragging);
m_graph->setDragButton(Qt::LeftButton);
//! [8]
@ -164,7 +161,6 @@ void ScatterDataModifier::handleAxisDragging(QVector2D delta)
{
//! [10]
float distance = 0.0f;
//! [11]
// Get scene orientation from active camera
float xRotation = m_graph->cameraXRotation();

45
src/graphs3d/input/qgraphsinputhandler.cpp
View File

@ -3,9 +3,9 @@
#include "qgraphsinputhandler_p.h"
#include <QtQuick/private/qquicktaphandler_p.h>
#include <QtQuick/private/qquickdraghandler_p.h>
#include <QtQuick/private/qquickpinchhandler_p.h>
#include <QtQuick/private/qquicktaphandler_p.h>
#include <QtQuick/private/qquickwheelhandler_p.h>
#include "qquickgraphsitem_p.h"
@ -26,11 +26,9 @@ QGraphsInputHandler::QGraphsInputHandler(QQuickItem *parent)
m_wheelHandler = new QQuickWheelHandler(this);
m_dragHandler->setAcceptedButtons(Qt::MouseButton::RightButton);
m_wheelHandler->setAcceptedDevices(QInputDevice::DeviceType::Mouse | QInputDevice::DeviceType::TouchPad);
QObject::connect(m_tapHandler,
&QQuickTapHandler::tapped,
this,
&QGraphsInputHandler::onTapped);
m_wheelHandler->setAcceptedDevices(QInputDevice::DeviceType::Mouse
| QInputDevice::DeviceType::TouchPad);
QObject::connect(m_tapHandler, &QQuickTapHandler::tapped, this, &QGraphsInputHandler::onTapped);
QObject::connect(m_dragHandler,
&QQuickDragHandler::translationChanged,
this,
@ -161,10 +159,7 @@ void QGraphsInputHandler::setDragButton(Qt::MouseButtons button)
void QGraphsInputHandler::setGraphsItem(QQuickGraphsItem *item)
{
m_graphsItem = item;
QObject::connect(m_tapHandler,
&QQuickTapHandler::tapped,
item,
&QQuickGraphsItem::tapped);
QObject::connect(m_tapHandler, &QQuickTapHandler::tapped, item, &QQuickGraphsItem::tapped);
QObject::connect(m_tapHandler,
&QQuickTapHandler::doubleTapped,
item,
@ -177,10 +172,7 @@ void QGraphsInputHandler::setGraphsItem(QQuickGraphsItem *item)
&QQuickDragHandler::translationChanged,
item,
&QQuickGraphsItem::dragged);
QObject::connect(m_wheelHandler,
&QQuickWheelHandler::wheel,
item,
&QQuickGraphsItem::wheel);
QObject::connect(m_wheelHandler, &QQuickWheelHandler::wheel, item, &QQuickGraphsItem::wheel);
QObject::connect(m_pinchHandler,
&QQuickPinchHandler::scaleChanged,
item,
@ -223,15 +215,21 @@ void QGraphsInputHandler::onTranslationChanged(QVector2D delta)
item->setCameraYRotation(yRotation);
}
void QGraphsInputHandler::onGrabChanged(QPointingDevice::GrabTransition transition, QEventPoint point)
void QGraphsInputHandler::onGrabChanged(QPointingDevice::GrabTransition transition,
QEventPoint point)
{
Q_UNUSED(point);
if (transition == QPointingDevice::UngrabExclusive
|| transition == QPointingDevice::UngrabPassive) {
static QPointF pickPoint;
if (transition == QPointingDevice::GrabPassive) {
pickPoint = point.position().toPoint();
} else if (transition == QPointingDevice::GrabExclusive) {
m_graphsItem->doPicking(pickPoint);
} else if (transition == QPointingDevice::UngrabExclusive
|| transition == QPointingDevice::UngrabPassive) {
setPosition(QPointF(.0f, .0f));
setScale(1.f);
setRotation(.0f);
emit m_graphsItem->selectedElementChanged(QAbstract3DGraph::ElementType::None);
pickPoint = QPointF();
}
}
@ -275,8 +273,7 @@ void QGraphsInputHandler::onWheel(QQuickWheelEvent *event)
// If zooming in/out outside the graph, or zooming out after certain point,
// move towards the center.
if ((qAbs(targetPosition.x()) > 2.0f
|| qAbs(targetPosition.y()) > 2.0f
if ((qAbs(targetPosition.x()) > 2.0f || qAbs(targetPosition.y()) > 2.0f
|| qAbs(targetPosition.z()) > 2.0f)
|| (previousZoom > zoomLevel && zoomLevel <= driftTowardCenterLevel)) {
targetPosition = QVector3D();
@ -324,15 +321,15 @@ void QGraphsInputHandler::onPinchScaleChanged(qreal delta)
zoomLevel -= zoomRate;
zoomLevel = qBound(minZoomLevel, zoomLevel, maxZoomLevel);
if (m_zoomAtTarget) {
QVector3D targetPosition = item->graphPositionAt(m_pinchHandler->centroid().position().toPoint());
QVector3D targetPosition = item->graphPositionAt(
m_pinchHandler->centroid().position().toPoint());
item->setCameraZoomLevel(zoomLevel);
float diffAdj = 0.0f;
// If zooming in/out outside the graph, or zooming out after certain point,
// move towards the center.
if ((qAbs(targetPosition.x()) > 2.0f
|| qAbs(targetPosition.y()) > 2.0f
if ((qAbs(targetPosition.x()) > 2.0f || qAbs(targetPosition.y()) > 2.0f
|| qAbs(targetPosition.z()) > 2.0f)
|| (m_pinchDiff > .0f && zoomLevel <= driftTowardCenterLevel)) {
targetPosition = QVector3D();

9
src/graphs3d/qml/qquickgraphsitem.cpp
View File

@ -2601,17 +2601,16 @@ void QQuickGraphsItem::updateLabels()
zPos *= -1.0f;
labelTrans.setZ(zPos);
for (int i = 0; i < repeaterY()->count() / 2; i++) {
if (labelCount <= i)
break;
for (int i = 0; i < repeaterY()->count(); i++) {
auto obj = static_cast<QQuick3DNode *>(repeaterY()->objectAt(i));
labelTrans.setY(static_cast<QValue3DAxis *>(axisY())->labelPositionAt(i) * scale * 2.0f
labelTrans.setY(static_cast<QValue3DAxis *>(axisY())->labelPositionAt(i % labelCount)
* scale * 2.0f
- scale);
obj->setObjectName(QStringLiteral("ElementAxisYLabel"));
obj->setScale(m_fontScaled);
obj->setPosition(labelTrans);
obj->setRotation(totalRotation);
obj->setProperty("labelText", labels[i]);
obj->setProperty("labelText", labels[i % labelCount]);
obj->setProperty("labelWidth", labelsMaxWidth);
obj->setProperty("labelHeight", labelHeight);
}