From e652a0e48d25bc01f230426b888f74f57e356ff2 Mon Sep 17 00:00:00 2001 From: h_vogt Date: Sat, 23 Mar 2013 11:03:08 +0100 Subject: [PATCH] Separate progress report from having Windows GUI --- src/frontend/inp.c | 2 +- src/frontend/measure.c | 2 +- src/frontend/spec.c | 2 +- src/spicelib/analysis/acan.c | 4 ++-- src/spicelib/analysis/cktop.c | 2 +- src/spicelib/analysis/cktsetup.c | 2 +- src/spicelib/analysis/dcpss.c | 2 +- src/spicelib/analysis/dctran.c | 2 +- src/spicelib/analysis/dctrcurv.c | 6 +++--- src/spicelib/parser/inppas2.c | 6 +++--- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/frontend/inp.c b/src/frontend/inp.c index b6605fabe..00ba77153 100644 --- a/src/frontend/inp.c +++ b/src/frontend/inp.c @@ -493,7 +493,7 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile) Go on if there is something left after the controls.*/ if (deck->li_next) { fprintf(cp_out, "\nCircuit: %s\n\n", tt); -#ifdef HAS_WINGUI +#ifdef HAS_PROGREP SetAnalyse("Prepare Deck", 0); #endif /* Now expand subcircuit macros and substitute numparams.*/ diff --git a/src/frontend/measure.c b/src/frontend/measure.c index b97b0349f..f74fb821c 100644 --- a/src/frontend/measure.c +++ b/src/frontend/measure.c @@ -221,7 +221,7 @@ do_measure( wordlist *measure_word_list; int precision = measure_get_precision(); -#ifdef HAS_WINGUI +#ifdef HAS_PROGREP if (!chk_only) SetAnalyse("meas", 0); #endif diff --git a/src/frontend/spec.c b/src/frontend/spec.c index 82d073706..2152eaafc 100644 --- a/src/frontend/spec.c +++ b/src/frontend/spec.c @@ -264,7 +264,7 @@ com_spec(wordlist *wl) fdvec[i][j].cx_imag += value*sina; } } -#ifdef HAS_WINGUI +#ifdef HAS_PROGREP SetAnalyse("spec", (int)(j * 1000./ fpts)); #endif } diff --git a/src/spicelib/analysis/acan.c b/src/spicelib/analysis/acan.c index f5106649a..2e0ad1e94 100644 --- a/src/spicelib/analysis/acan.c +++ b/src/spicelib/analysis/acan.c @@ -340,7 +340,7 @@ ACan(CKTcircuit *ckt, int restart) case OCTAVE: /* inserted again 14.12.2001 */ -#ifdef HAS_WINGUI +#ifdef HAS_PROGREP { double endfreq = job->ACstopFreq; double startfreq = job->ACstartFreq; @@ -359,7 +359,7 @@ ACan(CKTcircuit *ckt, int restart) break; case LINEAR: -#ifdef HAS_WINGUI +#ifdef HAS_PROGREP { double endfreq = job->ACstopFreq; double startfreq = job->ACstartFreq; diff --git a/src/spicelib/analysis/cktop.c b/src/spicelib/analysis/cktop.c index 3dd8c4879..403b2c389 100644 --- a/src/spicelib/analysis/cktop.c +++ b/src/spicelib/analysis/cktop.c @@ -22,7 +22,7 @@ CKTop (CKTcircuit * ckt, long int firstmode, long int continuemode, int iterlim) { int converged; -#ifdef HAS_WINGUI +#ifdef HAS_PROGREP SetAnalyse("op", 0); #endif ckt->CKTmode = firstmode; diff --git a/src/spicelib/analysis/cktsetup.c b/src/spicelib/analysis/cktsetup.c index 28fa71359..49a99d80d 100644 --- a/src/spicelib/analysis/cktsetup.c +++ b/src/spicelib/analysis/cktsetup.c @@ -68,7 +68,7 @@ CKTsetup(CKTcircuit *ckt) #endif for (i=0;iDEVsetup && ckt->CKThead[i] ) { diff --git a/src/spicelib/analysis/dcpss.c b/src/spicelib/analysis/dcpss.c index 0619bafde..1e64514d1 100644 --- a/src/spicelib/analysis/dcpss.c +++ b/src/spicelib/analysis/dcpss.c @@ -1147,7 +1147,7 @@ resume: } } #endif -#ifdef HAS_WINGUI +#ifdef HAS_PROGREP if (ckt->CKTtime == 0.) SetAnalyse( "tran init", 0); else if ((pss_state != PSS) && (shooting_cycle_counter > 0)) diff --git a/src/spicelib/analysis/dctran.c b/src/spicelib/analysis/dctran.c index b5eae3210..1ac307f4a 100644 --- a/src/spicelib/analysis/dctran.c +++ b/src/spicelib/analysis/dctran.c @@ -504,7 +504,7 @@ resume: } } #endif -#ifdef HAS_WINGUI +#ifdef HAS_PROGREP if (ckt->CKTtime == 0.) SetAnalyse( "tran init", 0); else diff --git a/src/spicelib/analysis/dctrcurv.c b/src/spicelib/analysis/dctrcurv.c index a6062e4b7..49e4742b9 100644 --- a/src/spicelib/analysis/dctrcurv.c +++ b/src/spicelib/analysis/dctrcurv.c @@ -24,7 +24,7 @@ Modified: 1999 Paolo Nenzi #include "ngspice/devdefs.h" -#ifdef HAS_WINGUI +#ifdef HAS_PROGREP static double actval, actdiff; #endif @@ -166,7 +166,7 @@ DCtrCurv(CKTcircuit *ckt, int restart) found:; } -#ifdef HAS_WINGUI +#ifdef HAS_PROGREP actval = job->TRCVvStart[job->TRCVnestLevel]; actdiff = job->TRCVvStart[job->TRCVnestLevel] - job->TRCVvStop[job->TRCVnestLevel]; #endif @@ -518,7 +518,7 @@ nextstep:; job->TRCVnestState = i; return(E_PAUSE); } -#ifdef HAS_WINGUI +#ifdef HAS_PROGREP if (i == job->TRCVnestLevel) { actval += job->TRCVvStep[job->TRCVnestLevel]; SetAnalyse( "dc", abs((int)(actval * 1000. / actdiff))); diff --git a/src/spicelib/parser/inppas2.c b/src/spicelib/parser/inppas2.c index 8eb431e1f..598866810 100644 --- a/src/spicelib/parser/inppas2.c +++ b/src/spicelib/parser/inppas2.c @@ -32,7 +32,7 @@ void INPpas2(CKTcircuit *ckt, card * data, INPtables * tab, TSKtask *task) char *gname; CKTnode *gnode; int error; /* used by the macros defined above */ -#ifdef HAS_WINGUI +#ifdef HAS_PROGREP int linecount = 0, actcount = 0; #endif @@ -68,7 +68,7 @@ void INPpas2(CKTcircuit *ckt, card * data, INPtables * tab, TSKtask *task) #endif -#ifdef HAS_WINGUI +#ifdef HAS_PROGREP for (current = data; current != NULL; current = current->nextcard) linecount++; #endif @@ -80,7 +80,7 @@ void INPpas2(CKTcircuit *ckt, card * data, INPtables * tab, TSKtask *task) printf("In INPpas2, examining card %s . . .\n", current->line); #endif -#ifdef HAS_WINGUI +#ifdef HAS_PROGREP if (linecount > 0) { SetAnalyse( "Circuit2", (int) (1000.*actcount/linecount)); actcount++;