Add categorized logging to graphs 3d pt1HEADdev

Feature allows developers to turn on categorized logging in graphs 3D which will log various different things
qt.graphs3d.general, general purpose logs
qt.graphs3d.series, series addition/removal
qt.graphs3d.properties, property changes
qt.graphs3d.events, sliceview enter/exit, zoom/rotate values
qt.graphs3d.inputEvents, pick results
qt.graphs3d.axis.general, axis general purpose
qt.graphs3d.axis.properties, axis properties
qt.graphs3d.critical, critical

Task-number: QTBUG-128886
Change-Id: I714ff59af47f9ec583eae57e89fd0ae417d900df
Reviewed-by: Sami Varanka <[email protected]>

1 files changed, 25 insertions, 3 deletions

diff --git a/src/graphs3d/qml/qquickgraphssurface.cpp b/src/graphs3d/qml/qquickgraphssurface.cpp
index d96b2c7b..518d109b 100644
--- a/src/graphs3d/qml/qquickgraphssurface.cpp
+++ b/src/graphs3d/qml/qquickgraphssurface.cpp
@@ -6,6 +6,7 @@
 #include "q3dscene.h"
 #include "qabstractdataproxy.h"
 #include "qquickgraphssurface_p.h"
+#include "qgraphs3dlogging_p.h"
 
 #include "qcategory3daxis_p.h"
 #include "qgraphsinputhandler_p.h"
@@ -776,13 +777,14 @@ void QQuickGraphsSurface::setSelectionMode(QtGraphs3D::SelectionFlags mode)
     if ((mode.testFlag(QtGraphs3D::SelectionFlag::Row)
          || mode.testFlag(QtGraphs3D::SelectionFlag::Column))
         && !mode.testFlag(QtGraphs3D::SelectionFlag::Slice)) {
-        qWarning("Unsupported selection mode.");
+        qCWarning(lcProperties3D, "%s unsupported selection mode",
+                  qUtf8Printable(QLatin1String(__FUNCTION__)));
         return;
     } else if (mode.testFlag(QtGraphs3D::SelectionFlag::Slice)
                && (mode.testFlag(QtGraphs3D::SelectionFlag::Row)
                    == mode.testFlag(QtGraphs3D::SelectionFlag::Column))) {
-        qWarning("Must specify one of either row or column selection mode"
-                 "in conjunction with slicing mode.");
+        qCWarning(lcProperties3D, "%s must specify one of either row or column selection mode"
+                 "in conjunction with slicing mode.", qUtf8Printable(QLatin1String(__FUNCTION__)));
     } else {
         QtGraphs3D::SelectionFlags oldMode = selectionMode();
 
@@ -990,10 +992,13 @@ void QQuickGraphsSurface::componentComplete()
     }
 
     graphsInputHandler()->setGraphsItem(this);
+    qCDebug(lcGraphs3D, " QQuickGraphsSurface::componentComplete");
 }
 
 void QQuickGraphsSurface::synchData()
 {
+    qCDebug(lcGraphs3D, "%s start syncing", qUtf8Printable(QLatin1String(__FUNCTION__)));
+
     if (isFlipHorizontalGridChanged())
         setHorizontalFlipFactor(flipHorizontalGrid() ? -1 : 1);
 
@@ -1065,6 +1070,7 @@ void QQuickGraphsSurface::synchData()
         doPicking(m_lastPick);
         m_pickThisFrame = false;
     }
+    qCDebug(lcGraphs3D, "%s end syncing", qUtf8Printable(QLatin1String(__FUNCTION__)));
 }
 
 void QQuickGraphsSurface::updateGraph()
@@ -1555,6 +1561,14 @@ void QQuickGraphsSurface::updateModel(SurfaceModel *model)
         gridMaterial->setProperty("graphHeight", scaleWithBackground().y());
         gridMaterial->setProperty("fill", model->series->drawMode().testFlag(QSurface3DSeries::DrawFilledSurface));
 
+        qCDebug(lcGraphs3D) << "surface info"
+            << "\n vertices:" << model->vertices.count()
+            << "\n indices:" << model->indices.count()
+            << "\n dataArray dimensions:" << QVector2D(model->series->dataArray().size(), model->series->dataArray().at(0).size())
+            << "\n plane size:" << QVector2D(sampleSpace.width(), sampleSpace.height())
+            << "\n vertCount:" << QVector2D(columnCount, rowCount);
+
+
         m_proxyDirty = true;
 
         if (lineData)
@@ -2381,6 +2395,10 @@ bool QQuickGraphsSurface::doPicking(QPointF position)
                     if (!selectedVertex.position.isNull() && model->picked) {
                         model->series->setSelectedPoint(selectedVertex.coord);
                         setSlicingActive(false);
+                        qCDebug(lcInput3D) << "pick results:"
+                            << "\n instance position:" << selectedVertex.position
+                            << "\n picked vertices coords:" << selectedVertex.coord
+                            << "\n picked vertices values:" << model->series->dataProxy()->itemAt(selectedVertex.coord).position();
                         if (isSliceEnabled())
                             setSliceActivatedChanged(true);
                     }
@@ -2469,6 +2487,10 @@ bool QQuickGraphsSurface::doRayPicking(QVector3D origin, QVector3D direction)
                     if (!selectedVertex.position.isNull() && model->picked) {
                         model->series->setSelectedPoint(selectedVertex.coord);
                         setSlicingActive(false);
+                        qCDebug(lcInput3D) << "pick results:"
+                            << "\n instance position:" << selectedVertex.position
+                            << "\n picked vertices coords:" << selectedVertex.coord
+                            << "\n picked vertices values:" << model->series->dataProxy()->itemAt(selectedVertex.coord).position();
                         if (isSliceEnabled())
                             setSliceActivatedChanged(true);
                     }