Menu
▾
▴
callflow:[213] man
|
From: <rb...@us...> - 2016-12-23 16:35:49
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> <title>callflow:[213] man</title> </head> <body> <style type="text/css"><!-- #msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dl.meta dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } #logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } #logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } #logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } #logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } #logmsg pre { background: #eee; padding: 1em; } #logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} #logmsg dl { margin: 0; } #logmsg dt { font-weight: bold; } #logmsg dd { margin: 0; padding: 0 0 0.5em 0; } #logmsg dd:before { content:'\00bb';} #logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } #logmsg table th.Corner { text-align: left; } #logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } #header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <div id="msg"> <dl class="meta"> <dt>Revision</dt> <dd><a href="http://sourceforge.net/p/callflow/code/213">213</a></dd> <dt>Author</dt> <dd>rbos</dd> <dt>Date</dt> <dd>2016-12-23 16:35:47 +0000 (Fri, 23 Dec 2016)</dd> </dl> <h3>Log Message</h3> <pre>Add PDF output. The PDF output can be activated via the various configuration files, or with the --pdf option. When output to PDF and the creation of an archive is requested the PDF file is included in the archive. By default the PDF output is disabled Patch provided by Zoltan Miricz</pre> <h3>Modified Paths</h3> <ul> <li><a href="#callflow">callflow</a></li> <li><a href="#confcallflowconf">conf/callflow.conf</a></li> <li><a href="#imagesindextpl">images/index.tpl</a></li> <li><a href="#mancallflow1">man/callflow.1</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="callflow"></a> <div class="modfile"><h4>Modified: callflow (212 => 213)</h4> <pre class="diff"><span> <span class="info">--- callflow 2016-12-23 13:15:33 UTC (rev 212) +++ callflow 2016-12-23 16:35:47 UTC (rev 213) </span><span class="lines">@@ -10,6 +10,7 @@ </span><span class="cx"> ARCHIVE_TYPE=bz2 </span><span class="cx"> CONFDIR=/etc/callflow </span><span class="cx"> removeDF=0 # do not remove duplicate frames </span><ins>+SVG_TO_PDF=no # default value for PDF conversion </ins><span class="cx"> ORDER=0 # do not build order file </span><span class="cx"> localLoop=1 # take into account flows from and to the same element (rounded flows) </span><span class="cx"> </span><span class="lines">@@ -150,6 +151,9 @@ </span><span class="cx"> A file containing the element or node names that belong to the </span><span class="cx"> addresses shown in the callflow. </span><span class="cx"> </span><ins>+ --pdf + Additionally provide the callflow in pdf. + </ins><span class="cx"> --refresh-cache </span><span class="cx"> Refresh the contents of the callflow.short and callflow.long </span><span class="cx"> files. By default these are cached. The cache is automatically </span><span class="lines">@@ -181,7 +185,7 @@ </span><span class="cx"> # alphabetically listed, keep it this way please. </span><span class="cx"> LOPT="archive:,browser" </span><span class="cx"> LOPT="$LOPT,capture-filter:,help,lines-between-nodes:,list-nodes,no-archive,no-loops" </span><del>-LOPT="$LOPT,no-sdp,no-time,nodenames:,refresh-cache,remove-duplicate-frames,title:,with-sdp" </del><ins>+LOPT="$LOPT,no-sdp,no-time,nodenames:,pdf,refresh-cache,remove-duplicate-frames,title:,with-sdp" </ins><span class="cx"> LOPT="$LOPT,width-between-nodes:,version" </span><span class="cx"> </span><span class="cx"> # Note that we use `"$@"' to let each command-line parameter expand to a </span><span class="lines">@@ -240,6 +244,10 @@ </span><span class="cx"> --nodenames) </span><span class="cx"> OPT_NODENAMES=$2; shift </span><span class="cx"> ;; </span><ins>+ --pdf) + # Additionally provide the callflow in pdf + SVG_TO_PDF=yes + ;; </ins><span class="cx"> --refresh-cache) </span><span class="cx"> OPT_REFRESH_CACHE=yes </span><span class="cx"> ;; </span><span class="lines">@@ -563,13 +571,19 @@ </span><span class="cx"> # Build callflow.png if inkscape is available </span><span class="cx"> if which inkscape >/dev/null 2>&1; then </span><span class="cx"> </span><ins>+ INKSCAPE_ARGS="--export-dpi=90 -C --export-background=white --export-png=$DESTDIR/callflow.png $DESTDIR/callflow.svg" + + [[ "$SVG_TO_PDF" == "yes" ]] && { + INKSCAPE_ARGS="--export-pdf=$DESTDIR/callflow.pdf $INKSCAPE_ARGS" + } + </ins><span class="cx"> # Inkscape does not have a quiet option, it might get one in a future release </span><span class="cx"> # Workaround; sent the output to /dev/null in case the files to be archived </span><span class="cx"> # will be listed on the screen </span><span class="cx"> if [[ "$ARCHIVE_TYPE" == "files" ]] || [[ "$INKSCAPE_MODE" == "QUIET" ]]; then </span><del>- inkscape --export-dpi=90 -C --export-background=white --export-png=$DESTDIR/callflow.png $DESTDIR/callflow.svg >/dev/null 2>&1 </del><ins>+ inkscape $INKSCAPE_ARGS >/dev/null 2>&1 </ins><span class="cx"> else </span><del>- inkscape --export-dpi=90 -C --export-background=white --export-png=$DESTDIR/callflow.png $DESTDIR/callflow.svg </del><ins>+ inkscape $INKSCAPE_ARGS </ins><span class="cx"> fi </span><span class="cx"> </span><span class="cx"> # Copy the input file into destination directory </span><span class="lines">@@ -613,6 +627,10 @@ </span><span class="cx"> echo " <a href=\"$ARCHIVE_FILE\">Callflow files in archive</a> (to sent the callflow to e.g. interested parties)" </span><span class="cx"> echo " <br/>" </span><span class="cx"> } </span><ins>+ [[ "$SVG_TO_PDF" == "yes" ]] && { + echo " Callflow in <a href=\"callflow.pdf\">PDF</a> format" + echo " <br/>" + } </ins><span class="cx"> echo " <a href=\"index.html\" target=\"_parent\">Back to landing page</a>" </span><span class="cx"> echo " </p>" </span><span class="cx"> echo " </div>" </span><span class="lines">@@ -656,6 +674,10 @@ </span><span class="cx"> echo " <a href=\"$ARCHIVE_FILE\">Callflow files in archive</a> (to sent the callflow to e.g. interested parties)" </span><span class="cx"> echo " <br/>" </span><span class="cx"> } </span><ins>+ [[ "$SVG_TO_PDF" == "yes" ]] && { + echo " Callflow in <a href=\"callflow.pdf\">PDF</a> format" + echo " <br/>" + } </ins><span class="cx"> echo " <a href=\"index.html\" target=\"_parent\">Back to landing page</a>" </span><span class="cx"> echo " </p>" </span><span class="cx"> echo " </div>" </span><span class="lines">@@ -698,6 +720,7 @@ </span><span class="cx"> -e "s/@ARCHIVE_FILE@/$ARCHIVE_FILE/" \ </span><span class="cx"> $SETUPDIR/images/index.tpl > $DESTDIR/index.html </span><span class="cx"> [[ $ARCHIVE != "yes" ]] && sed -i '/@@@ARCHIVE_FILE@@@/d' $DESTDIR/index.html </span><ins>+ [[ "$SVG_TO_PDF" != "yes" ]] && sed -i '/@@@PDF_FILE@@@/d' $DESTDIR/index.html </ins><span class="cx"> </span><span class="cx"> else </span><span class="cx"> ( echo "Error $PRGNAME: inkscape not found." </span><span class="lines">@@ -721,6 +744,11 @@ </span><span class="cx"> FILES="$FILES $TRACEFILE callflow.png graph.html" </span><span class="cx"> FILES="$FILES index_dynamic.html index_frame_bottom.html index_frameless.html" </span><span class="cx"> FILES="$FILES index_frame_right.html index.html" </span><ins>+ [[ "$SVG_TO_PDF" == "yes" ]] && { + FILES="$FILES callflow.pdf" + } + + </ins><span class="cx"> ARCHIVE_FILES=$(tr " " "\n" <<< "$FILES" | sort) </span><span class="cx"> </span><span class="cx"> if [[ "$ARCHIVE_TYPE" == "files" ]]; then </span><span class="lines">@@ -754,6 +782,7 @@ </span><span class="cx"> </span><span class="cx"> if [[ "$START_BROWSER" == "yes" ]]; then </span><span class="cx"> # Start the browser in the background </span><ins>+ echo "Launching ${BROWSER:=firefox}" </ins><span class="cx"> if [[ -z "$CALLFLOW_URL" ]]; then </span><span class="cx"> "${BROWSER:=firefox}" "$DESTDIR/index.html" >/dev/null & </span><span class="cx"> else </span></span></pre></div> <a id="confcallflowconf"></a> <div class="modfile"><h4>Modified: conf/callflow.conf (212 => 213)</h4> <pre class="diff"><span> <span class="info">--- conf/callflow.conf 2016-12-23 13:15:33 UTC (rev 212) +++ conf/callflow.conf 2016-12-23 16:35:47 UTC (rev 213) </span><span class="lines">@@ -86,6 +86,11 @@ </span><span class="cx"> # Default value: QUIET </span><span class="cx"> INKSCAPE_MODE=QUIET </span><span class="cx"> </span><ins>+ +# SVG_TO_PDF: enable (yes) or disable (no) output in PDF format +# Default value: no +# SVG_TO_PDF=yes + </ins><span class="cx"> # Duplicate packet removal: </span><span class="cx"> # </span><span class="cx"> # REMOVE_DUP_MODE, how aggressive should callflow be with respect to removing </span></span></pre></div> <a id="imagesindextpl"></a> <div class="modfile"><h4>Modified: images/index.tpl (212 => 213)</h4> <pre class="diff"><span> <span class="info">--- images/index.tpl 2016-12-23 13:15:33 UTC (rev 212) +++ images/index.tpl 2016-12-23 16:35:47 UTC (rev 213) </span><span class="lines">@@ -39,7 +39,8 @@ </span><span class="cx"> <h2>Trace file</h2> </span><span class="cx"> <p>The <a href="@TRACE@">trace file</a> that resulted in the callflow diagrams. </span><span class="cx"> <br/> </span><del>- <a href="@ARCHIVE_FILE@">Callflow files in archive</a> (to sent the callflow to e.g. interested parties) <!-- @@@@ARCHIVE_FILE@@@@ --> </del><ins>+ <a href="@ARCHIVE_FILE@">Callflow files in archive</a> (to sent the callflow to e.g. interested parties)<br/> <!-- @@@@ARCHIVE_FILE@@@@ --> + Callflow in <a href="callflow.pdf">PDF</a> format <!-- @@@@PDF_FILE@@@@ --> </ins><span class="cx"> </p> </span><span class="cx"> <p class="info">Those diagrams were created with <a href="http://callflow.sourceforge.net">callflow</a></p> </span><span class="cx"> </body> </span></span></pre></div> <a id="mancallflow1"></a> <div class="modfile"><h4>Modified: man/callflow.1 (212 => 213)</h4> <pre class="diff"><span> <span class="info">--- man/callflow.1 2016-12-23 13:15:33 UTC (rev 212) +++ man/callflow.1 2016-12-23 16:35:47 UTC (rev 213) </span><span class="lines">@@ -116,6 +116,11 @@ </span><span class="cx"> </span><span class="cx"> .TP </span><span class="cx"> .PD 0 </span><ins>+.B --pdf +Additionally provide the callflow in pdf. + +.TP +.PD 0 </ins><span class="cx"> .B -d </span><span class="cx"> .TP </span><span class="cx"> .PD </span></span></pre> </div> </div> <div id="footer">This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.</div> </body> </html> |
