ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use split_line convenience function for better consistency and backward compatibility

Browse Source
This commit is contained in:
Axel Kohlmeyer
2023-09-17 19:39:31 -04:00
parent cf8b157702
commit 20be9e64cf
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/lammps-gui/codeeditor.cpp
View File

@ -173,7 +173,7 @@ CodeEditor::CodeEditor(QWidget *parent) :
if (help_index.open(QIODevice::ReadOnly | QIODevice::Text)) { if (help_index.open(QIODevice::ReadOnly | QIODevice::Text)) {
while (!help_index.atEnd()) { while (!help_index.atEnd()) {
auto line = QString(help_index.readLine()); auto line = QString(help_index.readLine());
auto words = line.trimmed().split(' '); auto words = line.trimmed().replace('\t', ' ').split(' ');
if (words.size() > 2) { if (words.size() > 2) {
if (words.at(1) == "pair_style") { if (words.at(1) == "pair_style") {
pair_map[words.at(2)] = words.at(0); pair_map[words.at(2)] = words.at(0);
@ -396,8 +396,8 @@ void CodeEditor::setGroupList()
cursor.movePosition(QTextCursor::Start); cursor.movePosition(QTextCursor::Start);
setTextCursor(cursor); setTextCursor(cursor);
while (find(groupcmd)) { while (find(groupcmd)) {
auto words = textCursor().block().text().replace('\t', ' ').split(' ', Qt::SkipEmptyParts); auto words = split_line(textCursor().block().text().replace('\t', ' ').toStdString());
if ((words.size() > 1) && !groups.contains(words[1])) groups << words[1]; if ((words.size() > 1) && !groups.contains(words[1].c_str())) groups << words[1].c_str();
} }
groups.sort(); groups.sort();
groups.prepend(QStringLiteral("all")); groups.prepend(QStringLiteral("all"));
@ -426,13 +426,13 @@ void CodeEditor::setVarNameList()
cursor.movePosition(QTextCursor::Start); cursor.movePosition(QTextCursor::Start);
setTextCursor(cursor); setTextCursor(cursor);
while (find(varcmd)) { while (find(varcmd)) {
auto words = textCursor().block().text().replace('\t', ' ').split(' ', Qt::SkipEmptyParts); auto words = split_line(textCursor().block().text().replace('\t', ' ').toStdString());
if ((words.size() > 1)) { if ((words.size() > 1)) {
QString w = QString("$%1").arg(words[1]); QString w = QString("$%1").arg(words[1].c_str());
if ((words[1].size() == 1) && !vars.contains(w)) vars << w; if ((words[1].size() == 1) && !vars.contains(w)) vars << w;
w = QString("${%1}").arg(words[1]); w = QString("${%1}").arg(words[1].c_str());
if (!vars.contains(w)) vars << w; if (!vars.contains(w)) vars << w;
w = QString("v_%1").arg(words[1]); w = QString("v_%1").arg(words[1].c_str());
if (!vars.contains(w)) vars << w; if (!vars.contains(w)) vars << w;
} }
} }
@ -452,11 +452,11 @@ void CodeEditor::setComputeIDList()
cursor.movePosition(QTextCursor::Start); cursor.movePosition(QTextCursor::Start);
setTextCursor(cursor); setTextCursor(cursor);
while (find(compcmd)) { while (find(compcmd)) {
auto words = textCursor().block().text().replace('\t', ' ').split(' ', Qt::SkipEmptyParts); auto words = split_line(textCursor().block().text().replace('\t', ' ').toStdString());
if ((words.size() > 1)) { if ((words.size() > 1)) {
QString w = QString("c_%1").arg(words[1]); QString w = QString("c_%1").arg(words[1].c_str());
if (!compid.contains(w)) compid << w; if (!compid.contains(w)) compid << w;
w = QString("C_%1").arg(words[1]); w = QString("C_%1").arg(words[1].c_str());
if (!compid.contains(w)) compid << w; if (!compid.contains(w)) compid << w;
} }
} }
@ -476,11 +476,11 @@ void CodeEditor::setFixIDList()
cursor.movePosition(QTextCursor::Start); cursor.movePosition(QTextCursor::Start);
setTextCursor(cursor); setTextCursor(cursor);
while (find(fixcmd)) { while (find(fixcmd)) {
auto words = textCursor().block().text().replace('\t', ' ').split(' ', Qt::SkipEmptyParts); auto words = split_line(textCursor().block().text().replace('\t', ' ').toStdString());
if ((words.size() > 1)) { if ((words.size() > 1)) {
QString w = QString("f_%1").arg(words[1]); QString w = QString("f_%1").arg(words[1].c_str());
if (!fixid.contains(w)) fixid << w; if (!fixid.contains(w)) fixid << w;
w = QString("F_%1").arg(words[1]); w = QString("F_%1").arg(words[1].c_str());
if (!fixid.contains(w)) fixid << w; if (!fixid.contains(w)) fixid << w;
} }
} }

2
tools/lammps-gui/lammpsgui.cpp
View File

@ -528,7 +528,7 @@ void LammpsGui::update_recents(const QString &filename)
void LammpsGui::update_variables() void LammpsGui::update_variables()
{ {
const auto doc = ui->textEdit->toPlainText().split('\n'); const auto doc = ui->textEdit->toPlainText().replace('\t', ' ').split('\n');
QStringList known; QStringList known;
QRegularExpression indexvar("^\\s*variable\\s+(\\w+)\\s+index\\s+(.*)"); QRegularExpression indexvar("^\\s*variable\\s+(\\w+)\\s+index\\s+(.*)");
QRegularExpression anyvar("^\\s*variable\\s+(\\w+)\\s+(\\w+)\\s+(.*)"); QRegularExpression anyvar("^\\s*variable\\s+(\\w+)\\s+(\\w+)\\s+(.*)");