Changeset 0615d9 in git


Ignore:
Timestamp:
Nov 25, 2013, 11:13:47 AM (9 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '48f1dd268d0ff74ef2f7dccbf02545425002ddcc')
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:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/LIB/resgraph.lib

    r40971d r0615d9  
    77AUTHOR: A. Fruehbis-Krueger,  anne@mathematik.uni-kl.de,
    88
    9 NOTE: This library uses the external programs surf, graphviz and xv.
     9NOTE: This library uses the external programs surf, graphviz and imagemagick.
    1010@*    Input data is assumed to originate from resolve.lib and reszeta.lib
    1111
    1212PROCEDURES:
    13 InterDiv(M[,name])   dual graph of resolution of a surface (uses graphviz,xv)
    14 ResTree(L,M[,name])  tree of charts of resolution (uses graphviz,xv)
     13InterDiv(M[,name])   dual graph of resolution of a surface (uses graphviz,imagemagick)
     14ResTree(L,M[,name])  tree of charts of resolution (uses graphviz,imagemagick)
    1515finalCharts(L,...)   pictures of final charts of surface (uses surf)
    1616";
     
    2727@*       if filename is given
    2828NOTE:    only available on UNIX-type systems and programs
    29 @*       'xv' (X11/Xorg package) and 'dot' (Graphviz package) need to
     29@*       'display' (imagemagick package) and 'dot' (Graphviz package) need to
    3030@*       be in the standard search PATH
    3131RETURN:  nothing, only generating graphics output in separate window
     
    8585  close(eing);
    8686//---------------------------------------------------------------------------
    87 // produce graphics output using the programs dot and xv
     87// produce graphics output using the programs dot and display
    8888//---------------------------------------------------------------------------
    8989  string outfile=@filename + ".jpg";
    9090  if(!find(outfile,"/"))
    9191  {
    92 //--- xv needs fully qualified path to file
     92//--- display needs fully qualified path to file
    9393     outfile=system("getenv","PWD") + "/" + outfile;
    9494  }
    9595  j=system("sh","dot -Tjpg " + @filename + " -o "+ outfile);
    96   j=system("sh","xv " + outfile + " &");
     96  j=system("sh","display " + outfile + " &");
    9797//---------------------------------------------------------------------------
    9898// clean up if necessary
     
    160160@*       if filename is given
    161161NOTE:    only available on UNIX-type systems and programs
    162 @*       'xv' (X11/Xorg package) and 'dot' (Graphviz package) need to
     162@*       'display' (imagemagick package) and 'dot' (Graphviz package) need to
    163163@*       be in the standard search PATH
    164164RETURN:  nothing, only generating graphics output in separate window
     
    271271  close(eing);
    272272//---------------------------------------------------------------------------
    273 // Create the graphics output using the programs dot and xv
     273// Create the graphics output using the programs dot and display
    274274//---------------------------------------------------------------------------
    275275  string outfile=@filename + ".jpg";
    276276  if(!find(outfile,"/"))
    277277  {
    278 //--- xv needs fully qualified path to file
     278//--- display needs fully qualified path to file
    279279     outfile=system("getenv","PWD") + "/" + outfile;
    280280  }
    281281  j=system("sh", "dot -Tjpg " + @filename + " -o "+ outfile);
    282   j=system("sh","/usr/bin/X11/xv " + outfile + "&");
     282  j=system("sh","display " + outfile + "&");
    283283//---------------------------------------------------------------------------
    284284// Clean up public directories if necessary
     
    310310@*       - several '.ras' files in the directory in which 'name' resides
    311311NOTE:    only available on UNIX-type systems
    312 @*       external programs 'surf' and 'xv' (X11/Xorg package) need to be
     312@*       external programs 'surf' and 'display' (imagemagick package) need to be
    313313@*       in the standard search PATH
    314314RETURN:  nothing, only generating graphics output in separate window
     
    556556     if(!find(fnamebase,"/"))
    557557     {
    558 //--- xv needs fully qualified path to file
     558//--- display needs fully qualified path to file
    559559         if(defined(outfile)) {kill outfile;}
    560560         string outfile=system("getenv","PWD") + "/" + fnamebase;
     
    577577     if(!defined(outfile))
    578578     {
    579         j=system("sh","/usr/bin/X11/xv " + fnamebase
     579        j=system("sh","display " + fnamebase
    580580                       + string(endCharts[i]) + ".ras &");
    581581     }
    582582     else
    583583     {
    584         j=system("sh","/usr/bin/X11/xv " + outfile
     584        j=system("sh","display " + outfile
    585585                       + string(endCharts[i]) + ".ras &");
    586586        kill outfile;
Note: See TracChangeset for help on using the changeset viewer.