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

Fixed compile in Ubuntu (undone recent change in newprojdialog.h)

Browse Source 
Fixed impedance not shown on new marker in Smith Chart
This commit is contained in:
Frans Schreuder 2014-01-14 09:55:09 +01:00
parent 86f77d9512
commit 231409c3cb
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qucs/diagrams/marker.cpp
View File

@ -49,13 +49,13 @@ Marker::Marker(Diagram *Diag_, Graph *pg_, int _nn, int cx_, int cy_)
cy = -cy_;
fCX = float(cx);
fCY = float(cy);
Z0 = 50; //Used for Smith chart marker, to calculate impedance
if(!pGraph) makeInvalid();
else initText(_nn); // finally create marker
x1 = cx + 60;
y1 = -cy - 60;
Z0 = 50; //Used for Smith chart marker, to calculate impedance
}
Marker::~Marker()
@ -149,7 +149,19 @@ void Marker::initText(int n)
}
VarPos[nVarPos] = *pz;
VarPos[nVarPos+1] = *(pz+1);
if(Diag->Name=="Smith") //impedance is useful as well here
{
double Zr, Zi;
Zr = *pz;
Zi = *(pz+1);
MatchDialog::r2z(Zr, Zi, Z0);
QString Var = pGraph->Var;
if(Var.startsWith("S"))
Text += "\n"+ Var.replace('S', 'Z')+": " +complexRect(Zr, Zi, Precision);
else
Text += "\nZ("+ Var+"): " +complexRect(Zr, Zi, Precision);
}
px = VarPos;
if(py != &Dummy) // 2D in 3D diagram ?
py = VarPos + 1;
@ -229,7 +241,6 @@ void Marker::createText()
Zr = *pz;
Zi = *(pz+1);
MatchDialog::r2z(Zr, Zi, Z0);
QString Var = pGraph->Var;
if(Var.startsWith("S"))

2
qucs/dialogs/newprojdialog.h
View File

@ -31,7 +31,7 @@ class QGridLayout;
*/
class NewProjDialog : public QDialog {
Q_OBJECT
//Q_OBJECT
public:
NewProjDialog(QWidget *parent=0, const char *name=0);
~NewProjDialog();