luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

function rename, Arc() -> DevDrawArc()

This commit is contained in:
rlar 2010-09-08 17:59:00 +00:00
parent 2010672489
commit 984754de75
6 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2010-09-08 Robert Larice
* src/frontend/display.c ,
* src/frontend/display.h ,
* src/frontend/plotting/grid.c ,
* src/frontend/wdisp/windisp.c ,
* src/frontend/wdisp/winprint.c :
function rename, Arc() -> DevDrawArc()
2010-09-08 Robert Larice
* README.adms ,
* autogen.sh ,

2
src/frontend/display.c
View File

@ -209,7 +209,7 @@ void DrawLine(int x1, int y1, int x2, int y2)
}
void Arc(int x0, int y0, int radius, double theta, double delta_theta)
void DevDrawArc(int x0, int y0, int radius, double theta, double delta_theta)
{
(*(dispdev->Arc))(x0, y0, radius, theta, delta_theta);

2
src/frontend/display.h
View File

@ -18,7 +18,7 @@ int NewViewport(GRAPH *pgraph);
void DevClose(void);
void DevClear(void);
void DrawLine(int x1, int y1, int x2, int y2);
void Arc(int x0, int y0, int radius, double theta, double delta_theta);
void DevDrawArc(int x0, int y0, int radius, double theta, double delta_theta);
void Text(char *text, int x, int y);
void DefineColor(int colorid, double red, double green, double blue);
void DefineLinestyle(int linestyleid, int mask);

12
src/frontend/plotting/grid.c
View File

@ -845,7 +845,7 @@ drawpolargrid(GRAPH *graph)
dist = sqrt((double) (relcx * relcx + relcy * relcy));
SetLinestyle(0);
Arc(graph->grid.xaxis.circular.center,
DevDrawArc(graph->grid.xaxis.circular.center,
graph->grid.yaxis.circular.center,
graph->grid.xaxis.circular.radius,
(double) 0.0, 2*M_PI);
@ -1264,7 +1264,7 @@ drawsmithgrid(GRAPH *graph)
SetLinestyle(0);
Arc(gr_xcenter, gr_ycenter, gr_radius, 0.0, 2*M_PI);
DevDrawArc(gr_xcenter, gr_ycenter, gr_radius, 0.0, 2*M_PI);
/*
if ((xoff > - gr_radius) && (xoff < gr_radius)) {
zheight = gr_radius * sin(acos((double) xoff / gr_radius));
@ -1412,7 +1412,7 @@ cliparc(double cx, double cy, double rad, double start, double end, int iclipx,
return(-1);
if (dist + rad < cliprad) {
/* The arc is entirely in the boundary. */
Arc((int)cx, (int)cy, (int)rad, start, end-start);
DevDrawArc((int)cx, (int)cy, (int)rad, start, end-start);
return(flag?start:end);
} else if ((dist - rad >= cliprad) || (rad - dist >= cliprad)) {
/* The arc is outside of the boundary. */
@ -1484,7 +1484,7 @@ cliparc(double cx, double cy, double rad, double start, double end, int iclipx,
start = d;
d = tmp;
}
Arc((int)cx, (int)cy, (int)rad, start, d-start);
DevDrawArc((int)cx, (int)cy, (int)rad, start, d-start);
sclip = start;
eclip = d;
}
@ -1511,7 +1511,7 @@ cliparc(double cx, double cy, double rad, double start, double end, int iclipx,
}
if (in) {
Arc((int)cx, (int)cy, (int)rad, l, d-l);
DevDrawArc((int)cx, (int)cy, (int)rad, l, d-l);
sclip = l;
eclip = d;
}
@ -1521,7 +1521,7 @@ cliparc(double cx, double cy, double rad, double start, double end, int iclipx,
/* And from here to the end. */
if (in) {
Arc((int)cx, (int)cy, (int)rad, d, end-d);
DevDrawArc((int)cx, (int)cy, (int)rad, d, end-d);
/* special case */
if (flag != 2) {
sclip = d;

2
src/frontend/wdisp/windisp.c
View File

@ -765,7 +765,7 @@ int WIN_Arc(int x0, int y0, int radius, double theta, double delta_theta)
/* plot */
NewPen = CreatePen( LType(wd->ColorIndex), linewidth, ColorTable[wd->ColorIndex] );
OldPen = SelectObject(wd->hDC, NewPen);
Arc( wd->hDC, left, yb-top, right, yb-bottom, xs, yb-ys, xe, yb-ye);/*FIXME name clash*/
DevDrawArc( wd->hDC, left, yb-top, right, yb-bottom, xs, yb-ys, xe, yb-ye);/*FIXME name clash*/
OldPen = SelectObject(wd->hDC, OldPen);
DeleteObject( NewPen);

2
src/frontend/wdisp/winprint.c
View File

@ -392,7 +392,7 @@ int WPRINT_Arc(int x0, int y0, int radius, double theta, double delta_theta)
/* Zeichnen */
NewPen = CreatePen( LineTable[pd->LineIndex], 0, ColorTable[ColIndex] );
OldPen = SelectObject(PrinterDC, NewPen);
Arc( PrinterDC, left, yb-top, right, yb-bottom, xs, yb-ys, xe, yb-ye);/*FIXME name clash*/
DevDrawArc( PrinterDC, left, yb-top, right, yb-bottom, xs, yb-ys, xe, yb-ye);/*FIXME name clash*/
OldPen = SelectObject(PrinterDC, OldPen);
DeleteObject( NewPen);