adrido
/
MinetestMapperGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make RegularExpressions const and parse legacy format

master
adrido 2015-07-13 10:37:39 +02:00
parent 84edddce80
commit 9a004f8671
2 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
geometrywidget.cpp
View File

@ -85,20 +85,39 @@ Geometry::Format Geometry::set(QString str)
}
return Geometry::CornerDimensions;
}
else if((match = centerDimensionSimple.match(str)).hasMatch()){
qDebug()<<"format is CenterDimensions with center =0,0";
center[0] = 0;
center[1] = 0;
dimension[0] = match.captured(1).toInt();
dimension[1] = match.captured(2).toInt();
computeCorner0();
computeCorner1();
if (adjustCorners()) {
// Order is important here!
computeDimensions();
computeCenter();
else if((match = cornerDimensionAlternate.match(str)).hasMatch()){
qDebug() << "format is <width>x<height>[<+|-xoffset><+|-yoffset>]";
if(match.lastCapturedIndex() ==2){
qDebug() << "format is CenterDimensions with center =0,0";
center[0] = 0;
center[1] = 0;
dimension[0] = match.captured(1).toInt();
dimension[1] = match.captured(2).toInt();
computeCorner0();
computeCorner1();
if (adjustCorners()) {
// Order is important here!
computeDimensions();
computeCenter();
}
return Geometry::CenterDimensions;
}
return Geometry::CenterDimensions;
else if(match.lastCapturedIndex() ==4){
qDebug() << "format is CornerDimensions";
corner[0][0] = match.captured(3).toInt();
corner[0][1] = match.captured(4).toInt();
dimension[0] = match.captured(1).toInt();
dimension[1] = match.captured(2).toInt();
computeCenter();
computeCorner1();
if (adjustCorners()) {
// Order is important here!
computeDimensions();
computeCenter();
}
return Geometry::CornerDimensions;
}
else return Geometry::FormatCustom;
}
else {
qDebug()<<"Warning: Could not parse format of string: "<<str;

8
geometrywidget.h
View File

@ -49,10 +49,10 @@ public:
void setCorners(int c0x, int c0y, int c1x, int c1y);
QString getString(Geometry::Format format = Geometry::FormatNone);
private:
QRegularExpression corners = QRegularExpression("(-?\\d*),(-?\\d*):(-?\\d*),(-?\\d*)");
QRegularExpression centerDimension = QRegularExpression("(-?\\d*),(-?\\d*):(-?\\d*)x(-?\\d*)");
QRegularExpression cornerDimension = QRegularExpression("(-?\\d*)[,x](-?\\d*)[+-](-?\\d*)[+-](-?\\d*)");
QRegularExpression centerDimensionSimple = QRegularExpression("(\\d*)x(\\d*)");
const QRegularExpression corners = QRegularExpression("(-?\\d*),(-?\\d*):(-?\\d*),(-?\\d*)");
const QRegularExpression centerDimension = QRegularExpression("(-?\\d*),(-?\\d*):(-?\\d*)x(-?\\d*)");
const QRegularExpression cornerDimension = QRegularExpression("(-?\\d*)[,:](-?\\d*)[+-](-?\\d*)[+-](-?\\d*)");
const QRegularExpression cornerDimensionAlternate = QRegularExpression("(\\d*)x(\\d*)[+]?(-?\\d+)?[+]?(-?\\d+)?");
bool adjustCorners(void);
void computeCorner0(void);
void computeCorner1(void);