atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/huderlem/porymap

Browse source
This commit is contained in:
Marcus Huderle 2018-12-20 17:35:11 -06:00
commit 0c761edb88
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/project.cpp
View file

@ -1856,6 +1856,7 @@ QString Project::readCIncbin(QString text, QString label) {
QMap<QString, int> Project::readCDefines(QString text, QStringList prefixes) { QMap<QString, int> Project::readCDefines(QString text, QStringList prefixes) {
ParseUtil parser; ParseUtil parser;
text.replace(QRegularExpression("//.*"), "");
QMap<QString, int> allDefines; QMap<QString, int> allDefines;
QMap<QString, int> filteredDefines; QMap<QString, int> filteredDefines;
QRegularExpression re("#define\\s+(?<defineName>\\w+)[^\\S\\n]+(?<defineValue>.+)"); QRegularExpression re("#define\\s+(?<defineName>\\w+)[^\\S\\n]+(?<defineValue>.+)");
@ -1864,7 +1865,7 @@ QMap<QString, int> Project::readCDefines(QString text, QStringList prefixes) {
QRegularExpressionMatch match = iter.next(); QRegularExpressionMatch match = iter.next();
QString name = match.captured("defineName"); QString name = match.captured("defineName");
QString expression = match.captured("defineValue"); QString expression = match.captured("defineValue");
expression.replace(QRegularExpression("//.*"), ""); if (expression == " ") continue;
int value = parser.evaluateDefine(expression, &allDefines); int value = parser.evaluateDefine(expression, &allDefines);
allDefines.insert(name, value); allDefines.insert(name, value);
for (QString prefix : prefixes) { for (QString prefix : prefixes) {

1
src/ui/connectionpixmapitem.cpp
View file

@ -1,4 +1,5 @@
#include "connectionpixmapitem.h" #include "connectionpixmapitem.h"
#include <cmath>
void ConnectionPixmapItem::render(qreal opacity) { void ConnectionPixmapItem::render(qreal opacity) {
QPixmap newPixmap = this->basePixmap.copy(0, 0, this->basePixmap.width(), this->basePixmap.height()); QPixmap newPixmap = this->basePixmap.copy(0, 0, this->basePixmap.width(), this->basePixmap.height());