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

Fix labels of SPICE netlist sections being rendered too small

Browse Source 
On some devices the labels like .PARAM, .Nutmeg, etc. were rendered
too small comparing to other parts of a component. With this commit
they are rendered the same way on all devices.
This commit is contained in:
Andrey Kalmykov 2024-06-15 10:14:20 +02:00
parent e94faf9945
commit 01738ccb84
13 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qucs/components/equation.cpp
View File

@ -19,6 +19,7 @@
#include "extsimkernels/spicecompat.h"
#include "extsimkernels/verilogawriter.h"
#include <QFontInfo>
#include <QFontMetrics>
Equation::Equation()
@ -38,7 +39,7 @@ Equation::Equation()
Lines.append(new qucs::Line(-xb, -yb, -xb, yb,QPen(Qt::darkBlue,2)));
Lines.append(new qucs::Line(-xb, yb, xb+3,yb,QPen(Qt::darkBlue,2)));
Texts.append(new Text(-xb+4, -yb-3, QObject::tr("Equation"),
QColor(0,0,0), 12.0));
QColor(0,0,0), QFontInfo(f).pixelSize()));
x1 = -xb-3; y1 = -yb-5;
x2 = xb+9; y2 = yb+3;

3
qucs/spicecomponents/incl_script.cpp
View File

@ -16,6 +16,7 @@
***************************************************************************/
#include "incl_script.h"
#include "main.h"
#include <QFontInfo>
#include <QFontMetrics>
@ -37,7 +38,7 @@ InclScript::InclScript()
Lines.append(new qucs::Line(-xb, -yb, -xb, yb,QPen(Qt::darkRed,2)));
Lines.append(new qucs::Line(-xb, yb, xb+3,yb,QPen(Qt::darkRed,2)));
Texts.append(new Text(-xb+4, -yb-3, QObject::tr(".INCLUDE SCRIPT"),
QColor(0,0,0), 12.0));
QColor(0,0,0), QFontInfo(f).pixelSize()));
x1 = -xb-3; y1 = -yb-5;
x2 = xb+9; y2 = yb+3;

3
qucs/spicecomponents/sp_func.cpp
View File

@ -17,6 +17,7 @@
#include "sp_func.h"
#include "main.h"
#include <QFontInfo>
#include <QFontMetrics>
SpiceFunc::SpiceFunc()
@ -37,7 +38,7 @@ SpiceFunc::SpiceFunc()
Lines.append(new qucs::Line(-xb, -yb, -xb, yb,QPen(Qt::darkRed,2)));
Lines.append(new qucs::Line(-xb, yb, xb+3,yb,QPen(Qt::darkRed,2)));
Texts.append(new Text(-xb+4, -yb-3, QObject::tr(".FUNC"),
QColor(0,0,0), 12.0));
QColor(0,0,0), QFontInfo(f).pixelSize()));
x1 = -xb-3; y1 = -yb-5;
x2 = xb+9; y2 = yb+3;

3
qucs/spicecomponents/sp_globalpar.cpp
View File

@ -17,6 +17,7 @@
#include "sp_globalpar.h"
#include "main.h"
#include <QFontInfo>
#include <QFontMetrics>
SpiceGlobalParam::SpiceGlobalParam()
@ -37,7 +38,7 @@ SpiceGlobalParam::SpiceGlobalParam()
Lines.append(new qucs::Line(-xb, -yb, -xb, yb,QPen(Qt::darkRed,2)));
Lines.append(new qucs::Line(-xb, yb, xb+3,yb,QPen(Qt::darkRed,2)));
Texts.append(new Text(-xb+4, -yb-3, QObject::tr(".GLOBAL PARAM"),
QColor(0,0,0), 12.0));
QColor(0,0,0), QFontInfo(f).pixelSize()));
x1 = -xb-3; y1 = -yb-5;
x2 = xb+9; y2 = yb+3;

3
qucs/spicecomponents/sp_ic.cpp
View File

@ -17,6 +17,7 @@
#include "sp_ic.h"
#include "main.h"
#include <QFontInfo>
#include <QFontMetrics>
SpiceIC::SpiceIC()
@ -37,7 +38,7 @@ SpiceIC::SpiceIC()
Lines.append(new qucs::Line(-xb, -yb, -xb, yb,QPen(Qt::darkRed,2)));
Lines.append(new qucs::Line(-xb, yb, xb+3,yb,QPen(Qt::darkRed,2)));
Texts.append(new Text(-xb+4, -yb-3, QObject::tr(".IC"),
QColor(0,0,0), 12.0));
QColor(0,0,0), QFontInfo(f).pixelSize()));
x1 = -xb-3; y1 = -yb-5;
x2 = xb+9; y2 = yb+3;

3
qucs/spicecomponents/sp_include.cpp
View File

@ -18,6 +18,7 @@
#include "main.h"
#include "misc.h"
#include <QFontInfo>
#include <QFontMetrics>
S4Q_Include::S4Q_Include()
@ -38,7 +39,7 @@ S4Q_Include::S4Q_Include()
Lines.append(new qucs::Line(-xb, -yb, -xb, yb,QPen(Qt::darkRed,2)));
Lines.append(new qucs::Line(-xb, yb, xb+3,yb,QPen(Qt::darkRed,2)));
Texts.append(new Text(-xb+4, -yb-3, QObject::tr(".INCLUDE"),
QColor(0,0,0), 12.0));
QColor(0,0,0), QFontInfo(f).pixelSize()));
x1 = -xb-3; y1 = -yb-5;
x2 = xb+9; y2 = yb+3;

3
qucs/spicecomponents/sp_lib.cpp
View File

@ -17,6 +17,7 @@
#include "sp_lib.h"
#include "main.h"
#include "misc.h"
#include <QFontInfo>
#include <QFontMetrics>
S4Q_Lib::S4Q_Lib()
@ -37,7 +38,7 @@ S4Q_Lib::S4Q_Lib()
Lines.append(new qucs::Line(-xb, -yb, -xb, yb,QPen(Qt::darkRed,2)));
Lines.append(new qucs::Line(-xb, yb, xb+3,yb,QPen(Qt::darkRed,2)));
Texts.append(new Text(-xb+4, -yb-3, QObject::tr(".LIB"),
QColor(0,0,0), 12.0));
QColor(0,0,0), QFontInfo(f).pixelSize()));
x1 = -xb-3; y1 = -yb-5;
x2 = xb+9; y2 = yb+3;

3
qucs/spicecomponents/sp_model.cpp
View File

@ -17,6 +17,7 @@
#include "sp_model.h"
#include "main.h"
#include <QFontInfo>
#include <QFontMetrics>
S4Q_Model::S4Q_Model()
@ -39,7 +40,7 @@ S4Q_Model::S4Q_Model()
Lines.append(new qucs::Line(-xb, -yb, -xb, yb,QPen(Qt::darkRed,2)));
Lines.append(new qucs::Line(-xb, yb, xb+3,yb,QPen(Qt::darkRed,2)));
Texts.append(new Text(-xb+4, -yb-3, QObject::tr(".MODEL"),
QColor(0,0,0), 12.0));
QColor(0,0,0), QFontInfo(f).pixelSize()));
x1 = -xb-3; y1 = -yb-5;
x2 = xb+9; y2 = yb+3;

3
qucs/spicecomponents/sp_nodeset.cpp
View File

@ -17,6 +17,7 @@
#include "sp_nodeset.h"
#include "main.h"
#include <QFontInfo>
#include <QFontMetrics>
SpiceNodeset::SpiceNodeset()
@ -37,7 +38,7 @@ SpiceNodeset::SpiceNodeset()
Lines.append(new qucs::Line(-xb, -yb, -xb, yb,QPen(Qt::darkRed,2)));
Lines.append(new qucs::Line(-xb, yb, xb+3,yb,QPen(Qt::darkRed,2)));
Texts.append(new Text(-xb+4, -yb-3, QObject::tr(".NODESET"),
QColor(0,0,0), 12.0));
QColor(0,0,0), QFontInfo(f).pixelSize()));
x1 = -xb-3; y1 = -yb-5;
x2 = xb+9; y2 = yb+3;

3
qucs/spicecomponents/sp_nutmeg.cpp
View File

@ -17,6 +17,7 @@
#include "sp_nutmeg.h"
#include "main.h"
#include <QFontInfo>
#include <QFontMetrics>
#include <QRegularExpression>
@ -38,7 +39,7 @@ NutmegEquation::NutmegEquation()
Lines.append(new qucs::Line(-xb, -yb, -xb, yb,QPen(Qt::blue,2)));
Lines.append(new qucs::Line(-xb, yb, xb+3,yb,QPen(Qt::blue,2)));
Texts.append(new Text(-xb+4, -yb-3, QObject::tr("Nutmeg"),
QColor(0,0,0), 12.0));
QColor(0,0,0), QFontInfo(f).pixelSize()));
x1 = -xb-3; y1 = -yb-5;
x2 = xb+9; y2 = yb+3;

3
qucs/spicecomponents/sp_options.cpp
View File

@ -17,6 +17,7 @@
#include "sp_options.h"
#include "main.h"
#include <QFontInfo>
#include <QFontMetrics>
SpiceOptions::SpiceOptions()
@ -37,7 +38,7 @@ SpiceOptions::SpiceOptions()
Lines.append(new qucs::Line(-xb, -yb, -xb, yb,QPen(Qt::darkRed,2)));
Lines.append(new qucs::Line(-xb, yb, xb+3,yb,QPen(Qt::darkRed,2)));
Texts.append(new Text(-xb+4, -yb-3, QObject::tr(".OPTIONS"),
QColor(0,0,0), 12.0));
QColor(0,0,0), QFontInfo(f).pixelSize()));
x1 = -xb-3; y1 = -yb-5;
x2 = xb+9; y2 = yb+3;

3
qucs/spicecomponents/sp_parameter.cpp
View File

@ -17,6 +17,7 @@
#include "sp_parameter.h"
#include "main.h"
#include <QFontInfo>
#include <QFontMetrics>
SpiceParam::SpiceParam()
@ -37,7 +38,7 @@ SpiceParam::SpiceParam()
Lines.append(new qucs::Line(-xb, -yb, -xb, yb,QPen(Qt::darkRed,2)));
Lines.append(new qucs::Line(-xb, yb, xb+3,yb,QPen(Qt::darkRed,2)));
Texts.append(new Text(-xb+4, -yb-3, QObject::tr(".PARAM"),
QColor(0,0,0), 12.0));
QColor(0,0,0), QFontInfo(f).pixelSize()));
x1 = -xb-3; y1 = -yb-5;
x2 = xb+9; y2 = yb+3;

3
qucs/spicecomponents/sp_spiceinit.cpp
View File

@ -14,6 +14,7 @@
#include "sp_spiceinit.h"
#include "main.h"
#include <QFontInfo>
#include <QFontMetrics>
SpiceSpiceinit::SpiceSpiceinit()
@ -33,7 +34,7 @@ SpiceSpiceinit::SpiceSpiceinit()
Lines.append(new qucs::Line(-xb, -yb, -xb, yb,QPen(Qt::darkRed,2)));
Lines.append(new qucs::Line(-xb, yb, xb+3,yb,QPen(Qt::darkRed,2)));
Texts.append(new Text(-xb+4, -yb-3, QObject::tr(".spiceinit"), QColor(0,0,0), 12.0));
Texts.append(new Text(-xb+4, -yb-3, QObject::tr(".spiceinit"), QColor(0,0,0), QFontInfo(f).pixelSize()));
x1 = -xb-3; y1 = -yb-5;
x2 = xb+9; y2 = yb+3;