summaryrefslogtreecommitdiffstats
path: root/src/dot.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2018-07-23 14:12:13 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2018-07-23 14:12:13 (GMT)
commitcbca2bdcd77ce0ab6b907cf2d4bab65340a57f00 (patch)
tree09c61b099f264e9ef7ffe1a291604f593deaa3bd /src/dot.cpp
parent578e2539bfa83fb0dc7b3e3931ea19d69b613dcf (diff)
downloadDoxygen-cbca2bdcd77ce0ab6b907cf2d4bab65340a57f00.zip
Doxygen-cbca2bdcd77ce0ab6b907cf2d4bab65340a57f00.tar.gz
Doxygen-cbca2bdcd77ce0ab6b907cf2d4bab65340a57f00.tar.bz2
Combined lrRank and rank parameters for computeMd5Signature
Diffstat (limited to 'src/dot.cpp')
-rw-r--r--src/dot.cpp29
1 files changed, 11 insertions, 18 deletions
diff --git a/src/dot.cpp b/src/dot.cpp
index 3bed539..7b29569 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -3071,26 +3071,21 @@ DotClassGraph::~DotClassGraph()
QCString computeMd5Signature(DotNode *root,
DotNode::GraphType gt,
GraphOutputFormat format,
- bool lrRank,
+ const QCString &rank, // either "LR", "RL", or ""
bool renderParents,
bool backArrows,
const QCString &title,
- QCString &graphStr,
- const char *rank
+ QCString &graphStr
)
{
//printf("computeMd5Signature\n");
QGString buf;
FTextStream md5stream(&buf);
writeGraphHeader(md5stream,title);
- if (rank)
+ if (!rank.isEmpty())
{
md5stream << " rankdir=\"" << rank << "\";" << endl;
}
- else if (lrRank)
- {
- md5stream << " rankdir=\"LR\";" << endl;
- }
root->clearWriteFlag();
root->write(md5stream,
gt,
@@ -3138,18 +3133,17 @@ static bool updateDotGraph(DotNode *root,
DotNode::GraphType gt,
const QCString &baseName,
GraphOutputFormat format,
- bool lrRank,
+ const QCString &rank,
bool renderParents,
bool backArrows,
- const QCString &title=QCString(),
- const char *rank = NULL
+ const QCString &title=QCString()
)
{
QCString theGraph;
// TODO: write graph to theGraph, then compute md5 checksum
QCString md5 = computeMd5Signature(
- root,gt,format,lrRank,renderParents,
- backArrows,title,theGraph, rank);
+ root,gt,format,rank,renderParents,
+ backArrows,title,theGraph);
QFile f(baseName+".dot");
if (f.open(IO_WriteOnly))
{
@@ -3209,7 +3203,7 @@ QCString DotClassGraph::writeGraph(FTextStream &out,
m_graphType,
absBaseName,
graphFormat,
- m_lrRank,
+ m_lrRank ? "LR" : "",
m_graphType==DotNode::Inheritance,
TRUE,
m_startNode->label()
@@ -3569,7 +3563,7 @@ QCString DotInclDepGraph::writeGraph(FTextStream &out,
DotNode::Dependency,
absBaseName,
graphFormat,
- FALSE, // lrRank
+ "", // lrRank
FALSE, // renderParents
m_inverse, // backArrows
m_startNode->label()
@@ -3887,11 +3881,10 @@ QCString DotCallGraph::writeGraph(FTextStream &out, GraphOutputFormat graphForma
DotNode::CallGraph,
absBaseName,
graphFormat,
- TRUE, // lrRank
+ m_inverse ? "RL" : "LR", // lrRank
FALSE, // renderParents
m_inverse, // backArrows
- m_startNode->label(),
- (m_inverse ? "RL" : "LR")
+ m_startNode->label()
) ||
!checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :
usePDFLatex ? absPdfName : absEpsName,