mirror of
https://github.com/ra3xdh/qucs_s
synced 2025-03-28 21:13:26 +00:00
working with qt6
This commit is contained in:
Krasilnikov Sergei
zergud
parent
30fc185357
commit
05177da97b
@ -1,6 +1,6 @@
|
||||
<Qucs Schematic 0.0.24>
|
||||
<Qucs Schematic 1.0.0>
|
||||
<Properties>
|
||||
<View=-78,-81,1387,1001,1,71,0>
|
||||
<View=-78,-81,1387,1001,1,28,0>
|
||||
<Grid=10,10,1>
|
||||
<DataSet=BJT.dat>
|
||||
<DataDisplay=BJT.dpl>
|
||||
@ -63,10 +63,10 @@
|
||||
<400 60 480 60 "" 0 0 0 "">
|
||||
</Wires>
|
||||
<Diagrams>
|
||||
<Rect 896 365 387 269 3 #c0c0c0 1 10 1 0 1 0 1 -1 0.5 1 1 -1 0.5 1 315 0 225 "" "" "">
|
||||
<Rect 896 365 387 269 3 #c0c0c0 1 10 1 0 1 0 1 -1 0.5 1 1 -1 0.5 1 315 0 225 0 0 0 "" "" "">
|
||||
<"ngspice/ac.k" #0000ff 0 3 0 0 0>
|
||||
</Rect>
|
||||
<Rect 900 706 383 272 3 #c0c0c0 1 00 1 -1 0.2 1 1 -1 0.5 1 1 -1 0.5 1 315 0 225 "" "" "">
|
||||
<Rect 900 706 383 272 3 #c0c0c0 1 00 1 -1 0.2 1 1 -1 0.5 1 1 -1 0.5 1 315 0 225 0 0 0 "" "" "">
|
||||
<"ngspice/tran.i(pr1)" #0000ff 0 3 0 0 0>
|
||||
<"ngspice/tran.pwr" #ff0000 0 3 0 0 1>
|
||||
</Rect>
|
||||
|
||||
@ -56,11 +56,11 @@ ComponentDialog::ComponentDialog(Component *c, Schematic *d)
|
||||
ValInteger = new QIntValidator(1, 1000000, this);
|
||||
|
||||
Expr.setPattern("[^\"=]*"); // valid expression for property 'edit'
|
||||
Validator = new QRegExpValidator(Expr, this);
|
||||
Validator = new QRegularExpressionValidator(Expr, this);
|
||||
Expr.setPattern("[^\"]*"); // valid expression for property 'edit'
|
||||
Validator2 = new QRegExpValidator(Expr, this);
|
||||
Validator2 = new QRegularExpressionValidator(Expr, this);
|
||||
Expr.setPattern("[\\w_\\.\\(\\) @:\\[\\]]+"); // valid expression for property 'NameEdit'. Space to enable Spice-style par sweep
|
||||
ValRestrict = new QRegExpValidator(Expr, this);
|
||||
ValRestrict = new QRegularExpressionValidator(Expr, this);
|
||||
|
||||
checkSim = 0; comboSim = 0; comboType = 0; checkParam = 0;
|
||||
editStart = 0; editStop = 0; editNumber = 0;
|
||||
@ -661,7 +661,7 @@ void ComponentDialog::slotSelectProperty(QTableWidgetItem *item)
|
||||
int e = desc.lastIndexOf(']');
|
||||
if (e-b > 2) {
|
||||
QString str = desc.mid(b+1, e-b-1);
|
||||
str.replace( QRegExp("[^a-zA-Z0-9_,]"), "" );
|
||||
str.replace( QRegularExpression("[^a-zA-Z0-9_,]"), "" );
|
||||
List = str.split(',');
|
||||
qDebug() << "List = " << List;
|
||||
}
|
||||
|
||||
@ -21,6 +21,7 @@
|
||||
#include "component.h"
|
||||
|
||||
#include <QDialog>
|
||||
#include <QRegularExpression>
|
||||
|
||||
class Schematic;
|
||||
|
||||
@ -82,7 +83,7 @@ protected slots:
|
||||
private:
|
||||
QVBoxLayout *all; // the mother of all widgets
|
||||
QValidator *Validator, *ValRestrict, *Validator2;
|
||||
QRegExp Expr;
|
||||
QRegularExpression Expr;
|
||||
QIntValidator *ValInteger;
|
||||
QTableWidget *prop;
|
||||
QLineEdit *edit, *NameEdit, *CompNameEdit;
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
#include <QList>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QFontMetrics>
|
||||
|
||||
#include <QFileInfo>
|
||||
@ -202,9 +202,9 @@ QString EqnDefined::va_code()
|
||||
*/
|
||||
void EqnDefined::subsVoltages(QStringList &tokens, int Nbranch)
|
||||
{
|
||||
QRegExp volt_pattern("^V[0-9]+$");
|
||||
QRegularExpression volt_pattern("^V[0-9]+$");
|
||||
for (QStringList::iterator it = tokens.begin();it != tokens.end();it++) {
|
||||
if (volt_pattern.exactMatch(*it)) {
|
||||
if (volt_pattern.match(*it).hasMatch()) {
|
||||
QString volt = *it;
|
||||
volt.remove('V');
|
||||
int branch = volt.toInt();
|
||||
@ -226,9 +226,9 @@ void EqnDefined::subsVoltages(QStringList &tokens, int Nbranch)
|
||||
*/
|
||||
void EqnDefined::findCurrents(QStringList &tokens, QList<int> &branches)
|
||||
{
|
||||
QRegExp curr_pattern("^I[0-9]+$");
|
||||
QRegularExpression curr_pattern("^I[0-9]+$");
|
||||
for (QStringList::iterator it = tokens.begin();it != tokens.end();it++) {
|
||||
if (curr_pattern.exactMatch(*it)) {
|
||||
if (curr_pattern.match(*it).hasMatch()) {
|
||||
QString curr = *it;
|
||||
int num = curr.remove(0,1).toInt();
|
||||
if (!branches.contains(num)) branches.append(num-1);
|
||||
@ -243,9 +243,9 @@ void EqnDefined::findCurrents(QStringList &tokens, QList<int> &branches)
|
||||
*/
|
||||
void EqnDefined::subsCurrents(QStringList &tokens)
|
||||
{
|
||||
QRegExp curr_pattern("^I[0-9]+$");
|
||||
QRegularExpression curr_pattern("^I[0-9]+$");
|
||||
for (QStringList::iterator it = tokens.begin();it != tokens.end();it++) {
|
||||
if (curr_pattern.exactMatch(*it)) {
|
||||
if (curr_pattern.match(*it).hasMatch()) {
|
||||
QString curr = *it;
|
||||
int branch = curr.remove('I').toInt();
|
||||
*it = QString("i(V_%1sens_%2)").arg(Name).arg(branch-1);
|
||||
|
||||
@ -130,6 +130,13 @@ QString Equation::getExpression(bool isXyce)
|
||||
|
||||
QString s;
|
||||
s.clear();
|
||||
|
||||
QRegularExpression fp_pattern("^[\\+\\-]*\\d*\\.\\d+$"); // float
|
||||
QRegularExpression fp_exp_pattern("^[\\+\\-]*\\d*\\.*\\d+e[\\+\\-]*\\d+$"); // float with exp
|
||||
QRegularExpression dec_pattern("^[\\+\\-]*\\d+$"); // integer
|
||||
QRegularExpression spicefp_pattern("^[\\+\\-]*\\d*\\.\\d+[A-Za-z]{,3}$"); // float and scaling suffix
|
||||
QRegularExpression spicedec_pattern("^[\\+\\-]*\\d+[A-Za-z]{,3}$"); // decimal and scaling suffix
|
||||
|
||||
for (unsigned int i=0;i<Props.count()-1;i++) {
|
||||
QStringList tokens;
|
||||
QString eqn = Props.at(i)->Value;
|
||||
@ -138,16 +145,12 @@ QString Equation::getExpression(bool isXyce)
|
||||
eqn = tokens.join("");
|
||||
if (isXyce) {
|
||||
eqn.replace("^","**");
|
||||
QRegExp fp_pattern("^[\\+\\-]*\\d*\\.\\d+$"); // float
|
||||
QRegExp fp_exp_pattern("^[\\+\\-]*\\d*\\.*\\d+e[\\+\\-]*\\d+$"); // float with exp
|
||||
QRegExp dec_pattern("^[\\+\\-]*\\d+$"); // integer
|
||||
QRegExp spicefp_pattern("^[\\+\\-]*\\d*\\.\\d+[A-Za-z]{,3}$"); // float and scaling suffix
|
||||
QRegExp spicedec_pattern("^[\\+\\-]*\\d+[A-Za-z]{,3}$"); // decimal and scaling suffix
|
||||
if (!(fp_pattern.exactMatch(eqn)||
|
||||
dec_pattern.exactMatch(eqn)||
|
||||
fp_exp_pattern.exactMatch(eqn)||
|
||||
spicefp_pattern.exactMatch(eqn)||
|
||||
spicedec_pattern.exactMatch(eqn))) eqn = "{" + eqn + "}"; // wrap equation if it contains vars
|
||||
|
||||
if (!(fp_pattern.match(eqn).hasMatch()||
|
||||
dec_pattern.match(eqn).hasMatch()||
|
||||
fp_exp_pattern.match(eqn).hasMatch()||
|
||||
spicefp_pattern.match(eqn).hasMatch()||
|
||||
spicedec_pattern.match(eqn).hasMatch())) eqn = "{" + eqn + "}"; // wrap equation if it contains vars
|
||||
}
|
||||
|
||||
if (!spicecompat::containNodes(tokens,ng_vars)) {
|
||||
|
||||
@ -18,6 +18,7 @@
|
||||
#include "main.h"
|
||||
#include "misc.h"
|
||||
#include "extsimkernels/spicecompat.h"
|
||||
#include <QRegularExpression>
|
||||
|
||||
|
||||
HB_Sim::HB_Sim()
|
||||
@ -79,7 +80,7 @@ QString HB_Sim::spice_netlist(bool isXyce)
|
||||
QString s="";
|
||||
if (isXyce) { // Only in Xyce
|
||||
s += QString(".options hbint numfreq=%1 STARTUPPERIODS=2\n").arg(Props.at(1)->Value);
|
||||
QStringList freqs = Props.at(0)->Value.split(QRegExp("\\s+(?=[0-9])"));
|
||||
QStringList freqs = Props.at(0)->Value.split(QRegularExpression("\\s+(?=[0-9])"));
|
||||
// split frequencyes list by space before digit
|
||||
for (QStringList::iterator it = freqs.begin();it != freqs.end(); it++) {
|
||||
(*it) = spicecompat::normalize_value(*it);
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
#include <QTextStream>
|
||||
#include <QDir>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QDebug>
|
||||
|
||||
LibComp::LibComp()
|
||||
@ -146,7 +146,7 @@ int LibComp::loadSection(const QString& Name, QString& Section,
|
||||
if(EndI < 0) return -11; // file corrupt
|
||||
StartI++; EndI--;
|
||||
QString inc = Section.mid(StartI, EndI-StartI);
|
||||
QStringList f = inc.split(QRegExp("\"\\s+\""));
|
||||
QStringList f = inc.split(QRegularExpression("\"\\s+\""));
|
||||
for(QStringList::Iterator it = f.begin(); it != f.end(); ++it ) {
|
||||
Includes->append(*it);
|
||||
}
|
||||
@ -164,7 +164,7 @@ int LibComp::loadSection(const QString& Name, QString& Section,
|
||||
if(EndI < 0) return -11; // file corrupt
|
||||
StartI++; EndI--;
|
||||
QString inc = Section.mid(StartI, EndI-StartI);
|
||||
QStringList f = inc.split(QRegExp("\"\\s+\""));
|
||||
QStringList f = inc.split(QRegularExpression("\"\\s+\""));
|
||||
for(QStringList::Iterator it = f.begin(); it != f.end(); ++it ) {
|
||||
Attach->append(*it);
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
#include <QDir>
|
||||
#include <QFile>
|
||||
#include <QTextStream>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
|
||||
@ -235,7 +235,7 @@ bool Optimize_Sim::createASCOnetlist()
|
||||
}
|
||||
else
|
||||
{
|
||||
QRegExp reg = QRegExp("=\"(" + *it + ")\"");
|
||||
QRegularExpression reg = QRegularExpression("=\"(" + *it + ")\"");
|
||||
Line.replace(reg, "=\"#\\1#\"");
|
||||
}
|
||||
|
||||
|
||||
@ -57,7 +57,7 @@ OptimizeDialog::OptimizeDialog(Optimize_Sim *c_, Schematic *d_)
|
||||
setWindowTitle(tr("Edit Optimization Properties"));
|
||||
|
||||
Expr.setPattern("[\\w_]+");
|
||||
Validator = new QRegExpValidator(Expr, this);
|
||||
Validator = new QRegularExpressionValidator(Expr, this);
|
||||
numVal = new QDoubleValidator(this);
|
||||
intVal = new QIntValidator(this);
|
||||
|
||||
@ -327,7 +327,7 @@ OptimizeDialog::OptimizeDialog(Optimize_Sim *c_, Schematic *d_)
|
||||
// buttons on the bottom of the dialog (independent of the TabWidget)
|
||||
QHBoxLayout *Butts = new QHBoxLayout();
|
||||
Butts->setSpacing(3);
|
||||
Butts->setMargin(3);
|
||||
Butts->setContentsMargins(3, 3, 3, 3);
|
||||
|
||||
QPushButton *OkButt = new QPushButton(tr("OK"));
|
||||
connect(OkButt, SIGNAL(clicked()), SLOT(slotOK()));
|
||||
|
||||
@ -19,7 +19,8 @@
|
||||
#define OPTIMIZEDIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QRegularExpressionValidator>
|
||||
|
||||
class Schematic;
|
||||
class Optimize_Sim;
|
||||
@ -80,8 +81,8 @@ public:
|
||||
QComboBox *SimEdit, *GoalTypeCombo, *MethodCombo, *VarTypeCombo;
|
||||
QTableWidget *VarTable, *GoalTable;
|
||||
|
||||
QRegExp Expr;
|
||||
QRegExpValidator *Validator;
|
||||
QRegularExpression Expr;
|
||||
QRegularExpressionValidator *Validator;
|
||||
QDoubleValidator *numVal;
|
||||
QIntValidator *intVal;
|
||||
};
|
||||
|
||||
@ -107,7 +107,7 @@ QString Param_Sweep::getNgspiceBeforeSim(QString sim, int lvl)
|
||||
QStringList::const_iterator constListIterator;
|
||||
QString type = getProperty("Type")->Value;
|
||||
QString step_var = parameter_list.begin()->toLower();// use first element name as variable name
|
||||
step_var.remove(QRegExp("[\\.\\[\\]@:]"));
|
||||
step_var.remove(QRegularExpression("[\\.\\[\\]@:]"));
|
||||
|
||||
s = QString("let number_%1 = 0\n").arg(step_var);
|
||||
if (lvl==0) s += QString("echo \"STEP %1.%2\" > spice4qucs.%3.cir.res\n").arg(sim).arg(step_var).arg(sim);
|
||||
@ -120,7 +120,7 @@ QString Param_Sweep::getNgspiceBeforeSim(QString sim, int lvl)
|
||||
List = getProperty("Values")->Value.split(";");
|
||||
|
||||
for(int i = 0; i < List.length(); i++) {
|
||||
List[i].remove(QRegExp("[A-Z a-z [\\] s/' '//g]"));
|
||||
List[i].remove(QRegularExpression("[A-Z a-z [\\] s/' '//g]"));
|
||||
s += QString("%1 ").arg(List[i]);
|
||||
}
|
||||
} else {
|
||||
@ -202,7 +202,7 @@ QString Param_Sweep::getNgspiceAfterSim(QString sim, int lvl)
|
||||
QStringList parameter_list = getProperty("Param")->Value.split( this->param_split_str );
|
||||
QString par = parameter_list.begin()->toLower();
|
||||
QString type = getProperty("Type")->Value;
|
||||
par.remove(QRegExp("[\\.\\[\\]@:]"));
|
||||
par.remove(QRegularExpression("[\\.\\[\\]@:]"));
|
||||
|
||||
s = "set appendwrite\n";
|
||||
|
||||
@ -218,7 +218,7 @@ QString Param_Sweep::getNgspiceAfterSim(QString sim, int lvl)
|
||||
QString Param_Sweep::getCounterVar()
|
||||
{
|
||||
QString par = getProperty("Param")->Value;
|
||||
par.remove(QRegExp("[\\.\\[\\]@:]"));
|
||||
par.remove(QRegularExpression("[\\.\\[\\]@:]"));
|
||||
QString s = QString("number_%1").arg(par);
|
||||
return s;
|
||||
}
|
||||
|
||||
@ -54,9 +54,9 @@ SpiceDialog::SpiceDialog(QucsApp* App_, SpiceFile *c, Schematic *d)
|
||||
QWidget *myParent = this;
|
||||
|
||||
Expr.setPattern("[^\"=]+"); // valid expression for property 'edit' etc
|
||||
Validator = new QRegExpValidator(Expr, this);
|
||||
Validator = new QRegularExpressionValidator(Expr, this);
|
||||
Expr.setPattern("[\\w_]+"); // valid expression for property 'NameEdit' etc
|
||||
ValRestrict = new QRegExpValidator(Expr, this);
|
||||
ValRestrict = new QRegularExpressionValidator(Expr, this);
|
||||
|
||||
// ...........................................................
|
||||
QGridLayout *topGrid = new QGridLayout;
|
||||
|
||||
@ -19,7 +19,8 @@
|
||||
#define SPICEDIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QRegularExpressionValidator>
|
||||
|
||||
class Schematic;
|
||||
class SpiceFile;
|
||||
@ -69,8 +70,8 @@ private:
|
||||
bool loadSpiceNetList(const QString&);
|
||||
|
||||
QVBoxLayout *all; // the mother of all widgets
|
||||
QRegExpValidator *Validator, *ValRestrict;
|
||||
QRegExp Expr;
|
||||
QRegularExpressionValidator *Validator, *ValRestrict;
|
||||
QRegularExpression Expr;
|
||||
QListWidget *NodesList, *PortsList;
|
||||
QCheckBox *FileCheck, *SimCheck;
|
||||
QLineEdit *FileEdit, *CompNameEdit;
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
#if HAVE_UNISTD_H
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QProcess>
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
#include <QString>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QFile>
|
||||
#include <QFileInfo>
|
||||
|
||||
@ -61,9 +61,9 @@ VerilogA_File_Info::VerilogA_File_Info (QString File, bool isfile)
|
||||
File.remove(i, j-i+2);
|
||||
}
|
||||
|
||||
QRegExp Expr,Expr1;
|
||||
Expr.setCaseSensitivity(Qt::CaseSensitive);
|
||||
Expr1.setCaseSensitivity(Qt::CaseSensitive);
|
||||
QRegularExpression Expr,Expr1;
|
||||
//Expr.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
|
||||
//Expr1.setPatternOptions(Qt::CaseSensitive);
|
||||
k--;
|
||||
Expr.setPattern("\\bmodule\\b"); // start of last module
|
||||
k = File.lastIndexOf(Expr, k);
|
||||
@ -101,9 +101,9 @@ VerilogA_File_Info::VerilogA_File_Info (QString File, bool isfile)
|
||||
// -------------------------------------------------------
|
||||
QString VerilogA_File_Info::parsePorts(QString s, int i)
|
||||
{
|
||||
QRegExp Expr,Expr1;
|
||||
Expr.setCaseSensitivity(Qt::CaseSensitive);
|
||||
Expr1.setCaseSensitivity(Qt::CaseSensitive);
|
||||
QRegularExpression Expr,Expr1;
|
||||
//Expr.setCaseSensitivity(Qt::CaseSensitive);
|
||||
//Expr1.setCaseSensitivity(Qt::CaseSensitive);
|
||||
|
||||
int j;
|
||||
i = 0; // remove all Verilog-A identifiers (e.g. "input")
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
#include "misc.h"
|
||||
|
||||
#include <QTextStream>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QFileInfo>
|
||||
|
||||
|
||||
@ -241,9 +241,9 @@ Verilog_File_Info::Verilog_File_Info(QString File, bool isfile)
|
||||
File.remove(i, j-i+2);
|
||||
}
|
||||
|
||||
QRegExp Expr,Expr1;
|
||||
Expr.setCaseSensitivity(Qt::CaseSensitive);
|
||||
Expr1.setCaseSensitivity(Qt::CaseSensitive);
|
||||
QRegularExpression Expr,Expr1;
|
||||
//Expr.setCaseSensitivity(Qt::CaseSensitive);
|
||||
//Expr1.setCaseSensitivity(Qt::CaseSensitive);
|
||||
k--;
|
||||
Expr.setPattern("\\bmodule\\b"); // start of last module
|
||||
k = File.lastIndexOf(Expr, k);
|
||||
@ -281,9 +281,9 @@ Verilog_File_Info::Verilog_File_Info(QString File, bool isfile)
|
||||
// -------------------------------------------------------
|
||||
QString Verilog_File_Info::parsePorts(QString s, int i)
|
||||
{
|
||||
QRegExp Expr,Expr1;
|
||||
Expr.setCaseSensitivity(Qt::CaseSensitive);
|
||||
Expr1.setCaseSensitivity(Qt::CaseSensitive);
|
||||
QRegularExpression Expr,Expr1;
|
||||
//Expr.setCaseSensitivity(Qt::CaseSensitive);
|
||||
//Expr1.setCaseSensitivity(Qt::CaseSensitive);
|
||||
|
||||
int j;
|
||||
i = 0; // remove all Verilog identifiers (e.g. "input")
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
#include "misc.h"
|
||||
|
||||
#include <QTextStream>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QFileInfo>
|
||||
|
||||
|
||||
@ -280,8 +280,8 @@ VHDL_File_Info::VHDL_File_Info(QString File, bool isfile)
|
||||
File.remove(i, j-i);
|
||||
}
|
||||
|
||||
QRegExp Expr;
|
||||
Expr.setCaseSensitivity(Qt::CaseInsensitive);
|
||||
QRegularExpression Expr;
|
||||
Expr.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
|
||||
for(;;) {
|
||||
k--;
|
||||
Expr.setPattern("\\bentity\\b"); // start of last entity
|
||||
@ -325,8 +325,8 @@ VHDL_File_Info::VHDL_File_Info(QString File, bool isfile)
|
||||
// -------------------------------------------------------
|
||||
QString VHDL_File_Info::parsePorts(QString s, int j)
|
||||
{
|
||||
QRegExp Expr;
|
||||
Expr.setCaseSensitivity(Qt::CaseInsensitive);
|
||||
QRegularExpression Expr;
|
||||
Expr.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
|
||||
int i, p, l, k;
|
||||
|
||||
Expr.setPattern("\\bport\\b"); // start of interface definition
|
||||
@ -388,8 +388,8 @@ QString VHDL_File_Info::parsePorts(QString s, int j)
|
||||
// -------------------------------------------------------
|
||||
QString VHDL_File_Info::parseGenerics(QString s, int j)
|
||||
{
|
||||
QRegExp Expr;
|
||||
Expr.setCaseSensitivity(Qt::CaseInsensitive);
|
||||
QRegularExpression Expr;
|
||||
Expr.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
|
||||
int i, p, l, k, n;
|
||||
|
||||
Expr.setPattern("\\bgeneric\\b");
|
||||
|
||||
@ -50,7 +50,7 @@
|
||||
|
||||
#include <QTextStream>
|
||||
#include <QMessageBox>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QDateTime>
|
||||
#include <QPainter>
|
||||
#include <QDebug>
|
||||
|
||||
@ -126,7 +126,7 @@ DiagramDialog::DiagramDialog(Diagram *d, QWidget *parent, Graph *currentGraph)
|
||||
toTake = false; // double-clicked variable be inserted into graph list ?
|
||||
|
||||
Expr.setPattern("[^\"]+");
|
||||
Validator = new QRegExpValidator(Expr, this);
|
||||
Validator = new QRegularExpressionValidator(Expr, this);
|
||||
ValInteger = new QIntValidator(0, 360, this);
|
||||
ValDouble = new QDoubleValidator(-1e200, 1e200, 6, this);
|
||||
|
||||
@ -742,7 +742,7 @@ DiagramDialog::DiagramDialog(Diagram *d, QWidget *parent, Graph *currentGraph)
|
||||
QWidget *Butts = new QWidget();
|
||||
QHBoxLayout *ButtsLayout = new QHBoxLayout();
|
||||
ButtsLayout->setSpacing(5);
|
||||
ButtsLayout->setMargin(5);
|
||||
ButtsLayout->setContentsMargins(5, 5, 5, 5);
|
||||
Butts->setLayout(ButtsLayout);
|
||||
all->addWidget(Butts);
|
||||
|
||||
@ -1639,7 +1639,7 @@ void DiagramDialog::slotEditRotZ(const QString& Text)
|
||||
void DiagramDialog::slotPlotVs(int)
|
||||
{
|
||||
QString s = GraphInput->text();
|
||||
s.remove(QRegExp("@.*$")); // remove all after "@" symbol
|
||||
s.remove(QRegularExpression("@.*$")); // remove all after "@" symbol
|
||||
if (ChooseXVar->currentIndex()!=0) {
|
||||
s += "@" + ChooseXVar->currentText();
|
||||
}
|
||||
|
||||
@ -25,7 +25,8 @@
|
||||
#endif*/
|
||||
|
||||
#include <QDialog>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QRegularExpressionValidator>
|
||||
#include "qt3_compat/qt_compat.h"
|
||||
|
||||
class QVBoxLayout;
|
||||
@ -99,10 +100,10 @@ private:
|
||||
Diagram *Diag;
|
||||
QString defaultDataSet;
|
||||
|
||||
QRegExp Expr;
|
||||
QRegularExpression Expr;
|
||||
QDoubleValidator *ValDouble;
|
||||
QIntValidator *ValInteger;
|
||||
QRegExpValidator *Validator;
|
||||
QRegularExpressionValidator *Validator;
|
||||
|
||||
QLabel *lblSim;
|
||||
QLabel *lblPlotVs;
|
||||
|
||||
@ -41,14 +41,14 @@ ChangeDialog::ChangeDialog(Schematic *Doc_)
|
||||
setWindowTitle(tr("Change Component Properties"));
|
||||
|
||||
Expr.setPattern("[^\"=]+"); // valid expression for property value
|
||||
Validator = new QRegExpValidator(Expr, this);
|
||||
Validator = new QRegularExpressionValidator(Expr, this);
|
||||
Expr.setPattern("[\\w_]+"); // valid expression for property name
|
||||
ValRestrict = new QRegExpValidator(Expr, this);
|
||||
ValRestrict = new QRegularExpressionValidator(Expr, this);
|
||||
|
||||
|
||||
// ...........................................................
|
||||
all = new QGridLayout(this);//, 6,2,3,3);
|
||||
all->setMargin(5);
|
||||
all->setContentsMargins(5, 5, 5, 5);
|
||||
|
||||
all->addWidget(new QLabel(tr("Components:"), this), 0,0);
|
||||
CompTypeEdit = new QComboBox(this);
|
||||
@ -127,8 +127,9 @@ bool ChangeDialog::matches(const QString& CompModel)
|
||||
// Is called if the "Replace"-button is pressed.
|
||||
void ChangeDialog::slotButtReplace()
|
||||
{
|
||||
Expr.setPatternSyntax(QRegExp::Wildcard); // switch into wildcard mode
|
||||
Expr.setPattern(CompNameEdit->text());
|
||||
//Expr.setPatternSyntax(QRegExp::Wildcard); // switch into wildcard mode
|
||||
//Expr.setPattern(CompNameEdit->text());
|
||||
Expr = QRegularExpression(QRegularExpression::wildcardToRegularExpression(CompNameEdit->text()));
|
||||
if(!Expr.isValid()) {
|
||||
QMessageBox::critical(this, tr("Error"),
|
||||
tr("Regular expression for component name is invalid."));
|
||||
@ -140,7 +141,7 @@ void ChangeDialog::slotButtReplace()
|
||||
Dia->setWindowTitle(tr("Found Components"));
|
||||
QVBoxLayout *Dia_All = new QVBoxLayout(Dia);
|
||||
Dia_All->setSpacing(3);
|
||||
Dia_All->setMargin(5);
|
||||
Dia_All->setContentsMargins(5, 5, 5, 5);
|
||||
|
||||
QScrollArea *Dia_Scroll = new QScrollArea(Dia);
|
||||
//Dia_Scroll->setMargin(5);
|
||||
@ -172,7 +173,8 @@ void ChangeDialog::slotButtReplace()
|
||||
// search through all components
|
||||
for(pc = Doc->Components->first(); pc!=0; pc = Doc->Components->next()) {
|
||||
if(matches(pc->Model)) {
|
||||
if(Expr.indexIn(pc->Name) >= 0)
|
||||
QRegularExpressionMatch match = Expr.match(pc->Name);
|
||||
if(match.hasMatch())
|
||||
for(Property *pp = pc->Props.first(); pp!=0; pp = pc->Props.next())
|
||||
if(pp->Name == PropNameEdit->currentText()) {
|
||||
pb = new QCheckBox(pc->Name);
|
||||
@ -185,7 +187,7 @@ void ChangeDialog::slotButtReplace()
|
||||
i2 = pp->Description.lastIndexOf(']');
|
||||
if(i2-i1 < 2) break;
|
||||
str = pp->Description.mid(i1+1, i2-i1-1);
|
||||
str.replace( QRegExp("[^a-zA-Z0-9_,]"), "" );
|
||||
str.replace( QRegularExpression("[^a-zA-Z0-9_,]"), "" );
|
||||
List = str.split(',');
|
||||
if(List.lastIndexOf(NewValueEdit->text()) >= 0)
|
||||
break; // property value is okay
|
||||
|
||||
@ -19,7 +19,8 @@
|
||||
#define CHANGEDIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QRegularExpressionValidator>
|
||||
#include <QGridLayout>
|
||||
|
||||
class Schematic;
|
||||
@ -43,8 +44,8 @@ private:
|
||||
|
||||
Schematic *Doc;
|
||||
QGridLayout *all; // the mother of all widgets
|
||||
QRegExpValidator *Validator, *ValRestrict;
|
||||
QRegExp Expr;
|
||||
QRegularExpressionValidator *Validator, *ValRestrict;
|
||||
QRegularExpression Expr;
|
||||
QLineEdit *CompNameEdit, *NewValueEdit;
|
||||
QComboBox *CompTypeEdit, *PropNameEdit;
|
||||
};
|
||||
|
||||
@ -39,10 +39,10 @@ DigiSettingsDialog::DigiSettingsDialog(TextDoc *Doc_)
|
||||
setWindowTitle(tr("Document Settings"));
|
||||
|
||||
Expr.setPattern("[0-9][0-9a-zA-Z ]+"); // valid expression for LineEdit
|
||||
Validator = new QRegExpValidator(Expr, this);
|
||||
Validator = new QRegularExpressionValidator(Expr, this);
|
||||
|
||||
QVBoxLayout *all = new QVBoxLayout(this);
|
||||
all->setMargin(5);
|
||||
all->setContentsMargins(5,5,5,5);
|
||||
|
||||
QGroupBox *setGroup = new QGroupBox(tr("Digital Simulation Settings"));
|
||||
all->addWidget(setGroup);
|
||||
|
||||
@ -19,7 +19,8 @@
|
||||
#define DIGISETTINGSDIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QRegularExpressionValidator>
|
||||
#include <QLabel>
|
||||
|
||||
class TextDoc;
|
||||
@ -47,8 +48,8 @@ private slots:
|
||||
|
||||
private:
|
||||
TextDoc *Doc;
|
||||
QRegExp Expr;
|
||||
QRegExpValidator *Validator;
|
||||
QRegularExpression Expr;
|
||||
QRegularExpressionValidator *Validator;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -34,7 +34,7 @@ DisplayDialog::DisplayDialog(QWidget *parent, QString Text, QString SpiceText)
|
||||
: QDialog(parent)
|
||||
{
|
||||
vLayout = new QVBoxLayout(this);
|
||||
vLayout->setMargin(3);
|
||||
vLayout->setContentsMargins(3,3,3,3);
|
||||
|
||||
QGroupBox *Spice = new QGroupBox (tr("SPICE"), this);
|
||||
QVBoxLayout *SpiceLayout = new QVBoxLayout();
|
||||
|
||||
@ -38,7 +38,7 @@ LabelDialog::LabelDialog(WireLabel *pl, QWidget *parent)
|
||||
// valid expression for LineEdit: alpha-numeric, but must start with
|
||||
// letter and never two "_" together
|
||||
Expr1.setPattern("[a-zA-Z]([0-9a-zA-Z]|_(?!_))+\\!{0,1}");
|
||||
Validator1 = new QRegExpValidator(Expr1, this);
|
||||
Validator1 = new QRegularExpressionValidator(Expr1, this);
|
||||
|
||||
QLabel *Label1 = new QLabel(tr("Enter the label:"));
|
||||
gbox->addWidget(Label1,0,0);
|
||||
@ -49,7 +49,7 @@ LabelDialog::LabelDialog(WireLabel *pl, QWidget *parent)
|
||||
gbox->addWidget(NodeName,1,0,1,3);
|
||||
|
||||
Expr2.setPattern("[^\"=]+"); // valid expression for LineEdit
|
||||
Validator2 = new QRegExpValidator(Expr2, this);
|
||||
Validator2 = new QRegularExpressionValidator(Expr2, this);
|
||||
|
||||
Label2 = new QLabel(tr("Initial node voltage:"));
|
||||
gbox->addWidget(Label2,2,0);
|
||||
|
||||
@ -19,7 +19,8 @@
|
||||
#define LABELDIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QRegularExpressionValidator>
|
||||
#include <QGridLayout>
|
||||
#include <QLabel>
|
||||
|
||||
@ -47,8 +48,8 @@ private slots:
|
||||
private:
|
||||
QPushButton *ButtonOk, *ButtonCancel, *ButtonMore;
|
||||
QGridLayout *gbox;
|
||||
QRegExpValidator *Validator1, *Validator2;
|
||||
QRegExp Expr1, Expr2;
|
||||
QRegularExpressionValidator *Validator1, *Validator2;
|
||||
QRegularExpression Expr1, Expr2;
|
||||
QLabel *Label2;
|
||||
|
||||
WireLabel *pLabel;
|
||||
|
||||
@ -58,13 +58,13 @@ LibraryDialog::LibraryDialog(QWidget *parent)
|
||||
setWindowTitle(tr("Create Library"));
|
||||
|
||||
Expr.setPattern("[\\w_]+");
|
||||
Validator = new QRegExpValidator(Expr, this);
|
||||
Validator = new QRegularExpressionValidator(Expr, this);
|
||||
|
||||
curDescr = 0; // description counter, prev, next
|
||||
|
||||
// ...........................................................
|
||||
all = new QVBoxLayout(this);
|
||||
all->setMargin(5);
|
||||
all->setContentsMargins(5,5,5,5);
|
||||
all->setSpacing(6);
|
||||
|
||||
stackedWidgets = new QStackedWidget(this);
|
||||
|
||||
@ -24,7 +24,8 @@
|
||||
#ifndef LIBRARYDIALOG_H
|
||||
#define LIBRARYDIALOG_H
|
||||
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QRegularExpressionValidator>
|
||||
|
||||
#include <QList>
|
||||
#include <QStringList>
|
||||
@ -47,7 +48,7 @@ class QTreeWidgetItem;
|
||||
class QGroupBox;
|
||||
class QRegExpValidator;
|
||||
class QStackedWidget;
|
||||
class QStringList;
|
||||
//class QStringList;
|
||||
class QListWidget;
|
||||
|
||||
|
||||
@ -96,8 +97,8 @@ private:
|
||||
|
||||
QFile LibFile;
|
||||
QDir LibDir;
|
||||
QRegExp Expr;
|
||||
QRegExpValidator *Validator;
|
||||
QRegularExpression Expr;
|
||||
QRegularExpressionValidator *Validator;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -59,7 +59,7 @@ void LoadDialog::setApp(QucsApp *a)
|
||||
void LoadDialog::initDialog()
|
||||
{
|
||||
QVBoxLayout *all = new QVBoxLayout(this);
|
||||
all->setMargin(5);
|
||||
all->setContentsMargins(5,5,5,5);
|
||||
all->setSpacing(6);
|
||||
|
||||
// hold group of files / group icon and checkboxes
|
||||
|
||||
@ -53,7 +53,7 @@ PackageDialog::PackageDialog(QWidget *parent_, bool create_)
|
||||
: QDialog(parent_)
|
||||
{
|
||||
all = new QVBoxLayout(this);
|
||||
all->setMargin(5);
|
||||
all->setContentsMargins(5,5,5,5);
|
||||
all->setSpacing(6);
|
||||
|
||||
QHBoxLayout *h2 = new QHBoxLayout();
|
||||
|
||||
@ -63,7 +63,7 @@ QucsSettingsDialog::QucsSettingsDialog(QucsApp *parent)
|
||||
setWindowTitle(tr("Edit Qucs Properties"));
|
||||
|
||||
Expr.setPattern("[\\w_]+");
|
||||
Validator = new QRegExpValidator(Expr, this);
|
||||
Validator = new QRegularExpressionValidator(Expr, this);
|
||||
|
||||
all = new QVBoxLayout(this); // to provide the necessary size
|
||||
QTabWidget *t = new QTabWidget();
|
||||
@ -416,7 +416,7 @@ QucsSettingsDialog::QucsSettingsDialog(QucsApp *parent)
|
||||
|
||||
QHBoxLayout *Butts = new QHBoxLayout();
|
||||
Butts->setSpacing(3);
|
||||
Butts->setMargin(3);
|
||||
Butts->setContentsMargins(3,3,3,3);
|
||||
all->addLayout(Butts);
|
||||
|
||||
QPushButton *OkButt = new QPushButton(tr("OK"));
|
||||
|
||||
@ -23,7 +23,8 @@
|
||||
|
||||
#include <QDialog>
|
||||
#include <QFont>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QRegularExpressionValidator>
|
||||
#include <QVBoxLayout>
|
||||
|
||||
class QLineEdit;
|
||||
@ -99,8 +100,8 @@ public:
|
||||
QVBoxLayout *all;
|
||||
QIntValidator *val50;
|
||||
QIntValidator *val200;
|
||||
QRegExp Expr;
|
||||
QRegExpValidator *Validator;
|
||||
QRegularExpression Expr;
|
||||
QRegularExpressionValidator *Validator;
|
||||
|
||||
private:
|
||||
QStringList currentPaths;
|
||||
|
||||
@ -29,7 +29,8 @@
|
||||
#include <QLabel>
|
||||
#include <QWidget>
|
||||
#include <QLayout>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QRegularExpressionValidator>
|
||||
#include <QLineEdit>
|
||||
#include <QTextEdit>
|
||||
#include <QCheckBox>
|
||||
@ -97,7 +98,7 @@ SettingsDialog::SettingsDialog(Schematic *Doc_)
|
||||
Check_GridOn = new QCheckBox(tr("show Grid"), Tab2);
|
||||
gp2->addWidget(Check_GridOn,0,0,1,1);
|
||||
|
||||
valExpr = new QRegExpValidator(QRegExp("[1-9]\\d{0,2}"), this);
|
||||
valExpr = new QRegularExpressionValidator(QRegularExpression("[1-9]\\d{0,2}"), this);
|
||||
|
||||
QLabel *l3 = new QLabel(tr("horizontal Grid:"), Tab2);
|
||||
gp2->addWidget(l3,1,0);
|
||||
@ -146,7 +147,7 @@ SettingsDialog::SettingsDialog(Schematic *Doc_)
|
||||
// buttons on the bottom of the dialog (independent of the TabWidget)
|
||||
QHBoxLayout *Butts = new QHBoxLayout();
|
||||
Butts->setSpacing(5);
|
||||
Butts->setMargin(5);
|
||||
Butts->setContentsMargins(5,5,5,5);
|
||||
all->addLayout(Butts);
|
||||
|
||||
QPushButton *OkButt = new QPushButton(tr("OK"));
|
||||
@ -352,7 +353,7 @@ AuxFilesDialog::AuxFilesDialog(QWidget *parent, const QString &filter) :QDialog(
|
||||
// buttons at the bottom of the dialog
|
||||
QHBoxLayout *Btns = new QHBoxLayout();
|
||||
Btns->setSpacing(5);
|
||||
Btns->setMargin(5);
|
||||
Btns->setContentsMargins(5,5,5,5);
|
||||
layout->addLayout(Btns);
|
||||
|
||||
Btns->addStretch();
|
||||
|
||||
@ -20,6 +20,7 @@
|
||||
|
||||
#include <QDialog>
|
||||
#include <QVBoxLayout>
|
||||
#include <QRegularExpressionValidator>
|
||||
|
||||
class Schematic;
|
||||
class QLineEdit;
|
||||
@ -56,7 +57,7 @@ public:
|
||||
QCheckBox *Check_OpenDpl, *Check_GridOn, *Check_RunScript;
|
||||
|
||||
QVBoxLayout *all;
|
||||
QRegExpValidator *valExpr;
|
||||
QRegularExpressionValidator *valExpr;
|
||||
};
|
||||
|
||||
class AuxFilesDialog : public QDialog {
|
||||
|
||||
@ -30,7 +30,8 @@ using namespace std;
|
||||
#include <QPushButton>
|
||||
#include <QPlainTextEdit>
|
||||
#include <QDateTime>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QRegularExpressionValidator>
|
||||
#include <QTextStream>
|
||||
#include <QVBoxLayout>
|
||||
#include <QHBoxLayout>
|
||||
@ -84,7 +85,7 @@ SimMessage::SimMessage(QWidget *w, QWidget *parent)
|
||||
|
||||
all = new QVBoxLayout(this);
|
||||
all->setSpacing(5);
|
||||
all->setMargin(5);
|
||||
all->setContentsMargins(5,5,5,5);
|
||||
QGroupBox *Group1 = new QGroupBox(tr("Progress:"));
|
||||
all->addWidget(Group1);
|
||||
QVBoxLayout *vbox1 = new QVBoxLayout();
|
||||
|
||||
@ -94,7 +94,7 @@ SweepDialog::SweepDialog(Schematic *Doc_,QHash<QString,double> *NodeVals)
|
||||
int i = 0;
|
||||
// ...........................................................
|
||||
QGridLayout *all = new QGridLayout(this);//, pGraph->cPointsX.count()+2,2,3,3);
|
||||
all->setMargin(5);
|
||||
all->setContentsMargins(5,5,5,5);
|
||||
all->setSpacing(5);
|
||||
all->setColumnStretch(1,5);
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
#define SWEEPDIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QList>
|
||||
|
||||
#include <QSpinBox>
|
||||
|
||||
@ -45,7 +45,7 @@ VASettingsDialog::VASettingsDialog (TextDoc * Doc_)
|
||||
QString Module = Doc->getModuleName ();
|
||||
|
||||
Expr.setPattern("[0-9a-zA-Z /\\]+"); // valid expression for IconEdit
|
||||
Validator = new QRegExpValidator (Expr, this);
|
||||
Validator = new QRegularExpressionValidator (Expr, this);
|
||||
|
||||
vLayout = new QVBoxLayout(this);
|
||||
|
||||
|
||||
@ -19,7 +19,8 @@
|
||||
#define VASETTINGSDIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QRegularExpressionValidator>
|
||||
#include <QLabel>
|
||||
|
||||
class TextDoc;
|
||||
@ -50,8 +51,8 @@ private slots:
|
||||
|
||||
private:
|
||||
TextDoc * Doc;
|
||||
QRegExp Expr;
|
||||
QRegExpValidator * Validator;
|
||||
QRegularExpression Expr;
|
||||
QRegularExpressionValidator * Validator;
|
||||
QVBoxLayout *vLayout;
|
||||
};
|
||||
|
||||
|
||||
@ -331,7 +331,7 @@ void AbstractSpiceKernel::parseNgSpiceSimOutput(QString ngspice_file,QList< QLis
|
||||
bool start_values_sec = false;
|
||||
int NumVars=0; // Number of dep. and indep.variables
|
||||
while (!ngsp_data.atEnd()) { // Parse header;
|
||||
QRegExp sep("[ \t,]");
|
||||
QRegularExpression sep("[ \t,]");
|
||||
QString lin = ngsp_data.readLine();
|
||||
if (lin.isEmpty()) continue;
|
||||
if (lin.contains("Flags")&&lin.contains("complex")) { // output consists of
|
||||
@ -420,7 +420,7 @@ void AbstractSpiceKernel::parseHBOutput(QString ngspice_file, QList<QList<double
|
||||
}
|
||||
var_list.append(norm_vars);
|
||||
}
|
||||
if ((lin.contains(QRegExp("\\d*\\.\\d+[+-]*[eE]*[\\d]*")))) { // CSV dataline
|
||||
if ((lin.contains(QRegularExpression("\\d*\\.\\d+[+-]*[eE]*[\\d]*")))) { // CSV dataline
|
||||
QStringList vals = lin.split(" ",qucs::SkipEmptyParts);
|
||||
QList <double> sim_point;
|
||||
sim_point.clear();
|
||||
@ -452,8 +452,8 @@ void AbstractSpiceKernel::parseFourierOutput(QString ngspice_file, QList<QList<d
|
||||
var_list.append("fourierfreq");
|
||||
int Nharm; // number of harmonics
|
||||
bool firstgroup = false;
|
||||
QRegularExpression sep("[ \t,]");
|
||||
while (!ngsp_data.atEnd()) {
|
||||
QRegExp sep("[ \t,]");
|
||||
QString lin = ngsp_data.readLine();
|
||||
if (lin.isEmpty()) continue;
|
||||
if (lin.contains("Fourier analysis for")) {
|
||||
@ -477,7 +477,7 @@ void AbstractSpiceKernel::parseFourierOutput(QString ngspice_file, QList<QList<d
|
||||
QString ss = lin.section(sep,2,2,QString::SectionSkipEmpty);
|
||||
if (ss.endsWith(',')) ss.chop(1);
|
||||
Nharm = ss.toInt();
|
||||
while (!ngsp_data.readLine().contains(QRegExp("Harmonic\\s+Frequency")));
|
||||
while (!ngsp_data.readLine().contains(QRegularExpression("Harmonic\\s+Frequency")));
|
||||
if (!(QucsSettings.DefaultSimulator == spicecompat::simXyceSer||
|
||||
QucsSettings.DefaultSimulator == spicecompat::simXycePar)) lin = ngsp_data.readLine(); // dummy line
|
||||
for (int i=0;i<Nharm;i++) {
|
||||
@ -669,8 +669,8 @@ void AbstractSpiceKernel::parseDC_OPoutputXY(QString xyce_file)
|
||||
QTextStream ngsp_data(&ofile);
|
||||
QStringList lines = ngsp_data.readAll().split("\n");
|
||||
if (lines.count()>=2) {
|
||||
QStringList nods = lines.at(0).split(QRegExp("\\s"),qucs::SkipEmptyParts);
|
||||
QStringList vals = lines.at(1).split(QRegExp("\\s"),qucs::SkipEmptyParts);
|
||||
QStringList nods = lines.at(0).split(QRegularExpression("\\s"),qucs::SkipEmptyParts);
|
||||
QStringList vals = lines.at(1).split(QRegularExpression("\\s"),qucs::SkipEmptyParts);
|
||||
QStringList::iterator n,v;
|
||||
for(n = nods.begin(),v = vals.begin();n!=nods.end()||v!=vals.end();n++,v++) {
|
||||
if ((*n).startsWith("I(")) {
|
||||
@ -724,7 +724,7 @@ void AbstractSpiceKernel::parseSTEPOutput(QString ngspice_file,
|
||||
int NumVars=0; // Number of dep. and indep.variables
|
||||
int NumPoints=0; // Number of simulation points
|
||||
while (!ngsp_data.atEnd()) {
|
||||
QRegExp sep("[ \t,]");
|
||||
QRegularExpression sep("[ \t,]");
|
||||
QString lin = ngsp_data.readLine();
|
||||
if (lin.isEmpty()) continue;
|
||||
if (lin.contains("Plotname:")&& // skip operating point
|
||||
@ -817,11 +817,11 @@ void AbstractSpiceKernel::extractBinSamples(QDataStream &dbl, QList<QList<double
|
||||
bool AbstractSpiceKernel::extractASCIISamples(QString &lin, QTextStream &ngsp_data,
|
||||
QList<QList<double> > &sim_points, int NumVars, bool isComplex)
|
||||
{
|
||||
QRegExp sep("[ \t,]");
|
||||
QRegularExpression sep("[ \t,]");
|
||||
QList<double> sim_point;
|
||||
bool ok = false;
|
||||
QRegExp dataline_patter("^ *[0-9]+[ \t]+.*");
|
||||
if (!dataline_patter.exactMatch(lin)) return false;
|
||||
QRegularExpression dataline_patter("^ *[0-9]+[ \t]+.*");
|
||||
if (!dataline_patter.match(lin).hasMatch()) return false;
|
||||
double indep_val = lin.section(sep,1,1,QString::SectionSkipEmpty).toDouble(&ok);
|
||||
//double indep_val = lin.split(sep,QString::SkipEmptyParts).at(1).toDouble(&ok); // only real indep vars
|
||||
if (!ok) return false;
|
||||
@ -978,15 +978,15 @@ void AbstractSpiceKernel::parseResFile(QString resfile, QString &var, QStringLis
|
||||
QFile ofile(resfile);
|
||||
if (ofile.open(QFile::ReadOnly)) {
|
||||
QTextStream swp_data(&ofile);
|
||||
QRegularExpression point_pattern("^\\s*[0-9]+ .*");
|
||||
QRegularExpression var_pattern("^STEP\\s+.*");
|
||||
QRegularExpression sep("\\s");
|
||||
while (!swp_data.atEnd()) {
|
||||
QRegExp point_pattern("^\\s*[0-9]+ .*");
|
||||
QRegExp var_pattern("^STEP\\s+.*");
|
||||
QRegExp sep("\\s");
|
||||
QString lin = swp_data.readLine();
|
||||
if (var_pattern.exactMatch(lin)) {
|
||||
if (var_pattern.match(lin).hasMatch()) {
|
||||
var = lin.split(sep,qucs::SkipEmptyParts).last();
|
||||
}
|
||||
if (point_pattern.exactMatch(lin)) {
|
||||
if (point_pattern.match(lin).hasMatch()) {
|
||||
values.append(lin.split(sep,qucs::SkipEmptyParts).last());
|
||||
}
|
||||
}
|
||||
@ -1011,6 +1011,7 @@ int AbstractSpiceKernel::checkRawOutupt(QString ngspice_file, QStringList &value
|
||||
bool isXyce = false;
|
||||
if (ofile.open(QFile::ReadOnly)) {
|
||||
QTextStream ngsp_data(&ofile);
|
||||
QRegularExpression rx("^0\\s+[0-9].*"); // Zero index pattern
|
||||
while (!ngsp_data.atEnd()) {
|
||||
QString lin = ngsp_data.readLine();
|
||||
if (lin.startsWith("Plotname: ")) {
|
||||
@ -1018,8 +1019,7 @@ int AbstractSpiceKernel::checkRawOutupt(QString ngspice_file, QStringList &value
|
||||
values.append(QString::number(plots_cnt));
|
||||
}
|
||||
if (lin.startsWith("End of Xyce(TM)")) isXyce = true;
|
||||
QRegExp rx("^0\\s+[0-9].*"); // Zero index pattern
|
||||
if (rx.exactMatch(lin)) {
|
||||
if (rx.match(lin).hasMatch()) {
|
||||
zeroindex_cnt++;
|
||||
values.append(QString::number(zeroindex_cnt));
|
||||
}
|
||||
@ -1074,7 +1074,7 @@ void AbstractSpiceKernel::convertToQucsData(const QString &qucs_dataset)
|
||||
bool hasParSweep = false;
|
||||
bool hasDblParSweep = false;
|
||||
|
||||
QRegExp four_rx(".*\\.four[0-9]+$");
|
||||
QRegularExpression four_rx(".*\\.four[0-9]+$");
|
||||
QString full_outfile = workdir+QDir::separator()+ngspice_output_filename;
|
||||
if (ngspice_output_filename.endsWith("HB.FD.prn")) {
|
||||
//parseHBOutput(full_outfile,sim_points,var_list,hasParSweep);
|
||||
@ -1086,7 +1086,7 @@ void AbstractSpiceKernel::convertToQucsData(const QString &qucs_dataset)
|
||||
parseResFile(res_file,swp_var,swp_var_val);
|
||||
}
|
||||
} else if (ngspice_output_filename.endsWith(".four") ||
|
||||
four_rx.exactMatch(ngspice_output_filename)) {
|
||||
four_rx.match(ngspice_output_filename).hasMatch()) {
|
||||
isComplex=false;
|
||||
parseFourierOutput(full_outfile,sim_points,var_list);
|
||||
} else if (ngspice_output_filename.endsWith(".ngspice.sens.dc.prn")) {
|
||||
@ -1283,6 +1283,10 @@ void AbstractSpiceKernel::normalizeVarsNames(QStringList &var_list)
|
||||
|
||||
QStringList::iterator it=var_list.begin();
|
||||
|
||||
QRegularExpression iprobe_pattern("^[Vv][Pp][Rr][0-9]+.*");
|
||||
QRegularExpression ivprobe_pattern("^[Vv][Pp][Rr][0-9]+.*");
|
||||
QRegularExpression ivprobe_pattern_ngspice("^(ac\\.|tran\\.)[Vv][Pp][Rr][0-9]+.*");
|
||||
|
||||
for (it++;it!=var_list.end();it++) {
|
||||
if ((!(it->startsWith(prefix)||it->startsWith(iprefix)))||(HB)) {
|
||||
if (HB) {
|
||||
@ -1294,20 +1298,19 @@ void AbstractSpiceKernel::normalizeVarsNames(QStringList &var_list)
|
||||
*it = it->right(cnt-idx-1);
|
||||
it->remove(')');
|
||||
*it += suffix;
|
||||
QRegExp iprobe_pattern("^[Vv][Pp][Rr][0-9]+.*");
|
||||
if (iprobe_pattern.exactMatch(*it)) (*it).remove(0,1);
|
||||
|
||||
if (iprobe_pattern.match(*it).hasMatch()) (*it).remove(0,1);
|
||||
} else {
|
||||
*it = prefix + *it;
|
||||
}
|
||||
}
|
||||
QStringList lst = it->split('(');
|
||||
if (lst.count()>1) {
|
||||
QRegExp ivprobe_pattern("^[Vv][Pp][Rr][0-9]+.*");
|
||||
QRegExp ivprobe_pattern_ngspice("^(ac\\.|tran\\.)[Vv][Pp][Rr][0-9]+.*");
|
||||
if (ivprobe_pattern.exactMatch(lst.at(1))) {
|
||||
|
||||
if (ivprobe_pattern.match(lst.at(1)).hasMatch()) {
|
||||
lst[1].remove(0,1);
|
||||
*it = lst.join("(");
|
||||
} else if (ivprobe_pattern_ngspice.exactMatch(lst.at(1))) {
|
||||
} else if (ivprobe_pattern_ngspice.match(lst.at(1)).hasMatch()) {
|
||||
lst[1].replace(".v",".",Qt::CaseInsensitive);
|
||||
*it = lst.join("(");
|
||||
}
|
||||
|
||||
@ -195,8 +195,8 @@ bool CodeModelGen::createIFSfromEDD(QTextStream &stream, Schematic *sch, Compone
|
||||
for(QString& tok : tokens){
|
||||
bool isNum = true;
|
||||
tok.toFloat(&isNum);
|
||||
QRegExp inp_pattern("[IV][0-9]+");
|
||||
bool isInput = inp_pattern.exactMatch(tok);
|
||||
QRegularExpression inp_pattern("[IV][0-9]+");
|
||||
bool isInput = inp_pattern.match(tok).hasMatch();
|
||||
if ((!isGinacFunc(tok))&&(!isNum)&&(!isInput))
|
||||
if(!pars.contains(tok)) pars.append(tok);
|
||||
}
|
||||
@ -284,8 +284,8 @@ bool CodeModelGen::createMODfromEDD(QTextStream &stream, Schematic *sch, Compone
|
||||
for (QString& tok : tokens){
|
||||
bool isNum = true;
|
||||
tok.toFloat(&isNum);
|
||||
QRegExp inp_pattern("[IV][0-9]+");
|
||||
bool isInput = inp_pattern.exactMatch(tok);
|
||||
QRegularExpression inp_pattern("[IV][0-9]+");
|
||||
bool isInput = inp_pattern.match(tok).hasMatch();
|
||||
if ((isInput)&&(!inputs.contains(tok))) inputs.append(tok);
|
||||
if ((!isGinacFunc(tok))&&(!isNum)&&(!isInput))
|
||||
if(!pars.contains(tok)) pars.append(tok);
|
||||
@ -487,7 +487,7 @@ bool CodeModelGen::GinacDiffTernaryOp(QString &eq, QString &var, QString &res)
|
||||
bool r = false;
|
||||
QStringList::iterator subeq = tokens.begin();
|
||||
for(;subeq!=tokens.end();subeq++) {
|
||||
if (!(*subeq).contains(QRegExp("[?:<>=]"))) {
|
||||
if (!(*subeq).contains(QRegularExpression("[?:<>=]"))) {
|
||||
QString subres;
|
||||
r = GinacDiff(*subeq,var,subres);
|
||||
if (!r) return false;
|
||||
@ -512,7 +512,7 @@ bool CodeModelGen::GinacConvToCTernaryOp(QString &eq, QString &res)
|
||||
bool r = false;
|
||||
QStringList::iterator subeq = tokens.begin();
|
||||
for(;subeq!=tokens.end();subeq++) {
|
||||
if (!(*subeq).contains(QRegExp("[?:<>=]"))) {
|
||||
if (!(*subeq).contains(QRegularExpression("[?:<>=]"))) {
|
||||
QString subres;
|
||||
r = GinacConvToC(*subeq,subres);
|
||||
if (!r) return false;
|
||||
|
||||
@ -161,9 +161,10 @@ void CustomSimDialog::slotFindVars()
|
||||
|
||||
|
||||
QStringList strings = edtCode->toPlainText().split('\n');
|
||||
QRegularExpression let_pattern("^\\s*let\\s+[A-Za-z]+\\w*\\s*\\=\\s*[A-Za-z]+.*$");
|
||||
|
||||
for (const QString& line : strings) {
|
||||
QRegExp let_pattern("^\\s*let\\s+[A-Za-z]+\\w*\\s*\\=\\s*[A-Za-z]+.*$");
|
||||
if (let_pattern.exactMatch(line)) {
|
||||
if (let_pattern.match(line).hasMatch()) {
|
||||
QString var = line.section('=',0,0);
|
||||
var.remove("let ");
|
||||
var.remove(' ');
|
||||
@ -179,12 +180,14 @@ void CustomSimDialog::slotFindOutputs()
|
||||
QStringList outps;
|
||||
QStringList strings = edtCode->toPlainText().split('\n');
|
||||
if (isXyceScr) {
|
||||
QRegExp print_ex("^\\s*\\.print\\s.*");
|
||||
print_ex.setCaseSensitivity(Qt::CaseInsensitive);
|
||||
QRegularExpression print_ex("^\\s*\\.print\\s.*");
|
||||
print_ex.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
|
||||
QRegularExpression file_ex("\\s*file\\s*=\\s*");
|
||||
file_ex.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
|
||||
|
||||
for (const QString& line : strings) {
|
||||
if (print_ex.exactMatch(line)) {
|
||||
QRegExp file_ex("\\s*file\\s*=\\s*");
|
||||
file_ex.setCaseSensitivity(Qt::CaseInsensitive);
|
||||
if (print_ex.match(line).hasMatch()) {
|
||||
//file_ex.setCaseSensitivity(Qt::CaseInsensitive);
|
||||
int p = line.indexOf(file_ex);
|
||||
p = line.indexOf('=',p);
|
||||
int l = line.size()-(p+1);
|
||||
@ -193,11 +196,11 @@ void CustomSimDialog::slotFindOutputs()
|
||||
}
|
||||
}
|
||||
} else {
|
||||
QRegExp write_ex("^\\s*write\\s.*");
|
||||
write_ex.setCaseSensitivity(Qt::CaseInsensitive);
|
||||
QRegularExpression write_ex("^\\s*write\\s.*");
|
||||
write_ex.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
|
||||
for (const QString& line : strings) {
|
||||
if (write_ex.exactMatch(line)) {
|
||||
outps.append(line.section(QRegExp("\\s"),1,1,QString::SectionSkipEmpty));
|
||||
if (write_ex.match(line).hasMatch()) {
|
||||
outps.append(line.section(QRegularExpression("\\s"),1,1,QString::SectionSkipEmpty));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -597,13 +597,13 @@ bool Ngspice::findMathFuncInc(QString &mathf_inc)
|
||||
void Ngspice::slotProcessOutput()
|
||||
{
|
||||
QString s = SimProcess->readAllStandardOutput();
|
||||
QRegExp percentage_pattern("^%\\d\\d*\\.\\d\\d.*$");
|
||||
if (percentage_pattern.exactMatch(s)) {
|
||||
QRegularExpression percentage_pattern("^%\\d\\d*\\.\\d\\d.*$");
|
||||
if (percentage_pattern.match(s).hasMatch()) {
|
||||
int percent = round(s.mid(1,5).toFloat());
|
||||
emit progress(percent);
|
||||
} else {
|
||||
s.remove(QRegExp("%\\d\\d*\\.\\d\\d")); // Remove percentage from logs
|
||||
s.remove(QRegExp("\010+")); // Large amount of datar from percentage reports
|
||||
s.remove(QRegularExpression("%\\d\\d*\\.\\d\\d")); // Remove percentage from logs
|
||||
s.remove(QRegularExpression("\010+")); // Large amount of datar from percentage reports
|
||||
// can freeze QTextEdit for over 100k simulation points
|
||||
output += s;
|
||||
}
|
||||
@ -636,7 +636,7 @@ void Ngspice::SaveNetlist(QString filename)
|
||||
|
||||
void Ngspice::setSimulatorCmd(QString cmd)
|
||||
{
|
||||
if (cmd.contains(QRegExp("spiceopus(....|)$"))) {
|
||||
if (cmd.contains(QRegularExpression("spiceopus(....|)$"))) {
|
||||
// spiceopus needs English locale to produce correct decimal point (dot symbol)
|
||||
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
|
||||
env.remove("LANG");
|
||||
|
||||
@ -62,32 +62,32 @@ QString qucs2spice::convert_netlist(QString netlist, bool xyce)
|
||||
{
|
||||
QStringList net_lst=netlist.split("\n");
|
||||
|
||||
QRegExp res_pattern("^[ \t]*R:[A-Za-z]+.*");
|
||||
QRegExp cap_pattern("^[ \t]*C:[A-Za-z]+.*");
|
||||
QRegExp ind_pattern("^[ \t]*L:[A-Za-z]+.*");
|
||||
QRegExp diode_pattern("^[ \t]*Diode:[A-Za-z]+.*");
|
||||
QRegExp mosfet_pattern("^[ \t]*MOSFET:[A-Za-z]+.*");
|
||||
QRegExp jfet_pattern("^[ \t]*JFET:[A-Za-z]+.*");
|
||||
QRegExp bjt_pattern("^[ \t]*BJT:[A-Za-z]+.*");
|
||||
QRegExp ccvs_pattern("^[ \t]*CCVS:[A-Za-z]+.*");
|
||||
QRegExp cccs_pattern("^[ \t]*CCCS:[A-Za-z]+.*");
|
||||
QRegExp vcvs_pattern("^[ \t]*VCVS:[A-Za-z]+.*");
|
||||
QRegExp vccs_pattern("^[ \t]*VCCS:[A-Za-z]+.*");
|
||||
QRegExp subckt_head_pattern("^[ \t]*\\.Def:[A-Za-z]+.*");
|
||||
QRegExp ends_pattern("^[ \t]*\\.Def:End[ \t]*$");
|
||||
QRegExp dc_pattern("^[ \t]*[VI]dc:[A-Za-z]+.*");
|
||||
QRegExp edd_pattern("^[ \t]*EDD:[A-Za-z]+.*");
|
||||
QRegExp eqn_pattern("^[ \t]*Eqn:[A-Za-z]+.*");
|
||||
QRegExp subckt_pattern("^[ \t]*Sub:[A-Za-z]+.*");
|
||||
QRegExp gyrator_pattern("^[ \t]*Gyrator:[A-Za-z]+.*");
|
||||
QRegularExpression res_pattern("^[ \t]*R:[A-Za-z]+.*");
|
||||
QRegularExpression cap_pattern("^[ \t]*C:[A-Za-z]+.*");
|
||||
QRegularExpression ind_pattern("^[ \t]*L:[A-Za-z]+.*");
|
||||
QRegularExpression diode_pattern("^[ \t]*Diode:[A-Za-z]+.*");
|
||||
QRegularExpression mosfet_pattern("^[ \t]*MOSFET:[A-Za-z]+.*");
|
||||
QRegularExpression jfet_pattern("^[ \t]*JFET:[A-Za-z]+.*");
|
||||
QRegularExpression bjt_pattern("^[ \t]*BJT:[A-Za-z]+.*");
|
||||
QRegularExpression ccvs_pattern("^[ \t]*CCVS:[A-Za-z]+.*");
|
||||
QRegularExpression cccs_pattern("^[ \t]*CCCS:[A-Za-z]+.*");
|
||||
QRegularExpression vcvs_pattern("^[ \t]*VCVS:[A-Za-z]+.*");
|
||||
QRegularExpression vccs_pattern("^[ \t]*VCCS:[A-Za-z]+.*");
|
||||
QRegularExpression subckt_head_pattern("^[ \t]*\\.Def:[A-Za-z]+.*");
|
||||
QRegularExpression ends_pattern("^[ \t]*\\.Def:End[ \t]*$");
|
||||
QRegularExpression dc_pattern("^[ \t]*[VI]dc:[A-Za-z]+.*");
|
||||
QRegularExpression edd_pattern("^[ \t]*EDD:[A-Za-z]+.*");
|
||||
QRegularExpression eqn_pattern("^[ \t]*Eqn:[A-Za-z]+.*");
|
||||
QRegularExpression subckt_pattern("^[ \t]*Sub:[A-Za-z]+.*");
|
||||
QRegularExpression gyrator_pattern("^[ \t]*Gyrator:[A-Za-z]+.*");
|
||||
|
||||
QString s="";
|
||||
|
||||
QStringList EqnsAndVars;
|
||||
|
||||
for (QString line : net_lst) { // Find equations
|
||||
if (eqn_pattern.exactMatch(line)) {
|
||||
line.remove(QRegExp("^[ \t]*Eqn:[A-Za-z]+\\w+\\s+"));
|
||||
if (eqn_pattern.match(line).hasMatch()) {
|
||||
line.remove(QRegularExpression("^[ \t]*Eqn:[A-Za-z]+\\w+\\s+"));
|
||||
ExtractVarsAndValues(line,EqnsAndVars);
|
||||
}
|
||||
}
|
||||
@ -97,25 +97,25 @@ QString qucs2spice::convert_netlist(QString netlist, bool xyce)
|
||||
|
||||
|
||||
for (QString& line : net_lst) {
|
||||
if (subckt_head_pattern.exactMatch(line)) {
|
||||
if (ends_pattern.exactMatch(line)) s += ".ENDS\n";
|
||||
if (subckt_head_pattern.match(line).hasMatch()) {
|
||||
if (ends_pattern.match(line).hasMatch()) s += ".ENDS\n";
|
||||
else s += convert_header(line);
|
||||
}
|
||||
if (res_pattern.exactMatch(line)) s += convert_rcl(line);
|
||||
if (cap_pattern.exactMatch(line)) s += convert_rcl(line);
|
||||
if (ind_pattern.exactMatch(line)) s += convert_rcl(line);
|
||||
if (diode_pattern.exactMatch(line)) s += convert_diode(line,xyce);
|
||||
if (mosfet_pattern.exactMatch(line)) s += convert_mosfet(line,xyce);
|
||||
if (jfet_pattern.exactMatch(line)) s += convert_jfet(line,xyce);
|
||||
if (bjt_pattern.exactMatch(line)) s += convert_bjt(line);
|
||||
if (vccs_pattern.exactMatch(line)) s += convert_vccs(line);
|
||||
if (vcvs_pattern.exactMatch(line)) s += convert_vcvs(line);
|
||||
if (cccs_pattern.exactMatch(line)) s+= convert_cccs(line);
|
||||
if (ccvs_pattern.exactMatch(line)) s+= convert_ccvs(line);
|
||||
if (dc_pattern.exactMatch(line)) s += convert_dc_src(line);
|
||||
if (edd_pattern.exactMatch(line)) s += convert_edd(line,EqnsAndVars);
|
||||
if (subckt_pattern.exactMatch(line)) s+= convert_subckt(line);
|
||||
if (gyrator_pattern.exactMatch(line)) s+= convert_gyrator(line);
|
||||
if (res_pattern.match(line).hasMatch()) s += convert_rcl(line);
|
||||
if (cap_pattern.match(line).hasMatch()) s += convert_rcl(line);
|
||||
if (ind_pattern.match(line).hasMatch()) s += convert_rcl(line);
|
||||
if (diode_pattern.match(line).hasMatch()) s += convert_diode(line,xyce);
|
||||
if (mosfet_pattern.match(line).hasMatch()) s += convert_mosfet(line,xyce);
|
||||
if (jfet_pattern.match(line).hasMatch()) s += convert_jfet(line,xyce);
|
||||
if (bjt_pattern.match(line).hasMatch()) s += convert_bjt(line);
|
||||
if (vccs_pattern.match(line).hasMatch()) s += convert_vccs(line);
|
||||
if (vcvs_pattern.match(line).hasMatch()) s += convert_vcvs(line);
|
||||
if (cccs_pattern.match(line).hasMatch()) s+= convert_cccs(line);
|
||||
if (ccvs_pattern.match(line).hasMatch()) s+= convert_ccvs(line);
|
||||
if (dc_pattern.match(line).hasMatch()) s += convert_dc_src(line);
|
||||
if (edd_pattern.match(line).hasMatch()) s += convert_edd(line,EqnsAndVars);
|
||||
if (subckt_pattern.match(line).hasMatch()) s+= convert_subckt(line);
|
||||
if (gyrator_pattern.match(line).hasMatch()) s+= convert_gyrator(line);
|
||||
}
|
||||
|
||||
//s.replace(" gnd "," 0 ");
|
||||
@ -391,8 +391,8 @@ QString qucs2spice::convert_edd(const QString& line, QStringList &EqnsAndVars)
|
||||
QString Qvar = line.section('"',2*i+3,2*i+3,QString::SectionSkipEmpty);
|
||||
QString Qeqn = EqnsAndVars.at(EqnsAndVars.indexOf(Qvar)+1);
|
||||
Qeqn.remove(' ');
|
||||
QRegExp zero_pattern("0+(\\.*0+|)");
|
||||
if (!zero_pattern.exactMatch(Qeqn)) {
|
||||
QRegularExpression zero_pattern("0+(\\.*0+|)");
|
||||
if (!zero_pattern.match(Qeqn).hasMatch()) {
|
||||
s += QString("G%1Q%2 %3 %4 n%1Q%2 %4 1.0\n").arg(nam).arg(i).arg(plus).arg(minus);
|
||||
s += QString("L%1Q%2 n%1Q%2 %3 1.0\n").arg(nam).arg(i).arg(minus);
|
||||
s += QString("B%1Q%2 n%1Q%2 %3 I=-(%4)\n").arg(nam).arg(i).arg(minus).arg(Qeqn);
|
||||
@ -479,9 +479,9 @@ void qucs2spice::ExtractVarsAndValues(QString line,QStringList& VarsAndVals)
|
||||
|
||||
void qucs2spice::subsVoltages(QStringList &tokens, QStringList& nods)
|
||||
{
|
||||
QRegExp volt_pattern("^V[0-9]+$");
|
||||
QRegularExpression volt_pattern("^V[0-9]+$");
|
||||
for (QStringList::iterator it = tokens.begin();it != tokens.end();it++) {
|
||||
if (volt_pattern.exactMatch(*it)) {
|
||||
if (volt_pattern.match(*it).hasMatch()) {
|
||||
QString volt = *it;
|
||||
volt.remove('V').remove(' ');
|
||||
int i = volt.toInt();
|
||||
|
||||
@ -21,6 +21,7 @@
|
||||
#define QUCS2SPICE_H
|
||||
|
||||
#include <QString>
|
||||
#include <QRegularExpression>
|
||||
|
||||
/*!
|
||||
\file qucs2spice.h
|
||||
|
||||
@ -235,7 +235,7 @@ void SimSettingsDialog::slotSetWorkdir()
|
||||
{
|
||||
QFileDialog dlg( this, tr("Select directory to store netlist and simulator output"), edtWorkdir->text() );
|
||||
dlg.setAcceptMode(QFileDialog::AcceptOpen);
|
||||
dlg.setFileMode(QFileDialog::DirectoryOnly);
|
||||
dlg.setFileMode(QFileDialog::Directory);
|
||||
if (dlg.exec()) {
|
||||
QString s = dlg.selectedFiles().first();
|
||||
if (!s.isEmpty()) edtWorkdir->setText(s);
|
||||
|
||||
@ -30,43 +30,43 @@ QString spicecompat::check_refdes(QString &Name,QString &SpiceModel)
|
||||
*/
|
||||
QString spicecompat::normalize_value(QString Value)
|
||||
{
|
||||
QRegExp r_pattern("^[0-9]+.*Ohm$");
|
||||
QRegExp p_pattern("^[+-]*[0-9]+.*dBm$");
|
||||
QRegExp c_pattern("^[0-9]+.*F$");
|
||||
QRegExp l_pattern("^[0-9]+.*H$");
|
||||
QRegExp v_pattern("^[0-9]+.*V$");
|
||||
QRegExp hz_pattern("^[0-9]+.*Hz$");
|
||||
QRegExp s_pattern("^[0-9]+.*S$");
|
||||
QRegExp sec_pattern("^[0-9]+.*s$");
|
||||
QRegExp var_pattern("^[A-Za-z].*$");
|
||||
QRegularExpression r_pattern("^[0-9]+.*Ohm$");
|
||||
QRegularExpression p_pattern("^[+-]*[0-9]+.*dBm$");
|
||||
QRegularExpression c_pattern("^[0-9]+.*F$");
|
||||
QRegularExpression l_pattern("^[0-9]+.*H$");
|
||||
QRegularExpression v_pattern("^[0-9]+.*V$");
|
||||
QRegularExpression hz_pattern("^[0-9]+.*Hz$");
|
||||
QRegularExpression s_pattern("^[0-9]+.*S$");
|
||||
QRegularExpression sec_pattern("^[0-9]+.*s$");
|
||||
QRegularExpression var_pattern("^[A-Za-z].*$");
|
||||
|
||||
QString s = Value.remove(' ');
|
||||
if (s.startsWith('\'')&&s.endsWith('\'')) return Value; // Expression detected
|
||||
|
||||
if (r_pattern.exactMatch(s)) { // Component value
|
||||
if (r_pattern.match(s).hasMatch()) { // Component value
|
||||
s.remove("Ohm");
|
||||
s.replace("M","Meg");
|
||||
} else if (c_pattern.exactMatch(s)) {
|
||||
} else if (c_pattern.match(s).hasMatch()) {
|
||||
s.remove("F");
|
||||
s.replace("M","Meg");
|
||||
} else if (l_pattern.exactMatch(s)) {
|
||||
} else if (l_pattern.match(s).hasMatch()) {
|
||||
s.remove("H");
|
||||
s.replace("M","Meg");
|
||||
} else if (v_pattern.exactMatch(s)) {
|
||||
} else if (v_pattern.match(s).hasMatch()) {
|
||||
s.remove("V");
|
||||
s.replace("M","Meg");
|
||||
} else if (hz_pattern.exactMatch(s)) {
|
||||
} else if (hz_pattern.match(s).hasMatch()) {
|
||||
s.remove("Hz");
|
||||
s.replace("M","Meg");
|
||||
} else if (s_pattern.exactMatch(s)) {
|
||||
} else if (s_pattern.match(s).hasMatch()) {
|
||||
s.remove("S");
|
||||
s.replace("M","Meg");
|
||||
} else if (sec_pattern.exactMatch(s)) {
|
||||
} else if (sec_pattern.match(s).hasMatch()) {
|
||||
s.remove("s");
|
||||
s.replace("M","Meg");
|
||||
} else if (p_pattern.exactMatch(s)) {
|
||||
} else if (p_pattern.match(s).hasMatch()) {
|
||||
s.remove("dBm");
|
||||
} else if (var_pattern.exactMatch(s)) {
|
||||
} else if (var_pattern.match(s).hasMatch()) {
|
||||
s = "{" + s + "}";
|
||||
}
|
||||
|
||||
@ -139,13 +139,14 @@ void spicecompat::splitEqn(QString &eqn, QStringList &tokens)
|
||||
tok += *it;
|
||||
}
|
||||
if (!tok.isEmpty()) tokens.append(tok);
|
||||
|
||||
QRegularExpression fpn("[0-9]+\\.[0-9]+[eE]"); // first part of float number
|
||||
QRegularExpression dn("[0-9]+[eE]");
|
||||
QRegularExpression intn("[0-9]+");
|
||||
// Reassemble floating point numbers such as [+-]1.2e[+-]02 , etc.
|
||||
for(auto t = tokens.begin();t != tokens.end();t++) {
|
||||
QRegExp fpn("[0-9]+\\.[0-9]+[eE]"); // first part of float number
|
||||
QRegExp dn("[0-9]+[eE]");
|
||||
|
||||
qDebug()<<*t;
|
||||
if (dn.exactMatch(*t)||fpn.exactMatch(*t)) {
|
||||
if (dn.match(*t).hasMatch()||fpn.match(*t).hasMatch()) {
|
||||
auto t1 = t;
|
||||
t1++;
|
||||
if (t1!=tokens.end()) {
|
||||
@ -156,8 +157,8 @@ void spicecompat::splitEqn(QString &eqn, QStringList &tokens)
|
||||
} else break;
|
||||
t1++;
|
||||
if (t1!=tokens.end()) {
|
||||
QRegExp intn("[0-9]+");
|
||||
if (intn.exactMatch(*t1)) {
|
||||
|
||||
if (intn.match(*t1).hasMatch()) {
|
||||
(*t) += (*t1);
|
||||
*t1 = "";
|
||||
}
|
||||
@ -177,14 +178,14 @@ void spicecompat::splitEqn(QString &eqn, QStringList &tokens)
|
||||
*/
|
||||
bool spicecompat::containNodes(QStringList &tokens, QStringList &vars)
|
||||
{
|
||||
QRegExp var_pattern("^[\\w]+\\.([IV]t|[iv]|vn|Vb|[IV])$");
|
||||
QRegExp disto_var("^[Dd][Ii][Ss][Tt][Oo][0-9]\\.[Vv]$");
|
||||
QRegularExpression var_pattern("^[\\w]+\\.([IV]t|[iv]|vn|Vb|[IV])$");
|
||||
QRegularExpression disto_var("^[Dd][Ii][Ss][Tt][Oo][0-9]\\.[Vv]$");
|
||||
QStringList system_vars;
|
||||
system_vars.clear();
|
||||
system_vars<<"frequency"<<"acfrequency"<<"time"<<"hbfrequncy";
|
||||
for (const QString& tok : tokens) {
|
||||
if (var_pattern.exactMatch(tok)) return true;
|
||||
if (disto_var.exactMatch(tok)) return true;
|
||||
if (var_pattern.match(tok).hasMatch()) return true;
|
||||
if (disto_var.match(tok).hasMatch()) return true;
|
||||
if (system_vars.contains(tok)) return true;
|
||||
if (tok.endsWith("#branch")) return true;
|
||||
if (vars.contains(tok)) return true;
|
||||
@ -212,17 +213,17 @@ bool spicecompat::containNodes(QStringList &tokens, QStringList &vars)
|
||||
*/
|
||||
void spicecompat::convertNodeNames(QStringList &tokens, QString &sim)
|
||||
{
|
||||
QRegExp var_pattern("^[\\w]+\\.([IV]t|[iv]|vn|Vb|[IV])$");
|
||||
QRegExp disto_var("^[Dd][Ii][Ss][Tt][Oo][0-9]\\.[Vv]$");
|
||||
QRegularExpression var_pattern("^[\\w]+\\.([IV]t|[iv]|vn|Vb|[IV])$");
|
||||
QRegularExpression disto_var("^[Dd][Ii][Ss][Tt][Oo][0-9]\\.[Vv]$");
|
||||
for (QStringList::iterator it=tokens.begin();it!=tokens.end();it++) {
|
||||
if ((*it).endsWith("#branch")) sim="all";
|
||||
if ((*it).toUpper()=="V") {
|
||||
it++;
|
||||
if ((*it)=="(") sim="all";
|
||||
}
|
||||
if (disto_var.exactMatch(*it)) sim = "disto";
|
||||
if (var_pattern.exactMatch(*it)) {
|
||||
if (!disto_var.exactMatch(*it)) {
|
||||
if (disto_var.match(*it).hasMatch()) sim = "disto";
|
||||
if (var_pattern.match(*it).hasMatch()) {
|
||||
if (!disto_var.match(*it).hasMatch()) {
|
||||
if ((it->endsWith(".v"))||(it->endsWith(".i"))) sim = "ac";
|
||||
if ((it->endsWith(".Vt"))||(it->endsWith(".It"))) sim = "tran";
|
||||
if ((it->endsWith(".V"))||(it->endsWith(".I"))) sim = "dc";
|
||||
@ -271,12 +272,15 @@ int spicecompat::getPins(const QString &file, const QString &compname, QStringLi
|
||||
f.close();
|
||||
} else return 0;
|
||||
|
||||
QRegularExpression subckt_header("^\\s*\\.(S|s)(U|u)(B|b)(C|c)(K|k)(T|t)\\s.*");
|
||||
QRegularExpression sep("\\s");
|
||||
|
||||
QTextStream stream(&content,QIODevice::ReadOnly);
|
||||
while (!stream.atEnd()) {
|
||||
QString lin = stream.readLine();
|
||||
QRegExp subckt_header("^\\s*\\.(S|s)(U|u)(B|b)(C|c)(K|k)(T|t)\\s.*");
|
||||
if (subckt_header.exactMatch(lin)) {
|
||||
QRegExp sep("\\s");
|
||||
|
||||
if (subckt_header.match(lin).hasMatch()) {
|
||||
|
||||
QStringList lst2 = lin.split(sep,qucs::SkipEmptyParts);
|
||||
QString name = lin.section(sep,1,1,QString::SectionSkipEmpty).toLower();
|
||||
QString refname = compname.toLower();
|
||||
@ -309,11 +313,11 @@ QString spicecompat::getSubcktName(const QString& subfilename)
|
||||
|
||||
QFile sub_file(subfilename);
|
||||
if (sub_file.open(QIODevice::ReadOnly)) {
|
||||
QRegularExpression subckt_header("^\\s*\\.(S|s)(U|u)(B|b)(C|c)(K|k)(T|t)\\s.*");
|
||||
QRegularExpression sep("\\s");
|
||||
QStringList lst = QString(sub_file.readAll()).split("\n");
|
||||
for (const QString& str : lst) {
|
||||
QRegExp subckt_header("^\\s*\\.(S|s)(U|u)(B|b)(C|c)(K|k)(T|t)\\s.*");
|
||||
if (subckt_header.exactMatch(str)) {
|
||||
QRegExp sep("\\s");
|
||||
for (const QString& str : lst) {
|
||||
if (subckt_header.match(str).hasMatch()) {
|
||||
s = str.section(sep,1,1,QString::SectionSkipEmpty);
|
||||
break;
|
||||
}
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
#include <QRegularExpression>
|
||||
|
||||
/*!
|
||||
\brief spicecompat namespace contains definitions responsible
|
||||
|
||||
@ -81,27 +81,27 @@ QString vacompat::normalize_current(QString &plus, QString &minus, bool left_sid
|
||||
*/
|
||||
QString vacompat::normalize_value(QString Value)
|
||||
{
|
||||
QRegExp r_pattern("^[0-9]+.*Ohm$");
|
||||
QRegExp c_pattern("^[0-9]+.*F$");
|
||||
QRegExp l_pattern("^[0-9]+.*H$");
|
||||
QRegExp v_pattern("^[0-9]+.*V$");
|
||||
QRegExp hz_pattern("^[0-9]+.*Hz$");
|
||||
QRegExp s_pattern("^[0-9]+.*S$");
|
||||
QRegularExpression r_pattern("^[0-9]+.*Ohm$");
|
||||
QRegularExpression c_pattern("^[0-9]+.*F$");
|
||||
QRegularExpression l_pattern("^[0-9]+.*H$");
|
||||
QRegularExpression v_pattern("^[0-9]+.*V$");
|
||||
QRegularExpression hz_pattern("^[0-9]+.*Hz$");
|
||||
QRegularExpression s_pattern("^[0-9]+.*S$");
|
||||
|
||||
QString s = Value.remove(' ');
|
||||
if (s.startsWith('\'')&&s.endsWith('\'')) return Value.remove('\''); // Expression detected
|
||||
|
||||
if (r_pattern.exactMatch(s)) { // Component value
|
||||
if (r_pattern.match(s).hasMatch()) { // Component value
|
||||
s.remove("Ohm");
|
||||
} else if (c_pattern.exactMatch(s)) {
|
||||
} else if (c_pattern.match(s).hasMatch()) {
|
||||
s.remove("F");
|
||||
} else if (l_pattern.exactMatch(s)) {
|
||||
} else if (l_pattern.match(s).hasMatch()) {
|
||||
s.remove("H");
|
||||
} else if (v_pattern.exactMatch(s)) {
|
||||
} else if (v_pattern.match(s).hasMatch()) {
|
||||
s.remove("V");
|
||||
} else if (hz_pattern.exactMatch(s)) {
|
||||
} else if (hz_pattern.match(s).hasMatch()) {
|
||||
s.remove("Hz");
|
||||
} else if (s_pattern.exactMatch(s)) {
|
||||
} else if (s_pattern.match(s).hasMatch()) {
|
||||
s.remove("S");
|
||||
}
|
||||
|
||||
|
||||
@ -27,6 +27,7 @@
|
||||
#include <QStringList>
|
||||
#include <QTextStream>
|
||||
#include <schematic.h>
|
||||
#include <QRegularExpression>
|
||||
|
||||
/*!
|
||||
\file verilogawriter.h
|
||||
|
||||
@ -230,7 +230,7 @@ void Xyce::createNetlist(QTextStream &stream, int , QStringList &simulations,
|
||||
QString filename;
|
||||
if (hasParSweep) filename = QString("%1_%2_swp.txt").arg(basenam).arg(sim);
|
||||
else filename = QString("%1_%2.txt").arg(basenam).arg(sim);
|
||||
filename.remove(QRegExp("\\s")); // XYCE don't support spaces and quotes
|
||||
filename.remove(QRegularExpression("\\s")); // XYCE don't support spaces and quotes
|
||||
QString write_str;
|
||||
if (sim=="hb") {
|
||||
// write_str = QString(".PRINT %1 file=%2 %3\n").arg(sim).arg(filename).arg(nods);
|
||||
|
||||
@ -30,11 +30,11 @@
|
||||
#include <QApplication>
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
#include <QTextCodec>
|
||||
//#include <QTextCodec>
|
||||
#include <QTranslator>
|
||||
#include <QFile>
|
||||
#include <QMessageBox>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QtSvg>
|
||||
|
||||
#include "qucs.h"
|
||||
@ -813,12 +813,13 @@ int main(int argc, char *argv[])
|
||||
|
||||
// initially center the application
|
||||
QApplication a(argc, argv);
|
||||
QDesktopWidget *d = a.desktop();
|
||||
//QDesktopWidget *d = a.desktop();
|
||||
QucsSettings.font = QApplication::font();
|
||||
QucsSettings.appFont = QApplication::font();
|
||||
QucsSettings.font.setPointSize(12);
|
||||
int w = d->width();
|
||||
int h = d->height();
|
||||
QSize size = QGuiApplication::primaryScreen()->size();
|
||||
int w = size.width();
|
||||
int h = size.height();
|
||||
QucsSettings.x = w/8;
|
||||
QucsSettings.y = h/8;
|
||||
QucsSettings.dx = w*3/4;
|
||||
@ -939,7 +940,7 @@ int main(int argc, char *argv[])
|
||||
a.setFont(QucsSettings.appFont);
|
||||
|
||||
// set codecs
|
||||
QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
|
||||
//QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
|
||||
// QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
|
||||
|
||||
QTranslator tor( 0 );
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
#include <cstdio>
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QFileInfo>
|
||||
#include <QDir>
|
||||
|
||||
@ -41,7 +41,7 @@ bool misc::isDarkTheme()
|
||||
{
|
||||
QLabel *lbl = new QLabel("check dark");
|
||||
int text_hsv = lbl->palette().color(QPalette::WindowText).value();
|
||||
int bg_hsv = lbl->palette().color(QPalette::Background).value();
|
||||
int bg_hsv = lbl->palette().color(QPalette::Window).value();
|
||||
bool is_dark_theme = text_hsv > bg_hsv;
|
||||
return is_dark_theme;
|
||||
}
|
||||
@ -205,7 +205,7 @@ void misc::str2num(const QString& s_, double& Number, QString& Unit, double& Fac
|
||||
}
|
||||
}*/
|
||||
|
||||
QRegExp Expr( QRegExp("[^0-9\\x2E\\x2D\\x2B]") );
|
||||
QRegularExpression Expr( QRegularExpression("[^0-9\\x2E\\x2D\\x2B]") );
|
||||
int i = str.indexOf( Expr );
|
||||
if(i >= 0)
|
||||
if((str.at(i).toLatin1() | 0x20) == 'e') {
|
||||
@ -342,7 +342,7 @@ QString misc::properName(const QString& Name)
|
||||
s.chop(4);
|
||||
if(s.at(0) <= '9') if(s.at(0) >= '0')
|
||||
s = 'n' + s;
|
||||
s.replace(QRegExp("\\W"), "_"); // none [a-zA-Z0-9] into "_"
|
||||
s.replace(QRegularExpression("\\W"), "_"); // none [a-zA-Z0-9] into "_"
|
||||
s.replace("__", "_"); // '__' not allowed in VHDL
|
||||
if(s.at(0) == '_')
|
||||
s = 'n' + s;
|
||||
|
||||
@ -877,7 +877,7 @@ void MouseActions::rightPressMenu(Schematic *Doc, QMouseEvent *Event, float fX,
|
||||
ComponentMenu->addAction(QucsMain->popH);
|
||||
} while(false);
|
||||
|
||||
*focusMEvent = *Event; // remember event for "edit component" action
|
||||
//*focusMEvent = *Event; // remember event for "edit component" action
|
||||
ComponentMenu->popup(Event->globalPos());
|
||||
Doc->viewport()->update();
|
||||
drawn = false;
|
||||
|
||||
@ -19,6 +19,7 @@
|
||||
#define MOUSEACTIONS_H
|
||||
|
||||
#include "element.h"
|
||||
#include <QAction>
|
||||
|
||||
#include <qt3_compat/qt_compat.h>
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@ ArrowDialog::ArrowDialog(QWidget *parent, const char *name)
|
||||
val100 = new QIntValidator(0, 100, this);
|
||||
|
||||
all = new QGridLayout(this);
|
||||
all->setMargin(3);
|
||||
all->setContentsMargins(3,3,3,3);
|
||||
|
||||
|
||||
|
||||
|
||||
@ -116,7 +116,7 @@ if(show) {
|
||||
QHBoxLayout *ButtsLayout = new QHBoxLayout();
|
||||
|
||||
ButtsLayout->setSpacing(5);
|
||||
ButtsLayout->setMargin(5);
|
||||
ButtsLayout->setContentsMargins(5,5,5,5);
|
||||
|
||||
QPushButton *ButtOK = new QPushButton(tr("OK"));
|
||||
ButtsLayout->addWidget(ButtOK);
|
||||
|
||||
@ -39,7 +39,7 @@ GraphicTextDialog::GraphicTextDialog(QWidget *parent, const char *name)
|
||||
setWindowTitle(tr("Edit Text Properties"));
|
||||
|
||||
vert = new QVBoxLayout(this);
|
||||
vert->setMargin(3);
|
||||
vert->setContentsMargins(3,3,3,3);
|
||||
vert->setSpacing(3);
|
||||
|
||||
vert->addWidget(
|
||||
|
||||
@ -39,14 +39,14 @@ ID_Dialog::ID_Dialog(ID_Text *idText_)
|
||||
|
||||
all = new QVBoxLayout;
|
||||
all->setSpacing(5);
|
||||
all->setMargin(5);
|
||||
all->setContentsMargins(5,5,5,5);
|
||||
|
||||
QHBoxLayout *htop = new QHBoxLayout;
|
||||
htop->setSpacing(5);
|
||||
all->addLayout(htop);
|
||||
|
||||
Expr.setPattern("[A-Za-z][A-Za-z0-9_]*");
|
||||
SubVal = new QRegExpValidator(Expr, this);
|
||||
SubVal = new QRegularExpressionValidator(Expr, this);
|
||||
Prefix = new QLineEdit(idText->Prefix);
|
||||
Prefix->setValidator(SubVal);
|
||||
|
||||
@ -109,22 +109,22 @@ ID_Dialog::ID_Dialog(ID_Text *idText_)
|
||||
paramEditLayout->addWidget(new QLabel(tr("Type:")), 3, 0);
|
||||
|
||||
Expr.setPattern("[\\w_]+");
|
||||
NameVal = new QRegExpValidator(Expr, this);
|
||||
NameVal = new QRegularExpressionValidator(Expr, this);
|
||||
ParamNameEdit = new QLineEdit;
|
||||
ParamNameEdit->setValidator(NameVal);
|
||||
|
||||
Expr.setPattern("[^\"=]*");
|
||||
ValueVal = new QRegExpValidator(Expr, this);
|
||||
ValueVal = new QRegularExpressionValidator(Expr, this);
|
||||
ValueEdit = new QLineEdit;
|
||||
ValueEdit->setValidator(ValueVal);
|
||||
|
||||
Expr.setPattern("[^\"=\\x005B\\x005D]*");
|
||||
DescrVal = new QRegExpValidator(Expr, this);
|
||||
DescrVal = new QRegularExpressionValidator(Expr, this);
|
||||
DescriptionEdit = new QLineEdit;
|
||||
DescriptionEdit->setValidator(DescrVal);
|
||||
|
||||
Expr.setPattern("[\\w_]+");
|
||||
TypeVal = new QRegExpValidator(Expr, this);
|
||||
TypeVal = new QRegularExpressionValidator(Expr, this);
|
||||
TypeEdit = new QLineEdit;
|
||||
TypeEdit->setValidator(TypeVal);
|
||||
|
||||
|
||||
@ -23,7 +23,8 @@
|
||||
#define ID_DIALOG_H
|
||||
|
||||
#include <QDialog>
|
||||
#include <QRegExp>
|
||||
#include <QRegularExpression>
|
||||
#include <QRegularExpressionValidator>
|
||||
|
||||
class ID_Text;
|
||||
class QTableWidget;
|
||||
@ -51,8 +52,8 @@ private:
|
||||
QCheckBox *showCheck;
|
||||
QLineEdit *ParamNameEdit, *ValueEdit, *DescriptionEdit, *TypeEdit;
|
||||
|
||||
QRegExp Expr;
|
||||
QRegExpValidator *SubVal, *NameVal, *ValueVal, *DescrVal, *TypeVal;
|
||||
QRegularExpression Expr;
|
||||
QRegularExpressionValidator *SubVal, *NameVal, *ValueVal, *DescrVal, *TypeVal;
|
||||
|
||||
private slots:
|
||||
void slotOk();
|
||||
|
||||
@ -95,7 +95,7 @@ PrinterWriter::print(QWidget *doc)
|
||||
{
|
||||
QPrintDialog *dialog = new QPrintDialog(Printer, 0);
|
||||
dialog->setWindowTitle(QObject::tr("Print Document"));
|
||||
dialog->addEnabledOption(QAbstractPrintDialog::PrintSelection);
|
||||
dialog->setOption(QAbstractPrintDialog::PrintSelection);
|
||||
|
||||
if (QucsApp::isTextDocument(doc))
|
||||
{
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
#include <QProcess>
|
||||
#include <qt3_compat/q3ptrlist.h>
|
||||
#include <QRegExpValidator>
|
||||
#include <QRegularExpressionValidator>
|
||||
#include <QLineEdit>
|
||||
#include <QAction>
|
||||
#include <QStatusBar>
|
||||
@ -69,8 +69,8 @@
|
||||
#endif
|
||||
|
||||
// for editing component name on schematic
|
||||
QRegExp Expr_CompProp;
|
||||
QRegExpValidator Val_CompProp(Expr_CompProp, 0);
|
||||
QRegularExpression Expr_CompProp;
|
||||
QRegularExpressionValidator Val_CompProp(Expr_CompProp, 0);
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// This function is called from all toggle actions.
|
||||
@ -1207,7 +1207,7 @@ void QucsApp::slotApplyCompText()
|
||||
}
|
||||
else // it is the component name
|
||||
Expr_CompProp.setPattern("[\\w_]+");
|
||||
Val_CompProp.setRegExp(Expr_CompProp);
|
||||
Val_CompProp.setRegularExpression(Expr_CompProp);
|
||||
editText->setValidator(&Val_CompProp);
|
||||
|
||||
z = editText->fontMetrics().lineSpacing();
|
||||
|
||||
@ -77,7 +77,7 @@ inline bool getSection(QString section, QString &list, QString &content)
|
||||
return false;
|
||||
}
|
||||
content = list.mid(Start, End-Start);
|
||||
content.replace(QRegExp("\\n\\x20+"), "\n").remove(0, 1);
|
||||
content.replace(QRegularExpression("\\n\\x20+"), "\n").remove(0, 1);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@ -237,7 +237,7 @@ inline int parseQucsComponentLibrary (QString libPath, ComponentLibrary &library
|
||||
QString LibraryString = ReadWhole.readAll();
|
||||
file.close();
|
||||
|
||||
LibraryString.replace(QRegExp("\\r\\n"), "\n");
|
||||
LibraryString.replace(QRegularExpression("\\r\\n"), "\n");
|
||||
|
||||
// The libraries have a header statement like the following:
|
||||
//
|
||||
@ -392,7 +392,7 @@ inline int parseSPICEComponentLibrary (QString libPath, ComponentLibrary &librar
|
||||
idx--;
|
||||
while (lin.at(idx).isSpace()) idx--;
|
||||
while (lin.at(idx).isLetterOrNumber()) idx--;
|
||||
} else idx = lin.lastIndexOf(QRegExp("[ \t]"),idx);
|
||||
} else idx = lin.lastIndexOf(QRegularExpression("[ \t]"),idx);
|
||||
pars = lin.mid(idx);
|
||||
} else pars = "";
|
||||
|
||||
|
||||
@ -49,10 +49,10 @@ SymbolWidget::SymbolWidget(QWidget *parent) : QWidget(parent)
|
||||
PaintText = tr("Symbol:");
|
||||
setFont(QucsSettings.font);
|
||||
QFontMetrics metrics(QucsSettings.font, 0); // use the the screen-compatible metric
|
||||
TextWidth = metrics.width(PaintText) + 4; // get size of text
|
||||
TextWidth = metrics.horizontalAdvance(PaintText) + 4; // get size of text
|
||||
|
||||
DragNDropText = tr("! Drag n'Drop me !");
|
||||
DragNDropWidth = metrics.width(DragNDropText); // get size of text
|
||||
DragNDropWidth = metrics.horizontalAdvance(DragNDropText); // get size of text
|
||||
TextHeight = metrics.lineSpacing();
|
||||
|
||||
///setPaletteBackgroundColor(Qt::white);
|
||||
|
||||
@ -208,37 +208,37 @@ void SyntaxHighlighter::setLanguage(int lang)
|
||||
}
|
||||
|
||||
for (const QString &pattern : reservedWordPattern) {
|
||||
rule.pattern = QRegExp(pattern);
|
||||
rule.pattern = QRegularExpression(pattern);
|
||||
rule.format = reservedWordFormat;
|
||||
highlightingRules.append(rule);
|
||||
}
|
||||
|
||||
for (const QString &pattern : unitPattern) {
|
||||
rule.pattern = QRegExp(pattern);
|
||||
rule.pattern = QRegularExpression(pattern);
|
||||
rule.format = unitFormat;
|
||||
highlightingRules.append(rule);
|
||||
}
|
||||
|
||||
for (const QString &pattern : datatypePattern) {
|
||||
rule.pattern = QRegExp(pattern);
|
||||
rule.pattern = QRegularExpression(pattern);
|
||||
rule.format = datatypeFormat;
|
||||
highlightingRules.append(rule);
|
||||
}
|
||||
|
||||
for (const QString &pattern : directivePattern) {
|
||||
rule.pattern = QRegExp(pattern);
|
||||
rule.pattern = QRegularExpression(pattern);
|
||||
rule.format = directiveFormat;
|
||||
highlightingRules.append(rule);
|
||||
}
|
||||
|
||||
for (const QString &pattern : functionPattern) {
|
||||
rule.pattern = QRegExp(pattern);
|
||||
rule.pattern = QRegularExpression(pattern);
|
||||
rule.format = functionFormat;
|
||||
highlightingRules.append(rule);
|
||||
}
|
||||
|
||||
for (const QString &pattern : commentPattern) {
|
||||
rule.pattern = QRegExp(pattern);
|
||||
rule.pattern = QRegularExpression(pattern);
|
||||
rule.format = commentFormat;
|
||||
highlightingRules.append(rule);
|
||||
}
|
||||
@ -247,12 +247,13 @@ void SyntaxHighlighter::setLanguage(int lang)
|
||||
// ---------------------------------------------------
|
||||
void SyntaxHighlighter::highlightBlock(const QString &text) {
|
||||
for (const HighlightingRule &rule : highlightingRules) {
|
||||
QRegExp expression(rule.pattern);
|
||||
int index = expression.indexIn(text);
|
||||
while (index >= 0) {
|
||||
int length = expression.matchedLength();
|
||||
setFormat(index, length, rule.format);
|
||||
index = expression.indexIn(text, index + length);
|
||||
QRegularExpression expression(rule.pattern);
|
||||
QRegularExpressionMatch match = expression.match(text);
|
||||
//int index = expression.indexIn(text);
|
||||
while (match.hasMatch()) {
|
||||
int length = match.capturedLength();
|
||||
setFormat(match.capturedStart(), length, rule.format);
|
||||
//index = expression.indexIn(text, index + length);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -20,6 +20,7 @@
|
||||
|
||||
#include "textdoc.h"
|
||||
#include <QSyntaxHighlighter>
|
||||
#include <QRegularExpression>
|
||||
|
||||
enum language_type {
|
||||
LANG_NONE = 0,
|
||||
@ -48,7 +49,7 @@ private:
|
||||
|
||||
struct HighlightingRule
|
||||
{
|
||||
QRegExp pattern;
|
||||
QRegularExpression pattern;
|
||||
QTextCharFormat format;
|
||||
};
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user