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

com_measure.c com_measure.h commands.c spiceif.c : 

Enable measure all the time
Let new spicefile overwrite the tran struct
This commit is contained in:
stefanjones 2004-10-27 22:14:28 +00:00
parent 9f469e53e2
commit 549e62497a
4 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/frontend/com_measure.c
View File

@ -7,8 +7,6 @@
#include "vectors.h" #include "vectors.h"
#include <math.h> #include <math.h>
#ifdef TCL_MODULE
typedef struct measure typedef struct measure
{ {
char *result; char *result;
@ -940,4 +938,3 @@ void com_measure(wordlist *wl) {
return; return;
} }
#endif

3
src/frontend/com_measure.h
View File

@ -2,9 +2,8 @@
#define _COM_MEASURE_H #define _COM_MEASURE_H
#include <config.h> #include <config.h>
#ifdef TCL_MODULE
void com_measure(wordlist *wl); void com_measure(wordlist *wl);
float get_measure(wordlist *wl); float get_measure(wordlist *wl);
#endif
#endif #endif

8
src/frontend/commands.c
View File

@ -112,15 +112,15 @@ struct comm spcp_coms[] = {
{ 0, 0, 0, 0 }, E_DEFHMASK, 3, LOTS, { 0, 0, 0, 0 }, E_DEFHMASK, 3, LOTS,
(void (*)()) NULL, (void (*)()) NULL,
"spec name pat ... : Redefine vector and plot types.\n" } , "spec name pat ... : Redefine vector and plot types.\n" } ,
{ "measure", com_measure, FALSE, FALSE, TRUE,
{ 041000, 041000, 041000, 041000 }, E_BEGINNING | E_HASPLOTS, 1, LOTS,
arg_plot,
"measure..." },
#ifdef TCL_MODULE #ifdef TCL_MODULE
{ "bltplot", com_bltplot, FALSE, FALSE, TRUE, { "bltplot", com_bltplot, FALSE, FALSE, TRUE,
{ 041000, 041000, 041000, 041000 }, E_BEGINNING | E_HASPLOTS, 1, LOTS, { 041000, 041000, 041000, 041000 }, E_BEGINNING | E_HASPLOTS, 1, LOTS,
arg_plot, arg_plot,
"expr ... [vs expr] [xl xlo xhi] [yl ylo yhi] : Plot things." }, "expr ... [vs expr] [xl xlo xhi] [yl ylo yhi] : Plot things." },
{ "measure", com_measure, FALSE, FALSE, TRUE,
{ 041000, 041000, 041000, 041000 }, E_BEGINNING | E_HASPLOTS, 1, LOTS,
arg_plot,
"measure..." },
{ "plot", com_bltplot, FALSE, FALSE, TRUE, { "plot", com_bltplot, FALSE, FALSE, TRUE,
{ 041000, 041000, 041000, 041000 }, E_BEGINNING | E_HASPLOTS, 1, LOTS, { 041000, 041000, 041000, 041000 }, E_BEGINNING | E_HASPLOTS, 1, LOTS,
arg_plot, arg_plot,

27
src/frontend/spiceif.c
View File

@ -1167,23 +1167,32 @@ do {\
_foo(ckt->CKTbreaks,double,ckt->CKTbreakSize); _foo(ckt->CKTbreaks,double,ckt->CKTbreakSize);
_foo((TSKtask *)ft_curckt->ci_curTask,TSKtask,1); #if 0
_foo((TSKtask *)ft_curckt->ci_curTask,TSKtask,1);
/* To stop the Free */
((TSKtask *)ft_curckt->ci_curTask)->TSKname = NULL; ((TSKtask *)ft_curckt->ci_curTask)->TSKname = NULL;
((TSKtask *)ft_curckt->ci_curTask)->jobs = NULL;
_foo(((TSKtask *)ft_curckt->ci_curTask)->TSKname,char,-1); _foo(((TSKtask *)ft_curckt->ci_curTask)->TSKname,char,-1);
((TSKtask *)ft_curckt->ci_curTask)->jobs = NULL;
_foo(((TRANan *)((TSKtask *)ft_curckt->ci_curTask)->jobs),TRANan,1); _foo(((TRANan *)((TSKtask *)ft_curckt->ci_curTask)->jobs),TRANan,1);
((TSKtask *)ft_curckt->ci_curTask)->jobs->JOBname = NULL;
ckt->CKTcurJob = (JOB *)((TSKtask *)ft_curckt->ci_curTask)->jobs; ((TSKtask *)ft_curckt->ci_curTask)->jobs->JOBname = NULL;
_foo(((TSKtask *)ft_curckt->ci_curTask)->jobs->JOBname,char,-1); _foo(((TSKtask *)ft_curckt->ci_curTask)->jobs->JOBname,char,-1);
#else
{
void *tmp=NULL;
_foo(tmp,TSKtask,1);
_foo(tmp,char,-1);
_foo(tmp,TRANan,1);
_foo(tmp,char,-1);
tfree(tmp);
}
#endif
ckt->CKTcurJob = (JOB *)((TSKtask *)ft_curckt->ci_curTask)->jobs;
((TSKtask *)ft_curckt->ci_curTask)->jobs->JOBnextJob = NULL; ((TRANan *)((TSKtask *)ft_curckt->ci_curTask)->jobs)->TRANplot = NULL;
((TRANan *)((TSKtask *)ft_curckt->ci_curTask)->jobs)->TRANplot = NULL; ((TSKtask *)ft_curckt->ci_curTask)->jobs->JOBnextJob = NULL;
_foo(ckt->CKTstat,STATistics,1); _foo(ckt->CKTstat,STATistics,1);