Changeset 0615d9 in git

Timestamp:

Nov 25, 2013, 11:13:47 AM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')

Children:

7bb7da5db82ebe13b1923654fb861e84c6c3ec65

Parents:

40971d53362e3fb612b5ee52d46dc9023f52e8cd

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-11-25 11:13:47+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-11-25 11:17:40+01:00

Message:

chg: use imagemagick instead of xv for display

from master

File:

• Singular/LIB/resgraph.lib (modified) (8 diffs)

Singular/LIB/resgraph.lib

@@ -7 +7 @@
 AUTHOR: A. Fruehbis-Krueger,  anne@mathematik.uni-kl.de,
 
-NOTE: This library uses the external programs surf, graphviz and xv.
+NOTE: This library uses the external programs surf, graphviz and imagemagick.
 @*    Input data is assumed to originate from resolve.lib and reszeta.lib
 
 PROCEDURES:
-InterDiv(M[,name])   dual graph of resolution of a surface (uses graphviz,xv)
-ResTree(L,M[,name])  tree of charts of resolution (uses graphviz,xv)
+InterDiv(M[,name])   dual graph of resolution of a surface (uses graphviz,imagemagick)
+ResTree(L,M[,name])  tree of charts of resolution (uses graphviz,imagemagick)
 finalCharts(L,...)   pictures of final charts of surface (uses surf)
 ";
@@ -27 +27 @@
 @*       if filename is given
 NOTE:    only available on UNIX-type systems and programs
-@*       'xv' (X11/Xorg package) and 'dot' (Graphviz package) need to
+@*       'display' (imagemagick package) and 'dot' (Graphviz package) need to
 @*       be in the standard search PATH
 RETURN:  nothing, only generating graphics output in separate window
@@ -85 +85 @@
   close(eing);
 //---------------------------------------------------------------------------
-// produce graphics output using the programs dot and xv
+// produce graphics output using the programs dot and display
 //---------------------------------------------------------------------------
   string outfile=@filename + ".jpg";
   if(!find(outfile,"/"))
   {
-//--- xv needs fully qualified path to file
+//--- display needs fully qualified path to file
      outfile=system("getenv","PWD") + "/" + outfile;
   }
   j=system("sh","dot -Tjpg " + @filename + " -o "+ outfile);
-  j=system("sh","xv " + outfile + " &");
+  j=system("sh","display " + outfile + " &");
 //---------------------------------------------------------------------------
 // clean up if necessary
@@ -160 +160 @@
 @*       if filename is given
 NOTE:    only available on UNIX-type systems and programs
-@*       'xv' (X11/Xorg package) and 'dot' (Graphviz package) need to
+@*       'display' (imagemagick package) and 'dot' (Graphviz package) need to
 @*       be in the standard search PATH
 RETURN:  nothing, only generating graphics output in separate window
@@ -271 +271 @@
   close(eing);
 //---------------------------------------------------------------------------
-// Create the graphics output using the programs dot and xv
+// Create the graphics output using the programs dot and display
 //---------------------------------------------------------------------------
   string outfile=@filename + ".jpg";
   if(!find(outfile,"/"))
   {
-//--- xv needs fully qualified path to file
+//--- display needs fully qualified path to file
      outfile=system("getenv","PWD") + "/" + outfile;
   }
   j=system("sh", "dot -Tjpg " + @filename + " -o "+ outfile);
-  j=system("sh","/usr/bin/X11/xv " + outfile + "&");
+  j=system("sh","display " + outfile + "&");
 //---------------------------------------------------------------------------
 // Clean up public directories if necessary
@@ -310 +310 @@
 @*       - several '.ras' files in the directory in which 'name' resides
 NOTE:    only available on UNIX-type systems
-@*       external programs 'surf' and 'xv' (X11/Xorg package) need to be
+@*       external programs 'surf' and 'display' (imagemagick package) need to be
 @*       in the standard search PATH
 RETURN:  nothing, only generating graphics output in separate window
@@ -556 +556 @@
      if(!find(fnamebase,"/"))
      {
-//--- xv needs fully qualified path to file
+//--- display needs fully qualified path to file
          if(defined(outfile)) {kill outfile;}
          string outfile=system("getenv","PWD") + "/" + fnamebase;
@@ -577 +577 @@
      if(!defined(outfile))
      {
-        j=system("sh","/usr/bin/X11/xv " + fnamebase
+        j=system("sh","display " + fnamebase
                        + string(endCharts[i]) + ".ras &");
      }
      else
      {
-        j=system("sh","/usr/bin/X11/xv " + outfile
+        j=system("sh","display " + outfile
                        + string(endCharts[i]) + ".ras &");
         kill outfile;