X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParametersPlugin%2FParametersPlugin_EvalListener.cpp;h=cc299083317be073bda56b3ab5da4bda2d24feca;hb=08e661e0df1d1fb54ad8d59655cd9dee0340c922;hp=d63741c9fa606596f832c40bd95ddb6524d0b2ac;hpb=7e9e955376b504dc7d9e0a5e79a9a38943a53fcd;p=modules%2Fshaper.git diff --git a/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp b/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp index d63741c9f..cc2990833 100644 --- a/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp +++ b/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp @@ -1,15 +1,27 @@ -/* - * ParametersPlugin_EvalListener.cpp - * - * Created on: Apr 28, 2015 - * Author: sbh - */ +// Copyright (C) 2014-2017 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 #include #include -#include #include @@ -20,6 +32,7 @@ #include #include #include +#include #include #include @@ -58,16 +71,12 @@ ParametersPlugin_EvalListener::ParametersPlugin_EvalListener() Events_Loop* aLoop = Events_Loop::loop(); Events_ID anEvents_IDs[] = { - ModelAPI_AttributeEvalMessage::eventId(), ModelAPI_ObjectRenamedMessage::eventId(), ModelAPI_ReplaceParameterMessage::eventId() }; for (int i = 0; i < sizeof(anEvents_IDs)/sizeof(anEvents_IDs[0]); ++i) aLoop->registerListener(this, anEvents_IDs[i], NULL, true); - - myInterp = std::shared_ptr(new ParametersPlugin_PyInterp()); - myInterp->initialize(); } ParametersPlugin_EvalListener::~ParametersPlugin_EvalListener() @@ -80,128 +89,13 @@ void ParametersPlugin_EvalListener::processEvent( if (!theMessage.get()) return; - const Events_ID kEvaluationEvent = ModelAPI_AttributeEvalMessage::eventId(); const Events_ID kObjectRenamedEvent = ModelAPI_ObjectRenamedMessage::eventId(); const Events_ID kReplaceParameterEvent = ModelAPI_ReplaceParameterMessage::eventId(); - if (theMessage->eventID() == kEvaluationEvent) { - processEvaluationEvent(theMessage); - } else if (theMessage->eventID() == kObjectRenamedEvent) { + if (theMessage->eventID() == kObjectRenamedEvent) { processObjectRenamedEvent(theMessage); } else if (theMessage->eventID() == kReplaceParameterEvent) { processReplaceParameterEvent(theMessage); - } else { - Events_InfoMessage("ParametersPlugin_EvalListener", - "ParametersPlugin python interpreter, unhandled message caught: ") - .arg(theMessage->eventID().eventText()).send(); - } -} - -double ParametersPlugin_EvalListener::evaluate(FeaturePtr theParameter, - const std::string& theExpression, std::string& theError) -{ - std::list anExprParams = myInterp->compile(theExpression); - // find expression's params in the model - std::list aContext; - std::list::iterator it = anExprParams.begin(); - for ( ; it != anExprParams.end(); it++) { - double aValue; - ResultParameterPtr aParamRes; - // If variable does not exist python interpreter will generate an error. It is OK. - // But due to the issue 1479 it should not check the history position of parameters relatively - // to feature that contains expression - if (!ModelAPI_Tools::findVariable(/*theParameter*/ FeaturePtr(), - *it, aValue, aParamRes, theParameter->document())) - continue; - - aContext.push_back(*it + "=" + toStdString(aValue)); - } - myInterp->extendLocalContext(aContext); - double result = myInterp->evaluate(theExpression, theError); - myInterp->clearLocalContext(); - return result; -} - -void ParametersPlugin_EvalListener::processEvaluationEvent( - const std::shared_ptr& theMessage) -{ - std::shared_ptr aMessage = - std::dynamic_pointer_cast(theMessage); - - FeaturePtr aParamFeature = - std::dynamic_pointer_cast(aMessage->attribute()->owner()); - if (aMessage->attribute()->attributeType() == ModelAPI_AttributeInteger::typeId()) { - AttributeIntegerPtr anAttribute = - std::dynamic_pointer_cast(aMessage->attribute()); - std::string anError; - int aValue = (int)evaluate(aParamFeature, anAttribute->text(), anError); - bool isValid = anError.empty(); - if (isValid) - anAttribute->setCalculatedValue(aValue); - anAttribute->setUsedParameters(isValid ? toSet(myInterp->compile(anAttribute->text())) : std::set()); - anAttribute->setExpressionInvalid(!isValid); - anAttribute->setExpressionError(anAttribute->text().empty() ? "" : anError); - } else - if (aMessage->attribute()->attributeType() == ModelAPI_AttributeDouble::typeId()) { - AttributeDoublePtr anAttribute = - std::dynamic_pointer_cast(aMessage->attribute()); - std::string anError; - double aValue = evaluate(aParamFeature, anAttribute->text(), anError); - bool isValid = anError.empty(); - if (isValid) - anAttribute->setCalculatedValue(aValue); - anAttribute->setUsedParameters(isValid ? toSet(myInterp->compile(anAttribute->text())) : std::set()); - anAttribute->setExpressionInvalid(!isValid); - anAttribute->setExpressionError(anAttribute->text().empty() ? "" : anError); - } else - if (aMessage->attribute()->attributeType() == GeomDataAPI_Point::typeId()) { - AttributePointPtr anAttribute = - std::dynamic_pointer_cast(aMessage->attribute()); - std::string aText[] = { - anAttribute->textX(), - anAttribute->textY(), - anAttribute->textZ() - }; - double aCalculatedValue[] = { - anAttribute->x(), - anAttribute->y(), - anAttribute->z() - }; - for (int i = 0; i < 3; ++i) { - std::string anError; - double aValue = evaluate(aParamFeature, aText[i], anError); - bool isValid = anError.empty(); - if (isValid) aCalculatedValue[i] = aValue; - anAttribute->setUsedParameters(i, isValid ? toSet(myInterp->compile(aText[i])) : std::set()); - anAttribute->setExpressionInvalid(i, !isValid); - anAttribute->setExpressionError(i, aText[i].empty() ? "" : anError); - } - anAttribute->setCalculatedValue(aCalculatedValue[0], - aCalculatedValue[1], - aCalculatedValue[2]); - } else - if (aMessage->attribute()->attributeType() == GeomDataAPI_Point2D::typeId()) { - AttributePoint2DPtr anAttribute = - std::dynamic_pointer_cast(aMessage->attribute()); - std::string aText[] = { - anAttribute->textX(), - anAttribute->textY() - }; - double aCalculatedValue[] = { - anAttribute->x(), - anAttribute->y() - }; - for (int i = 0; i < 2; ++i) { - std::string anError; - double aValue = evaluate(aParamFeature, aText[i], anError); - bool isValid = anError.empty(); - if (isValid) aCalculatedValue[i] = aValue; - anAttribute->setUsedParameters(i, isValid ? toSet(myInterp->compile(aText[i])) : std::set()); - anAttribute->setExpressionInvalid(i, !isValid); - anAttribute->setExpressionError(i, aText[i].empty() ? "" : anError); - } - anAttribute->setCalculatedValue(aCalculatedValue[0], - aCalculatedValue[1]); } } @@ -212,8 +106,10 @@ std::string ParametersPlugin_EvalListener::renameInPythonExpression( { std::string anExpressionString = theExpression; - std::list > aPositions = - myInterp->positions(anExpressionString, theOldName); + // ask interpreter to compute the positions in the expression + std::shared_ptr aMsg = + ModelAPI_ComputePositionsMessage::send(theExpression, theOldName, this); + const std::list >& aPositions = aMsg->positions(); if (aPositions.empty()) return anExpressionString; @@ -255,11 +151,11 @@ void ParametersPlugin_EvalListener::renameInParameter( anExpressionString = renameInPythonExpression(anExpressionString, theOldName, theNewName); - // Issue #588. No need for reevaluating expression. + // Issue #588. No need for reevaluating expression. // Moreover, current history may not contain necessary parameters. - anExpressionAttribute->owner()->data()->blockSendAttributeUpdated(true); + bool aWasBlocked = anExpressionAttribute->owner()->data()->blockSendAttributeUpdated(true); anExpressionAttribute->setValue(anExpressionString); - anExpressionAttribute->owner()->data()->blockSendAttributeUpdated(false); + anExpressionAttribute->owner()->data()->blockSendAttributeUpdated(aWasBlocked); } void ParametersPlugin_EvalListener::renameInAttribute( @@ -313,26 +209,27 @@ void ParametersPlugin_EvalListener::renameInAttribute( } } -void ParametersPlugin_EvalListener::renameInDependents(std::shared_ptr theResultParameter, - const std::string& theOldName, - const std::string& theNewName) +void ParametersPlugin_EvalListener::renameInDependents( + std::shared_ptr theResultParameter, + const std::string& theOldName, + const std::string& theNewName) { std::set > anAttributes = - theResultParameter->data()->refsToMe(); + theResultParameter->data()->refsToMe(); std::set >::const_iterator anAttributeIt = - anAttributes.cbegin(); + anAttributes.cbegin(); for (; anAttributeIt != anAttributes.cend(); ++anAttributeIt) { const AttributePtr& anAttribute = *anAttributeIt; if (anAttribute->attributeType() == ModelAPI_AttributeRefList::typeId()) { std::shared_ptr aParameter = - std::dynamic_pointer_cast( - anAttribute->owner()); + std::dynamic_pointer_cast( + anAttribute->owner()); if (aParameter.get()) // Rename renameInParameter(aParameter, theOldName, theNewName); } else - // Rename - renameInAttribute(anAttribute, theOldName, theNewName); + // Rename + renameInAttribute(anAttribute, theOldName, theNewName); } } @@ -345,18 +242,19 @@ bool isValidAttribute(const AttributePtr& theAttribute) void setParameterName(ResultParameterPtr theResultParameter, const std::string& theName) { - theResultParameter->data()->blockSendAttributeUpdated(true); + bool aWasBlocked = theResultParameter->data()->blockSendAttributeUpdated(true); theResultParameter->data()->setName(theName); - theResultParameter->data()->blockSendAttributeUpdated(false, false); + theResultParameter->data()->blockSendAttributeUpdated(aWasBlocked, false); - std::shared_ptr aParameter = + std::shared_ptr aParameter = std::dynamic_pointer_cast( ModelAPI_Feature::feature(theResultParameter)); - aParameter->data()->blockSendAttributeUpdated(true); + std::string anOldName = aParameter->name(); + aWasBlocked = aParameter->data()->blockSendAttributeUpdated(true); aParameter->data()->setName(theName); aParameter->string(ParametersPlugin_Parameter::VARIABLE_ID())->setValue(theName); - aParameter->data()->blockSendAttributeUpdated(false); + aParameter->data()->blockSendAttributeUpdated(aWasBlocked); } void ParametersPlugin_EvalListener::processObjectRenamedEvent( @@ -373,7 +271,7 @@ void ParametersPlugin_EvalListener::processObjectRenamedEvent( // check if the renamed object is a result parameter ResultParameterPtr aResultParameter = std::dynamic_pointer_cast(aMessage->object()); - if (!aResultParameter.get()) + if (!aResultParameter.get()) return; // get parameter feature for the result @@ -386,8 +284,8 @@ void ParametersPlugin_EvalListener::processObjectRenamedEvent( std::string aNotActivatedNames; if (!ModelAPI_Tools::allDocumentsActivated(aNotActivatedNames)) { QMessageBox::StandardButton aRes = QMessageBox::warning(0, QObject::tr("Warning"), - QObject::tr("Selected objects can be used in Part documents which are not loaded: \ -%1. Whould you like to continue?").arg(aNotActivatedNames.c_str()), + QObject::tr("Selected objects can be used in Part documents which are not loaded: " + "%1. Whould you like to continue?").arg(aNotActivatedNames.c_str()), QMessageBox::No | QMessageBox::Yes, QMessageBox::No); if (aRes != QMessageBox::Yes) { setParameterName(aResultParameter, aMessage->oldName()); @@ -397,15 +295,21 @@ void ParametersPlugin_EvalListener::processObjectRenamedEvent( // try to update the parameter feature according the new name setParameterName(aResultParameter, aMessage->newName()); - // TODO(spo): replace with ModelAPI_Session::get()->validators()->validate(aParameter, ParametersPlugin_Parameter::VARIABLE_ID()) - // when ModelAPI_ValidatorsFactory::validate(const std::shared_ptr& theFeature, const std::string& theAttribute) const - // is ready if (!isValidAttribute(aParameter->string(ParametersPlugin_Parameter::VARIABLE_ID()))) { - setParameterName(aResultParameter, aMessage->oldName()); + //setParameterName(aResultParameter, aMessage->oldName()); + if (myOldNames.find(aParameter.get()) == myOldNames.end()) + myOldNames[aParameter.get()] = aMessage->oldName(); return; } - renameInDependents(aResultParameter, aMessage->oldName(), aMessage->newName()); + std::string anOldName = aMessage->oldName(); + if (myOldNames.find(aParameter.get()) != myOldNames.end()) { + anOldName = myOldNames[aParameter.get()]; + myOldNames.erase(aParameter.get()); + aParameter->execute(); // to enable result because of previously incorrect name + } + + renameInDependents(aResultParameter, anOldName, aMessage->newName()); } void ParametersPlugin_EvalListener::processReplaceParameterEvent(