From b87be59459362c07ea15ee6a9165f10ffff10e88 Mon Sep 17 00:00:00 2001 From: raimi Date: Wed, 18 Jan 2006 07:31:58 +0000 Subject: [PATCH] 2006-01-18 Stefan Jahn * qucs-filter/qf_filter.cpp: Lowpass/Highpass/Bandpass of Cauer filter now quite like working. * qucs-filter/qf_cauer.cpp: Fixed bug in bandpass/bandstop generation. --- ChangeLog | 8 ++ qucs-filter/qf_cauer.cpp | 4 +- qucs-filter/qf_filter.cpp | 269 +++++++++++++++++++++++-------------- qucs-filter/qf_filter.h | 5 + qucs-filter/qucsfilter.cpp | 11 +- qucs-filter/qucsfilter.h | 2 +- 6 files changed, 189 insertions(+), 110 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6007ba5..294f5a0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-01-18 Stefan Jahn + + * qucs-filter/qf_filter.cpp: Lowpass/Highpass/Bandpass of + Cauer filter now quite like working. + + * qucs-filter/qf_cauer.cpp: Fixed bug in bandpass/bandstop + generation. + 2006-01-16 Stefan Jahn * qucs-filter/qf_filter.cpp: Preliminary support for Cauer diff --git a/qucs-filter/qf_cauer.cpp b/qucs-filter/qf_cauer.cpp index badd0909..e46408a2 100644 --- a/qucs-filter/qf_cauer.cpp +++ b/qucs-filter/qf_cauer.cpp @@ -409,7 +409,7 @@ void qf_cauer::synth (qft type) { case BANDPASS: { // We double the number of components ncomp = 3 * o - 1; - qfc * Comp2 = (qfc *) malloc (sizeof (double) * ncomp); + qfc * Comp2 = (qfc *) malloc (sizeof (qfc) * ncomp); double q = f / bw; for (unsigned i = 0, j = 0, node = 1;;) { @@ -471,7 +471,7 @@ void qf_cauer::synth (qft type) { } case BANDSTOP: { ncomp = 3 * o - 1; - qfc * Comp2 = (qfc *) malloc (sizeof (double) * ncomp); + qfc * Comp2 = (qfc *) malloc (sizeof (qfc) * ncomp); double q = f / bw; for (unsigned i = 0, j = 0, node = 1;;) { diff --git a/qucs-filter/qf_filter.cpp b/qucs-filter/qf_filter.cpp index 80da9feb..6c466170 100644 --- a/qucs-filter/qf_filter.cpp +++ b/qucs-filter/qf_filter.cpp @@ -100,6 +100,37 @@ void qf_filter::extract_pole_pCsLC (double p, qfc * pComp, double Ws) { BD.disp ("BD"); } +// User readable value string. +std::string qf_filter::num2str (double num) { + char c = 0; + double cal = fabs(num); + if(cal > 1e-20) { + cal = log10(cal) / 3.0; + if(cal < -0.2) cal -= 0.98; + int expo = int(cal); + + if(expo >= -5) if(expo <= 4) + switch(expo) { + case -5: c = 'f'; break; + case -4: c = 'p'; break; + case -3: c = 'n'; break; + case -2: c = 'u'; break; + case -1: c = 'm'; break; + case 1: c = 'k'; break; + case 2: c = 'M'; break; + case 3: c = 'G'; break; + case 4: c = 'T'; break; + } + + if(c) num /= pow(10.0, double(3*expo)); + } + + std::stringstream str; + str << num; + if(c) str << c; + return str.str(); +} + // Dumps a filter to std::cout void qf_filter::dump_cout (void) { std::string unit; @@ -218,90 +249,133 @@ void qf_filter::dump_spice (void) { std::string qf_filter::to_qucs (void) { std::ostringstream res; + std::ostringstream wir; double Value, Value2; // create the Qucs schematic res << "\n"; - int x = 20; - if(type != BANDPASS) x += 40; + int x2, x = 20 + 40; res << "\n"; res << "\n"; res << "\n"; int yc = 320, yl = 240; - unsigned int i, j=0; - for(i = 0; i < o; i++) { - x = 100 +((i+1) * 70); + unsigned int i, j = 0, k = o, repser = 0; - if(Comp[j].comp == CAP) - res << "\n" + << "<" << x << " 240 " << x2 << " 240 \"\" 0 0 0>\n"; - if(Comp[j].node2 == 0) - res << " " << yc << " 17 -26 0 1"; - else - res << " " << yl << " -26 10 0 0"; - res << " \"" << Comp[j].val; + x = 170; + if (type == BANDPASS) k = o * 2; + for(i = 0; i < k; i++) { + // find series components to ground + unsigned int a = j; + while (Comp[a].node2 != 0) { + if (a+1 < ncomp && Comp[a].node2 == Comp[a+1].node1 && + Comp[a].comp != Comp[a+1].comp) + a++; + else + break; + } + // handle series components to ground + if (Comp[a].node2 == 0) { + // wire down to shunt components + wir << "<" << x << " 240 " << x << " 290 \"\" 0 0 0>\n"; + wir << "<" << x-35 << " 240 " << x+35 << " 240 \"\" 0 0 0>\n"; + unsigned int b, c; + for (c = 0, b = j; b <= a; b++, c++) { + // type of component + switch(Comp[b].comp) { + case CAP: res << "\n"; + // value of component + res << " \"" << num2str(Comp[b].val).c_str(); + switch(Comp[b].comp) { + case CAP: res << "F"; break; + case IND: res << "H"; break; + case RES: res << "Ohm"; break; + } + res << "\" 1>\n"; + } + // place ground symbol here + res << "\n"; + j = a + 1; + repser = 0; + } + // handle parallel components in series + else { + if (repser) x += 35; + // connect in series + if (i != 0) + wir << "<" << x-70 << " 240 " << x-30 << " 240 \"\" 0 0 0>\n"; + if (i != k - 1) + wir << "<" << x+70 << " 240 " << x+30 << " 240 \"\" 0 0 0>\n"; + unsigned int b = j, c = 0; + do { + // type of component + switch(Comp[b].comp) { + case CAP: res << "\n" + << "<" << x+30 << " " << yl + << " " << x+30 << " " << yl-c*35 << " \"\" 0 0 0>\n"; + } + else + res << "10"; + res << " 0 0"; - if(Comp[j].node2 == 0) - res << "\n"; - - j++; - if(j >= ncomp) break; - if(Comp[j].node1 != Comp[j-1].node1) continue; - if(Comp[j].node2 != Comp[j-1].node2) continue; - - - // second component parallel to the last - if(Comp[j].comp == CAP) - res << "\n"; - - if(Comp[j].node2 == 0) - res << "\n"; - - j++; + // value of commponent + res << " \"" << num2str(Comp[b].val).c_str(); + switch(Comp[b].comp) { + case CAP: res << "F"; break; + case IND: res << "H"; break; + case RES: res << "Ohm"; break; + } + res << "\" 1>\n"; + b++; + c++; + } + while (b < ncomp && Comp[b-1].node1 == Comp[b].node1 && + Comp[b-1].node2 == Comp[b].node2); + j = b; + repser++; + } + if (j >= ncomp) break; + x += 70; } - - if(o & 1) x += 110; - else x += 70; + if(o & 1) + x += 110; + else + x += 70; res << "\n" << "\n"; yc += 100; + if (type == HIGHPASS) yc += 40; Value = f / 10.0; - if((type == BANDPASS) || (type == BANDSTOP)) - Value2 = 10.0 * (f + bw); - else - Value2 = 10.0 *f; + Value2 = 10.0 * f; res << "<.SP SP1 1 70 " << yc << " 0 50 0 0 \"log\" 1 \"" - << Value << "Hz\" 1 \"" << Value2 + << num2str(Value).c_str() << "Hz\" 1 \"" << num2str(Value2).c_str() << "Hz\" 1 \"200\" 1 \"no\" 0 \"1\" 0 \"2\" 0>\n" << "\n" @@ -309,63 +383,50 @@ std::string qf_filter::to_qucs (void) { res << "\n"; - // connect left source - x = 20; - if(type != BANDPASS) x += 40; - res << "<" << x << " 240 " << x << " 290 \"\" 0 0 0>\n" - << "<" << x << " 240 170 240 \"\" 0 0 0>\n"; - - // wires down to shunt components - for(i = 0; i < (o / 2) + 1; i++) { - x = 170 + (i * 140); - res << "<" << x << " 240 " << x << " 290 \"\" 0 0 0>\n"; - } - - // horizontal wires for series components - if(type == BANDPASS) { - for(i = 0; i < (o / 2); i++) { - x = 170 + (i * 140); - res << "<" << x << " 240 " << (x+20) << " 240 \"\" 0 0 0>\n" - << "<" << (x-30) << " 290 " << x << " 290 \"\" 0 0 0>\n" - << "<" << (x-30) << " 350 " << x << " 350 \"\" 0 0 0>\n"; - } - if(o & 1) - res << "<" << (x+110) << " 290 " << (x+140) << " 290 \"\" 0 0 0>\n" - << "<" << (x+110) << " 350 " << (x+140) << " 350 \"\" 0 0 0>\n"; - } - else - for(i = 0; i < (o / 2); i++) { - x = 170 + (i * 140); - res << "<" << x << " 240 " << (x+40) << " 240 \"\" 0 0 0>\n" - << "<" << (x+100) << " 240 " << (x+140) << " 240 \"\" 0 0 0>\n"; -// if(type == BANDSTOP) - // connect parallel components - res << "<" << (x+40) << " 240 " << (x+40) << " 205 \"\" 0 0 0>\n" - << "<" << (x+100) << " 240 " << (x+100) << " 205 \"\" 0 0 0>\n"; - } + // internal wires + res << wir.str().c_str(); // connect right source - if(o & 1) { - x += 140 + 110; - res << "<" << x << " 240 " << x << " 290 \"\" 0 0 0>\n" - << "<" << (x-110) << " 240 " << x << " 240 \"\" 0 0 0>\n"; - } + x2 = x - 110; + if(type == HIGHPASS) x2 += 30; + res << "<" << x << " 240 " << x << " 290 \"\" 0 0 0>\n" + << "<" << x2 << " 240 " << x << " 240 \"\" 0 0 0>\n"; + res << "\n" << "\n" << "\n" << "\n"; - res << "\n"; diff --git a/qucs-filter/qf_filter.h b/qucs-filter/qf_filter.h index 00226be1..aba2c15e 100644 --- a/qucs-filter/qf_filter.h +++ b/qucs-filter/qf_filter.h @@ -99,12 +99,17 @@ public: // This one extracts a finite pole of transmission void extract_pole_pCsLC (double, qfc *, double); + int order (void) { return o; } virtual void synth (qft) = 0; // Synthesize filter + std::string to_qucs (void); // Outputs Qucs std::string to_spice (void); // Outputs SPICE void dump_qucs (void); // Outputs Qucs to std::cout void dump_spice (void); // Outputs SPICE to std::cout void dump_cout (void); // Outputs to std::cout + +private: + std::string num2str (double); }; #endif // _QF_FILTER_H diff --git a/qucs-filter/qucsfilter.cpp b/qucs-filter/qucsfilter.cpp index cc7cfc7e..21046482 100644 --- a/qucs-filter/qucsfilter.cpp +++ b/qucs-filter/qucsfilter.cpp @@ -94,8 +94,8 @@ QucsFilter::QucsFilter() IntVal = new QIntValidator(1, 200, this); DoubleVal = new QDoubleValidator(this); - QLabel *Label3 = new QLabel(tr("Order:"), this); - gbox->addWidget(Label3, 3,0); + LabelOrder = new QLabel(tr("Order:"), this); + gbox->addWidget(LabelOrder, 3,0); EditOrder = new QLineEdit("3", this); EditOrder->setValidator(IntVal); gbox->addWidget(EditOrder, 3,1); @@ -264,7 +264,8 @@ QString * QucsFilter::calculateFilter(struct tFilter * Filter) break; } if (F) { - //F->dump_qucs(); + //F->dump(); + EditOrder->setText(QString::number(F->order())); s = new QString(F->to_qucs().c_str()); delete F; } @@ -372,6 +373,8 @@ void QucsFilter::slotTypeChanged(int index) break; } if (index == TYPE_CAUER) { + LabelOrder->setEnabled(false); + EditOrder->setEnabled(false); LabelAtten->setEnabled(true); EditAtten->setEnabled(true); LabelAtten_dB->setEnabled(true); @@ -380,6 +383,8 @@ void QucsFilter::slotTypeChanged(int index) ComboBandStop->setEnabled(true); } else { + LabelOrder->setEnabled(true); + EditOrder->setEnabled(true); LabelAtten->setEnabled(false); EditAtten->setEnabled(false); LabelAtten_dB->setEnabled(false); diff --git a/qucs-filter/qucsfilter.h b/qucs-filter/qucsfilter.h index a3b2e77f..c2019908 100644 --- a/qucs-filter/qucsfilter.h +++ b/qucs-filter/qucsfilter.h @@ -65,7 +65,7 @@ private: QLineEdit *EditOrder, *EditCorner, *EditStop, *EditRipple, *EditImpedance; QLineEdit *EditAtten, *EditBandStop; QLabel *LabelRipple, *LabelRipple_dB, *LabelStart, *LabelStop, *LabelResult; - QLabel *LabelAtten, *LabelAtten_dB, *LabelBandStop; + QLabel *LabelAtten, *LabelAtten_dB, *LabelBandStop, *LabelOrder; QIntValidator *IntVal; QDoubleValidator *DoubleVal; };