1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
--- EMBOSS-6.3.1/ajax/graphics/ajgraph.c 2012-07-19 23:29:05.000000000 +0200
+++ /tmp/ajgraph.c 2012-07-19 23:25:00.000000000 +0200
@@ -1645,14 +1645,14 @@
** @return [void]
** @@
******************************************************************************/
static void GraphSetPen(ajint colour)
{
- ajDebug("=g= plcol(%d '%s') [colour]\n", colour, graphColourName[colour]);
- plcol((PLINT)colour);
+ ajDebug("=g= plcol0(%d '%s') [colour]\n", colour, graphColourName[colour]);
+ plcol0((PLINT)colour);
return;
}
--- EMBOSS-6.3.1/plplot/plcore.c 2007-10-24 15:14:43.000000000 +0200
+++ /tmp/plcore.c 2012-07-19 23:25:00.000000000 +0200
@@ -1709,13 +1709,13 @@
if (plsc->zdigmax == 0)
plsc->zdigmax = 3;
/* Switch to graphics mode and set color and arrow style*/
plgra();
- plcol(1);
+ plcol0(1);
plstyl(0, &mk, &sp);
plpat(1, &inc, &del);
plsvect(def_arrow_x, def_arrow_y, 6, 0);
--- EMBOSS-6.3.1/plplot/plstripc.c 2007-05-08 11:09:37.000000000 +0200
+++ /tmp/plstripc.c 2012-07-19 23:25:00.000000000 +0200
@@ -153,17 +153,17 @@
plgchr(&sc, &dy);
sc = dy = dy/100;
plwind(-0.01, 1.01, -0.01, 1.01);
for (i=0; i<PEN; i++) {
if (mystripc->npts[i] || first) {
- plcol(mystripc->colline[i]);
+ plcol0(mystripc->colline[i]);
pllsty(mystripc->styline[i]);
pljoin(mystripc->xlpos, mystripc->ylpos - sc,
mystripc->xlpos + 0.1, mystripc->ylpos - sc);
- plcol(mystripc->collab);
+ plcol0(mystripc->collab);
plptex(mystripc->xlpos + 0.11, mystripc->ylpos - sc,
0., 0., 0, mystripc->legline[i]);
sc += dy;
}
}
plwind(mystripc->xmin, mystripc->xmax, mystripc->ymin, mystripc->ymax);
@@ -184,34 +184,34 @@
PLFLT x[]={0.,1.,1.,0.}, y[]={0.,0.,1.,1.};
/* Set up window */
plvpor(0,1,0,1);
plwind(0,1,0,1);
- plcol(0);plpsty(0);
+ plcol0(0);plpsty(0);
plfill(4, &x[0], &y[0]);
plvsta();
/* Draw box and same window dimensions */
mystrip->wxmin=mystrip->xmin;
mystrip->wxmax=mystrip->xmax;
mystrip->wymin=mystrip->ymin;
mystrip->wymax=mystrip->ymax; /* FIXME - can exist some redundancy here */
plwind(mystrip->xmin, mystrip->xmax, mystrip->ymin, mystrip->ymax);
pllsty(1);
- plcol(mystrip->colbox);
+ plcol0(mystrip->colbox);
plbox(mystrip->xspec, 0.0, 0, mystrip->yspec, 0.0, 0);
- plcol(mystrip->collab);
+ plcol0(mystrip->collab);
pllab(mystrip->labx, mystrip->laby, mystrip->labtop);
for (i=0; i<PEN; i++) {
if (mystrip->npts[i] > 0) {
- plcol(mystrip->colline[i]);pllsty(mystrip->styline[i]);
+ plcol0(mystrip->colline[i]);pllsty(mystrip->styline[i]);
plline(mystrip->npts[i], mystrip->x[i], mystrip->y[i]);
}
}
plstrip_legend(mystrip,0);
}
@@ -269,13 +269,13 @@
if (stripc->xmax - stripc->xmin < stripc->xlen) {
if( yasc == 0) {
/* If user has changed subwindow, make shure we have the correct one */
plvsta();
plwind(stripc->wxmin, stripc->wxmax, stripc->wymin, stripc->wymax); /* FIXME - can exist some redundancy here */
- plcol(stripc->colline[p]); pllsty(stripc->styline[p]);
+ plcol0(stripc->colline[p]); pllsty(stripc->styline[p]);
if ((stripc->npts[p]-2) < 0)
plP_movwor(stripc->x[p][stripc->npts[p]-1], stripc->y[p][stripc->npts[p]-1]);
else
plP_movwor(stripc->x[p][stripc->npts[p]-2], stripc->y[p][stripc->npts[p]-2]);
plP_drawor(stripc->x[p][stripc->npts[p]-1], stripc->y[p][stripc->npts[p]-1]);
plflush();
|
GitWeb