phpwiki-checkins

[phpwiki-checkins] SF.net SVN: phpwiki:[8529] trunk/lib/plugin/GraphViz.php

[<var...@us...>]

Revision: 8529
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8529&view=rev
Author:   vargenau
Date:     2012-11-23 11:03:10 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Remove "Usage" and "See also" (put in Help page)

Modified Paths:
--------------
    trunk/lib/plugin/GraphViz.php

Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php	2012-11-23 10:58:43 UTC (rev 8528)
+++ trunk/lib/plugin/GraphViz.php	2012-11-23 11:03:10 UTC (rev 8529)
@@ -22,7 +22,7 @@
 
 /**
  * The GraphViz plugin passes all its arguments to the grapviz dot
- * binary and displays the result as cached image (PNG,GIF,SVG) or imagemap.
+ * binary and displays the result as cached image.
  *
  * @Author: Reini Urban
  *
@@ -30,12 +30,6 @@
  * - We support only images supported by GD so far (PNG most likely).
  *   EPS, PS, SWF, SVG or SVGZ and imagemaps need to be tested.
  *
- * Usage:
-<<GraphViz [options...]
-multiline dot script ...
->>
- * See also: VisualWiki, which depends on GraphViz and WikiPluginCached.
- *
  * TODO:
  * - neato binary ?
  * - expand embedded <!plugin-list pagelist !> within the digraph script.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9224] trunk/lib/plugin/GraphViz.php

[<var...@us...>]

Revision: 9224
          http://sourceforge.net/p/phpwiki/code/9224
Author:   vargenau
Date:     2014-10-07 18:34:29 +0000 (Tue, 07 Oct 2014)
Log Message:
-----------
graphviz via Homebrew

Modified Paths:
--------------
    trunk/lib/plugin/GraphViz.php

Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php	2014-10-07 18:32:29 UTC (rev 9223)
+++ trunk/lib/plugin/GraphViz.php	2014-10-07 18:34:29 UTC (rev 9224)
@@ -37,7 +37,7 @@
 
 if (PHP_OS == "Darwin") { // Mac OS X
     if (!defined("GRAPHVIZ_EXE"))
-        define('GRAPHVIZ_EXE', '/sw/bin/dot'); // graphviz via Fink
+        define('GRAPHVIZ_EXE', '/usr/local/bin/dot'); // graphviz via Homebrew
     // Name of the Truetypefont - at least LucidaSansRegular.ttf is always present on OS X
     if (!defined('VISUALWIKIFONT'))
         define('VISUALWIKIFONT', 'LucidaSansRegular');

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[9280] trunk/lib/plugin/GraphViz.php

[<var...@us...>]

Revision: 9280
          http://sourceforge.net/p/phpwiki/code/9280
Author:   vargenau
Date:     2014-11-03 12:49:39 +0000 (Mon, 03 Nov 2014)
Log Message:
-----------
Use "&&" instead of "and" to get right priority

Modified Paths:
--------------
    trunk/lib/plugin/GraphViz.php

Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php	2014-11-03 12:30:59 UTC (rev 9279)
+++ trunk/lib/plugin/GraphViz.php	2014-11-03 12:49:39 UTC (rev 9280)
@@ -383,20 +383,20 @@
         $args = "-T$gif $tempfiles.dot -o $outfile";
         $cmdline1 = "$dotbin $args";
         if ($debug) $cmdline1 .= " > $tempout";
-        $ok = $ok and $this->filterThroughCmd($source, $cmdline1);
+        $ok = $ok && $this->filterThroughCmd($source, $cmdline1);
         //$ok = $this->execute("$dotbin -T$gif $tempfiles.dot -o $outfile" .
         //                     ($debug ? " > $tempout 2>&1" : " 2>&1"), $outfile)
 
         $args = "-Timap $tempfiles.dot -o $tempfiles.map";
         $cmdline2 = "$dotbin $args";
         if ($debug) $cmdline2 .= " > $tempout";
-        $ok = $ok and $this->filterThroughCmd($source, $cmdline2);
+        $ok = $ok && $this->filterThroughCmd($source, $cmdline2);
         // $this->execute("$dotbin -Timap $tempfiles.dot -o ".$tempfiles.".map" .
         //                    ($debug ? " > $tempout 2>&1" : " 2>&1"), $tempfiles.".map")
-        $ok = $ok and file_exists($outfile);
-        $ok = $ok and file_exists($tempfiles . '.map');
-        $ok = $ok and ($img = $ImageCreateFromFunc($outfile));
-        $ok = $ok and ($fp = fopen($tempfiles . '.map', 'r'));
+        $ok = $ok && file_exists($outfile);
+        $ok = $ok && file_exists($tempfiles . '.map');
+        $ok = $ok && ($img = $ImageCreateFromFunc($outfile));
+        $ok = $ok && ($fp = fopen($tempfiles . '.map', 'r'));
 
         $map = HTML();
         if ($debug == 'static') {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[10314] trunk/lib/plugin/GraphViz.php

[<var...@us...>]

Revision: 10314
          http://sourceforge.net/p/phpwiki/code/10314
Author:   vargenau
Date:     2021-06-22 15:27:04 +0000 (Tue, 22 Jun 2021)
Log Message:
-----------
lib/plugin/GraphViz.php: remove phpwiki.sourceforge.net and fontpath

Modified Paths:
--------------
    trunk/lib/plugin/GraphViz.php

Modified: trunk/lib/plugin/GraphViz.php
===================================================================
--- trunk/lib/plugin/GraphViz.php	2021-06-22 13:21:55 UTC (rev 10313)
+++ trunk/lib/plugin/GraphViz.php	2021-06-22 15:27:04 UTC (rev 10314)
@@ -43,19 +43,11 @@
     // Name of the Truetypefont - at least LucidaSansRegular.ttf is always present on OS X
     if (!defined('VISUALWIKIFONT'))
         define('VISUALWIKIFONT', 'LucidaSansRegular');
-    // The default font paths do not find your fonts, set the path here:
-    $fontpath = "/System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Home/lib/fonts/";
-    //$fontpath = "/usr/X11R6/lib/X11/fonts/TTF/";
 } elseif (isWindows()) {
     if (!defined("GRAPHVIZ_EXE"))
         define('GRAPHVIZ_EXE', 'dot.exe');
     if (!defined('VISUALWIKIFONT'))
         define('VISUALWIKIFONT', 'Arial');
-} elseif ($_SERVER["SERVER_NAME"] == 'phpwiki.sourceforge.net') { // sf.net hack
-    if (!defined("GRAPHVIZ_EXE"))
-        define('GRAPHVIZ_EXE', '/home/groups/p/ph/phpwiki/bin/dot');
-    if (!defined('VISUALWIKIFONT'))
-        define('VISUALWIKIFONT', 'luximr');
 } else { // other os
     if (!defined("GRAPHVIZ_EXE"))
         define('GRAPHVIZ_EXE', '/usr/bin/dot');
@@ -62,11 +54,6 @@
     // Name of the Truetypefont - Helvetica is probably easier to read
     if (!defined('VISUALWIKIFONT'))
         define('VISUALWIKIFONT', 'Helvetica');
-    //define('VISUALWIKIFONT', 'Times');
-    //define('VISUALWIKIFONT', 'Arial');
-    // The default font paths do not find your fonts, set the path here:
-    //$fontpath = "/usr/X11R6/lib/X11/fonts/TTF/";
-    //$fontpath = "/usr/share/fonts/default/TrueType/";
 }
 
 require_once 'lib/WikiPluginCached.php';
@@ -74,7 +61,6 @@
 class WikiPlugin_GraphViz
     extends WikiPluginCached
 {
-
     public $_args;
     public $source;
     public $_mapfile;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.