-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
-/*
- * InitializationPlugin_EvalListener.cpp
- *
- * Created on: Apr 28, 2015
- * Author: sbh
- */
+// Copyright (C) 2014-2020 CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
#include <pyconfig.h>
#include <Events_InfoMessage.h>
+#include <Locale_Convert.h>
+
#include <ModelAPI_AttributeDouble.h>
#include <ModelAPI_AttributeInteger.h>
#include <ModelAPI_AttributeRefList.h>
//------------------------------------------------------------------------------
// Tools
-std::string toStdString(double theValue)
+std::wstring toString(double theValue)
{
- std::ostringstream sstream;
- sstream << theValue;
- size_t aPos = sstream.str().find(".");
- std::string aPnt = "";
- if (aPos == std::string::npos)
- aPnt = ".";
- return sstream.str() + aPnt;
+ std::wostringstream sstream;
+ // write value in scientific format with 16 digits,
+ // thus, not check the dot position
+ sstream.precision(16);
+ sstream << std::scientific << theValue;
+ return sstream.str();
}
-std::set<std::string> toSet(const std::list<std::string>& theContainer)
+std::set<std::wstring> toSet(const std::list<std::wstring>& theContainer)
{
- return std::set<std::string>(theContainer.begin(), theContainer.end());
+ return std::set<std::wstring>(theContainer.begin(), theContainer.end());
}
//------------------------------------------------------------------------------
std::shared_ptr<ModelAPI_ParameterEvalMessage> aMsg =
std::dynamic_pointer_cast<ModelAPI_ParameterEvalMessage>(theMessage);
FeaturePtr aParam = aMsg->parameter();
- std::string anExp = aParam->string(ParametersPlugin_Parameter::EXPRESSION_ID())->value();
+ AttributeStringPtr anExprAttr = aParam->string(ParametersPlugin_Parameter::EXPRESSION_ID());
+ std::wstring anExp = anExprAttr->isUValue() ?
+ Locale::Convert::toWString(anExprAttr->valueU()) :
+ Locale::Convert::toWString(anExprAttr->value());
std::string anError;
std::list<std::shared_ptr<ModelAPI_ResultParameter> > aParamsList;
double aResult = evaluate(aParam, anExp, anError, aParamsList, true);
}
double InitializationPlugin_EvalListener::evaluate(FeaturePtr theParameter,
- const std::string& theExpression, std::string& theError,
+ const std::wstring& theExpression, std::string& theError,
std::list<std::shared_ptr<ModelAPI_ResultParameter> >& theParamsList,
const bool theIsParameter)
{
- std::list<std::string> anExprParams = myInterp->compile(theExpression);
+ std::list<std::wstring> anExprParams = myInterp->compile(theExpression);
// find expression's params in the model
- std::list<std::string> aContext;
- std::list<std::string>::iterator it = anExprParams.begin();
+ std::list<std::wstring> aContext;
+ std::list<std::wstring>::iterator it = anExprParams.begin();
for ( ; it != anExprParams.end(); it++) {
double aValue;
ResultParameterPtr aParamRes;
if (theIsParameter)
theParamsList.push_back(aParamRes);
- aContext.push_back(*it + "=" + toStdString(aValue));
+ aContext.push_back(*it + L"=" + toString(aValue));
}
myInterp->extendLocalContext(aContext);
double result = myInterp->evaluate(theExpression, theError);
if (isValid)
anAttribute->setCalculatedValue(aValue);
anAttribute->setUsedParameters(isValid ?
- toSet(myInterp->compile(anAttribute->text())) : std::set<std::string>());
+ toSet(myInterp->compile(anAttribute->text())) : std::set<std::wstring>());
anAttribute->setExpressionInvalid(!isValid);
anAttribute->setExpressionError(anAttribute->text().empty() ? "" : anError);
} else
if (isValid)
anAttribute->setCalculatedValue(aValue);
anAttribute->setUsedParameters(isValid ?
- toSet(myInterp->compile(anAttribute->text())) : std::set<std::string>());
+ toSet(myInterp->compile(anAttribute->text())) : std::set<std::wstring>());
anAttribute->setExpressionInvalid(!isValid);
anAttribute->setExpressionError(anAttribute->text().empty() ? "" : anError);
} else
if (aMessage->attribute()->attributeType() == GeomDataAPI_Point::typeId()) {
AttributePointPtr anAttribute =
std::dynamic_pointer_cast<GeomDataAPI_Point>(aMessage->attribute());
- std::string aText[] = {
+ std::wstring aText[] = {
anAttribute->textX(),
anAttribute->textY(),
anAttribute->textZ()
bool isValid = anError.empty();
if (isValid) aCalculatedValue[i] = aValue;
anAttribute->setUsedParameters(i,
- isValid ? toSet(myInterp->compile(aText[i])) : std::set<std::string>());
+ isValid ? toSet(myInterp->compile(aText[i])) : std::set<std::wstring>());
anAttribute->setExpressionInvalid(i, !isValid);
anAttribute->setExpressionError(i, aText[i].empty() ? "" : anError);
}
if (aMessage->attribute()->attributeType() == GeomDataAPI_Point2D::typeId()) {
AttributePoint2DPtr anAttribute =
std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aMessage->attribute());
- std::string aText[] = {
+ std::wstring aText[] = {
anAttribute->textX(),
anAttribute->textY()
};
bool isValid = anError.empty();
if (isValid) aCalculatedValue[i] = aValue;
anAttribute->setUsedParameters(i,
- isValid ? toSet(myInterp->compile(aText[i])) : std::set<std::string>());
+ isValid ? toSet(myInterp->compile(aText[i])) : std::set<std::wstring>());
anAttribute->setExpressionInvalid(i, !isValid);
anAttribute->setExpressionError(i, aText[i].empty() ? "" : anError);
}
aCalculatedValue[1]);
}
}
+
+void InitializationPlugin_EvalListener::initDataModel()
+{
+ myInterp->runString("import salome_iapp;salome_iapp.register_module_in_study(\"Shaper\")");
+}