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

Additional checkings.

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2014-11-22 14:49:09 +02:00
parent cf36ec0b09
commit 6e0ff89b6a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/container/calculator.cpp
View File

@ -31,6 +31,7 @@
#include <QSettings> #include <QSettings>
#include "../core/vapplication.h" #include "../core/vapplication.h"
#include "vcontainer.h" #include "vcontainer.h"
#include "../core/vsettings.h"
using namespace qmu; using namespace qmu;
@ -52,6 +53,7 @@ using namespace qmu;
Calculator::Calculator(const VContainer *data) Calculator::Calculator(const VContainer *data)
:QmuParser(), vVarVal(nullptr), data(data) :QmuParser(), vVarVal(nullptr), data(data)
{ {
SCASSERT(data != nullptr)
InitCharacterSets(); InitCharacterSets();
setAllowSubexpressions(false);//Only one expression per time setAllowSubexpressions(false);//Only one expression per time
@ -88,6 +90,7 @@ Calculator::Calculator(const QString &formula, bool fromUser)
Eval(); Eval();
} }
//---------------------------------------------------------------------------------------------------------------------
Calculator::~Calculator() Calculator::~Calculator()
{ {
delete [] vVarVal; delete [] vVarVal;
@ -112,7 +115,7 @@ qreal Calculator::EvalFormula(const QString &formula)
QMap<int, QString> tokens = this->GetTokens(); QMap<int, QString> tokens = this->GetTokens();
// Remove "-" from tokens list if exist. If don't do that unary minus operation will broken. // Remove "-" from tokens list if exist. If don't do that unary minus operation will broken.
RemoveAll(tokens, "-"); RemoveAll(tokens, QStringLiteral("-"));
if (tokens.isEmpty()) if (tokens.isEmpty())
{ {
@ -132,6 +135,7 @@ void Calculator::InitVariables(const VContainer *data, const QMap<int, QString>
vVarVal = new qreal[2]; vVarVal = new qreal[2];
} }
SCASSERT(data != nullptr)
const QHash<QString, QSharedPointer<VInternalVariable> > *vars = data->DataVariables(); const QHash<QString, QSharedPointer<VInternalVariable> > *vars = data->DataVariables();
QMap<int, QString>::const_iterator i = tokens.constBegin(); QMap<int, QString>::const_iterator i = tokens.constBegin();
@ -225,7 +229,7 @@ void Calculator::SetSepForTr(bool fromUser)
{ {
if (fromUser) if (fromUser)
{ {
bool osSeparatorValue = qApp->getSettings()->value("configuration/osSeparator", 1).toBool(); const bool osSeparatorValue = qApp->getSettings()->GetOsSeparator();
if (osSeparatorValue) if (osSeparatorValue)
{ {