diff --git a/examples/iot-dashboard/DiagramSkinlet.cpp b/examples/iot-dashboard/DiagramSkinlet.cpp index 2914660f..9287bb8e 100644 --- a/examples/iot-dashboard/DiagramSkinlet.cpp +++ b/examples/iot-dashboard/DiagramSkinlet.cpp @@ -88,7 +88,7 @@ QSGNode* DiagramSkinlet::updateChartNode( const Diagram* diagram, QSGNode* node { if( node == nullptr ) { - node = new IdlChartNode; // ### rename + node = new DiagramDataNode; } using Q = Diagram; @@ -121,19 +121,19 @@ QSGNode* DiagramSkinlet::updateChartNode( const Diagram* diagram, QSGNode* node { if( diagram->typesAt( i ) & types.at( j ) ) { - IdlChartNode* dataPointNode; + DiagramDataNode* dataPointNode; if( chartNode->childCount() > nodeIndex ) { - dataPointNode = static_cast( chartNode->childAtIndex( nodeIndex ) ); + dataPointNode = static_cast( chartNode->childAtIndex( nodeIndex ) ); } else { - dataPointNode = new IdlChartNode; + dataPointNode = new DiagramDataNode; chartNode->appendChildNode( dataPointNode ); } - const IdlChartNode::Type nodeType = ( types.at( j ) == Diagram::Line ) ? IdlChartNode::Line : IdlChartNode::Area; + const DiagramDataNode::Type nodeType = ( types.at( j ) == Diagram::Line ) ? DiagramDataNode::Line : DiagramDataNode::Area; const QColor color = ( types.at( j ) == Diagram::Line ) ? diagram->color( lineSubcontrol ) : diagram->color( areaSubcontrol ); @@ -162,11 +162,11 @@ QSGNode* DiagramSkinlet::updateSeparatorNode( const Diagram* diagram, QSGNode* n return nullptr; } - auto* separatorNode = static_cast( node ); + auto* separatorNode = static_cast( node ); if( separatorNode == nullptr ) { - separatorNode = new IdlChartSegmentsNode; + separatorNode = new DiagramSegmentsNode; } using Q = Diagram; diff --git a/examples/iot-dashboard/nodes/DiagramDataNode.cpp b/examples/iot-dashboard/nodes/DiagramDataNode.cpp index 3a06a022..e5b74bb4 100644 --- a/examples/iot-dashboard/nodes/DiagramDataNode.cpp +++ b/examples/iot-dashboard/nodes/DiagramDataNode.cpp @@ -7,15 +7,15 @@ #include #include -IdlChartNode::IdlChartNode() +DiagramDataNode::DiagramDataNode() : m_geometry( QSGGeometry::defaultAttributes_Point2D(), 0 ) { setGeometry( &m_geometry ); setMaterial( &m_material ); } -void IdlChartNode::update( const QRectF& rect, Type type, const QColor& color, const QVector& dataPoints, - const qreal yMax, Qsk::Position position, int lineWidth ) +void DiagramDataNode::update( const QRectF& rect, Type type, const QColor& color, const QVector& dataPoints, + const qreal yMax, Qsk::Position position, int lineWidth ) { Q_UNUSED( rect ); diff --git a/examples/iot-dashboard/nodes/DiagramDataNode.h b/examples/iot-dashboard/nodes/DiagramDataNode.h index 5146f4f8..94180e6f 100644 --- a/examples/iot-dashboard/nodes/DiagramDataNode.h +++ b/examples/iot-dashboard/nodes/DiagramDataNode.h @@ -12,7 +12,7 @@ #include #include -class IdlChartNode : public QSGGeometryNode +class DiagramDataNode : public QSGGeometryNode { public: enum Type @@ -21,7 +21,7 @@ class IdlChartNode : public QSGGeometryNode Area, }; - IdlChartNode(); + DiagramDataNode(); void update( const QRectF& rect, Type type, const QColor& color, const QVector& dataPoints, const qreal yMax, Qsk::Position position, int lineWidth ); diff --git a/examples/iot-dashboard/nodes/DiagramSegmentsNode.cpp b/examples/iot-dashboard/nodes/DiagramSegmentsNode.cpp index b7d9f008..842e2ced 100644 --- a/examples/iot-dashboard/nodes/DiagramSegmentsNode.cpp +++ b/examples/iot-dashboard/nodes/DiagramSegmentsNode.cpp @@ -7,7 +7,7 @@ #include -IdlChartSegmentsNode::IdlChartSegmentsNode() +DiagramSegmentsNode::DiagramSegmentsNode() : m_geometry( QSGGeometry::defaultAttributes_Point2D(), 0 ) { m_geometry.setDrawingMode( GL_LINES ); @@ -16,7 +16,7 @@ IdlChartSegmentsNode::IdlChartSegmentsNode() setMaterial( &m_material ); } -void IdlChartSegmentsNode::update( const QRectF& rect, const QColor& color, const QVector >& dataPoints, int xGridLines ) +void DiagramSegmentsNode::update( const QRectF& rect, const QColor& color, const QVector >& dataPoints, int xGridLines ) { Q_UNUSED( rect ); diff --git a/examples/iot-dashboard/nodes/DiagramSegmentsNode.h b/examples/iot-dashboard/nodes/DiagramSegmentsNode.h index 71950c47..08ff8dfa 100644 --- a/examples/iot-dashboard/nodes/DiagramSegmentsNode.h +++ b/examples/iot-dashboard/nodes/DiagramSegmentsNode.h @@ -10,10 +10,10 @@ #include #include -class IdlChartSegmentsNode : public QSGGeometryNode +class DiagramSegmentsNode : public QSGGeometryNode { public: - IdlChartSegmentsNode(); + DiagramSegmentsNode(); void update( const QRectF& rect, const QColor& color, const QVector< QVector >& dataPoints, int xGridLines );