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

Support use of XSPICE event nodes with iplot. 

In graf.c, local function set() is renamed setflag() to avoid conflict
with a newly-visible global function with the same name.
This commit is contained in:
Giles Atkinson 2023-12-29 16:21:53 +00:00 committed by Holger Vogt
parent db39671ae2
commit 1d435daed7
5 changed files with 228 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/frontend/outitf.c
View File

@ -623,6 +623,8 @@ OUTpData(runDesc *plotPtr, IFvalue *refValue, IFvalue *valuePtr)
#endif
/* interpolated batch mode output to file/plot in transient analysis */
if (interpolated && run->circuit->CKTcurJob->JOBtype == 4) {
/* JOBtype == 4 means Transient Analysis. FIX ME */
if (run->writeOut) { /* To file */
InterpFileAdd(run, refValue, valuePtr);
}
@ -630,10 +632,9 @@ OUTpData(runDesc *plotPtr, IFvalue *refValue, IFvalue *valuePtr)
InterpPlotAdd(run, refValue, valuePtr);
}
return OK;
}
} else if (run->writeOut) {
/* standard batch mode output to file */
else if (run->writeOut) {
if (run->pointCount == 1) {
fileInit_pass2(run);
}
@ -737,7 +738,6 @@ OUTpData(runDesc *plotPtr, IFvalue *refValue, IFvalue *valuePtr)
#ifdef TCL_MODULE
blt_add(i, valuePtr->v.vec.rVec [run->data[i].outIndex]);
#endif
}
fileEndPoint(run->fp, run->binary);
@ -1231,12 +1231,9 @@ vlength2delta(int len)
return 1024;
}
static void
plotAddRealValue(dataDesc *desc, double value)
void
AddRealValueToVector(struct dvec *v, double value)
{
struct dvec *v = desc->vec;
#ifdef SHARED_MODULE
if (savenone)
/* always save new data to same location */
@ -1258,6 +1255,11 @@ plotAddRealValue(dataDesc *desc, double value)
v->v_dims[0] = v->v_length; /* va, must be updated */
}
static void
plotAddRealValue(dataDesc *desc, double value)
{
AddRealValueToVector(desc->vec, value);
}
static void
plotAddComplexValue(dataDesc *desc, IFcomplex value)

2
src/frontend/outitf.h
View File

@ -71,5 +71,5 @@ void OUTerrorf(int, const char *fmt, ...) __attribute__ ((format (__printf__, 2
void OUTerrorf(int, const char *fmt, ...);
#endif
void AddRealValueToVector(struct dvec *v, double value);
#endif

228
src/frontend/plotting/graf.c
View File

@ -23,16 +23,19 @@ Author: 1988 Jeffrey M. Hsu
#include "ngspice/grid.h"
#include "ngspice/sim.h"
#include "ngspice/stringskip.h"
#include "ngspice/evtproto.h"
#include "breakp2.h"
#include "display.h"
#include "graf.h"
#include "graphdb.h"
#include "runcoms.h"
#include "terminal.h"
#include "outitf.h"
static void gr_start_internal(struct dvec *dv, bool copyvec);
static void set(struct plot *plot, struct dbcomm *db, bool value, short mode);
static void setflag(struct plot *plot, struct dbcomm *db,
bool value, short mode);
static char *getitright(char *buf, double num);
/* for legends, set in gr_start, reset in gr_iplot and gr_init */
@ -159,6 +162,7 @@ int gr_init(double *xlims, double *ylims, /* The size of the screen. */
/* restore background color from previous graph, e.g. for zooming,
it will be used in NewViewport(graph) */
if (prevgraph > 0) {
pgraph = FindGraph(prevgraph);
if (pgraph)
@ -309,7 +313,8 @@ static void drawLine(int x1, int y1, int x2, int y2, struct dvec *dv)
{
if (LC.dv) {
if (LC.dv != dv) {
fprintf(cp_err, "LC: DV changed!\n");
fprintf(cp_err, "LC: DV changed from %s to %s!\n",
LC.dv->v_name, dv->v_name);
LC_flush();
LC.dv = dv;
}
@ -540,11 +545,11 @@ static void gr_start_internal(struct dvec *dv, bool copyvec)
/* Do something special with poles and zeros. Poles are 'x's, and
* zeros are 'o's. */
if (dv->v_type == SV_POLE) {
dv->v_linestyle = 'x';
return;
}
else if (dv->v_type == SV_ZERO) {
} else if (dv->v_type == SV_ZERO) {
dv->v_linestyle = 'o';
return;
}
@ -553,12 +558,10 @@ static void gr_start_internal(struct dvec *dv, bool copyvec)
if (currentgraph->plottype == PLOT_POINT) {
if (pointchars[cur.linestyle - 1]) {
cur.linestyle++;
}
else {
} else {
cur.linestyle = 2;
}
}
else if ((cur.linestyle > 0) &&
} else if ((cur.linestyle > 0) &&
(++cur.linestyle == dispdev->numlinestyles)) {
cur.linestyle = 2;
}
@ -570,18 +573,19 @@ static void gr_start_internal(struct dvec *dv, bool copyvec)
if (currentgraph->plottype == PLOT_POINT) {
dv->v_linestyle = pointchars[cur.linestyle - 2];
}
else {
} else {
dv->v_linestyle = cur.linestyle;
}
dv->v_color = cur.color;
/* Save the data so we can refresh */
link = TMALLOC(struct dveclist, 1);
link->next = currentgraph->plotdata;
/* Either reuse input vector or copy depnding on copyvec */
if (copyvec) {
link->vector = vec_copy(dv);
/* vec_copy doesn't set v_color or v_linestyle */
@ -589,8 +593,7 @@ static void gr_start_internal(struct dvec *dv, bool copyvec)
link->vector->v_linestyle = dv->v_linestyle;
link->vector->v_flags |= VF_PERMANENT;
link->f_own_vector = TRUE;
}
else {
} else {
link->vector = dv;
link->f_own_vector = FALSE;
}
@ -610,6 +613,7 @@ static void gr_start_internal(struct dvec *dv, bool copyvec)
}
/* Put the legend entry on the screen. */
if (!currentgraph->nolegend)
drawlegend(currentgraph, cur.plotno++, dv);
}
@ -846,6 +850,7 @@ void gr_restoretext(GRAPH *graph)
* XXX Or maybe even something more drastic ??
* It would be better to associate a color with an instance using a
* vector than the vector itself, for which color is something artificial. */
static int iplot(struct plot *pl, struct dbcomm *db)
{
double window;
@ -890,7 +895,9 @@ static int iplot(struct plot *pl, struct dbcomm *db)
strcpy(commandline, "plot ");
index = 5;
resumption = FALSE;
/* Draw the grid for the first time, and plot everything. */
lims = ft_minmax(xs, TRUE);
xlims[0] = lims[0];
xlims[1] = lims[1];
@ -955,7 +962,6 @@ static int iplot(struct plot *pl, struct dbcomm *db)
}
}
inited = 1;
} else {
if (!currentgraph) /* Window was closed? */
return 0;
@ -1034,11 +1040,14 @@ static int iplot(struct plot *pl, struct dbcomm *db)
/* checking for all y values */
for (v = pl->pl_dvecs; v; v = v->v_next) {
int l;
if (!(v->v_flags & VF_PLOT)) {
continue;
}
dy = (isreal(v) ? v->v_realdata[len - 1] :
realpart(v->v_compdata[len - 1]));
l = v->v_length - 1;
dy = (isreal(v) ? v->v_realdata[l] :
realpart(v->v_compdata[l]));
if (ft_grdb) {
fprintf(cp_err, "y = %G\n", dy);
}
@ -1094,12 +1103,65 @@ static int iplot(struct plot *pl, struct dbcomm *db)
#ifndef X_DISPLAY_MISSING
gr_redraw(currentgraph);
#endif
} else {
/* Draw latest point for each vector. */
for (v = pl->pl_dvecs; v; v = v->v_next) {
if (v->v_flags & VF_PLOT) {
if (v->v_flags & VF_EVENT_NODE) {
int last;
if (xs->v_type != SV_TIME) {
/* There will be only one value, ignore. */
continue;
}
last = v->v_length - 1;
if (len > 2 &&
v->v_scale->v_realdata[last] <
xs->v_realdata[len - 1]) {
/* No recent additions to this vector:
* draw/extend horizontal line showing last value.
* The rest is drawn in callback new_event().
*/
gr_point(v,
xs->v_realdata[len - 1],
v->v_realdata[last],
v->v_scale->v_realdata[last],
v->v_realdata[last],
len - 1);
}
} else {
/* Just connect the last two points.
* This won't be done with curve interpolation,
* so it might look funny. */
gr_point(v,
(isreal(xs) ? xs->v_realdata[len - 1] :
realpart(xs->v_compdata[len - 1])),
(isreal(v) ? v->v_realdata[len - 1] :
realpart(v->v_compdata[len - 1])),
(isreal(xs) ? xs->v_realdata[len - 2] :
realpart(xs->v_compdata[len - 2])),
(isreal(v) ? v->v_realdata[len - 2] :
realpart(v->v_compdata[len - 2])),
len - 1);
}
LC_flush(); // Disable line compression here ..
#ifdef LINE_COMPRESSION_CHECKS
LC.dv = NULL; // ... and suppress warnings.
#endif
}
}
#if BAD
}
else {
/* Just connect the last two points. This won't be done
* with curve interpolation, so it might look funny. */
for (v = pl->pl_dvecs; v; v = v->v_next) {
if (v->v_flags & VF_PLOT) {
if ((v->v_flags & VF_PLOT) && !(v->v_flags & VF_EVENT_NODE)) {
gr_point(v,
(isreal(xs) ? xs->v_realdata[len - 1] :
realpart(xs->v_compdata[len - 1])),
@ -1116,6 +1178,7 @@ static int iplot(struct plot *pl, struct dbcomm *db)
#endif
}
}
#endif // BAD
}
}
DevUpdate();
@ -1123,7 +1186,8 @@ static int iplot(struct plot *pl, struct dbcomm *db)
}
static void set(struct plot *plot, struct dbcomm *db, bool value, short mode)
static void setflag(struct plot *plot, struct dbcomm *db,
bool value, short mode)
{
struct dvec *v;
struct dbcomm *dc;
@ -1176,16 +1240,72 @@ static char *getitright(char *buf, double num)
}
}
static int hit, hit2;
void reset_trace(void)
{
hit = -1;
hit2 = -1;
}
/* This function is called from XSPICE whan an event node that is
* being i-plotted has a confirmed new value.
*/
#ifdef XSPICE
static Mif_Boolean_t new_event(double when, Mif_Value_t *val,
void *ctx, int is_last)
{
struct dbcomm *db = (struct dbcomm *)ctx;
struct dvec *v;
int last;
if (db->db_type == DB_DEADIPLOT)
return MIF_TRUE;
v = vec_fromplot(db->db_nodename1, plot_cur);
if (!v || !v->v_scale)
return MIF_TRUE;
/* Extend vectors. */
last = v->v_length - 1;
AddRealValueToVector(v->v_scale, when);
AddRealValueToVector(v->v_scale, when);
AddRealValueToVector(v, v->v_realdata[last]);
AddRealValueToVector(v, val->rvalue);
if (db->db_graphid) {
GRAPH *gr;
gr = FindGraph(db->db_graphid);
if (gr) {
PushGraphContext(gr);
/* Draw horizontal and vertical lines. */
gr_point(v, when, v->v_realdata[last],
v->v_scale->v_realdata[last], v->v_realdata[last],
last > 0);
gr_point(v, when, val->rvalue, when, v->v_realdata[last], 1);
if (is_last) {
struct dvec *xs;
/* Extend horizontally to the end of the time-step. */
xs = v->v_plot->pl_scale;
gr_point(v, xs->v_realdata[xs->v_length - 1], val->rvalue,
when, val->rvalue, 1);
}
LC_flush();
#ifdef LINE_COMPRESSION_CHECKS
LC.dv = NULL; // ... and suppress warnings.
#endif
PopGraphContext();
}
}
return MIF_FALSE;
}
#endif
void gr_iplot(struct plot *plot)
{
@ -1203,6 +1323,57 @@ void gr_iplot(struct plot *plot)
hit = 0;
for (db = dbs; db; db = db->db_next) {
if (db->db_type == DB_IPLOT || db->db_type == DB_IPLOTALL) {
#ifdef XSPICE
if (db->db_iteration == 0) {
struct dvec *v;
/* First call: find any XSPICE event nodes in the node
* list and set up plotting. There is a parallel path
* for pushing new event values into their corresponding
* vectors and plotting them.
*/
for (dc = db; dc; dc = dc->db_also) {
struct dbcomm *dd;
int dup = 0;
if (dc->db_nodename1 == NULL)
continue;
/* Duplicated names will corrupt the plot. */
for (dd = db; dd != dc; dd = dd->db_also) {
if (!strcmp(dc->db_nodename1, dd->db_nodename1)) {
dup = 1;
break;
}
}
if (dup)
continue;
v = vec_fromplot(dc->db_nodename1, plot);
if (!v) {
fprintf(cp_err,
"Warning: node %s non-existent in %s.\n",
dc->db_nodename1, plot->pl_name);
}
if (v && (v->v_flags & VF_EVENT_NODE)) {
if ((v->v_flags & VF_PERMANENT) == 0) {
vec_new(v);
v->v_flags |= VF_PERMANENT; // Make it findable.
if (v->v_scale) {
v->v_scale->v_flags |= VF_PERMANENT;
vec_new(v->v_scale);
}
}
EVTnew_value_call(dc->db_nodename1, new_event,
Evt_Cbt_Plot, dc);
}
}
db->db_iteration = 1;
}
#endif
if (db->db_graphid) {
GRAPH *gr;
@ -1214,16 +1385,20 @@ void gr_iplot(struct plot *plot)
/* Temporarily set plot flag on matching vector. */
set(plot, db, TRUE, VF_PLOT);
setflag(plot, db, TRUE, VF_PLOT);
dontpop = 0;
if (iplot(plot, db)) {
/* graph just assigned */
db->db_graphid = currentgraph->graphid;
/* Graph just assigned, place id into every struct dbcomm
* as event nodes need that.
*/
for (dc = db; dc; dc = dc->db_also)
dc->db_graphid = currentgraph->graphid;
dontpop = 1;
}
set(plot, db, FALSE, VF_PLOT);
setflag(plot, db, FALSE, VF_PLOT);
if (!dontpop && db->db_graphid)
PopGraphContext();
@ -1233,7 +1408,7 @@ void gr_iplot(struct plot *plot)
struct dvec *v, *u;
int len;
set(plot, db, TRUE, VF_PRINT);
setflag(plot, db, TRUE, VF_PRINT);
len = plot->pl_scale->v_length;
@ -1289,7 +1464,7 @@ void gr_iplot(struct plot *plot)
printf("\n");
}
}
set(plot, db, FALSE, VF_PRINT);
setflag(plot, db, FALSE, VF_PRINT);
}
}
}
@ -1323,11 +1498,12 @@ void gr_end_iplot(void)
}
}
else if (db->db_type == DB_IPLOT || db->db_type == DB_IPLOTALL) {
db->db_iteration = 0; // Reset XSPICE event plotting
if (db->db_graphid) {
/* get private copy of dvecs */
graph = FindGraph(db->db_graphid);
graph = FindGraph(db->db_graphid);
link = graph->plotdata;
while (link) {

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

@ -228,8 +228,15 @@ int DestroyGraph(int id)
if (db && (db->db_type == DB_IPLOT ||
db->db_type == DB_IPLOTALL)) {
/* Delete this later, after marking as dead.
* Entries on the node mlist are marked to terminate
* any XSPICE callbacks for event nodes.
*/
do {
db->db_type = DB_DEADIPLOT;
/* Delete this later */
db = db->db_also;
} while (db);
return 0;
}
@ -370,6 +377,3 @@ void PopGraphContext(void)
gcstacktop = gcstacktop->next;
txfree(dead); /* free allocation */
} /* end of function PopGraphContext */

2
src/xspice/idn/idndig.c
View File

@ -210,7 +210,7 @@ static void idn_digital_plot_val(void *evt_struct, char *member, double *val)
/* Output a value for the requested member of the digital struct */
if(strcmp(member,"strength") == 0) {
if (member && strcmp(member,"strength") == 0) {
/* Choose values that will not make plots lie on state plots */
switch(dig_struct->strength) {