diff options
50 files changed, 105 insertions, 70 deletions
diff --git a/src/config.xml b/src/config.xml index 438b885..b6f1936 100644 --- a/src/config.xml +++ b/src/config.xml @@ -3271,7 +3271,9 @@ to be found in the default search path. <docs> <![CDATA[ The \c DOT_IMAGE_FORMAT tag can be used to set the image format of the images - generated by \c dot. + generated by \c dot. For an explanation of the image formats see the section output formats + in the documentation of the \c dot tool + (<a href="http://www.graphviz.org/">Graphviz</a>). \note If you choose \c svg you need to set \ref cfg_html_file_extension "HTML_FILE_EXTENSION" to \c xhtml in order to make the SVG files visible in IE 9+ (other browsers do not have this requirement). @@ -3281,6 +3283,14 @@ to be found in the default search path. <value name='jpg'/> <value name='gif'/> <value name='svg'/> + <value name='png:gd'/> + <value name='png:gd:gd'/> + <value name='png:cairo'/> + <value name='png:cairo:gd'/> + <value name='png:cairo:cairo'/> + <value name='png:cairo:gdiplus'/> + <value name='png:gdiplus'/> + <value name='png:gdiplus:gdiplus'/> </option> <option type='bool' id='INTERACTIVE_SVG' defval='0' depends='HAVE_DOT'> <docs> diff --git a/src/docbookvisitor.cpp b/src/docbookvisitor.cpp index 29b3ea5..929ca42 100644 --- a/src/docbookvisitor.cpp +++ b/src/docbookvisitor.cpp @@ -1350,7 +1350,7 @@ void DocbookDocVisitor::startDotFile(const QCString &fileName, } baseName.prepend("dot_"); QCString outDir = Config_getString("DOCBOOK_OUTPUT"); - QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = getDotImageExtension(); writeDotGraphFromFile(fileName,outDir,baseName,GOF_BITMAP); m_t << "<para>" << endl; visitPreStart(m_t, hasCaption, baseName + "." + imgExt, width, height); diff --git a/src/dot.cpp b/src/dot.cpp index 1182e8d..e5825af 100644 --- a/src/dot.cpp +++ b/src/dot.cpp @@ -659,7 +659,8 @@ static bool writeSVGFigureLink(FTextStream &out,const QCString &relPath, // support the PNG format, we need to check the result. static void checkDotResult(const QCString &imgName) { - if (Config_getEnum("DOT_IMAGE_FORMAT")=="png") + QCString imgExt = getDotImageExtension(); + if (imgExt=="png") { FILE *f = portable_fopen(imgName,"rb"); if (f) @@ -2273,7 +2274,8 @@ void DotGfxHierarchyTable::createGraph(DotNode *n,FTextStream &out, { QDir d(path); QCString baseName; - QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = getDotImageExtension(); + QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); baseName.sprintf("inherit_graph_%d",id); QCString imgName = baseName+"."+ imgExt; QCString mapName = baseName+".map"; @@ -2323,7 +2325,7 @@ void DotGfxHierarchyTable::createGraph(DotNode *n,FTextStream &out, resetReNumbering(); DotRunner *dotRun = new DotRunner(dotName,d.absPath().data(),TRUE,absImgName); - dotRun->addJob(imgExt,absImgName); + dotRun->addJob(imgFmt,absImgName); dotRun->addJob(MAP_CMD,absMapName); DotManager::instance()->addRun(dotRun); } @@ -3128,7 +3130,8 @@ QCString DotClassGraph::writeGraph(FTextStream &out, baseName = convertNameToFile(diskName()); // derive target file names from baseName - QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = getDotImageExtension(); + QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); QCString absBaseName = d.absPath().utf8()+"/"+baseName; QCString absDotName = absBaseName+".dot"; QCString absMapName = absBaseName+".map"; @@ -3156,7 +3159,7 @@ QCString DotClassGraph::writeGraph(FTextStream &out, { DotRunner *dotRun = new DotRunner(absDotName, d.absPath().data(),TRUE,absImgName); - dotRun->addJob(imgExt,absImgName); + dotRun->addJob(imgFmt,absImgName); if (generateImageMap) dotRun->addJob(MAP_CMD,absMapName); DotManager::instance()->addRun(dotRun); @@ -3484,7 +3487,8 @@ QCString DotInclDepGraph::writeGraph(FTextStream &out, QCString mapName=escapeCharsInString(m_startNode->m_label,FALSE); if (m_inverse) mapName+="dep"; - QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = getDotImageExtension(); + QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); QCString absBaseName = d.absPath().utf8()+"/"+baseName; QCString absDotName = absBaseName+".dot"; QCString absMapName = absBaseName+".map"; @@ -3512,7 +3516,7 @@ QCString DotInclDepGraph::writeGraph(FTextStream &out, { // run dot to create a bitmap image DotRunner *dotRun = new DotRunner(absDotName,d.absPath().data(),TRUE,absImgName); - dotRun->addJob(imgExt,absImgName); + dotRun->addJob(imgFmt,absImgName); if (generateImageMap) dotRun->addJob(MAP_CMD,absMapName); DotManager::instance()->addRun(dotRun); } @@ -3796,7 +3800,8 @@ QCString DotCallGraph::writeGraph(FTextStream &out, GraphOutputFormat graphForma QCString baseName = m_diskName + (m_inverse ? "_icgraph" : "_cgraph"); QCString mapName = baseName; - QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = getDotImageExtension(); + QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); QCString absBaseName = d.absPath().utf8()+"/"+baseName; QCString absDotName = absBaseName+".dot"; QCString absMapName = absBaseName+".map"; @@ -3824,7 +3829,7 @@ QCString DotCallGraph::writeGraph(FTextStream &out, GraphOutputFormat graphForma { // run dot to create a bitmap image DotRunner *dotRun = new DotRunner(absDotName,d.absPath().data(),TRUE,absImgName); - dotRun->addJob(imgExt,absImgName); + dotRun->addJob(imgFmt,absImgName); if (generateImageMap) dotRun->addJob(MAP_CMD,absMapName); DotManager::instance()->addRun(dotRun); @@ -3950,7 +3955,8 @@ QCString DotDirDeps::writeGraph(FTextStream &out, QCString baseName=m_dir->getOutputFileBase()+"_dep"; QCString mapName=escapeCharsInString(baseName,FALSE); - QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = getDotImageExtension(); + QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); QCString absBaseName = d.absPath().utf8()+"/"+baseName; QCString absDotName = absBaseName+".dot"; QCString absMapName = absBaseName+".map"; @@ -3988,7 +3994,7 @@ QCString DotDirDeps::writeGraph(FTextStream &out, { // run dot to create a bitmap image DotRunner *dotRun = new DotRunner(absDotName,d.absPath().data(),TRUE,absImgName); - dotRun->addJob(imgExt,absImgName); + dotRun->addJob(imgFmt,absImgName); if (generateImageMap) dotRun->addJob(MAP_CMD,absMapName); DotManager::instance()->addRun(dotRun); } @@ -4113,7 +4119,8 @@ void generateGraphLegend(const char *path) MD5SigToString(md5_sig,sigStr.rawData(),33); QCString absBaseName = (QCString)path+"/graph_legend"; QCString absDotName = absBaseName+".dot"; - QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = getDotImageExtension(); + QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); QCString imgName = "graph_legend."+imgExt; QCString absImgName = absBaseName+"."+imgExt; if (checkAndUpdateMd5Signature(absBaseName,sigStr) || @@ -4133,7 +4140,7 @@ void generateGraphLegend(const char *path) // run dot to generate the a bitmap image from the graph DotRunner *dotRun = new DotRunner(absDotName,d.absPath().data(),TRUE,absImgName); - dotRun->addJob(imgExt,absImgName); + dotRun->addJob(imgFmt,absImgName); DotManager::instance()->addRun(dotRun); } else @@ -4161,14 +4168,15 @@ void writeDotGraphFromFile(const char *inFile,const char *outDir, err("Output dir %s does not exist!\n",outDir); exit(1); } - QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = getDotImageExtension(); + QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); QCString imgName = (QCString)outFile+"."+imgExt; QCString absImgName = d.absPath().utf8()+"/"+imgName; QCString absOutFile = d.absPath().utf8()+"/"+outFile; DotRunner dotRun(inFile,d.absPath().data(),FALSE,absImgName); if (format==GOF_BITMAP) - dotRun.addJob(imgExt,absImgName); + dotRun.addJob(imgFmt,absImgName); else // format==GOF_EPS { if (Config_getBool("USE_PDFLATEX")) @@ -4216,7 +4224,8 @@ void writeDotImageMapFromFile(FTextStream &t, } QCString mapName = baseName+".map"; - QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = getDotImageExtension(); + QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); QCString imgName = baseName+"."+imgExt; QCString absOutFile = d.absPath().utf8()+"/"+mapName; @@ -4511,7 +4520,8 @@ QCString DotGroupCollaboration::writeGraph( FTextStream &t, QCString sigStr(33); MD5Buffer((const unsigned char *)theGraph.data(),theGraph.length(),md5_sig); MD5SigToString(md5_sig,sigStr.rawData(),33); - QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = getDotImageExtension(); + QCString imgFmt = Config_getEnum("DOT_IMAGE_FORMAT"); QCString baseName = m_diskName; QCString imgName = baseName+"."+imgExt; QCString absPath = d.absPath().data(); @@ -4541,7 +4551,7 @@ QCString DotGroupCollaboration::writeGraph( FTextStream &t, if (graphFormat==GOF_BITMAP) // run dot to create a bitmap image { DotRunner *dotRun = new DotRunner(absDotName,d.absPath().data(),FALSE); - dotRun->addJob(imgExt,absImgName); + dotRun->addJob(imgFmt,absImgName); if (writeImageMap) dotRun->addJob(MAP_CMD,absMapName); DotManager::instance()->addRun(dotRun); diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index ebef0d4..c9567c5 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -2001,7 +2001,7 @@ void HtmlDocVisitor::writeMscFile(const QCString &fileName, } baseName.prepend("msc_"); QCString outDir = Config_getString("HTML_OUTPUT"); - QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = getDotImageExtension(); MscOutputFormat mscFormat = MSC_BITMAP; if ("svg" == imgExt) mscFormat = MSC_SVG; @@ -2045,7 +2045,7 @@ void HtmlDocVisitor::writePlantUMLFile(const QCString &fileName, baseName=baseName.left(i); } static QCString outDir = Config_getString("HTML_OUTPUT"); - static QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = getDotImageExtension(); if (imgExt=="svg") { generatePlantUMLOutput(fileName,outDir,PUML_SVG); diff --git a/src/index.cpp b/src/index.cpp index e448094..59f0b90 100644 --- a/src/index.cpp +++ b/src/index.cpp @@ -3266,7 +3266,8 @@ void writeGraphInfo(OutputList &ol) QCString legendDocs = theTranslator->trLegendDocs(); int s = legendDocs.find("<center>"); int e = legendDocs.find("</center>"); - if (Config_getEnum("DOT_IMAGE_FORMAT")=="svg" && s!=-1 && e!=-1) + QCString imgExt = getDotImageExtension(); + if (imgExt=="svg" && s!=-1 && e!=-1) { legendDocs = legendDocs.left(s+8) + "[!-- SVG 0 --]\n" + legendDocs.mid(e); //printf("legendDocs=%s\n",legendDocs.data()); diff --git a/src/rtfdocvisitor.cpp b/src/rtfdocvisitor.cpp index 20fbf53..7c7f607 100644 --- a/src/rtfdocvisitor.cpp +++ b/src/rtfdocvisitor.cpp @@ -1676,7 +1676,8 @@ void RTFDocVisitor::writeDotFile(const QCString &fileName) m_t << "{" << endl; m_t << rtf_Style_Reset; m_t << "\\pard \\qc {\\field\\flddirty {\\*\\fldinst INCLUDEPICTURE \""; - m_t << baseName << "." << Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = getDotImageExtension(); + m_t << baseName << "." << imgExt; m_t << "\" \\\\d \\\\*MERGEFORMAT}{\\fldrslt IMAGE}}\\par" << endl; m_t << "}" << endl; m_lastIsPara=TRUE; diff --git a/src/rtfgen.cpp b/src/rtfgen.cpp index 3f09eec..e0d5631 100644 --- a/src/rtfgen.cpp +++ b/src/rtfgen.cpp @@ -2435,7 +2435,8 @@ void RTFGenerator::endDotGraph(const DotClassGraph &g) t << "{" << endl; t << rtf_Style_Reset << endl; t << "\\par\\pard \\qc {\\field\\flddirty {\\*\\fldinst INCLUDEPICTURE \""; - t << fn << "." << Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = getDotImageExtension(); + t << fn << "." << imgExt; t << "\" \\\\d \\\\*MERGEFORMAT}{\\fldrslt IMAGE}}\\par" << endl; t << "}" << endl; newParagraph(); @@ -2458,7 +2459,8 @@ void RTFGenerator::endInclDepGraph(const DotInclDepGraph &g) t << "{" << endl; t << rtf_Style_Reset << endl; t << "\\par\\pard \\qc {\\field\\flddirty {\\*\\fldinst INCLUDEPICTURE \""; - t << fn << "." << Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = getDotImageExtension(); + t << fn << "." << imgExt; t << "\" \\\\d \\\\*MERGEFORMAT}{\\fldrslt IMAGE}}\\par" << endl; t << "}" << endl; DBG_RTF(t << "{\\comment (endInclDepGraph)}" << endl) @@ -2488,7 +2490,8 @@ void RTFGenerator::endCallGraph(const DotCallGraph &g) t << "{" << endl; t << rtf_Style_Reset << endl; t << "\\par\\pard \\qc {\\field\\flddirty {\\*\\fldinst INCLUDEPICTURE \""; - t << fn << "." << Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = getDotImageExtension(); + t << fn << "." << imgExt; t << "\" \\\\d \\\\*MERGEFORMAT}{\\fldrslt IMAGE}}\\par" << endl; t << "}" << endl; DBG_RTF(t << "{\\comment (endCallGraph)}" << endl) @@ -2510,7 +2513,8 @@ void RTFGenerator::endDirDepGraph(const DotDirDeps &g) t << "{" << endl; t << rtf_Style_Reset << endl; t << "\\par\\pard \\qc {\\field\\flddirty {\\*\\fldinst INCLUDEPICTURE \""; - t << fn << "." << Config_getEnum("DOT_IMAGE_FORMAT"); + QCString imgExt = getDotImageExtension(); + t << fn << "." << imgExt; t << "\" \\\\d \\\\*MERGEFORMAT}{\\fldrslt IMAGE}}\\par" << endl; t << "}" << endl; DBG_RTF(t << "{\\comment (endDirDepGraph)}" << endl) diff --git a/src/translator_am.h b/src/translator_am.h index 9eaba0e..f44b23d 100644 --- a/src/translator_am.h +++ b/src/translator_am.h @@ -994,7 +994,7 @@ class TranslatorArmenian : public TranslatorAdapter_1_8_0 "};\n"
"\\endcode\n"
"Սրանով կստանանք հետևյալ գրաֆը."
- "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
+ "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n"
"<p>\n"
"Այս գրաֆի ուղղանկյունները ունեն հետևյալ իմաստը.\n"
"<ul>\n"
diff --git a/src/translator_ar.h b/src/translator_ar.h index 5d37b69..0feb3f5 100644 --- a/src/translator_ar.h +++ b/src/translator_ar.h @@ -1044,7 +1044,7 @@ class TranslatorArabic : public TranslatorAdapter_1_4_6 "\\endcode\n" "If the \\c MAX_DOT_GRAPH_HEIGHT tag in the configuration file " "is set to 240 this will result in the following graph:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "The boxes in the above graph have the following meaning:\n" "<ul>\n" diff --git a/src/translator_br.h b/src/translator_br.h index b7bd604..ac28e86 100644 --- a/src/translator_br.h +++ b/src/translator_br.h @@ -1007,7 +1007,7 @@ class TranslatorBrazilian : public Translator "};\n" "\\endcode\n" "Isto irá gerar o seguinte gráfo:" - "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "As caixas no grafo acima tem as seguintes interpretações:\n" "<ul>\n" diff --git a/src/translator_ca.h b/src/translator_ca.h index 5c3e595..2f90950 100644 --- a/src/translator_ca.h +++ b/src/translator_ca.h @@ -1019,7 +1019,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_8_0 "};\n" "\\endcode\n" "Resultarà el gràfic següent:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "Les caixes del gràfic superior tenen aquesta interpretació:\n" "<ul>\n" diff --git a/src/translator_cn.h b/src/translator_cn.h index fc01ce0..55a8e25 100644 --- a/src/translator_cn.h +++ b/src/translator_cn.h @@ -910,7 +910,7 @@ class TranslatorChinese : public TranslatorAdapter_1_8_2 "};\n" "\\endcode\n" "结果将会生成以下图:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n" "<p>\n" "上图中的矩形有如下意义:\n" "</p>\n" diff --git a/src/translator_cz.h b/src/translator_cz.h index b83eb92..f56adc5 100644 --- a/src/translator_cz.h +++ b/src/translator_cz.h @@ -1070,7 +1070,7 @@ class TranslatorCzech : public Translator "};\n" "\\endcode\n" "K výše uvedenému bude vygenerován následující graf:" - "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "Bloky (tj. uzly) v uvedeném grafu mají následující význam:\n" "<ul>\n" diff --git a/src/translator_de.h b/src/translator_de.h index d936bf1..9caecfc 100644 --- a/src/translator_de.h +++ b/src/translator_de.h @@ -1116,7 +1116,7 @@ class TranslatorGerman : public TranslatorAdapter_1_8_4 "};\n" "\\endcode\n" "Dies liefert den folgenden Graphen:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n" "<p>\n" "Die Rechtecke in obigem Graphen bedeuten:\n" "</p>\n" diff --git a/src/translator_dk.h b/src/translator_dk.h index 74b07f4..2904a76 100644 --- a/src/translator_dk.h +++ b/src/translator_dk.h @@ -993,7 +993,7 @@ class TranslatorDanish : public TranslatorAdapter_1_8_0 "\\endcode\n" "Hvis \\c MAX_DOT_GRAPH_HEIGHT i konfigurationsfilen " "er sat til 240, vil dette resultere i følgende graf:" - "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "De forskellige slags kasser i ovenstående graf har følgende " "betydninger:\n" diff --git a/src/translator_en.h b/src/translator_en.h index 5937ed3..cf2424f 100644 --- a/src/translator_en.h +++ b/src/translator_en.h @@ -1014,7 +1014,7 @@ class TranslatorEnglish : public Translator "};\n" "\\endcode\n" "This will result in the following graph:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n" "<p>\n" "The boxes in the above graph have the following meaning:\n" "</p>\n" diff --git a/src/translator_eo.h b/src/translator_eo.h index e1513cb..e285a14 100644 --- a/src/translator_eo.h +++ b/src/translator_eo.h @@ -1017,7 +1017,7 @@ class TranslatorEsperanto : public TranslatorAdapter_1_8_4 "};\n" "\\endcode\n" "Tio ĉi liveros la sekvan diagramon:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "La skatoloj de la supra diagramo havas la sekvajn signifojn:\n" "<ul>\n" diff --git a/src/translator_es.h b/src/translator_es.h index ba6e823..9c5860a 100644 --- a/src/translator_es.h +++ b/src/translator_es.h @@ -1045,7 +1045,7 @@ class TranslatorSpanish : public Translator "};\n" "\\endcode\n" "Dará como resultado el siguiente gráfico:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n" "<p>\n" "Las cajas en el gráfico arriba tienen el siguiente significado:\n" "</p>\n" diff --git a/src/translator_fa.h b/src/translator_fa.h index 7b6f9d7..0fdc9a3 100644 --- a/src/translator_fa.h +++ b/src/translator_fa.h @@ -1015,7 +1015,7 @@ class TranslatorPersian : public TranslatorAdapter_1_7_5 "\\endcode\n" "If the \\c MAX_DOT_GRAPH_HEIGHT tag in the configuration file " "is set to 240 this will result in the following graph:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "The boxes in the above graph have the following meaning:\n" "<ul>\n" diff --git a/src/translator_fi.h b/src/translator_fi.h index eeeb9a5..d468c5c 100644 --- a/src/translator_fi.h +++ b/src/translator_fi.h @@ -1114,7 +1114,7 @@ class TranslatorFinnish : public TranslatorAdapter_1_6_0 "\\endcode\n" "Tuloksena on seuraavanlainen kaavio:" //"This will result in the following graph:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "Ylläolevassa kaaviossa laatikoilla on seuraavat merkitykset\n:" // "The boxes in the above graph have the following meaning:\n" diff --git a/src/translator_fr.h b/src/translator_fr.h index 2c548c2..cf8e2e2 100644 --- a/src/translator_fr.h +++ b/src/translator_fr.h @@ -1077,7 +1077,7 @@ class TranslatorFrench : public Translator "};\n" "\\endcode\n" "Cela aboutira au graphe suivant :" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n" "<p>\n" "Les rectangles du graphe ci-dessus ont la signification suivante :\n" "<ul>\n" @@ -2057,4 +2057,4 @@ class TranslatorFrench : public Translator }; -#endif
\ No newline at end of file +#endif diff --git a/src/translator_gr.h b/src/translator_gr.h index fa7a682..bfcd864 100644 --- a/src/translator_gr.h +++ b/src/translator_gr.h @@ -987,7 +987,7 @@ class TranslatorGreek : public TranslatorAdapter_1_8_4 "};\n" "\\endcode\n" "Αυτό οδηγεί στο επόμενο διάγραμμα:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n" "<p>\n" "Τα κουτιά στο παραπάνω διάγραμμα έχουν την ακόλουθη σημασία:\n" "</p>\n" diff --git a/src/translator_hr.h b/src/translator_hr.h index 98a746a..e9f0719 100644 --- a/src/translator_hr.h +++ b/src/translator_hr.h @@ -753,7 +753,7 @@ class TranslatorCroatian : public TranslatorAdapter_1_8_2 "};\n" "\\endcode\n" "To će rezultirati grafikonom:" - "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "Pravokutnici imaju slijedeće značenje:\n" "<ul>\n" diff --git a/src/translator_hu.h b/src/translator_hu.h index 610af8e..4892600 100644 --- a/src/translator_hu.h +++ b/src/translator_hu.h @@ -997,7 +997,7 @@ class TranslatorHungarian : public TranslatorAdapter_1_4_6 "\\endcode\n" "Ha a konfigurációs fájl \\c MAX_DOT_GRAPH_HEIGHT elemének értékét " "240-re állítjuk, az eredmény a következő ábra lesz:" - "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "Az ábrán levő dobozok jelentése:\n" "<ul>\n" diff --git a/src/translator_id.h b/src/translator_id.h index 5647bc0..dd79cd7 100644 --- a/src/translator_id.h +++ b/src/translator_id.h @@ -1001,7 +1001,7 @@ class TranslatorIndonesian : public TranslatorAdapter_1_8_0 "\\endcode\n" "Apabila tag \\c MAX_DOT_GRAPH_HEIGHT di file konfigurasi " "diset ke 240 kode di atas akan menghasilkan bagan berikut:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "Kotak-kotak pada bagan di atas mempunyai arti sebagai berikut:\n" "<ul>\n" diff --git a/src/translator_it.h b/src/translator_it.h index 59799a3..65be176 100644 --- a/src/translator_it.h +++ b/src/translator_it.h @@ -1028,7 +1028,7 @@ class TranslatorItalian : public TranslatorAdapter_1_8_2 "};\n" "\\endcode\n" "Verrà prodotto il grafo seguente:" - "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n" + "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n" "<p>\n" "I riquadri nel grafo qui sopra hanno il seguente significato:\n" "</p>\n" diff --git a/src/translator_jp.h b/src/translator_jp.h index ae3605a..6142e53 100644 --- a/src/translator_jp.h +++ b/src/translator_jp.h @@ -1037,7 +1037,7 @@ class TranslatorJapanese : public Translator "\\c MAX_DOT_GRAPH_" /* わざわざちょん切っているのは doc/translator.py の検出回避のため */ "HEIGHT タグに 200 を与えた設定ファイル" "を使うと、次のようなグラフとなります。" - "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "グラフ内の矩形は構造体やクラスを表しています。色の意味は次の通りです。\n" "<ul>\n" diff --git a/src/translator_kr.h b/src/translator_kr.h index 18337a5..ff9da26 100644 --- a/src/translator_kr.h +++ b/src/translator_kr.h @@ -1035,7 +1035,7 @@ class TranslatorKorean : public Translator "};\n" "\\endcode\n" "다음과 같은 그래프가 출력될 것입니다. :" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "위 그래프의 박스들은 다음과 같은 의미를 가집니다. :\n" "<ul>\n" diff --git a/src/translator_lt.h b/src/translator_lt.h index 174170e..98bd692 100644 --- a/src/translator_lt.h +++ b/src/translator_lt.h @@ -1006,7 +1006,7 @@ class TranslatorLithuanian : public TranslatorAdapter_1_4_6 "\\endcode\n" "If the \\c MAX_DOT_GRAPH_HEIGHT tag in the configuration file " "is set to 240 this will result in the following graph:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "The boxes in the above graph have the following meaning:\n" "<ul>\n" diff --git a/src/translator_lv.h b/src/translator_lv.h index 135cd11..bd069f1 100644 --- a/src/translator_lv.h +++ b/src/translator_lv.h @@ -1020,7 +1020,7 @@ class TranslatorLatvian : public TranslatorAdapter_1_8_4 "};\n" "\\endcode\n" "This will result in the following graph:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n" "<p>\n" "The boxes in the above graph have the following meaning:\n" "</p>\n" diff --git a/src/translator_mk.h b/src/translator_mk.h index 510561e..e2ec041 100644 --- a/src/translator_mk.h +++ b/src/translator_mk.h @@ -1003,7 +1003,7 @@ class TranslatorMacedonian : public TranslatorAdapter_1_6_0 "\\endcode\n" "Ако вредноста на \\c MAX_DOT_GRAPH_HEIGHT во конфигурациската датотека " "е 240 тогаш примерот ќе го создаде следниов дијаграм:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "Правоаголниците во дијаграмот погоре го имаат следново значење:\n" "<ul>\n" diff --git a/src/translator_nl.h b/src/translator_nl.h index 2ffacb6..1f59ed2 100644 --- a/src/translator_nl.h +++ b/src/translator_nl.h @@ -656,7 +656,7 @@ class TranslatorDutch : public Translator "};\n" "\\endcode\n" "Dit voorbeeld zal resulteren in de volgende graaf:" - "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "De rechthoeken in the bovenstaande graaf hebben de volgende betekenis:\n" "<ul>\n" diff --git a/src/translator_no.h b/src/translator_no.h index 2662e47..5bf6c17 100644 --- a/src/translator_no.h +++ b/src/translator_no.h @@ -1048,7 +1048,7 @@ class TranslatorNorwegian : public TranslatorAdapter_1_4_6 "\\endcode\n" "Hvis \\c MAX_DOT_GRAPH_HEIGHT er satt til 200 i " "konfigurasjonsfila vil dette resultere i følgende graf:" - "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "Boksene i grafen over betyr følgende:\n" "<ul>\n" diff --git a/src/translator_pl.h b/src/translator_pl.h index 6f2e14c..0b23775 100644 --- a/src/translator_pl.h +++ b/src/translator_pl.h @@ -1012,7 +1012,7 @@ class TranslatorPolish : public TranslatorAdapter_1_8_2 "};\n" "\\endcode\n" "Rezultat na następującym wykresie:" - "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n" + "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n" "<p>\n" "Prostokąty w powyższym wykresie mają następujące znaczenie:\n" "</p>\n" diff --git a/src/translator_pt.h b/src/translator_pt.h index 13422f6..be45424 100644 --- a/src/translator_pt.h +++ b/src/translator_pt.h @@ -1016,7 +1016,7 @@ class TranslatorPortuguese : public Translator "};\n" "\\endcode\n" "Isto irá gerar o seguinte gráfo:" - "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "As caixas no grafo anterior têm as seguintes interpretações:\n" "<ul>\n" diff --git a/src/translator_ro.h b/src/translator_ro.h index ea0988d..bde0f24 100644 --- a/src/translator_ro.h +++ b/src/translator_ro.h @@ -1031,7 +1031,7 @@ class TranslatorRomanian : public Translator "\\endcode\n" "Dacă tagul \\c MAX_DOT_GRAPH_HEIGHT din fişierul de configurare " "este setat la 200, acesta este graful rezultat:" - "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "Căsuţele din partea de sus au următoarea semnificaţie:\n" "<ul>\n" diff --git a/src/translator_ru.h b/src/translator_ru.h index c06d911..94ddf29 100644 --- a/src/translator_ru.h +++ b/src/translator_ru.h @@ -1004,7 +1004,7 @@ class TranslatorRussian : public Translator "\\endcode\n" "Если \\c MAX_DOT_GRAPH_HEIGHT в конфигурационном файле " "установлен в 240, получится следующий граф:" - "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "Прямоугольники в этом графе имеют следующее значение:\n" "<ul>\n" diff --git a/src/translator_sc.h b/src/translator_sc.h index 84e8756..5e37724 100644 --- a/src/translator_sc.h +++ b/src/translator_sc.h @@ -1033,7 +1033,7 @@ class TranslatorSerbianCyrillic : public TranslatorAdapter_1_6_0 "\\endcode\n" "Ако је \\c MAX_DOT_GRAPH_HEIGHT таг у конфигурационој датотеци " "подешен на 240, то ће резултовати на следећи начин:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "Правоугаоници имају следеће значење:\n" "<ul>\n" diff --git a/src/translator_si.h b/src/translator_si.h index 33bc27a..b6d6a87 100644 --- a/src/translator_si.h +++ b/src/translator_si.h @@ -684,7 +684,7 @@ class TranslatorSlovene : public TranslatorAdapter_1_4_6 "\\endcode\n" "If the \\c MAX_DOT_GRAPH_HEIGHT tag in the configuration file " "is set to 200 this will result in the following graph:" - "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "The boxes in the above graph have the following meaning:\n" "<ul>\n" diff --git a/src/translator_sk.h b/src/translator_sk.h index 0fc826b..d8f06f5 100644 --- a/src/translator_sk.h +++ b/src/translator_sk.h @@ -1004,7 +1004,7 @@ class TranslatorSlovak : public Translator "};\n" "\\endcode\n" "K vyššie uvedenému bude vygenerovaný nasledujúci graf:" - "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "Bloky (tj. uzly) v uvedenom grafe majú nasledujúci význam:\n" "<ul>\n" diff --git a/src/translator_sr.h b/src/translator_sr.h index 09b6534..5e09f60 100644 --- a/src/translator_sr.h +++ b/src/translator_sr.h @@ -1001,7 +1001,7 @@ class TranslatorSerbian : public TranslatorAdapter_1_6_0 "\\endcode\n" "Ako je \\c MAX_DOT_GRAPH_HEIGHT tag u konfiguracionoj datoteci " "postavljen na \\c 200 graf izvođenja će izgledati ovako:" - "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "Graf će biti odsečen ako ne stane unutar zadatih granica.\n" "<p>\n" "Pravougaonici imaju sledeća značenja:\n" diff --git a/src/translator_sv.h b/src/translator_sv.h index 5b36a17..d41a203 100644 --- a/src/translator_sv.h +++ b/src/translator_sv.h @@ -907,7 +907,7 @@ class TranslatorSwedish : public Translator "};\n" "\\endcode\n" "Detta resulterar i att följande graf genereras:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n" "<p>\n" "Rektanglarna i den ovanstående grafen har följande betydelser:\n" "<ul>\n" diff --git a/src/translator_tr.h b/src/translator_tr.h index 56b4a19..e02c1fe 100644 --- a/src/translator_tr.h +++ b/src/translator_tr.h @@ -1016,7 +1016,7 @@ class TranslatorTurkish : public TranslatorAdapter_1_7_5 "};\n" "\\endcode\n" "Bu kod aşağıdaki şemayı oluşturur:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "Yukarıdaki şemadaki kutular aşağıda açıklanmıştır:\n" "<ul>\n" diff --git a/src/translator_tw.h b/src/translator_tw.h index 7ff5b6c..a1faab9 100644 --- a/src/translator_tw.h +++ b/src/translator_tw.h @@ -1022,7 +1022,7 @@ class TranslatorChinesetraditional : public Translator "};\n" "\\endcode\n" "這個例子會產生下列的圖示:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center></p>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center></p>\n" "<p>\n" "上圖中的各區塊意義如下:\n" "</p>\n" diff --git a/src/translator_ua.h b/src/translator_ua.h index 45efd6e..12440cf 100644 --- a/src/translator_ua.h +++ b/src/translator_ua.h @@ -993,7 +993,7 @@ class TranslatorUkrainian : public TranslatorAdapter_1_8_4 "};\n" "\\endcode\n" "Таким чином, отримуємо наступний граф:" - "<p><center><img src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "Прямокутники в цьому графі мають наступний зміст:\n" "<ul>\n" diff --git a/src/translator_vi.h b/src/translator_vi.h index dd0a8f1..6fe38ba 100644 --- a/src/translator_vi.h +++ b/src/translator_vi.h @@ -1021,7 +1021,7 @@ class TranslatorVietnamese : public TranslatorAdapter_1_6_0 "};\n" "\\endcode\n" "Kết quả trong biểu đồ sau đây:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "Các hộp trong biểu đồ trên có ý nghĩa như sau:\n" "<ul>\n" diff --git a/src/translator_za.h b/src/translator_za.h index f47052e..a9ed3e4 100644 --- a/src/translator_za.h +++ b/src/translator_za.h @@ -1002,7 +1002,7 @@ class TranslatorAfrikaans : public TranslatorAdapter_1_6_0 "\\endcode\n" "As die \\c MAX_DOT_GRAPH_HEIGHT merker in die konfigurasie leër " "aan 240 gelyk gestel is, word die volgende diagram geproduseer:" - "<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n" + "<p><center><img alt=\"\" src=\"graph_legend."+getDotImageExtension()+"\"></center>\n" "<p>\n" "Die reghoeke in die diagram het die volgende betekenis:\n" "<ul>\n" diff --git a/src/util.cpp b/src/util.cpp index 83f65a4..108bdc4 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -8371,3 +8371,9 @@ bool mainPageHasTitle() return TRUE; } +QCString getDotImageExtension(void) +{ + QCString imgExt = Config_getEnum("DOT_IMAGE_FORMAT"); + imgExt = imgExt.replace( QRegExp(":.*"), "" ); + return imgExt; +} @@ -443,6 +443,8 @@ bool protectionLevelVisible(Protection prot); QCString stripIndentation(const QCString &s); +QCString getDotImageExtension(void); + bool fileVisibleInIndex(FileDef *fd,bool &genSourceFile); void addDocCrossReference(MemberDef *src,MemberDef *dst); diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp index 170bf5b..e24a224 100644 --- a/src/vhdldocgen.cpp +++ b/src/vhdldocgen.cpp @@ -2792,7 +2792,8 @@ bool VhdlDocGen::findConstraintFile(LayoutNavEntry *lne) QCString file; QCString co("Constraints"); - if (Config_getBool("HAVE_DOT") && Config_getEnum("DOT_IMAGE_FORMAT")=="svg") + QCString imgExt = getDotImageExtension(); + if (Config_getBool("HAVE_DOT") && imgExt=="svg") { QCString ov = theTranslator->trDesignOverview(); QCString ofile("vhdl_design_overview"); |