SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Magic numbers replaced by Enums and removed debug printing

Browse Source
This commit is contained in:
Vadim Kuznetzov 2014-07-22 19:15:13 +04:00 committed by Guilherme Brondani Torri
parent b84ae9f962
commit 32c519fd2e
6 changed files with 40 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qucs-activefilter/filter.cpp
View File

@ -53,11 +53,6 @@ void Filter::createSchematic(QString &s)
default: break;
}
/*QFile sch("filter.sch");
sch.open(QFile::WriteOnly);
QTextStream out(&sch);
out<<s;
sch.close();*/
}
void Filter::createHighPassSchematic(QString &s)
@ -156,7 +151,7 @@ void Filter::calcFirstOrder()
R1 = 1.0/(Wc*C*C1);
}
qDebug()<<C;
//qDebug()<<C;
if (Kv != 1.0) {
R2 = Kv*R1/(Kv - 1);

6
qucs-activefilter/mfbfilter.cpp
View File

@ -63,7 +63,6 @@ void MFBfilter::createLowPassSchematic(QString &s)
s += QString("<GND * 1 %1 360 0 0 0 0>\n").arg(70+dx);
for (int i=1; i<=N2ord; i++) {
stage = Sections.at(i-1);
qDebug()<<stage.N;
QString suffix1, suffix2;
float C1 = autoscaleCapacitor(stage.C1,suffix1);
float C2 = autoscaleCapacitor(stage.C2,suffix2);
@ -138,7 +137,6 @@ void MFBfilter::createHighPassSchematic(QString &s)
s += QString("<GND * 1 %1 360 0 0 0 0>\n").arg(70+dx);
for (int i=1; i<=N2ord; i++) {
stage = Sections.at(i-1);
qDebug()<<stage.N;
QString suffix1, suffix2;
float C1 = autoscaleCapacitor(stage.C1,suffix1);
float C2 = autoscaleCapacitor(stage.C2,suffix2);
@ -206,8 +204,6 @@ void MFBfilter::calcHighPass()
float B = -2.0*re;
float C = re*re + im*im;
qDebug()<<B<<C;
C1 = 10.0/Fc;
C2 = C1/Kv;
R1 = B/((2*C1+C2)*Wc);
@ -240,8 +236,6 @@ void MFBfilter::calcLowPass()
float B = -2.0*re;
float C = re*re + im*im;
qDebug()<<B<<C;
C2 = (10.0/Fc);
C1 = (B*B*C2)/(4*C*(Kv+1));
R2 = (2*(Kv+1))/(Wc*(B*C2+sqrt(B*B*C2*C2-4*C*C1*C2*(Kv+1))));

63
qucs-activefilter/qucsactivefilter.cpp
View File

@ -247,18 +247,18 @@ void QucsActiveFilter::slotCalcSchematic()
Filter::FilterFunc ffunc;
switch (cbxFilterFunc->currentIndex()) {
case 0 : ffunc = Filter::Butterworth;
case funcButterworth : ffunc = Filter::Butterworth;
break;
case 1 : ffunc = Filter::Chebyshev;
case funcChebyshev : ffunc = Filter::Chebyshev;
break;
case 2 : ffunc = Filter::InvChebyshev;
case funcInvChebyshev : ffunc = Filter::InvChebyshev;
break;
case 3 : ffunc = Filter::Cauer;
case funcCauer : ffunc = Filter::Cauer;
break;
case 4 : ffunc = Filter::Bessel;
case funcBessel : ffunc = Filter::Bessel;
par.order = edtOrder->text().toInt();
break;
case 5 : ffunc = Filter::User;
case funcUser : ffunc = Filter::User;
break;
default: ffunc = Filter::NoFunc;
break;
@ -267,13 +267,13 @@ void QucsActiveFilter::slotCalcSchematic()
switch (cbxResponse->currentIndex()) {
case 0 : ftyp = Filter::LowPass;
case tLowPass : ftyp = Filter::LowPass;
break;
case 1 : ftyp = Filter::HighPass;
case tHiPass : ftyp = Filter::HighPass;
break;
case 2 : ftyp = Filter::BandPass;
case tBandPass : ftyp = Filter::BandPass;
break;
case 3 : ftyp = Filter::BandStop;
case tBandStop : ftyp = Filter::BandStop;
break;
default: ftyp = Filter::NoFilter;
break;
@ -283,7 +283,7 @@ void QucsActiveFilter::slotCalcSchematic()
bool ok = false;
switch (cbxFilterType->currentIndex()) {
case 2 : {
case topoCauer : {
if (((ffunc==Filter::InvChebyshev)||(ffunc==Filter::Cauer))) {
SchCauer cauer(ffunc,ftyp,par);
ok = cauer.calcFilter();
@ -303,7 +303,7 @@ void QucsActiveFilter::slotCalcSchematic()
}
break;
case 0 : {
case topoMFB : {
if (!((ffunc==Filter::InvChebyshev)||(ffunc==Filter::Cauer))) {
MFBfilter mfb(ffunc,ftyp,par);
if (ffunc==Filter::User) {
@ -325,7 +325,7 @@ void QucsActiveFilter::slotCalcSchematic()
}
}
break;
case 1 : {
case topoSallenKey : {
SallenKey sk(ffunc,ftyp,par);
if (ffunc==Filter::User) {
sk.set_TrFunc(coeffA,coeffB);
@ -342,9 +342,8 @@ void QucsActiveFilter::slotCalcSchematic()
}
}
break;
case 3 : errorMessage(tr("Function will be implemented in future version"));
default : errorMessage(tr("Function will be implemented in future version"));
break;
default: break;
}
if (ok) {
@ -363,16 +362,16 @@ void QucsActiveFilter::slotUpdateResponse()
QString s = ":/images/bitmaps/AFR.svg";
switch (cbxResponse->currentIndex()) {
case 0 :
case tLowPass :
s = ":/images/bitmaps/AFR.svg";
ftyp = Filter::LowPass;
break;
case 1 : s = ":/images/bitmaps/high-pass.svg";
case tHiPass : s = ":/images/bitmaps/high-pass.svg";
ftyp = Filter::HighPass;
break;
case 2 : ftyp = Filter::BandPass;
case tBandPass : ftyp = Filter::BandPass;
break;
case 3 : ftyp = Filter::BandStop;
case tBandStop : ftyp = Filter::BandStop;
break;
default: ftyp = Filter::NoFilter;
break;
@ -392,15 +391,15 @@ void QucsActiveFilter::slotUpdateSchematic()
slotUpdateResponse();
QString s;
switch (cbxFilterType->currentIndex()) {
case 2 : s = ":images/bitmaps/cauer.svg"; // Cauer section
case topoCauer : s = ":images/bitmaps/cauer.svg"; // Cauer section
break;
case 0 : if (ftyp==Filter::HighPass) { // Multifeedback
case topoMFB : if (ftyp==Filter::HighPass) { // Multifeedback
s = ":/images/bitmaps/mfb-highpass.svg";
} else if (ftyp==Filter::LowPass) {
s = ":/images/bitmaps/mfb-lowpass.svg";
}
break;
case 1 : if (ftyp==Filter::HighPass) { // Sallen-Key
case topoSallenKey : if (ftyp==Filter::HighPass) { // Sallen-Key
s = ":/images/bitmaps/sk-highpass.svg";
} else if (ftyp==Filter::LowPass) {
s = ":/images/bitmaps/sk-lowpass.svg";
@ -423,7 +422,7 @@ void QucsActiveFilter::slotUpdateSchematic()
void QucsActiveFilter::slotSwitchParameters()
{
if (cbxFilterFunc->currentIndex()==0) { // Butterworth
if (cbxFilterFunc->currentIndex()==funcButterworth) { // Butterworth
edtA1->setEnabled(true);
edtPassbRpl->setEnabled(false);
} else {
@ -431,30 +430,32 @@ void QucsActiveFilter::slotSwitchParameters()
edtPassbRpl->setEnabled(true);
}
if ((cbxFilterFunc->currentIndex()==3)||(cbxFilterFunc->currentIndex()==2)) { // Inverse Chebyshev
if ((cbxFilterFunc->currentIndex()==funcCauer)||
(cbxFilterFunc->currentIndex()==funcInvChebyshev)) { // Inverse Chebyshev
// or Cauer
cbxFilterType->setDisabled(true);
} else {
cbxFilterType->setDisabled(false);
}
if ((cbxFilterFunc->currentIndex()==3)|| // Inv.Chebyshev
(cbxFilterFunc->currentIndex()==2)|| // Cauer
(cbxFilterFunc->currentIndex()==5)) // or User defined
if ((cbxFilterFunc->currentIndex()==funcInvChebyshev)|| // Inv.Chebyshev
(cbxFilterFunc->currentIndex()==funcCauer)|| // Cauer
(cbxFilterFunc->currentIndex()==funcUser)) // or User defined
{
cbxFilterType->addItem(tr("Cauer section"),Qt::DisplayRole);
cbxFilterType->setCurrentIndex(2);
cbxFilterType->setCurrentIndex(topoCauer);
} else {
cbxFilterType->removeItem(2);
cbxFilterType->removeItem(topoCauer);
}
if ((cbxFilterFunc->currentIndex())==4) { // Bessel
if ((cbxFilterFunc->currentIndex())==funcBessel) { // Bessel
edtOrder->setEnabled(true);
} else {
edtOrder->setEnabled(false);
}
if ((cbxFilterFunc->currentIndex()==5)||(cbxFilterFunc->currentIndex()==4)) { // Bessel or User Def.
if ((cbxFilterFunc->currentIndex()==funcUser)||
(cbxFilterFunc->currentIndex()==funcBessel)) { // Bessel or User Def.
btnDefineTransferFunc->setEnabled(true);
edtF2->setEnabled(false);
edtPassbRpl->setEnabled(false);

6
qucs-activefilter/qucsactivefilter.h
View File

@ -29,6 +29,12 @@ class QucsActiveFilter : public QMainWindow
Q_OBJECT
private:
enum lstTopology { topoMFB = 0, topoSallenKey = 1, topoCauer = 2};
enum lstFiltFunc { funcButterworth =0, funcChebyshev=1, funcInvChebyshev=2,
funcCauer = 3, funcBessel = 4, funcUser = 5};
enum lstFiltType { tLowPass =0, tHiPass=1, tBandPass=2, tBandStop=3};
QLabel *lblInputData;
QLabel *lblA1;
QLabel *lblA2;

11
qucs-activefilter/sallenkey.cpp
View File

@ -37,7 +37,6 @@ void SallenKey::calcLowPass()
float Wc = 2*M_PI*Fc;
float Nst = order/2 + order%2;
float Kv1 = pow(Kv,1.0/Nst);
qDebug()<<Kv1;
for (int k=1; k <= order/2; k++) {
@ -46,9 +45,6 @@ void SallenKey::calcLowPass()
float B = -2.0*re;
float C = re*re + im*im;
qDebug()<<B<<C;
C2 = 10 / Fc;
C1 = (B*B+4*C*(Kv1-1))*C2/(4*C);
R1 = 2/(Wc*(B*C2+sqrt((B*B + 4*C*(Kv1-1))*C2*C2-4*C*C1*C2)));
@ -93,8 +89,6 @@ void SallenKey::calcHighPass()
float B = -2.0*re;
float C = re*re + im*im;
qDebug()<<B<<C;
C1 = 10 / Fc;
R2 = 4*C/(Wc*C1*(B+sqrt(B*B+8*C*(Kv1-1))));
@ -143,11 +137,9 @@ void SallenKey::createHighPassSchematic(QString &s)
s += QString("<GND * 1 %1 290 0 0 0 0>\n").arg(20+dx);
for (int i=1; i<=N2ord; i++) {
stage = Sections.at(i-1);
qDebug()<<stage.N;
QString suffix1, suffix2;
float C1 = autoscaleCapacitor(stage.C1,suffix1);
float C2 = autoscaleCapacitor(stage.C2,suffix2);
//qDebug()<<C1<<suffix1<<" "<<C2<<suffix2<<stage.C1<<stage.C2;
s += QString("<OpAmp OP%1 1 %2 160 -26 42 0 0 \"1e6\" 1 \"15 V\" 0>\n").arg(stage.N).arg(370+dx);
s += QString("<GND * 1 %1 270 0 0 0 0>\n").arg(270+dx);
s += QString("<GND * 1 %1 370 0 0 0 0>\n").arg(320+dx);
@ -161,7 +153,6 @@ void SallenKey::createHighPassSchematic(QString &s)
}
if (N1stOrd!=0) {
qDebug()<<Sections.last().N;
createFirstOrderComponentsHPF(s,Sections.last(),dx);
}
@ -227,7 +218,7 @@ void SallenKey::createLowPassSchematic(QString &s)
s += QString("<GND * 1 %1 290 0 0 0 0>\n").arg(20+dx);
for (int i=1; i<=N2ord; i++) {
stage = Sections.at(i-1);
qDebug()<<stage.N;
//qDebug()<<stage.N;
QString suffix1, suffix2;
float C1 = autoscaleCapacitor(stage.C1,suffix1);
float C2 = autoscaleCapacitor(stage.C2,suffix2);

5
qucs-activefilter/schcauer.cpp
View File

@ -45,8 +45,6 @@ void SchCauer::calcLowPass()
im = Zeros.at(k-1).imag();
float A = im*im;
qDebug()<<A<<B<<C;
C1 = 10.0/Fc;
C2 = C1;
R5 = 1.0/(Wc*C1);
@ -89,8 +87,6 @@ void SchCauer::calcHighPass()
im = Zeros.at(k-1).imag();
float A = im*im;
qDebug()<<A<<B<<C;
C1 = 10.0/Fc;
C2 = C1;
R5 = 1.0/(Wc*C1);
@ -145,7 +141,6 @@ void SchCauer::createGenericSchematic(QString &s)
for (int i=1; i<=N2ord; i++) {
stage = Sections.at(i-1);
qDebug()<<stage.N;
QString suffix1, suffix2;
float C1 = autoscaleCapacitor(stage.C1,suffix1);
float C2 = autoscaleCapacitor(stage.C2,suffix2);