aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clear error message from parser.

Browse Source 
--HG--
branch : feature
This commit is contained in:
dismine 2014-05-21 19:59:53 +03:00
parent 107b131fdf
commit 34bd172f9a
2 changed files with 25 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/dialogs/tools/dialogtool.cpp
View File

@ -346,13 +346,11 @@ void DialogTool::Eval(QLineEdit *edit, bool &flag, QTimer *timer, QLabel *label)
flag = false; flag = false;
palette.setColor(labelEditFormula->foregroundRole(), Qt::red); palette.setColor(labelEditFormula->foregroundRole(), Qt::red);
emit ToolTip(e.GetMsg()); emit ToolTip(e.GetMsg());
qDebug() << "\nError:\n" qDebug() << "\nMath parser error:\n"
<< "--------\n" << "--------------------------------------\n"
<< "Message: " << e.GetMsg() << "\n" << "Message: " << e.GetMsg() << "\n"
<< "Expression: \"" << e.GetExpr() << "\"\n" << "Expression: " << e.GetExpr() << "\n"
<< "Token: \"" << e.GetToken() << "\"\n" << "--------------------------------------";
<< "Position: " << e.GetPos() << "\n"
<< "Errc: " << QString::number(e.GetCode(), 16);
} }
} }
CheckState(); CheckState();

70
src/app/xml/vpattern.cpp
View File

@ -854,11 +854,8 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, const QDomElement &d
catch(qmu::QmuParserError &e) catch(qmu::QmuParserError &e)
{ {
VExceptionObjectError excep(tr("Error creating or updating point of end line"), domElement); VExceptionObjectError excep(tr("Error creating or updating point of end line"), domElement);
QString message( "Message: " + e.GetMsg() + "\n"+ QString message("Message: " + e.GetMsg() + "\n"+
+ "Expression: \"" + e.GetExpr() + "\"\n"+ "Expression: " + e.GetExpr());
+ "Token: \"" + e.GetToken() + "\"\n"+
+ "Position: " + QString::number(e.GetPos()) + "\n"+
+ "Errc: " + QString::number(e.GetCode(), 16));
excep.AddMoreInformation(message); excep.AddMoreInformation(message);
throw excep; throw excep;
} }
@ -888,11 +885,8 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, const QDomElement &d
catch(qmu::QmuParserError &e) catch(qmu::QmuParserError &e)
{ {
VExceptionObjectError excep(tr("Error creating or updating point along line"), domElement); VExceptionObjectError excep(tr("Error creating or updating point along line"), domElement);
QString message( "Message: " + e.GetMsg() + "\n"+ QString message("Message: " + e.GetMsg() + "\n"+
+ "Expression: \"" + e.GetExpr() + "\"\n"+ "Expression: " + e.GetExpr());
+ "Token: \"" + e.GetToken() + "\"\n"+
+ "Position: " + QString::number(e.GetPos()) + "\n"+
+ "Errc: " + QString::number(e.GetCode(), 16));
excep.AddMoreInformation(message); excep.AddMoreInformation(message);
throw excep; throw excep;
} }
@ -923,11 +917,8 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, const QDomElement &d
catch(qmu::QmuParserError &e) catch(qmu::QmuParserError &e)
{ {
VExceptionObjectError excep(tr("Error creating or updating point of shoulder"), domElement); VExceptionObjectError excep(tr("Error creating or updating point of shoulder"), domElement);
QString message( "Message: " + e.GetMsg() + "\n"+ QString message("Message: " + e.GetMsg() + "\n"+
+ "Expression: \"" + e.GetExpr() + "\"\n"+ "Expression: " + e.GetExpr());
+ "Token: \"" + e.GetToken() + "\"\n"+
+ "Position: " + QString::number(e.GetPos()) + "\n"+
+ "Errc: " + QString::number(e.GetCode(), 16));
excep.AddMoreInformation(message); excep.AddMoreInformation(message);
throw excep; throw excep;
} }
@ -958,11 +949,8 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, const QDomElement &d
catch(qmu::QmuParserError &e) catch(qmu::QmuParserError &e)
{ {
VExceptionObjectError excep(tr("Error creating or updating point of normal"), domElement); VExceptionObjectError excep(tr("Error creating or updating point of normal"), domElement);
QString message( "Message: " + e.GetMsg() + "\n"+ QString message("Message: " + e.GetMsg() + "\n"+
+ "Expression: \"" + e.GetExpr() + "\"\n"+ "Expression: " + e.GetExpr());
+ "Token: \"" + e.GetToken() + "\"\n"+
+ "Position: " + QString::number(e.GetPos()) + "\n"+
+ "Errc: " + QString::number(e.GetCode(), 16));
excep.AddMoreInformation(message); excep.AddMoreInformation(message);
throw excep; throw excep;
} }
@ -993,11 +981,8 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, const QDomElement &d
catch(qmu::QmuParserError &e) catch(qmu::QmuParserError &e)
{ {
VExceptionObjectError excep(tr("Error creating or updating point of bisector"), domElement); VExceptionObjectError excep(tr("Error creating or updating point of bisector"), domElement);
QString message( "Message: " + e.GetMsg() + "\n"+ QString message("Message: " + e.GetMsg() + "\n"+
+ "Expression: \"" + e.GetExpr() + "\"\n"+ "Expression: " + e.GetExpr());
+ "Token: \"" + e.GetToken() + "\"\n"+
+ "Position: " + QString::number(e.GetPos()) + "\n"+
+ "Errc: " + QString::number(e.GetCode(), 16));
excep.AddMoreInformation(message); excep.AddMoreInformation(message);
throw excep; throw excep;
} }
@ -1048,11 +1033,8 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, const QDomElement &d
catch(qmu::QmuParserError &e) catch(qmu::QmuParserError &e)
{ {
VExceptionObjectError excep(tr("Error creating or updating point of contact"), domElement); VExceptionObjectError excep(tr("Error creating or updating point of contact"), domElement);
QString message( "Message: " + e.GetMsg() + "\n"+ QString message("Message: " + e.GetMsg() + "\n"+
+ "Expression: \"" + e.GetExpr() + "\"\n"+ "Expression: " + e.GetExpr());
+ "Token: \"" + e.GetToken() + "\"\n"+
+ "Position: " + QString::number(e.GetPos()) + "\n"+
+ "Errc: " + QString::number(e.GetCode(), 16));
excep.AddMoreInformation(message); excep.AddMoreInformation(message);
throw excep; throw excep;
} }
@ -1164,11 +1146,8 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, const QDomElement &d
catch(qmu::QmuParserError &e) catch(qmu::QmuParserError &e)
{ {
VExceptionObjectError excep(tr("Error creating or updating cut spline point"), domElement); VExceptionObjectError excep(tr("Error creating or updating cut spline point"), domElement);
QString message( "Message: " + e.GetMsg() + "\n"+ QString message("Message: " + e.GetMsg() + "\n"+
+ "Expression: \"" + e.GetExpr() + "\"\n"+ "Expression: " + e.GetExpr());
+ "Token: \"" + e.GetToken() + "\"\n"+
+ "Position: " + QString::number(e.GetPos()) + "\n"+
+ "Errc: " + QString::number(e.GetCode(), 16));
excep.AddMoreInformation(message); excep.AddMoreInformation(message);
throw excep; throw excep;
} }
@ -1195,11 +1174,8 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, const QDomElement &d
catch(qmu::QmuParserError &e) catch(qmu::QmuParserError &e)
{ {
VExceptionObjectError excep(tr("Error creating or updating cut spline path point"), domElement); VExceptionObjectError excep(tr("Error creating or updating cut spline path point"), domElement);
QString message( "Message: " + e.GetMsg() + "\n"+ QString message("Message: " + e.GetMsg() + "\n"+
+ "Expression: \"" + e.GetExpr() + "\"\n"+ "Expression: " + e.GetExpr());
+ "Token: \"" + e.GetToken() + "\"\n"+
+ "Position: " + QString::number(e.GetPos()) + "\n"+
+ "Errc: " + QString::number(e.GetCode(), 16));
excep.AddMoreInformation(message); excep.AddMoreInformation(message);
throw excep; throw excep;
} }
@ -1225,11 +1201,8 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, const QDomElement &d
catch(qmu::QmuParserError &e) catch(qmu::QmuParserError &e)
{ {
VExceptionObjectError excep(tr("Error creating or updating cut arc point"), domElement); VExceptionObjectError excep(tr("Error creating or updating cut arc point"), domElement);
QString message( "Message: " + e.GetMsg() + "\n"+ QString message("Message: " + e.GetMsg() + "\n"+
+ "Expression: \"" + e.GetExpr() + "\"\n"+ "Expression: " + e.GetExpr());
+ "Token: \"" + e.GetToken() + "\"\n"+
+ "Position: " + QString::number(e.GetPos()) + "\n"+
+ "Errc: " + QString::number(e.GetCode(), 16));
excep.AddMoreInformation(message); excep.AddMoreInformation(message);
throw excep; throw excep;
} }
@ -1419,11 +1392,8 @@ void VPattern::ParseArcElement(VMainGraphicsScene *scene, const QDomElement &dom
catch(qmu::QmuParserError &e) catch(qmu::QmuParserError &e)
{ {
VExceptionObjectError excep(tr("Error creating or updating simple arc"), domElement); VExceptionObjectError excep(tr("Error creating or updating simple arc"), domElement);
QString message( "Message: " + e.GetMsg() + "\n"+ QString message("Message: " + e.GetMsg() + "\n"+
+ "Expression: \"" + e.GetExpr() + "\"\n"+ "Expression: " + e.GetExpr());
+ "Token: \"" + e.GetToken() + "\"\n"+
+ "Position: " + QString::number(e.GetPos()) + "\n"+
+ "Errc: " + QString::number(e.GetCode(), 16));
excep.AddMoreInformation(message); excep.AddMoreInformation(message);
throw excep; throw excep;
} }