Merge branch 'feature/bug_395343' of https://github.com/albert-github/doxygen into albert-github-feature/bug_395343

2 files changed, 15 insertions, 6 deletions

diff --git a/src/dot.cpp b/src/dot.cpp
index 93fdb20..3bed539 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -3075,14 +3075,19 @@ QCString computeMd5Signature(DotNode *root,
                    bool renderParents,
                    bool backArrows,
                    const QCString &title,
-                   QCString &graphStr
+                   QCString &graphStr,
+                   const char *rank
                   )
 {
   //printf("computeMd5Signature\n");
   QGString buf;
   FTextStream md5stream(&buf);
   writeGraphHeader(md5stream,title);
-  if (lrRank)
+  if (rank)
+  {
+    md5stream << "  rankdir=\"" << rank << "\";" << endl;
+  }
+  else if (lrRank)
   {
     md5stream << "  rankdir=\"LR\";" << endl;
   }
@@ -3136,14 +3141,15 @@ static bool updateDotGraph(DotNode *root,
                            bool lrRank,
                            bool renderParents,
                            bool backArrows,
-                           const QCString &title=QCString()
+                           const QCString &title=QCString(),
+                           const char *rank = NULL
                           )
 {
   QCString theGraph;
   // TODO: write graph to theGraph, then compute md5 checksum
   QCString md5 = computeMd5Signature(
                    root,gt,format,lrRank,renderParents,
-                   backArrows,title,theGraph);
+                   backArrows,title,theGraph, rank);
   QFile f(baseName+".dot");
   if (f.open(IO_WriteOnly))
   {
@@ -3876,6 +3882,7 @@ QCString DotCallGraph::writeGraph(FTextStream &out, GraphOutputFormat graphForma
   QCString absImgName  = absBaseName+"."+imgExt;
 
   bool regenerate = FALSE;
+
   if (updateDotGraph(m_startNode,
                  DotNode::CallGraph,
                  absBaseName,
@@ -3883,7 +3890,8 @@ QCString DotCallGraph::writeGraph(FTextStream &out, GraphOutputFormat graphForma
                  TRUE,         // lrRank
                  FALSE,        // renderParents
                  m_inverse,    // backArrows
-                 m_startNode->label()
+                 m_startNode->label(),
+                 (m_inverse ? "RL" : "LR")
                 ) ||
       !checkDeliverables(graphFormat==GOF_BITMAP ? absImgName :
                          usePDFLatex ? absPdfName : absEpsName,
diff --git a/src/dot.h b/src/dot.h
index ab6a316..37832af 100644
--- a/src/dot.h
+++ b/src/dot.h
@@ -137,7 +137,8 @@ class DotNode
                       bool lrRank, bool renderParents,
                       bool backArrows,
                       const QCString &title,
-                      QCString &graphStr
+                      QCString &graphStr,
+                      const char *rank
                      );
 };