diff --git a/AFR.svg b/AFR.svg index efa4098f07..04a1f40d48 100644 --- a/AFR.svg +++ b/AFR.svg @@ -83,7 +83,7 @@ inkscape:pageshadow="2" inkscape:zoom="2.8" inkscape:cx="82.130173" - inkscape:cy="76.828431" + inkscape:cy="77.007002" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -117,7 +117,7 @@ image/svg+xml - + @@ -137,7 +137,7 @@ id="path3757" inkscape:connector-curvature="0" /> - АЧХ фильтра diff --git a/cauer.svg b/cauer.svg index acf9ceee3c..48308459c9 100644 --- a/cauer.svg +++ b/cauer.svg @@ -1,604 +1,1595 @@ - -Qt Svg Document -Generated with Qt - - - - - - - - - - - - - - - - - - - - - - - - - - - - -R1 - - - - - - - - - - - - - - - - - - - - - -OP3 - - - - - - - - - - - - - - - - - - - - - -OP2 - - - - - - - - - - - - - -C1 - - - - - - - - - - - - - - - - - - - - - -OP1 - - - - - - - - - - - - - - - - - - - - - - - -C2 - - - - - - - - - - - - -R5 - - - - - - - - - - - - -R4 - - - - - - - - - - - - -R2 - - - - - - - - - - - - -R3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -V1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -output - - - - - - - - - - - - - - - - - - - - -input - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + image/svg+xml + + + + + + Qt Svg Document + Generated with Qt + + + + + + + + + + + + + + + + + + + + + + + R1 + + + + + + + + + + + + + + + + + + OP3 + + + + + + + + + + + + + + + + + + OP2 + + + + + + + + + + + C1 + + + + + + + + + + + + + + + + + + OP1 + + + + + + + + + + + + + + + + + + + C2 + + + + + + + + + + + R5 + + + + + + + + + + + R4 + + + + + + + + + + + R2 + + + + + + + + + + + R3 + + + + + + + + + + + + + + + + + + + + + + + + + + + V1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + output + + + + + + + + + + + + + + + + + + input + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/filtersintez.cpp b/filtersintez.cpp index 6d0a909ad9..df66444d8f 100644 --- a/filtersintez.cpp +++ b/filtersintez.cpp @@ -16,13 +16,13 @@ FilterSintez::FilterSintez(QWidget *parent) QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); //lblInputData = new QLabel(tr("Входные данные")); - lblA1 = new QLabel(tr("Затухание в полосе пропускания, Ap")); - lblA2 = new QLabel(tr("Мин. затухание в полосе задерживания, As")); - lblF1 = new QLabel(tr("Частота среза фильтра, Fc (Гц)")); - lblF2 = new QLabel(tr("Начало полосы задерживания, Fs (Гц)")); - lblRpl1 = new QLabel(tr("Амплитуда пульсаций в полосе пропускания Rp(дБ)")); - //lblRpl2 = new QLabel(tr("Амплитуда пульсаций в полосе задерживания (дБ)")); - lblKv = new QLabel(tr("Усиление фильтра, Kv (дБ)")); + lblA1 = new QLabel(tr("Passband attenuation, Ap")); + lblA2 = new QLabel(tr("Stopband attenuation, As")); + lblF1 = new QLabel(tr("Cuttof frequency, Fc (Гц)")); + lblF2 = new QLabel(tr("Stopband frequency, Fs (Гц)")); + lblRpl1 = new QLabel(tr("Passband ripple Rp(дБ)")); + //lblRpl2 = new QLabel(tr("Stopband ripple (дБ)")); + lblKv = new QLabel(tr("Passband gain, Kv (дБ)")); edtA1 = new QLineEdit("3"); @@ -41,13 +41,13 @@ FilterSintez::FilterSintez(QWidget *parent) edtKv = new QLineEdit("0"); edtKv->setValidator(val1); - lblTyp = new QLabel(tr("Рассчитать фильтр:")); + lblTyp = new QLabel(tr("Approximation type:")); cbxFilterFunc = new QComboBox; QStringList lst2; - lst2<addItems(lst2); connect(cbxFilterFunc,SIGNAL(currentIndexChanged(int)),this,SLOT(slotSwitchParameters())); @@ -56,14 +56,14 @@ FilterSintez::FilterSintez(QWidget *parent) btnDefineTransferFunc->setEnabled(false); connect(btnDefineTransferFunc,SIGNAL(clicked()),this,SLOT(slotDefineTransferFunc())); - btnCalcSchematic = new QPushButton(tr("Рассчитать элементы схемы фильтра")); + btnCalcSchematic = new QPushButton(tr("Calculate and copy to clipboard")); connect(btnCalcSchematic,SIGNAL(clicked()),SLOT(slotCalcSchematic())); - lblResult = new QLabel(tr("Результаты расчёта: ")); + lblResult = new QLabel(tr("Calculation console")); txtResult = new QTextEdit; - lblSch = new QLabel(tr("Схемная реализация фильтра")); + lblSch = new QLabel(tr("Filter topology")); lblResp = new QLabel(tr("Filter type:")); cbxResponse = new QComboBox; QStringList lst3; @@ -78,13 +78,16 @@ FilterSintez::FilterSintez(QWidget *parent) cbxFilterType = new QComboBox; QStringList lst; lst<addItems(lst); connect(cbxFilterType,SIGNAL(currentIndexChanged(int)),this,SLOT(slotUpdateSchematic())); this->slotSwitchParameters(); + lblAFR = new QLabel(tr("General amplitude frequenc response")); + lblTopology = new QLabel(tr("Filter topology preview (one stage)")); + QString s1 = ":/images/AFR.svg"; QSvgRenderer *ren = new QSvgRenderer(s1); QSize sz = ren->defaultSize(); @@ -140,7 +143,9 @@ FilterSintez::FilterSintez(QWidget *parent) left->addWidget(btnCalcSchematic); left->addStretch(); + right->addWidget(lblAFR); right->addWidget(imgAFR); + right->addWidget(lblTopology); right->addWidget(sch_pic); right->addStretch(); diff --git a/filtersintez.h b/filtersintez.h index 1634e11ae0..b152971032 100644 --- a/filtersintez.h +++ b/filtersintez.h @@ -23,6 +23,9 @@ class FilterSintez : public QMainWindow QLabel *lblRpl2; QLabel *lblResp; + QLabel *lblAFR; + QLabel *lblTopology; + QLineEdit *edtA1; // passband attenuation A1 QLineEdit *edtA2; // stopband attenuation A2 QLineEdit *edtF1; // passband cutoff frequency F1 diff --git a/high-pass.svg b/high-pass.svg index 8310c97922..342637b272 100644 --- a/high-pass.svg +++ b/high-pass.svg @@ -14,7 +14,7 @@ id="svg2" version="1.1" inkscape:version="0.48.3.1 r9886" - sodipodi:docname="AFR.svg"> + sodipodi:docname="high-pass.svg"> image/svg+xml - + @@ -383,18 +383,6 @@ d="m 177.16535,102.75588 -3.5433,10.62992 -3.54331,-10.62992" id="path8659" inkscape:connector-curvature="0" /> - АЧХ фильтра - -Qt Svg Document -Generated with Qt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -OP1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -V1 - - - - - - - - - - - - -R2 - - - - - - - - - - - - -R1 - - - - - - - - - - - - - -C3 - - - - - - - - - - - - - -C2 - - - - - - - - - - - - - -C1 - - - - - - - - - - - - - - - - - -output - - - - - - - - - - - - - - - - -input - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + image/svg+xml + + + + + + Qt Svg Document + Generated with Qt + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OP1 + + + + + + + + + + + + + + + + + + + + + + + + + + + V1 + + + + + + + + + + + R2 + + + + + + + + + + + R1 + + + + + + + + + + + C3 + + + + + + + + + + + C2 + + + + + + + + + + + C1 + + + + + + + + + + + + + + + + output + + + + + + + + + + + + + + input + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mfb-lowpass.svg b/mfb-lowpass.svg index e96314ac8d..9f67fa0b1b 100644 --- a/mfb-lowpass.svg +++ b/mfb-lowpass.svg @@ -1,404 +1,1053 @@ - -Qt Svg Document -Generated with Qt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -R3 - - - - - - - - - - - - -R2 - - - - - - - - - - - - -R1 - - - - - - - - - - - - - -C2 - - - - - - - - - - - - - - - - - - - - - -OP1 - - - - - - - - - - - - - -C1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -V1 - - - - - - - - - - - - - - - - - - - -output - - - - - - - - - - - - - - - - -input - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + image/svg+xml + + + + + + Qt Svg Document + Generated with Qt + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R3 + + + + + + + + + + + R2 + + + + + + + + + + + R1 + + + + + + + + + + + C2 + + + + + + + + + + + + + + + + + + OP1 + + + + + + + + + + + C1 + + + + + + + + + + + + + + + + + + + + + + + + + + + V1 + + + + + + + + + + + + + + + + + + output + + + + + + + + + + + + + + input + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sk-highpass.svg b/sk-highpass.svg index f3de1a6b4a..0b52a24109 100644 --- a/sk-highpass.svg +++ b/sk-highpass.svg @@ -1,430 +1,1129 @@ - -Qt Svg Document -Generated with Qt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -C1 - - - - - - - - - - - - - -C2 - - - - - - - - - - - - -R1 - - - - - - - - - - - - -R2 - - - - - - - - - - - - -R4 - - - - - - - - - - - - -R3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -V1 - - - - - - - - - - - - - - - - - - - - - -OP1 - - - - - - - - -output - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -input - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + image/svg+xml + + + + + + Qt Svg Document + Generated with Qt + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + C1 + + + + + + + + + + + C2 + + + + + + + + + + + R1 + + + + + + + + + + + R2 + + + + + + + + + + + R4 + + + + + + + + + + + R3 + + + + + + + + + + + + + + + + + + + + + + + + + + + V1 + + + + + + + + + + + + + + + + + + OP1 + + + + + + + output + + + + + + + + + + + + + + + + + + + + + + + + + + + input + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sk-lowpass.svg b/sk-lowpass.svg index 4c8e3812fa..c9ae3d2194 100644 --- a/sk-lowpass.svg +++ b/sk-lowpass.svg @@ -1,430 +1,1129 @@ - -Qt Svg Document -Generated with Qt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -R4 - - - - - - - - - - - - -R3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -V1 - - - - - - - - - - - - - - - - - - - - - -OP1 - - - - - - - - - - - - -R1 - - - - - - - - - - - - -R2 - - - - - - - - - - - - - -C2 - - - - - - - - - - - - - -C1 - - - - - - - - - - - - - - - - - - -input - - - - - - - - - - - - - - - - - - - -output - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + image/svg+xml + + + + + + Qt Svg Document + Generated with Qt + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + R4 + + + + + + + + + + + R3 + + + + + + + + + + + + + + + + + + + + + + + + + + + V1 + + + + + + + + + + + + + + + + + + OP1 + + + + + + + + + + + R1 + + + + + + + + + + + R2 + + + + + + + + + + + C2 + + + + + + + + + + + C1 + + + + + + + + + + + + + + + + + input + + + + + + + + + + + + + + + + + output + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/transferfuncdialog.cpp b/transferfuncdialog.cpp index 185ab3a828..cb8419f151 100644 --- a/transferfuncdialog.cpp +++ b/transferfuncdialog.cpp @@ -54,6 +54,7 @@ TransferFuncDialog::TransferFuncDialog(QVector &a, QVector &a, QVector //else if (b0) b.append(0.0); } } + +void TransferFuncDialog::slotCheckCoeffs() +{ + +} diff --git a/transferfuncdialog.h b/transferfuncdialog.h index 03fc21838e..b023ccf600 100644 --- a/transferfuncdialog.h +++ b/transferfuncdialog.h @@ -30,6 +30,9 @@ class TransferFuncDialog : public QDialog signals: +private slots: + void slotCheckCoeffs(); + public slots: };