X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FPartSet%2FPartSet_OverconstraintListener.cpp;h=640af398ae868f252f563d34e61c89562c30fe6b;hb=ac6c4b849218e6f1a45c0a21e46c5fda401c38f0;hp=0e74b06001dd247194d8be3e5d85a91431aedf16;hpb=f68074b0f3e013e10a9d06016ceac84827a5cdc2;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_OverconstraintListener.cpp b/src/PartSet/PartSet_OverconstraintListener.cpp index 0e74b0600..640af398a 100755 --- a/src/PartSet/PartSet_OverconstraintListener.cpp +++ b/src/PartSet/PartSet_OverconstraintListener.cpp @@ -1,28 +1,48 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SketcherPrs_Angle.cpp -// Created: 20 August 2015 -// Author: Vitaly SMETANNIKOV +// 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 "PartSet_OverconstraintListener.h" #include #include #include +#include "XGUI_CustomPrs.h" +#include "XGUI_Displayer.h" #include "XGUI_ModuleConnector.h" +#include "XGUI_OperationMgr.h" +#include "XGUI_Tools.h" #include "XGUI_Workshop.h" -#include "XGUI_Displayer.h" -#include "XGUI_CustomPrs.h" #include "SketcherPrs_SymbolPrs.h" #include "SketchPlugin_SketchEntity.h" +#include "SketchPlugin_MacroArcReentrantMessage.h" +#include "SketchPlugin_Sketch.h" #include "Events_Loop.h" #include #include +#include #include #include @@ -30,7 +50,7 @@ //#define DEBUG_FEATURE_OVERCONSTRAINT_LISTENER PartSet_OverconstraintListener::PartSet_OverconstraintListener(ModuleBase_IWorkshop* theWorkshop) -: myWorkshop(theWorkshop), myIsFullyConstrained(false)//, myIsNeedUpdateCustomColor(false) +: myWorkshop(theWorkshop), myIsActive(false), myIsFullyConstrained(false) { Events_Loop* aLoop = Events_Loop::loop(); aLoop->registerListener(this, Events_Loop::eventByName(EVENT_SOLVER_FAILED)); @@ -39,32 +59,50 @@ PartSet_OverconstraintListener::PartSet_OverconstraintListener(ModuleBase_IWorks aLoop->registerListener(this, Events_Loop::eventByName(EVENT_SKETCH_UNDER_CONSTRAINED)); aLoop->registerListener(this, Events_Loop::eventByName(EVENT_SKETCH_FULLY_CONSTRAINED)); - aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_CREATED)); + aLoop->registerListener(this, ModelAPI_EventReentrantMessage::eventId()); + aLoop->registerListener(this, SketchPlugin_MacroArcReentrantMessage::eventId()); +} + +void PartSet_OverconstraintListener::setActive(const bool& theActive) +{ + if (myIsActive == theActive) + return; + + myIsActive = theActive; + myIsFullyConstrained = false; /// returned to default state, no custom color for it + + if (myIsActive) { + PartSet_Module* aModule = module(); + CompositeFeaturePtr aSketch = aModule->sketchMgr()->activeSketch(); + if (aSketch.get()) { + std::string aDOFMessage = aSketch->string(SketchPlugin_Sketch::SOLVER_DOF())->value(); + myIsFullyConstrained = QString(aDOFMessage.c_str()).contains("DoF = 0"); + } + } } void PartSet_OverconstraintListener::getCustomColor(const ObjectPtr& theObject, std::vector& theColor) { + if (!myIsActive) + return; + + FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); + std::string aFeatureName = aFeature->data()->name(); + if (myConflictingObjects.find(theObject) != myConflictingObjects.end()) { - Quantity_Color aColor = ModuleBase_Tools::color("Visualization", - "sketch_overconstraint_color"); - theColor.push_back(aColor.Red()*255.); - theColor.push_back(aColor.Green()*255.); - theColor.push_back(aColor.Blue()*255.); + theColor = Config_PropManager::color("Visualization", "sketch_overconstraint_color"); } if (myIsFullyConstrained) { FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); - if (aFeature.get()) { - PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); - CompositeFeaturePtr aCompositeFeature = aModule->sketchMgr()->activeSketch(); + // only entity features has custom color when sketch is fully constrained + if (aFeature.get() && PartSet_SketcherMgr::isEntity(aFeature->getKind()) && + !PartSet_SketcherMgr::isExternalFeature(aFeature)) { + PartSet_Module* aModule = module(); + CompositeFeaturePtr aSketch = aModule->sketchMgr()->activeSketch(); // the given object is sub feature of the current sketch(created or edited) - if (ModelAPI_Tools::compositeOwner(aFeature) == aCompositeFeature) { - Quantity_Color aColor = ModuleBase_Tools::color("Visualization", - "sketch_fully_constrained_color"); - theColor.push_back(aColor.Red()*0.); - theColor.push_back(aColor.Green()*255.); - theColor.push_back(aColor.Blue()*0.); - } + if (ModelAPI_Tools::compositeOwner(aFeature) == aSketch) + theColor = Config_PropManager::color("Visualization", "sketch_fully_constrained_color"); } } } @@ -72,6 +110,12 @@ void PartSet_OverconstraintListener::getCustomColor(const ObjectPtr& theObject, void PartSet_OverconstraintListener::processEvent( const std::shared_ptr& theMessage) { + // #2271 open document: if sketch has confilcting elements, solver sends message with the + // elements by opening the document. Sketch is not active, but an internal container should + // be updated. So, we should not check whether the listener is active here + //if (!myIsActive) + // return; + #ifdef DEBUG_FEATURE_OVERCONSTRAINT_LISTENER bool isRepaired = theMessage->eventID() == Events_Loop::eventByName(EVENT_SOLVER_REPAIRED); int aCount = 0; @@ -114,7 +158,6 @@ void PartSet_OverconstraintListener::processEvent( myIsFullyConstrained = anEventID == Events_Loop::eventByName(EVENT_SKETCH_FULLY_CONSTRAINED); if (aPrevFullyConstrained != myIsFullyConstrained) { - //myIsNeedUpdateCustomColor = true; std::set aModifiedObjects; PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); CompositeFeaturePtr aSketch = aModule->sketchMgr()->activeSketch(); @@ -130,19 +173,44 @@ void PartSet_OverconstraintListener::processEvent( } redisplayObjects(aModifiedObjects); } - //myIsNeedUpdateCustomColor = false; } } - else if (anEventID == Events_Loop::eventByName(EVENT_OBJECT_CREATED)) { - PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); - PartSet_SketcherReentrantMgr* aReentrantMgr = aModule->sketchReentranceMgr(); - if (aReentrantMgr->isInternalEditActive()) { - std::shared_ptr aUpdMsg = - std::dynamic_pointer_cast(theMessage); - std::set anObjects = aUpdMsg->objects(); - aReentrantMgr->appendCreatedObjects(anObjects); + else if (anEventID == ModelAPI_EventReentrantMessage::eventId() || + anEventID == SketchPlugin_MacroArcReentrantMessage::eventId()) { + // the message is sent to sketcher reentrant manager only if the name of feature + // sender is equal to feature name of the current operation. E.g. Horizontal create operation + // is active. Sketch Line feature is changed, so execute is called, it will send message + // This Line's message should not be processed, as the reentrant operation is not for Line + // It is not enoght of kind, the name should be used, e.g. restarted Lines on auxiliary + // cirlce sometimes causes previous line change, kind the same, but feature line is different + std::string aCurrentFeatureName; + ModuleBase_Operation* anOperation = + XGUI_Tools::workshop(myWorkshop)->operationMgr()->currentOperation(); + if (anOperation) { + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (anOperation); + if (aFOperation) { + FeaturePtr aFeature = aFOperation->feature(); + // data valid is necessary if the feature has been already deleted + // (e.g. Esc of Lenght if lenght value is modified) + if (aFeature.get() && aFeature->data()->isValid()) + aCurrentFeatureName = aFeature->data()->name(); + } + } + if (theMessage->sender()) { + ModelAPI_Object* aSender = static_cast(theMessage->sender()); + if (aSender) { + FeaturePtr aFeatureSender = + std::dynamic_pointer_cast(aSender->data()->owner()); + if (aFeatureSender.get() && aFeatureSender->data()->name() == aCurrentFeatureName) { + PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); + PartSet_SketcherReentrantMgr* aReentrantMgr = aModule->sketchReentranceMgr(); + aReentrantMgr->setReentrantMessage(theMessage); + } + } } } + #ifdef DEBUG_FEATURE_OVERCONSTRAINT_LISTENER aCurrentInfoStr = getObjectsInfo(myConflictingObjects); qDebug(QString("RESULT: current objects count = %1:%2\n") @@ -209,10 +277,9 @@ void PartSet_OverconstraintListener::redisplayObjects( aLoop->flush(EVENT_DISP); } -XGUI_Workshop* PartSet_OverconstraintListener::workshop() const +PartSet_Module* PartSet_OverconstraintListener::module() const { - XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); - return aConnector->workshop(); + return dynamic_cast(myWorkshop->module()); } #ifdef _DEBUG