summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2016-10-18 19:02:00 (GMT)
committerGitHub <noreply@github.com>2016-10-18 19:02:00 (GMT)
commit20cba183e8b99c378be8754a2a72f0816bead1e0 (patch)
tree37b0b5b79c4e56f72adcd88195175d10ff82b93f
parentadb44ae6ef1d102caea1338373be078bf4a5d640 (diff)
parentf50d9ed4cdc7d4e7884bb64fddb01b017b880778 (diff)
downloadDoxygen-20cba183e8b99c378be8754a2a72f0816bead1e0.zip
Doxygen-20cba183e8b99c378be8754a2a72f0816bead1e0.tar.gz
Doxygen-20cba183e8b99c378be8754a2a72f0816bead1e0.tar.bz2
Merge pull request #535 from kanje/master
Add mscgen images to index.qhp
-rw-r--r--src/msc.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/msc.cpp b/src/msc.cpp
index b093403..5b73d65 100644
--- a/src/msc.cpp
+++ b/src/msc.cpp
@@ -21,6 +21,7 @@
#include "message.h"
#include "docparser.h"
#include "doxygen.h"
+#include "index.h"
#include "util.h"
#include "ftextstream.h"
@@ -103,20 +104,20 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir,
//printf("Going to dir %s\n",QDir::currentDirPath().data());
QCString mscExe = Config_getString(MSCGEN_PATH)+"mscgen"+portable_commandExtension();
QCString mscArgs;
- QCString extension;
+ QCString imgName = outFile;
switch (format)
{
case MSC_BITMAP:
mscArgs+="-T png";
- extension=".png";
+ imgName+=".png";
break;
case MSC_EPS:
mscArgs+="-T eps";
- extension=".eps";
+ imgName+=".eps";
break;
case MSC_SVG:
mscArgs+="-T svg";
- extension=".svg";
+ imgName+=".svg";
break;
default:
goto error; // I am not very fond of goto statements, but when in Rome...
@@ -125,8 +126,7 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir,
mscArgs+=inFile;
mscArgs+="\" -o \"";
- mscArgs+=outFile;
- mscArgs+=extension+"\"";
+ mscArgs+=imgName+"\"";
int exitCode;
// printf("*** running: %s %s outDir:%s %s\n",mscExe.data(),mscArgs.data(),outDir,outFile);
portable_sysTimerStart();
@@ -149,6 +149,8 @@ void writeMscGraphFromFile(const char *inFile,const char *outDir,
portable_sysTimerStop();
}
+ Doxygen::indexList->addImageFile(imgName);
+
error:
QDir::setCurrent(oldDir);
}