diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2002-01-05 10:26:10 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2002-01-05 10:26:10 (GMT) |
commit | 9d4d8095cd70a06a3536eea20c32ca7bbddd9f3a (patch) | |
tree | ee15d10d932fa1d21de3ebfcb445e2bd81b9f00b /src/dot.cpp | |
parent | ad53b7bebd3042598e5a11b1f3ef29468815138b (diff) | |
download | Doxygen-9d4d8095cd70a06a3536eea20c32ca7bbddd9f3a.zip Doxygen-9d4d8095cd70a06a3536eea20c32ca7bbddd9f3a.tar.gz Doxygen-9d4d8095cd70a06a3536eea20c32ca7bbddd9f3a.tar.bz2 |
Release-1.2.13.1
Diffstat (limited to 'src/dot.cpp')
-rw-r--r-- | src/dot.cpp | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/src/dot.cpp b/src/dot.cpp index d1494a7..5f1b080 100644 --- a/src/dot.cpp +++ b/src/dot.cpp @@ -197,11 +197,12 @@ class DotNodeList : public QList<DotNode> /*! helper function that deletes all nodes in a connected graph, given * one of the graph's nodes */ -static void deleteNodes(DotNode *node) +static void deleteNodes(DotNode *node,SIntDict<DotNode> *skipNodes=0) { + //printf("deleteNodes skipNodes=%p\n",skipNodes); static DotNodeList deletedNodes; deletedNodes.setAutoDelete(TRUE); - node->deleteNode(deletedNodes); // collect nodes to be deleted. + node->deleteNode(deletedNodes,skipNodes); // collect nodes to be deleted. deletedNodes.clear(); // actually remove the nodes. } @@ -220,6 +221,7 @@ DotNode::DotNode(int n,const char *lab,const char *url,int distance,bool isRoot) DotNode::~DotNode() { + //printf("DotNode::~DotNode() %s\n",m_label.data()); delete m_children; delete m_parents; delete m_edgeInfo; @@ -276,7 +278,7 @@ void DotNode::removeParent(DotNode *n) if (m_parents) m_parents->remove(n); } -void DotNode::deleteNode(DotNodeList &deletedList) +void DotNode::deleteNode(DotNodeList &deletedList,SIntDict<DotNode> *skipNodes) { if (m_deleted) return; // avoid recursive loops in case the graph has cycles m_deleted=TRUE; @@ -287,7 +289,7 @@ void DotNode::deleteNode(DotNodeList &deletedList) for (dnlip.toFirst();(pn=dnlip.current());++dnlip) { //pn->removeChild(this); - pn->deleteNode(deletedList); + pn->deleteNode(deletedList,skipNodes); } } if (m_children!=0) // delete all child nodes of this node @@ -297,11 +299,16 @@ void DotNode::deleteNode(DotNodeList &deletedList) for (dnlic.toFirst();(cn=dnlic.current());++dnlic) { //cn->removeParent(this); - cn->deleteNode(deletedList); + cn->deleteNode(deletedList,skipNodes); } } // add this node to the list of deleted nodes. - deletedList.append(this); + //printf("skipNodes=%p find(%p)=%p\n",skipNodes,this,skipNodes ? skipNodes->find((int)this) : 0); + if (skipNodes==0 || skipNodes->find((int)this)==0) + { + //printf("deleting\n"); + deletedList.append(this); + } } static QCString convertLabel(const QCString &l) @@ -882,12 +889,22 @@ DotGfxHierarchyTable::DotGfxHierarchyTable() DotGfxHierarchyTable::~DotGfxHierarchyTable() { + //printf("DotGfxHierarchyTable::~DotGfxHierarchyTable\n"); + SIntDict<DotNode> skipNodes(17); + skipNodes.setAutoDelete(TRUE); DotNode *n = m_rootNodes->first(); while (n) { - DotNode *oldNode=n; + //printf("adding %s %p\n",n->label().data(),n); + skipNodes.append((int)n,n); + n=m_rootNodes->next(); + } + n = m_rootNodes->first(); + while (n) + { + //printf("Deleting root node %s\n",n->label().data()); + deleteNodes(n,&skipNodes); n=m_rootNodes->next(); - deleteNodes(oldNode); } delete m_rootNodes; delete m_usedNodes; |