mirror of
https://github.com/ra3xdh/qucs_s
synced 2025-03-28 21:13:26 +00:00
Done porting qucsattenuator to Qt4.
Compiled without Qt3Support. Testes on a Mac. I'm not sure about the menubar space. It also doens't update the layoutsize when changing from Bridged Tee to Tee, only when go up to Pi again.
This commit is contained in:
Guilherme Brondani Torri
parent
2724c76c4c
commit
928c152eb5
@ -62,14 +62,14 @@ HelpDialog::HelpDialog(QWidget *parent)
|
||||
QHBoxLayout *h = new QHBoxLayout();
|
||||
h->addLayout(vLayout);
|
||||
|
||||
//h->setStretchFactor(new QWidget(h),5); // stretchable placeholder
|
||||
h->addStretch(5);
|
||||
|
||||
QPushButton *ButtonClose = new QPushButton(tr("Close"));
|
||||
h->addWidget(ButtonClose);
|
||||
connect(ButtonClose, SIGNAL(clicked()), SLOT(slotClose()));
|
||||
ButtonClose->setFocus();
|
||||
|
||||
//h->setStretchFactor(new QWidget(h),5); // stretchable placeholder
|
||||
h->addStretch(5);
|
||||
|
||||
setLayout(h);
|
||||
}
|
||||
|
||||
@ -16,16 +16,15 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <qapplication.h>
|
||||
#include <qstring.h>
|
||||
#include <qtextcodec.h>
|
||||
#include <qtranslator.h>
|
||||
#include <qfile.h>
|
||||
#include <QTextstream>
|
||||
#include <qmessagebox.h>
|
||||
#include <qdir.h>
|
||||
#include <qfont.h>
|
||||
|
||||
#include <QApplication>
|
||||
#include <QString>
|
||||
#include <QTextCodec>
|
||||
#include <QTranslator>
|
||||
#include <QFile>
|
||||
#include <QTextStream>
|
||||
#include <QMessageBox>
|
||||
#include <QDir>
|
||||
#include <QFont>
|
||||
|
||||
#include "qucsattenuator.h"
|
||||
|
||||
|
||||
@ -21,26 +21,20 @@
|
||||
#include <QGridLayout>
|
||||
#include <QPixmap>
|
||||
#include <QVBoxLayout>
|
||||
|
||||
#include <Q3VBoxLayout>
|
||||
#include <Q3VBox>
|
||||
#include <Q3GroupBox>
|
||||
#include <Q3GridLayout>
|
||||
|
||||
#include <QVBoxLayout>
|
||||
#include <QHBoxLayout>
|
||||
#include <QGroupBox>
|
||||
#include <QMenu>
|
||||
#include <QMenuBar>
|
||||
#include <QMessageBox>
|
||||
#include <QLayout>
|
||||
#include <QLabel>
|
||||
#include <QPushButton>
|
||||
#include <QLineEdit>
|
||||
#include <QComboBox>
|
||||
#include <QValidator>
|
||||
#include <QTimer>
|
||||
#include <QClipboard>
|
||||
#include <QApplication>
|
||||
#include <QImage>
|
||||
#include <QTimer>
|
||||
#include <QDebug>
|
||||
|
||||
QucsAttenuator::QucsAttenuator()
|
||||
{
|
||||
@ -72,114 +66,129 @@ QucsAttenuator::QucsAttenuator()
|
||||
bar->addSeparator();
|
||||
bar->addMenu(helpMenu);
|
||||
|
||||
Q3VBoxLayout * v2 = new Q3VBoxLayout (this);
|
||||
Q3VBox * vm = new Q3VBox (this);
|
||||
vm->setSpacing(0);
|
||||
v2->setSpacing(2);
|
||||
|
||||
/*
|
||||
QWidget *Space = new QWidget(this); // reserve space for menubar
|
||||
Space->setFixedSize(5, bar->height());
|
||||
v2->addWidget(Space);
|
||||
*/
|
||||
|
||||
Q3HBox * h1 = new Q3HBox (this);
|
||||
v2->addWidget(h1);
|
||||
h1->setSpacing(2);
|
||||
h1->setMargin(5);
|
||||
Q3VBox * v1 = new Q3VBox (h1);
|
||||
v1->setSpacing(2);
|
||||
//==========Left
|
||||
QVBoxLayout *vboxLeft = new QVBoxLayout();
|
||||
|
||||
Q3GroupBox * TopoGroup = new Q3GroupBox (tr("Topology"), v1);
|
||||
Q3GridLayout * tbox = new Q3GridLayout(TopoGroup, 3,1,5,5);
|
||||
QGroupBox *TopoGroup = new QGroupBox(tr("Topology"));
|
||||
QGridLayout * topoGrid = new QGridLayout(TopoGroup);
|
||||
|
||||
QWidget *Space2 = new QWidget(TopoGroup);
|
||||
Space2->setFixedSize(8, 8);
|
||||
tbox->addMultiCellWidget(Space2,0,0,0,0);
|
||||
|
||||
ComboTopology = new QComboBox(TopoGroup);//=================Topology Combobox
|
||||
ComboTopology->insertItem("Pi");
|
||||
ComboTopology->insertItem("Tee");
|
||||
ComboTopology->insertItem("Bridged Tee");
|
||||
ComboTopology = new QComboBox();//=================Topology Combobox
|
||||
ComboTopology->insertItem(1, "Pi");
|
||||
ComboTopology->insertItem(2, "Tee");
|
||||
ComboTopology->insertItem(3, "Bridged Tee");
|
||||
connect(ComboTopology, SIGNAL(activated(int)), SLOT(slotTopologyChanged()));
|
||||
tbox->addWidget(ComboTopology, 1,0);
|
||||
topoGrid->addWidget(ComboTopology, 1,0,1,2);
|
||||
|
||||
pixTopology = new QLabel(TopoGroup);//====================Pixmap for Topology
|
||||
pixTopology->setPixmap(QPixmap (QImage (QucsSettings.BitmapDir + "att_pi.png")));
|
||||
tbox->addMultiCellWidget(pixTopology,2,2,0,0);
|
||||
pixTopology->setPixmap(QPixmap((QucsSettings.BitmapDir + "att_pi.png")));
|
||||
topoGrid->addWidget(pixTopology,2,0,3,2);
|
||||
|
||||
Q3VBox * vb = new Q3VBox (h1);
|
||||
vb->setSpacing(2);
|
||||
topoGrid->setSpacing(5);
|
||||
TopoGroup->setLayout(topoGrid);
|
||||
|
||||
Q3GroupBox * InputGroup = new Q3GroupBox (tr("Input"), vb);
|
||||
Q3GridLayout * ibox = new Q3GridLayout(InputGroup, 5,3,5,5);
|
||||
ibox->addMultiCellWidget(Space2,0,0,0,2);
|
||||
vboxLeft->addWidget(TopoGroup);
|
||||
|
||||
/*
|
||||
QWidget *Space1 = new QWidget(this); // reserve space for menubar
|
||||
Space1->setFixedSize(5,5);
|
||||
v2->addWidget(Space1);
|
||||
*/
|
||||
|
||||
//==========Right
|
||||
QVBoxLayout *vboxRight = new QVBoxLayout();
|
||||
|
||||
QGroupBox * InputGroup = new QGroupBox (tr("Input"));
|
||||
QGridLayout * inGrid = new QGridLayout();
|
||||
inGrid->setSpacing(1);
|
||||
|
||||
IntVal = new QIntValidator(this);
|
||||
DoubleVal = new QDoubleValidator(this);
|
||||
|
||||
LabelAtten = new QLabel(tr("Attenuation:"), InputGroup);
|
||||
ibox ->addWidget(LabelAtten, 1,0);
|
||||
inGrid ->addWidget(LabelAtten, 1,0);
|
||||
lineEdit_Attvalue = new QLineEdit(tr("1"), InputGroup);
|
||||
lineEdit_Attvalue->setValidator(DoubleVal);
|
||||
ibox->addWidget(lineEdit_Attvalue, 1,1);
|
||||
inGrid->addWidget(lineEdit_Attvalue, 1,1);
|
||||
QLabel *Label1 = new QLabel(tr("dB"), InputGroup);
|
||||
ibox->addWidget(Label1, 1,2);
|
||||
inGrid->addWidget(Label1, 1,2);
|
||||
|
||||
LabelImp1 = new QLabel(tr("Zin:"), InputGroup);
|
||||
ibox->addWidget(LabelImp1, 2,0);
|
||||
inGrid->addWidget(LabelImp1, 2,0);
|
||||
lineEdit_Zin = new QLineEdit(tr("50"), InputGroup);
|
||||
lineEdit_Zin->setValidator(DoubleVal);
|
||||
connect(lineEdit_Zin, SIGNAL(textChanged(const QString&)), this,
|
||||
SLOT(slotSetText_Zin(const QString&)) );
|
||||
SLOT(slotSetText_Zin(const QString&)) );
|
||||
|
||||
ibox->addWidget(lineEdit_Zin, 2,1);
|
||||
inGrid->addWidget(lineEdit_Zin, 2,1);
|
||||
QLabel *Label2 = new QLabel(tr("Ohm"), InputGroup);
|
||||
ibox->addWidget(Label2, 2,2);
|
||||
inGrid->addWidget(Label2, 2,2);
|
||||
|
||||
LabelImp2 = new QLabel(tr("Zout:"), InputGroup);
|
||||
ibox->addWidget(LabelImp2, 3,0);
|
||||
inGrid->addWidget(LabelImp2, 3,0);
|
||||
lineEdit_Zout = new QLineEdit(tr("50"), InputGroup);
|
||||
lineEdit_Zout->setValidator(DoubleVal);
|
||||
connect(lineEdit_Zout, SIGNAL(textChanged(const QString&)), this,
|
||||
SLOT(slotSetText_Zout(const QString&)) );
|
||||
ibox->addWidget(lineEdit_Zout, 3,1);
|
||||
SLOT(slotSetText_Zout(const QString&)) );
|
||||
inGrid->addWidget(lineEdit_Zout, 3,1);
|
||||
QLabel *Label3 = new QLabel(tr("Ohm"), InputGroup);
|
||||
ibox->addWidget(Label3, 3,2);
|
||||
inGrid->addWidget(Label3, 3,2);
|
||||
|
||||
Calculate = new QPushButton(tr("Calculate and put into Clipboard"), vb);
|
||||
InputGroup->setLayout(inGrid);
|
||||
|
||||
vboxRight->addWidget(InputGroup);
|
||||
|
||||
Calculate = new QPushButton(tr("Calculate and put into Clipboard"));
|
||||
connect(Calculate, SIGNAL(clicked()), SLOT(slotCalculate()));
|
||||
|
||||
Q3GroupBox * OutputGroup = new Q3GroupBox (tr("Output"), vb);
|
||||
Q3GridLayout * obox = new Q3GridLayout(OutputGroup, 5,3,5,5);
|
||||
obox->addMultiCellWidget(Space2,0,0,0,2);
|
||||
vboxRight->addWidget(Calculate);
|
||||
|
||||
QGroupBox * OutputGroup = new QGroupBox (tr("Output"));
|
||||
QGridLayout * outGrid = new QGridLayout(OutputGroup);
|
||||
outGrid->setSpacing(1);
|
||||
|
||||
LabelR1 = new QLabel(tr("R1:"), OutputGroup);
|
||||
obox->addWidget(LabelR1, 1,0);
|
||||
outGrid->addWidget(LabelR1, 1,0);
|
||||
lineEdit_R1 = new QLineEdit(tr("--"), OutputGroup);
|
||||
obox->addWidget(lineEdit_R1, 1,1);
|
||||
outGrid->addWidget(lineEdit_R1, 1,1);
|
||||
QLabel *Label4 = new QLabel(tr("Ohm"), OutputGroup);
|
||||
obox->addWidget(Label4, 1,2);
|
||||
outGrid->addWidget(Label4, 1,2);
|
||||
|
||||
LabelR2 = new QLabel(tr("R2:"), OutputGroup);
|
||||
obox->addWidget(LabelR2, 2,0);
|
||||
outGrid->addWidget(LabelR2, 2,0);
|
||||
lineEdit_R2 = new QLineEdit(tr("--"), OutputGroup);
|
||||
obox->addWidget(lineEdit_R2, 2,1);
|
||||
outGrid->addWidget(lineEdit_R2, 2,1);
|
||||
QLabel *Label5 = new QLabel(tr("Ohm"), OutputGroup);
|
||||
obox->addWidget(Label5, 2,2);
|
||||
outGrid->addWidget(Label5, 2,2);
|
||||
|
||||
LabelR3 = new QLabel(tr("R3:"), OutputGroup);
|
||||
obox->addWidget(LabelR3, 3,0);
|
||||
outGrid->addWidget(LabelR3, 3,0);
|
||||
lineEdit_R3 = new QLineEdit(tr("--"), OutputGroup);
|
||||
obox->addWidget(lineEdit_R3, 3,1);
|
||||
outGrid->addWidget(lineEdit_R3, 3,1);
|
||||
LabelR3_Ohm = new QLabel(tr("Ohm"), OutputGroup);
|
||||
obox->addWidget(LabelR3_Ohm, 3,2);
|
||||
outGrid->addWidget(LabelR3_Ohm, 3,2);
|
||||
|
||||
LabelResult = new QLabel(tr("Result:"), this);
|
||||
v2->addWidget(LabelResult);
|
||||
|
||||
vboxRight->addWidget(OutputGroup);
|
||||
|
||||
// put Left and Right together
|
||||
QHBoxLayout *hbox = new QHBoxLayout();
|
||||
hbox->addLayout(vboxLeft);
|
||||
hbox->addLayout(vboxRight);
|
||||
|
||||
// append the result label
|
||||
LabelResult = new QLabel(tr("Result:"));
|
||||
LabelResult->setAlignment(Qt::AlignHCenter);
|
||||
|
||||
QWidget *Space1 = new QWidget(this); // reserve space for menubar
|
||||
Space1->setFixedSize(5,5);
|
||||
v2->addWidget(Space1);
|
||||
QVBoxLayout *vbox = new QVBoxLayout(this);
|
||||
vbox->addLayout(hbox);
|
||||
vbox->addWidget(LabelResult);
|
||||
|
||||
}
|
||||
|
||||
QucsAttenuator::~QucsAttenuator()
|
||||
@ -227,7 +236,7 @@ void QucsAttenuator::slotQuit()
|
||||
|
||||
void QucsAttenuator::slotSetText_Zin( const QString &text )
|
||||
{
|
||||
if(ComboTopology->currentItem() == BRIDGE_TYPE) {
|
||||
if(ComboTopology->currentIndex() == BRIDGE_TYPE) {
|
||||
lineEdit_Zout->blockSignals( TRUE );
|
||||
lineEdit_Zout->setText( text );
|
||||
lineEdit_Zout->blockSignals( FALSE );
|
||||
@ -236,7 +245,7 @@ void QucsAttenuator::slotSetText_Zin( const QString &text )
|
||||
|
||||
void QucsAttenuator::slotSetText_Zout( const QString &text )
|
||||
{
|
||||
if(ComboTopology->currentItem() == BRIDGE_TYPE) {
|
||||
if(ComboTopology->currentIndex() == BRIDGE_TYPE) {
|
||||
lineEdit_Zin->blockSignals( TRUE );
|
||||
lineEdit_Zin->setText( text );
|
||||
lineEdit_Zin->blockSignals( FALSE );
|
||||
@ -245,24 +254,24 @@ void QucsAttenuator::slotSetText_Zout( const QString &text )
|
||||
|
||||
void QucsAttenuator::slotTopologyChanged()
|
||||
{
|
||||
switch(ComboTopology->currentItem())
|
||||
switch(ComboTopology->currentIndex())
|
||||
{
|
||||
case PI_TYPE:
|
||||
pixTopology->setPixmap(QPixmap(QImage(QucsSettings.BitmapDir + "att_pi.png")));
|
||||
pixTopology->setPixmap(QPixmap((QucsSettings.BitmapDir + "att_pi.png")));
|
||||
LabelR2->setText("R2:");
|
||||
LabelR3->show();
|
||||
lineEdit_R3->show();
|
||||
LabelR3_Ohm->show();
|
||||
break;
|
||||
case TEE_TYPE:
|
||||
pixTopology->setPixmap(QPixmap(QImage(QucsSettings.BitmapDir + "att_tee.png")));
|
||||
pixTopology->setPixmap(QPixmap((QucsSettings.BitmapDir + "att_tee.png")));
|
||||
LabelR2->setText("R2:");
|
||||
LabelR3->show();
|
||||
lineEdit_R3->show();
|
||||
LabelR3_Ohm->show();
|
||||
break;
|
||||
case BRIDGE_TYPE:
|
||||
pixTopology->setPixmap(QPixmap(QImage(QucsSettings.BitmapDir + "att_bridge.png")));
|
||||
pixTopology->setPixmap(QPixmap((QucsSettings.BitmapDir + "att_bridge.png")));
|
||||
LabelR2->setText("R4:");
|
||||
LabelR3->hide();
|
||||
lineEdit_R3->hide();
|
||||
@ -270,7 +279,7 @@ void QucsAttenuator::slotTopologyChanged()
|
||||
lineEdit_Zout->setText( lineEdit_Zin->text() );
|
||||
break;
|
||||
}
|
||||
adjustSize();
|
||||
adjustSize();
|
||||
}
|
||||
|
||||
void QucsAttenuator::slotCalculate()
|
||||
@ -281,7 +290,7 @@ void QucsAttenuator::slotCalculate()
|
||||
struct tagATT Values;
|
||||
|
||||
|
||||
Values.Topology = ComboTopology->currentItem();
|
||||
Values.Topology = ComboTopology->currentIndex();
|
||||
Values.Attenuation = lineEdit_Attvalue->text().toDouble();
|
||||
Values.Zin = lineEdit_Zin->text().toDouble();
|
||||
Values.Zout = lineEdit_Zout->text().toDouble();
|
||||
@ -308,5 +317,5 @@ void QucsAttenuator::slotCalculate()
|
||||
lineEdit_R2->setText("--");
|
||||
lineEdit_R3->setText("--");
|
||||
}
|
||||
|
||||
adjustSize();
|
||||
}
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
|
||||
#include <QDialog>
|
||||
#include <QLabel>
|
||||
|
||||
#include "attenuatorfunc.h"
|
||||
|
||||
class QComboBox;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user