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

Rotate MLIN and TLIN texts in getLineString() function

Browse Source 
So far, this function effectively rotated the component, but not the text associated. This commit is intended to fix this
This commit is contained in:
andresmmera 2024-06-04 21:25:30 +02:00
parent 3f8b53556b
commit 3953042d0c
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
qucs-filter/filter.cpp
View File

@ -355,16 +355,40 @@ double Filter::quadraticChebyshevValues(int No, int Order, double Ripple, double
QString Filter::getLineString(bool isMicrostrip, double width_or_impedance, double l, int x, int y, int rotate)
{
QString code;
double text_x, text_y; // Coordinates for the text. They change with the rotation
if (isMicrostrip)
{
return QString("<MLIN MS1 1 %1 %2 26 -30 0 %3 \"Sub1\" 1 \"%4mm\" 1 \"%5mm\" 1 \"Hammerstad\" 0 \"Kirschning\" 0 \"26.85\" 0>\n")
.arg(x).arg(y).arg(rotate).arg(width_or_impedance*1000).arg(l*1000);
if (rotate)
{
text_x = 20;
text_y = -25;
}
else
{
text_x = -30;
text_y = -70;
}
code = QString("<MLIN MS1 1 %1 %2 %3 %4 0 %5 \"Sub1\" 0 \"%6 mm\" 1 \"%7 mm\" 1 \"Hammerstad\" 0 \"Kirschning\" 0 \"26.85\" 0>\n")
.arg(x).arg(y).arg(text_x).arg(text_y).arg(rotate)
.arg(QString::number(width_or_impedance*1e3, 'f', 2)).arg(QString::number(l*1e3, 'f', 2));
}
else
{
return QString("<TLIN Line1 1 %1 %2 -26 20 0 %3 \"%4\" 1 \"%5\" 1 \"0 dB\" 0 \"26.85\" 0>\n")
.arg(x).arg(y).arg(rotate).arg(width_or_impedance).arg(l);
if (rotate)
{
text_x = 10;
text_y = -25;
}
else
{
text_x = -30;
text_y = -60;
}
code = QString("<TLIN Line1 1 %1 %2 %3 %4 0 %5 \"%6 Ohm\" 1 \"%7 mm\" 1 \"0 dB\" 0 \"26.85\" 0>\n")
.arg(x).arg(y).arg(text_x).arg(text_y).arg(rotate).arg(QString::number(width_or_impedance, 'f', 1)).arg(QString::number(l*1e3, 'f', 2));
}
return code;
}
QString Filter::getWireString(int x1, int y1, int x2, int y2)
@ -374,6 +398,6 @@ QString Filter::getWireString(int x1, int y1, int x2, int y2)
QString Filter::getTeeString(int x, int y, double width1, double width2, double width3)
{
return QString("<MTEE MS1 1 %1 %2 -26 20 1 0 \"Sub1\" 1 \"%3mm\" 1 \"%4mm\" 1 \"%5mm\" 1 \"Hammerstad\" 0 \"Kirschning\" 0 \"26.85\" 0>\n")
.arg(x).arg(y).arg(width1*1000).arg(width2*1000).arg(width3*1000);
return QString("<MTEE MS1 1 %1 %2 -26 20 1 0 \"Sub1\" 0 \"%3mm\" 1 \"%4mm\" 1 \"%5mm\" 1 \"Hammerstad\" 0 \"Kirschning\" 0 \"26.85\" 0>\n")
.arg(x).arg(y).arg(QString::number(width1*1e3, 'f', 2)).arg(QString::number(width2*1e3, 'f', 2)).arg(QString::number(width3*1e3, 'f', 2));
}

2
qucs-filter/quarterwave_filter.cpp
View File

@ -92,7 +92,7 @@ QString *QuarterWave_Filter::createSchematic(tFilter *Filter, tSubstrate *Substr
c_s += getLineString(isMicrostrip, W_line, L_line, x, 180, 0); // Series line
c_s += getTeeString(x+ 60 + x_space, 180, W_line, W_line, W_res);
c_s += getLineString(isMicrostrip, W_res, L_res, x+60 + x_space, 60, 3); // Shunt quarter-wavelength resonator
c_s += getLineString(isMicrostrip, W_res, L_res, x+60 + x_space, 60, 1); // Shunt quarter-wavelength resonator
w_s += getWireString(x+30, 180, x+30+x_space, 180);
w_s += getWireString(x+60 + x_space, 90, x+60 + x_space, 150);