From e52e95366e4460fbfeecafb157158b5adb73d286 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Fri, 17 Mar 2017 15:57:29 +0100
Subject: [PATCH] repairs => plotting basically works as before; much simpler
color configuration stance
---
{pub/share => arch/gcode}/c3.ps | 0
{pub/share => arch/gcode}/g3.ps | 0
pub/plot/ps_plotter.cpp | 2 +-
pub/share/CMakeLists.txt | 2 +-
pub/share/c4.ps | 12 ++++++++
pub/share/frida.ini.in | 4 +--
pub/share/g4.ps | 49 +++++++++++++++++++++++++++++++++
pub/share/wups17a.ps | 1 +
8 files changed, 66 insertions(+), 4 deletions(-)
rename {pub/share => arch/gcode}/c3.ps (100%)
rename {pub/share => arch/gcode}/g3.ps (100%)
create mode 100644 pub/share/c4.ps
create mode 100644 pub/share/g4.ps
diff --git a/pub/share/c3.ps b/arch/gcode/c3.ps
similarity index 100%
rename from pub/share/c3.ps
rename to arch/gcode/c3.ps
diff --git a/pub/share/g3.ps b/arch/gcode/g3.ps
similarity index 100%
rename from pub/share/g3.ps
rename to arch/gcode/g3.ps
diff --git a/pub/plot/ps_plotter.cpp b/pub/plot/ps_plotter.cpp
index 852863c6..e0b5b042 100644
--- a/pub/plot/ps_plotter.cpp
+++ b/pub/plot/ps_plotter.cpp
@@ -215,7 +215,7 @@ namespace {
+ doc_lines
+ "} oooinfo 1 eq { exec } { pop } ifelse\n"
+ "\n{(" + fname + ")} /filename exch def 10 -2.8 18 showfilename\n\n"
- + " EndFrame\n";
+ + "EndFrame\n";
}
} // anonymous namespace
diff --git a/pub/share/CMakeLists.txt b/pub/share/CMakeLists.txt
index e4bd0342..aa2f286f 100644
--- a/pub/share/CMakeLists.txt
+++ b/pub/share/CMakeLists.txt
@@ -1,3 +1,3 @@
configure_file(frida.ini.in frida.ini)
-set(share_files ${CMAKE_CURRENT_BINARY_DIR}/frida.ini g3.ps c3.ps wups11a.ps gnuplot-default-symbols.eps)
+set(share_files ${CMAKE_CURRENT_BINARY_DIR}/frida.ini g4.ps c4.ps wups17a.ps gnuplot-default-symbols.eps)
install(FILES ${share_files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/frida)
diff --git a/pub/share/c4.ps b/pub/share/c4.ps
new file mode 100644
index 00000000..b445711a
--- /dev/null
+++ b/pub/share/c4.ps
@@ -0,0 +1,12 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Next frame: customizable plot setup
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+WuGdict17a begin
+
+Resets
+BoxBackground
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Mark "ecu", end of the customization section
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/pub/share/frida.ini.in b/pub/share/frida.ini.in
index fd4c3dfb..ba5fbb00 100644
--- a/pub/share/frida.ini.in
+++ b/pub/share/frida.ini.in
@@ -1,7 +1,7 @@
pop($silent=1)
psdir="~/gnew/"
-pshead="${CMAKE_INSTALL_PREFIX}/share/frida/g3.ps"
-pscont="${CMAKE_INSTALL_PREFIX}/share/frida/c3.ps"
+pshead="${CMAKE_INSTALL_PREFIX}/share/frida/g4.ps"
+pscont="${CMAKE_INSTALL_PREFIX}/share/frida/c4.ps"
psdict="${CMAKE_INSTALL_PREFIX}/share/frida/wups17a.ps"
psgsym="${CMAKE_INSTALL_PREFIX}/share/frida/gnuplot-default-symbols.eps"
FK01="pv"
diff --git a/pub/share/g4.ps b/pub/share/g4.ps
new file mode 100644
index 00000000..f483f74c
--- /dev/null
+++ b/pub/share/g4.ps
@@ -0,0 +1,49 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Customizable plot setup, copied from g3.ps (editör: use latin-1)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+WuGdict17a begin
+
+10 dup autolabel defsiz
+1 dup geld stdred
+2 -11 setnewpage newpage
+
+2 4 13 -14 setpagegrid
+2 8 24 abcset % usage: {(text)} abc
+/EndFrame { nextFrame end } def
+
+1 1 language
+1 1 InfSet % plot fnam, info
+1 dup 2 SymGSet % srad slin serr(2=from pset) : graph symbols, global preset
+% /setboxbackgroundcolor { 0.93 setgray } def % default is white
+% setPalatino
+
+{ 8 aCol5 iColA } /ipCol x bind def % number of colours and colour style
+/pStyles [
+ { 11 0 0 1. 1. pset 0 ipCol }
+ { 12 1 0 1. 1. pset 1 ipCol }
+ { 13 1 0 1. 1. pset 2 ipCol }
+ { 1 0 0 1. 1. pset 3 ipCol }
+ { 1 1 0 .7 1. pset 4 ipCol }
+ { 3 0 0 1. 1. pset 5 ipCol }
+ { 3 1 0 .7 1. pset 6 ipCol }
+ { 4 0 0 1. 1. pset 7 ipCol }
+ { 4 1 0 .7 1. pset 0 ipCol }
+ { 5 0 0 1. 1. pset 1 ipCol }
+ { 5 1 0 .7 1. pset 2 ipCol }
+ { 2 0 0 1. 1. pset 3 ipCol }
+ { 2 1 0 .7 1. pset 4 ipCol }
+ ] def
+
+{ 8 aCol2 iColA } /icCol x bind def % number of colours and colour style
+/cStyles [
+ { 1. [] lset black }
+ { 1. [] lset 0 icCol }
+ ] def
+
+Resets
+BoxBackground
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Mark "ecu", end of the customization section
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/pub/share/wups17a.ps b/pub/share/wups17a.ps
index 11927c63..d481565c 100644
--- a/pub/share/wups17a.ps
+++ b/pub/share/wups17a.ps
@@ -723,6 +723,7 @@ WuGdict17a begin
% draw a line
aFro 0 np mv
aTo 0 li st
+ grestore
} def
% draw ticks (positions given by SetTicVec, parameters preset by OneAxx/..)
--
GitLab