diff --git a/ChangeLog b/ChangeLog index 428e3ffa2..06326c0b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2011-03-18 Dietmar Warning + * frontend/typedefs.c, outitf.c: bug no. 3214252 fixed + 2011-03-16 Dietmar Warning * plotit.c: fix the wrong x-axis label for temp-sweep and res-sweep by using macros SV_XXX for vector types diff --git a/src/frontend/outitf.c b/src/frontend/outitf.c index 6cb869763..7a93d7a3a 100644 --- a/src/frontend/outitf.c +++ b/src/frontend/outitf.c @@ -966,6 +966,14 @@ plotInit(runDesc *run) v->v_type = SV_TIME; else if (cieq(v->v_name, "frequency")) v->v_type = SV_FREQUENCY; + else if (cieq(v->v_name, "onoise_spectrum")) + v->v_type = SV_OUTPUT_N_DENS; + else if (cieq(v->v_name, "onoise_integrated")) + v->v_type = SV_OUTPUT_NOISE; + else if (cieq(v->v_name, "inoise_spectrum")) + v->v_type = SV_INPUT_N_DENS; + else if (cieq(v->v_name, "inoise_integrated")) + v->v_type = SV_INPUT_NOISE; else if (cieq(v->v_name, "temp-sweep")) v->v_type = SV_TEMP; else if (cieq(v->v_name, "res-sweep")) diff --git a/src/frontend/typesdef.c b/src/frontend/typesdef.c index 7d014f890..f178c6bfe 100644 --- a/src/frontend/typesdef.c +++ b/src/frontend/typesdef.c @@ -29,7 +29,7 @@ struct plotab { char *p_pattern; }; -/* note: This should correspond to SV_ defined in FTEconstant.h */ +/* note: This should correspond to SV_ defined in sim.h */ struct type types[NUMTYPES] = { { "notype", NULL } , { "time", "s" } , @@ -40,19 +40,16 @@ struct type types[NUMTYPES] = { { "onoise-integrated", "V or A" } , { "inoise-spectrum", "(V or A)^2/Hz" } , { "inoise-integrated", "V or A" } , - /* { "output-noise", NULL } , */ - /* { "input-noise", NULL } , */ { "pole", NULL } , { "zero", NULL } , { "s-param", NULL } , { "temp-sweep", "Celsius" } ,/* Added by HT */ - - { "res-sweep", "Ohms" } ,/* Added by HT */ - { "impedance", "Ohms" } ,/* Added by A.Roldan */ - { "admittance", "Mhos" } ,/* Added by A.Roldan */ - { "power", "W" } , /* Added by A.Roldan */ - { "phase", "Degree" } , /* Added by A.Roldan */ - { "decibel", "dB" } , /* Added by A.Roldan */ + { "res-sweep", "Ohms" } , /* Added by HT */ + { "impedance", "Ohms" } , /* Added by A.Roldan */ + { "admittance", "Mhos" } , /* Added by A.Roldan */ + { "power", "W" } , /* Added by A.Roldan */ + { "phase", "Degree" } , /* Added by A.Roldan */ + { "decibel", "dB" } , /* Added by A.Roldan */ } ;