diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-01-08 20:53:01 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-01-08 20:59:07 (GMT) |
| commit | 5021481aac33e51a4d94f4fea0fc745b4cbc8004 (patch) | |
| tree | 85c51b71268c29d0feacac36060f2fcf1b14adc6 /src/htmldocvisitor.cpp | |
| parent | 5c30c470ff646081747c6e9735d17a62383152b4 (diff) | |
| parent | 51bba9d513b22bd92d90127657b76f51d4555fa8 (diff) | |
| download | Doxygen-5021481aac33e51a4d94f4fea0fc745b4cbc8004.zip Doxygen-5021481aac33e51a4d94f4fea0fc745b4cbc8004.tar.gz Doxygen-5021481aac33e51a4d94f4fea0fc745b4cbc8004.tar.bz2 | |
Merge branch 'run_java_once_3rd_trial' of https://github.com/cheoljoo/doxygen into cheoljoo-run_java_once_3rd_trial
Diffstat (limited to 'src/htmldocvisitor.cpp')
| -rw-r--r-- | src/htmldocvisitor.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index 996b5c4..92fce37 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -588,12 +588,14 @@ void HtmlDocVisitor::visit(DocVerbatim *s) case DocVerbatim::PlantUML: { forceEndParagraph(s); - static QCString htmlOutput = Config_getString(HTML_OUTPUT); - QCString imgExt = getDotImageExtension(); - PlantUMLOutputFormat format = PUML_BITMAP; // default : PUML_BITMAP - if (imgExt=="svg"){ format = PUML_SVG; } - QCString baseName = writePlantUMLSource(htmlOutput,s->exampleFile(),s->text(),format); + QCString imgExt = getDotImageExtension(); + PlantumlManager::OutputFormat format = PlantumlManager::PUML_BITMAP; // default : PUML_BITMAP + if (imgExt=="svg") + { + format = PlantumlManager::PUML_SVG; + } + QCString baseName = PlantumlManager::instance()->writePlantUMLSource(htmlOutput,s->exampleFile(),s->text(),format); m_t << "<div class=\"plantumlgraph\">" << endl; writePlantUMLFile(baseName,s->relPath(),s->context()); visitPreCaption(m_t, s); @@ -2282,7 +2284,7 @@ void HtmlDocVisitor::writePlantUMLFile(const QCString &fileName, QCString imgExt = getDotImageExtension(); if (imgExt=="svg") { - generatePlantUMLOutput(fileName,outDir,PUML_SVG); + PlantumlManager::instance()->generatePlantUMLOutput(fileName,outDir,PlantumlManager::PUML_SVG); //m_t << "<iframe scrolling=\"no\" frameborder=\"0\" src=\"" << relPath << baseName << ".svg" << "\" />" << endl; //m_t << "<p><b>This browser is not able to show SVG: try Firefox, Chrome, Safari, or Opera instead.</b></p>"; //m_t << "</iframe>" << endl; @@ -2290,7 +2292,7 @@ void HtmlDocVisitor::writePlantUMLFile(const QCString &fileName, } else { - generatePlantUMLOutput(fileName,outDir,PUML_BITMAP); + PlantumlManager::instance()->generatePlantUMLOutput(fileName,outDir,PlantumlManager::PUML_BITMAP); m_t << "<img src=\"" << relPath << baseName << ".png" << "\" />" << endl; } } |