X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModuleBase%2FModuleBase_IModule.cpp;h=f3314ca2a27a1c186a11c2d01a1f636ce6a3da29;hb=6a23207a9154dac27c710190281aa5bfcf2bd498;hp=997c4134849595142d57bbe2c6d27cad00d83cc0;hpb=1caca4db4cda17236f7a9f50fc9c620f6a426372;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_IModule.cpp b/src/ModuleBase/ModuleBase_IModule.cpp index 997c41348..f3314ca2a 100644 --- a/src/ModuleBase/ModuleBase_IModule.cpp +++ b/src/ModuleBase/ModuleBase_IModule.cpp @@ -1,10 +1,30 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - +// Copyright (C) 2014-2019 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 "ModelAPI_IReentrant.h" +#include "ModelAPI_EventReentrantMessage.h" #include "ModuleBase_IModule.h" #include "ModuleBase_IViewer.h" #include "ModuleBase_ViewerPrs.h" #include "ModuleBase_Operation.h" +#include "ModuleBase_IPropertyPanel.h" #include "ModuleBase_ISelection.h" #include "ModuleBase_OperationDescription.h" #include "ModuleBase_OperationFeature.h" @@ -12,8 +32,10 @@ #include "ModuleBase_WidgetFactory.h" #include "ModuleBase_PageWidget.h" #include "ModuleBase_Dialog.h" +#include "ModuleBase_IErrorMgr.h" #include +#include #include #include @@ -23,7 +45,6 @@ #include #include #include -#include #include #include @@ -31,10 +52,9 @@ #include #include #include -#include ModuleBase_IModule::ModuleBase_IModule(ModuleBase_IWorkshop* theParent) - : QObject(theParent), myWorkshop(theParent) + : QObject(theParent), myWorkshop(theParent) { connect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); @@ -51,9 +71,22 @@ ModuleBase_IModule::ModuleBase_IModule(ModuleBase_IWorkshop* theParent) // SLOT(onMouseDoubleClick(QMouseEvent*))); } +ModuleBase_IModule::~ModuleBase_IModule() +{ + std::map::const_iterator aFiltersIt = + mySelectionFilters.begin(); + for (; aFiltersIt != mySelectionFilters.end(); aFiltersIt++) { + Handle(SelectMgr_Filter) aFilter = aFiltersIt->second; + if (!aFilter.IsNull()) + aFilter.Nullify(); + } +} + + void ModuleBase_IModule::launchModal(const QString& theCmdId) { - if (!myWorkshop->canStartOperation(theCmdId)) + bool isCommitted; + if (!myWorkshop->canStartOperation(theCmdId, isCommitted)) return; std::string aXmlCfg, aDescription; @@ -71,34 +104,64 @@ void ModuleBase_IModule::launchModal(const QString& theCmdId) } -void ModuleBase_IModule::launchOperation(const QString& theCmdId) +void ModuleBase_IModule::launchOperation(const QString& theCmdId, + const bool& isStartAfterCommitOnly) { - if (!myWorkshop->canStartOperation(theCmdId)) + /// selection should be obtained from workshop before ask if the operation can be started as + /// the canStartOperation method performs commit/abort of previous operation. + /// Sometimes commit/abort may cause selection clear(Sketch operation) as a result + /// it will be lost and is not used for preselection. + ModuleBase_ISelection* aSelection = myWorkshop->selection(); + QList aPreSelected = + aSelection->getSelected(ModuleBase_ISelection::AllControls); + + ModuleBase_OperationFeature* aCurOperation = dynamic_cast + (myWorkshop->currentOperation()); + QString aCurOperationKind = aCurOperation ? aCurOperation->getDescription()->operationId() : ""; + + bool isCommitted; + if (!myWorkshop->canStartOperation(theCmdId, isCommitted)) + return; + + /// reentrant operation(Sketch Line) should not be started if operation is aborted + if (isStartAfterCommitOnly && !isCommitted) return; ModuleBase_OperationFeature* aFOperation = dynamic_cast (createOperation(theCmdId.toStdString())); if (aFOperation) { - ModuleBase_ISelection* aSelection = myWorkshop->selection(); - // Initialise operation with preliminary selection - aFOperation->initSelection(aSelection, myWorkshop->viewer()); - sendOperation(aFOperation); + std::shared_ptr aMessage = reentrantMessage(); + if (aMessage.get()) { + setReentrantPreSelection(aMessage); + } + else if (canUsePreselection(aCurOperationKind, theCmdId)) { + // restore of previous opeation is absent or new launched operation has the same kind + aFOperation->initSelection(aPreSelected); + } + workshop()->processLaunchOperation(aFOperation); + + if (aFOperation) { + FeaturePtr aFeature = aFOperation->feature(); + ModelReentrantPtr aReentrantFeature = + std::dynamic_pointer_cast(aFeature); + if (aReentrantFeature.get()) { + if (aMessage.get()) { + ModuleBase_IPropertyPanel* aPanel = workshop()->propertyPanel(); + std::string aPrevAttribute = aReentrantFeature->processEvent(aMessage); + if (!aPrevAttribute.empty()) { + workshop()->errorMgr()->updateActions(aFeature); + ModuleBase_ModelWidget* aPrevWidget = aPanel->modelWidget(aPrevAttribute); + aPanel->activateNextWidget(aPrevWidget); + } + } + } + } } } - -void ModuleBase_IModule::sendOperation(ModuleBase_Operation* theOperation) +AISObjectPtr ModuleBase_IModule::createPresentation(const ObjectPtr& theResult) { - static Events_ID aModuleEvent = Events_Loop::eventByName(EVENT_OPERATION_LAUNCHED); - std::shared_ptr aMessage = - std::shared_ptr(new Config_PointerMessage(aModuleEvent, this)); - aMessage->setPointer(theOperation); - Events_Loop::loop()->send(aMessage); -} - -Handle(AIS_InteractiveObject) ModuleBase_IModule::createPresentation(const ResultPtr& theResult) -{ - return Handle(AIS_InteractiveObject)(); + return AISObjectPtr(); } bool ModuleBase_IModule::canBeShaded(Handle(AIS_InteractiveObject) theAIS) const @@ -108,13 +171,9 @@ bool ModuleBase_IModule::canBeShaded(Handle(AIS_InteractiveObject) theAIS) const QString ModuleBase_IModule::getFeatureError(const FeaturePtr& theFeature) { - QString aMsg = ModelAPI_Tools::getFeatureError(theFeature).c_str(); - if (!aMsg.isEmpty()) { - std::string aStr = Config_Translator::translate(theFeature->getKind(), aMsg.toStdString()).c_str(); - std::string aCodec = Config_Translator::codec(theFeature->getKind()); - aMsg = QTextCodec::codecForName(aCodec.c_str())->toUnicode(aStr.c_str()); - } - return aMsg; + // Error already translated. + std::string aMsg = ModelAPI_Tools::getFeatureError(theFeature); + return QString::fromUtf8(aMsg.c_str()); } void ModuleBase_IModule::grantedOperationIds(ModuleBase_Operation* theOperation, @@ -127,13 +186,6 @@ ModuleBase_Operation* ModuleBase_IModule::getNewOperation(const std::string& the return new ModuleBase_OperationFeature(theFeatureId.c_str(), this); } -bool ModuleBase_IModule::customizeObject(ObjectPtr theObject, - const ModuleBase_IModule::ModuleBase_CustomizeFlag& theFlag, - const bool theUpdateViewer) -{ - return false; -} - ModuleBase_Operation* ModuleBase_IModule::createOperation(const std::string& theFeatureId) { ModuleBase_OperationFeature* aFOperation = dynamic_cast @@ -162,7 +214,6 @@ ModuleBase_Operation* ModuleBase_IModule::createOperation(const std::string& the void ModuleBase_IModule::createFeatures() { registerValidators(); - registerFilters(); registerProperties(); Config_ModuleReader aXMLReader = Config_ModuleReader(); @@ -173,7 +224,6 @@ void ModuleBase_IModule::createFeatures() void ModuleBase_IModule::actionCreated(QAction* theFeature) { - theFeature->setStatusTip(theFeature->text()); connect(theFeature, SIGNAL(triggered(bool)), this, SLOT(onFeatureTriggered())); } @@ -187,6 +237,23 @@ bool ModuleBase_IModule::canDisplayObject(const ObjectPtr& theObject) const return true; } +bool ModuleBase_IModule::canUsePreselection(const QString& thePreviousOperationKind, + const QString& theStartedOperationKind) +{ + // no previous operation + if (thePreviousOperationKind.isEmpty()) + return true; + // edit operation + if (thePreviousOperationKind.endsWith(ModuleBase_OperationFeature::EditSuffix())) + return true; + + // reentrant operation + if (thePreviousOperationKind == theStartedOperationKind) + return true; + + return false; +} + bool ModuleBase_IModule::canUndo() const { SessionPtr aMgr = ModelAPI_Session::get(); @@ -205,8 +272,10 @@ void ModuleBase_IModule::onFeatureTriggered() //Do nothing on uncheck if (aCmd->isCheckable() && !aCmd->isChecked()) { ModuleBase_Operation* anOperation = myWorkshop->findStartedOperation(aCmd->data().toString()); - if (myWorkshop->canStopOperation(anOperation)) - myWorkshop->abortOperation(anOperation); + if (myWorkshop->canStopOperation(anOperation)) { + bool isCommitted; + myWorkshop->stopOperation(anOperation, isCommitted); + } else { aCmd->setChecked(true); } @@ -217,8 +286,7 @@ void ModuleBase_IModule::onFeatureTriggered() if (aInfo.get() && aInfo->isModal()) { launchModal(aCmdId); } else { - launchOperation(aCmdId); - emit operationLaunched(); + launchOperation(aCmdId, false); } } } @@ -226,14 +294,15 @@ void ModuleBase_IModule::onFeatureTriggered() void ModuleBase_IModule::editFeature(FeaturePtr theFeature) { std::string aFeatureId = theFeature->getKind(); - if (!myWorkshop->canStartOperation(aFeatureId.c_str())) + bool isCommitted; + if (!myWorkshop->canStartOperation(aFeatureId.c_str(), isCommitted)) return; ModuleBase_OperationFeature* aFOperation = dynamic_cast (createOperation(aFeatureId)); if (aFOperation) { aFOperation->setFeature(theFeature); - sendOperation(aFOperation); + workshop()->processLaunchOperation(aFOperation); } } @@ -244,7 +313,7 @@ bool ModuleBase_IModule::canActivateSelection(const ObjectPtr& theObject) const return !aFOperation || !aFOperation->hasObject(theObject); } -void ModuleBase_IModule::operationResumed(ModuleBase_Operation* theOperation) +void ModuleBase_IModule::operationResumed(ModuleBase_Operation* theOperation) { emit resumed(theOperation); } @@ -259,3 +328,35 @@ void ModuleBase_IModule::getXMLRepresentation(const std::string& theFeatureId, theXmlCfg = aWdgReader.featureWidgetCfg(theFeatureId); theDescription = aWdgReader.featureDescription(theFeatureId); } + + +//****************************************************** +QIntList ModuleBase_IModule::selectionFilters() +{ + QIntList aTypes; + + std::map::const_iterator aFiltersIt = + mySelectionFilters.begin(); + for (; aFiltersIt != mySelectionFilters.end(); aFiltersIt++) + aTypes.append(aFiltersIt->first); + + return aTypes; +} + +//****************************************************** +void ModuleBase_IModule::registerSelectionFilter(const ModuleBase_SelectionFilterType theFilterType, + const Handle(SelectMgr_Filter)& theFilter) +{ + mySelectionFilters[theFilterType] = theFilter; +} + +//****************************************************** +Handle(SelectMgr_Filter) ModuleBase_IModule::selectionFilter(const int theType) +{ + ModuleBase_SelectionFilterType aType = (ModuleBase_SelectionFilterType)theType; + + if (mySelectionFilters.find(aType) != mySelectionFilters.end()) + return mySelectionFilters[aType]; + else + return Handle(SelectMgr_Filter)(); +}