Skip to content
Snippets Groups Projects
Commit 151c147a authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

by default, use Gnuplot symbols in PostScript output;

explain them in share/gnuplot-default-symbols.eps
parent 4bfad5d1
Branches
Tags
No related merge requests found
......@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
[m4_warning([this file was generated for autoconf 2.68.
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
[m4_warning([this file was generated for autoconf 2.67.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
......
This diff is collapsed.
auxdir = $(datadir)/@PACKAGE@
aux_DATA = g3.ps wups07a.ps
aux_DATA = g3.ps wups07a.ps wups10a.ps wups11a.ps gnuplot-default-symbols.eps
sysconfdir = $(prefix)/etc/@PACKAGE@
sysconf_DATA = frida.ini
\ No newline at end of file
......@@ -167,7 +167,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
auxdir = $(datadir)/@PACKAGE@
aux_DATA = g3.ps wups07a.ps
aux_DATA = g3.ps wups07a.ps wups10a.ps wups11a.ps gnuplot-default-symbols.eps
sysconf_DATA = frida.ini
all: all-am
......
\d psdir ~/gnew/
\d pshead /usr/local/share/frida/g3.ps
\d psdict /usr/local/share/frida/wups10a.ps
\d psdict /usr/local/share/frida/wups11a.ps
\d psgsym /usr/local/share/frida/gnuplot-default-symbols.eps
\d cv_mode -1
\d cv_epsabs 1e-8
\d cv_epsrel 1e-8
......@@ -24,27 +24,32 @@ originUpperLeft_A4
%% Symbols and curve styles:
F /pcol x def % black&white on/off
{ 10 aCol1 iColA } /ipCol x bind def % number of colours and colour style
{ 8 aCol5 iColA } /ipCol x bind def % number of colours and colour style
/pStyles [
{ pcol { 1 1 0 1. 1. pset } { 1 1 0 1. 1. pset 0 ipCol } ifelse } % 1
{ pcol { 1 0 0 1. 1. pset } { 1 1 0 1. 1. pset 1 ipCol } ifelse } % 3
{ pcol { 2 1 0 1. 1. pset } { 1 1 0 1. 1. pset 2 ipCol } ifelse } % 2
{ pcol { 2 0 0 1. 1. pset } { 1 1 0 1. 1. pset 3 ipCol } ifelse } % 4
{ pcol { 3 1 0 1. 1. pset } { 1 1 0 1. 1. pset 4 ipCol } ifelse } % 5
{ pcol { 3 0 0 1. 1. pset } { 1 1 0 1. 1. pset 5 ipCol } ifelse } % 6
{ pcol { 4 1 0 1. 1. pset } { 1 1 0 1. 1. pset 6 ipCol } ifelse } % 7
{ pcol { 4 0 0 1. 1. pset } { 1 1 0 1. 1. pset 7 ipCol } ifelse } % 8
{ pcol { 5 1 0 1. 1. pset } { 1 1 0 1. 1. pset 8 ipCol } ifelse } % 9
{ pcol { 5 0 0 1. 1. pset } { 1 1 0 1. 1. pset 9 ipCol } ifelse } % 10
{ pcol { 1 1 0 1. 1. pset } { 11 0 0 1. 1. pset 0 ipCol } ifelse }
{ pcol { 1 0 0 1. 1. pset } { 12 1 0 1. 1. pset 1 ipCol } ifelse }
{ pcol { 2 1 0 1. 1. pset } { 13 1 0 1. 1. pset 2 ipCol } ifelse }
{ pcol { 2 0 0 1. 1. pset } { 1 0 0 1. 1. pset 3 ipCol } ifelse }
{ pcol { 3 1 0 1. 1. pset } { 1 1 0 .7 1. pset 4 ipCol } ifelse }
{ pcol { 3 0 0 1. 1. pset } { 3 0 0 1. 1. pset 5 ipCol } ifelse }
{ pcol { 4 1 0 1. 1. pset } { 3 1 0 .7 1. pset 6 ipCol } ifelse }
{ pcol { 4 0 0 1. 1. pset } { 4 0 0 1. 1. pset 7 ipCol } ifelse }
{ pcol { 5 1 0 1. 1. pset } { 4 1 0 .7 1. pset 0 ipCol } ifelse }
{ pcol { 5 0 0 1. 1. pset } { 5 0 0 1. 1. pset 1 ipCol } ifelse }
{ pcol { 5 0 0 1. 1. pset } { 5 1 0 .7 1. pset 2 ipCol } ifelse }
{ pcol { 3 0 0 1. 1. pset } { 2 0 0 1. 1. pset 3 ipCol } ifelse }
{ pcol { 4 1 0 1. 1. pset } { 2 1 0 .7 1. pset 4 ipCol } ifelse }
] def
T /ccol x def % black&white on/off
{ 8 aCol2 iColA } /icCol x bind def % number of colours and colour style
/cStyles [
{ ccol { 1. [ ] lset } { 1. [] lset 0 icCol } ifelse } % 1
{ ccol { 1. [1 3 ] lset } { 1. [] lset 1 icCol } ifelse } % 2
{ ccol { 1. [8 6 ] lset } { 1. [] lset 2 icCol } ifelse } % 3
{ ccol { 1. [8 3 1 3 ] lset } { 1. [] lset 3 icCol } ifelse } % 4
{ ccol { 1. [ ] lset } { 1. [] lset 0 icCol } ifelse }
{ ccol { 1. [1 3 ] lset } { 1. [] lset 1 icCol } ifelse }
{ ccol { 1. [8 6 ] lset } { 1. [] lset 2 icCol } ifelse }
{ ccol { 1. [8 3 1 3 ] lset } { 1. [] lset 3 icCol } ifelse }
] def
%% Clear frame:
......
This diff is collapsed.
......@@ -326,6 +326,16 @@ WuGdict11a begin
{ 120 80 30 }
{ 100 60 20 }
] def
/aCol5 [ % gnuplot default (see man gnuplot and rgb.txt)
{ 255 0 0 } % red
{ 0 255 0 } % green
{ 0 0 255 } % blue
{ 255 0 255 } % magenta
{ 0 255 255 } % cyan
{ 160 82 45 } % sienna
{ 255 165 0 } % orange
{ 255 127 80 } % coral
] def
%% Specialized ifelse, depending on pcol / ccol - OBSOLETE since 11a:
......
......@@ -279,6 +279,8 @@ bool fridaCommand( string cmd )
" gnd set maximum number of data points\n"
" gnc number of equidistant base points for curve plotting\n"
" gcr allow iterative refinement for curve plotting?\n"
"Help:\n"
" gsym explain plot symbols\n"
;
} else if ( cmd == "gx" ) {
......@@ -341,6 +343,8 @@ bool fridaCommand( string cmd )
break;
NPloWin::Plots[NPloWin::iPlot]->gp_write(cmd);
}
} else if (cmd == "gsym") {
system( ("gv " + NRead::wofmac( "\\psgsym" ) + "&").c_str() );
} else if (cmd == "p") {
NPlot::Plot( NPloWin::Plots[NPloWin::iPlot], 0);
} else if (cmd == "pp") {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment