[kgraphviewer-devel] [kgraphviewer/libkgraphviz] src/kgraphviz: Make CanvasElement::computeBoundingRect protected
Kevin Funk
krf at electrostorm.net
Thu Feb 10 18:22:31 CET 2011
Git commit 2270967361fb0cba97bdf9d70bcbed43fd83e207 by Kevin Funk.
Committed on 09/02/2011 at 16:33.
Pushed by kfunk into branch 'libkgraphviz'.
Make CanvasElement::computeBoundingRect protected
M +3 -3 src/kgraphviz/canvasedge.h
M +3 -3 src/kgraphviz/canvaselement.h
M +4 -4 src/kgraphviz/dotgraphview.cpp
http://commits.kde.org/kgraphviewer/2270967361fb0cba97bdf9d70bcbed43fd83e207
diff --git a/src/kgraphviz/canvasedge.h b/src/kgraphviz/canvasedge.h
index 0c43cb2..0bab360 100644
--- a/src/kgraphviz/canvasedge.h
+++ b/src/kgraphviz/canvasedge.h
@@ -53,13 +53,13 @@ public:
virtual ~CanvasEdge();
- virtual void computeBoundingRect();
-
- QPainterPath shape() const;
+ virtual QPainterPath shape() const;
GraphEdge* edge() const;
protected:
+ virtual void computeBoundingRect();
+
CanvasEdgePrivate* const d_ptr;
private:
diff --git a/src/kgraphviz/canvaselement.h b/src/kgraphviz/canvaselement.h
index 76b6388..a781efa 100644
--- a/src/kgraphviz/canvaselement.h
+++ b/src/kgraphviz/canvaselement.h
@@ -51,7 +51,6 @@ public:
virtual void paint(QPainter* p, const QStyleOptionGraphicsItem *option,
QWidget *widget = 0 );
- virtual void computeBoundingRect();
virtual QRectF boundingRect () const;
void initialize(qreal scaleX, qreal scaleY,
@@ -69,6 +68,9 @@ protected:
virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event );
virtual void hoverLeaveEvent( QGraphicsSceneHoverEvent * event );
+ virtual void computeBoundingRect();
+ void setBoundingRect(const QRectF& rect);
+
QFont font() const;
void setFont(const QFont& font);
qreal scaleX() const;
@@ -80,8 +82,6 @@ protected:
qreal marginY() const;
void setMarginY(qreal marginY);
- void setBoundingRect(const QRectF& rect);
-
CanvasElementPrivate* const d_ptr;
private:
diff --git a/src/kgraphviz/dotgraphview.cpp b/src/kgraphviz/dotgraphview.cpp
index 5127709..3595754 100644
--- a/src/kgraphviz/dotgraphview.cpp
+++ b/src/kgraphviz/dotgraphview.cpp
@@ -287,9 +287,9 @@ int DotGraphViewPrivate::displaySubgraph(GraphSubgraph* gsubgraph, int zValue, C
cnode->setZValue(zValue+1);
cnode->show();
}
- gnode->canvasElement()->computeBoundingRect();
+ gnode->canvasElement()->modelChanged();
}
- gsubgraph->canvasElement()->computeBoundingRect();
+ gsubgraph->canvasElement()->modelChanged();
int newZvalue = zValue;
foreach(GraphSubgraph* ssg, gsubgraph->subgraphs())
@@ -698,7 +698,7 @@ bool DotGraphView::displayGraph()
}
CanvasElement* element = gnode->canvasElement();
- element->computeBoundingRect();
+ element->modelChanged();
}
kDebug() << "Handling" << d->m_graph->edges().size() << "edges from" << d->m_graph;
@@ -727,7 +727,7 @@ bool DotGraphView::displayGraph()
scene()->addItem(cedge);
}
CanvasElement* element = gedge->canvasElement();
- element->computeBoundingRect();
+ element->modelChanged();
}
// kDebug() << "Adding graph render operations: " << d->m_graph->renderOperations().size();
More information about the kgraphviewer-devel
mailing list