X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_OperationFeature.cpp;h=4a3466ba6bd37475318a4a9046150c9abbf9db30;hb=7ad94f3cf928e9abe353fe20fa1becfe2574b857;hp=f6838a0494f216f1ca46cdda78d7145e2c9ae429;hpb=2469ecd08c3b16def494626928ff81e575bdfe3d;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_OperationFeature.cpp b/src/ModuleBase/ModuleBase_OperationFeature.cpp old mode 100755 new mode 100644 index f6838a049..4a3466ba6 --- a/src/ModuleBase/ModuleBase_OperationFeature.cpp +++ b/src/ModuleBase/ModuleBase_OperationFeature.cpp @@ -1,11 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -/* - * ModuleBase_OperationFeature.cpp - * - * Created on: Apr 2, 2014 - * Author: sbh - */ +// Copyright (C) 2014-2022 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 "ModuleBase_OperationFeature.h" @@ -42,13 +52,15 @@ #include #endif +//#define DEBUG_OPERATION_START + #ifdef _DEBUG #include #endif ModuleBase_OperationFeature::ModuleBase_OperationFeature(const QString& theId, QObject* theParent) -: ModuleBase_Operation(theId, theParent), - myIsEditing(false) +: ModuleBase_Operation(theId, theParent), myIsEditing(false), myNeedToBeAborted(false), +myRestartTransactionOnResume(false) { } @@ -100,6 +112,7 @@ bool ModuleBase_OperationFeature::isValid() const return true; std::string anError = ModelAPI_Tools::getFeatureError(myFeature); + //ModuleBase_Tools::translate(myFeature->getKind(), anError); return anError.empty(); } @@ -114,7 +127,8 @@ void ModuleBase_OperationFeature::startOperation() myVisualizedObjects.clear(); // store hidden result features - std::list aResults = aFeature->results(); + std::list aResults; + ModelAPI_Tools::allResults(aFeature, aResults); std::list::const_iterator aIt; for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { ObjectPtr anObject = *aIt; @@ -137,7 +151,8 @@ void ModuleBase_OperationFeature::stopOperation() return; // store hidden result features - std::list aResults = aFeature->results(); + std::list aResults; + ModelAPI_Tools::allResults(aFeature, aResults); std::list::const_iterator aIt; for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { ObjectPtr anObject = *aIt; @@ -160,20 +175,6 @@ FeaturePtr ModuleBase_OperationFeature::createFeature(const bool theFlushMessage std::shared_ptr aDoc = ModelAPI_Session::get()->activeDocument(); myFeature = aDoc->addFeature(getDescription()->operationId().toStdString()); } - if (myFeature) { // TODO: generate an error if feature was not created - setIsModified(true); - // Model update should call "execute" of a feature. - //myFeature->execute(); - // Init default values - /*QList aWidgets = getDescription()->modelWidgets(); - QList::const_iterator anIt = aWidgets.begin(), aLast = aWidgets.end(); - for (; anIt != aLast; anIt++) { - (*anIt)->storeValue(aFeature); - }*/ - } - - if (theFlushMessage) - Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED)); return myFeature; } @@ -189,29 +190,29 @@ bool ModuleBase_OperationFeature::hasObject(ObjectPtr theObj) const if (aFeature) { if (aFeature == theObj) return true; - std::list aResults = aFeature->results(); - std::list::const_iterator aIt; - for (aIt = aResults.cbegin(); aIt != aResults.cend(); ++aIt) { - if (theObj == (*aIt)) - return true; + ResultPtr anObjRes = std::dynamic_pointer_cast(theObj); + if (anObjRes.get() && aFeature == aFeature->document()->feature(anObjRes)) { + return true; } #ifdef DEBUG_DO_NOT_ACTIVATE_SUB_FEATURE if (aFeature->isMacro()) { - // macro feature may refers to sub-features, which also should be deactivated when the operation + // macro feature may refers to sub-features, + // which also should be deactivated when the operation // is active, e.g. rectangle'lines. FeaturePtr anObjectFeature = ModelAPI_Feature::feature(theObj); std::list anAttributes = aFeature->data()->attributes( ModelAPI_AttributeRefList::typeId()); - std::list::const_iterator anIt = anAttributes.begin(), aLast = anAttributes.end(); + std::list::const_iterator + anIt = anAttributes.begin(), aLast = anAttributes.end(); bool aFoundObject = false; for (; anIt != aLast && !aFoundObject; anIt++) { std::shared_ptr aCurSelList = - std::dynamic_pointer_cast(*anIt); + std::dynamic_pointer_cast(*anIt); for (int i = 0, aNb = aCurSelList->size(); i < aNb && !aFoundObject; i++) { - ObjectPtr anObject = aCurSelList->object(i); - FeaturePtr aFeature = std::dynamic_pointer_cast(anObject); - if (aFeature.get()) { - aFoundObject = anObjectFeature == aFeature; + ObjectPtr aCurObj = aCurSelList->object(i); + FeaturePtr aCurFeat = std::dynamic_pointer_cast(aCurObj); + if (aCurFeat.get()) { + aFoundObject = anObjectFeature == aCurFeat; } } } @@ -229,7 +230,9 @@ bool ModuleBase_OperationFeature::isDisplayedOnStart(ObjectPtr theObject) bool ModuleBase_OperationFeature::start() { - setIsModified(false); +#ifdef DEBUG_OPERATION_START + qDebug("ModuleBase_OperationFeature::start -- begin"); +#endif QString anId = getDescription()->operationId(); if (myIsEditing) { anId = anId.append(EditSuffix()); @@ -247,16 +250,26 @@ bool ModuleBase_OperationFeature::start() // in order to update commands status in the workshop, to be exact the feature action // to be unchecked abort(); +#ifdef DEBUG_OPERATION_START + qDebug("ModuleBase_OperationFeature::start -- end : IMPOSSIBLE to start"); +#endif return false; } } //Already called startOperation(); emit started(); +#ifdef DEBUG_OPERATION_START + qDebug("ModuleBase_OperationFeature::start -- end"); +#endif return true; } void ModuleBase_OperationFeature::abort() { +#ifdef DEBUG_OPERATION_START + qDebug("ModuleBase_OperationFeature::abort -- begin"); +#endif + emit beforeAborted(); // the viewer update should be blocked in order to avoid the features blinking before they are @@ -265,6 +278,12 @@ void ModuleBase_OperationFeature::abort() new Events_Message(Events_Loop::eventByName(EVENT_UPDATE_VIEWER_BLOCKED))); Events_Loop::loop()->send(aMsg); + if (myFeature.get()) + { + static const Events_ID anEvent = Events_Loop::eventByName(EVENT_VISUAL_ATTRIBUTES); + ModelAPI_EventCreator::get()->sendUpdated(myFeature, anEvent); + } + // the widgets of property panel should not process any events come from data mode // after abort clicked. Some signal such as redisplay/create influence on content // of the object browser and viewer context. Therefore it influence to the current @@ -291,16 +310,23 @@ void ModuleBase_OperationFeature::abort() Events_Loop::loop()->send(aMsg); emit aborted(); +#ifdef DEBUG_OPERATION_START + qDebug("ModuleBase_OperationFeature::abort -- end"); +#endif } bool ModuleBase_OperationFeature::commit() { +#ifdef DEBUG_OPERATION_START + qDebug("ModuleBase_OperationFeature::commit -- begin"); +#endif ModuleBase_IPropertyPanel* aPanel = propertyPanel(); if (aPanel) { ModuleBase_ModelWidget* anActiveWidget = aPanel->activeWidget(); if (anActiveWidget && anActiveWidget->getValueState() == ModuleBase_ModelWidget::ModifiedInPP) { anActiveWidget->storeValue(); } + aPanel->onAcceptData(); } if (canBeCommitted()) { emit beforeCommitted(); @@ -315,19 +341,26 @@ bool ModuleBase_OperationFeature::commit() myFeature->setStable(true); - SessionPtr aMgr = ModelAPI_Session::get(); - /// Set current feature and remeber old current feature - commitOperation(); - aMgr->finishOperation(); stopOperation(); + + SessionPtr aMgr = ModelAPI_Session::get(); + aMgr->finishOperation(); + // Finish operation has to be before stopped because stopped caused update of Object browser + // If it will be done before of cleaning of obsolete objects it will cause crash emit stopped(); emit committed(); afterCommitOperation(); +#ifdef DEBUG_OPERATION_START + qDebug("ModuleBase_OperationFeature::commit -- end"); +#endif return true; } +#ifdef DEBUG_OPERATION_START + qDebug("ModuleBase_OperationFeature::commit -- end : IMPOSSIBLE to commit"); +#endif return false; } @@ -337,8 +370,6 @@ ModuleBase_ModelWidget* ModuleBase_OperationFeature::activateByPreselection( ModuleBase_ModelWidget* aWidget = 0; if (myPreSelection.empty()) return aWidget; - // equal vertices should not be used here - ModuleBase_ISelection::filterSelectionOnEqualPoints(myPreSelection); ModuleBase_IPropertyPanel* aPropertyPanel = propertyPanel(); ModuleBase_ModelWidget* aFilledWgt = 0; @@ -347,41 +378,44 @@ ModuleBase_ModelWidget* ModuleBase_OperationFeature::activateByPreselection( QList::const_iterator aWIt; ModuleBase_ModelWidget* aWgt = 0; if (!aWidgets.empty()) { + // equal vertices should not be used here + ModuleBase_ISelection::filterSelectionOnEqualPoints(myPreSelection); + if (!theGreedAttributeId.empty()) { // set preselection to greed widget for (aWIt = aWidgets.constBegin(); aWIt != aWidgets.constEnd(); ++aWIt) { aWgt = (*aWIt); if (aWgt->attributeID() == theGreedAttributeId) { aPropertyPanel->setPreselectionWidget(aWgt); - aWgt->setSelection(myPreSelection, true); - aPropertyPanel->setPreselectionWidget(NULL); - aFilledWgt = aWgt; - break; + if (aWgt->setSelection(myPreSelection, true)) { + aPropertyPanel->setPreselectionWidget(NULL); + aFilledWgt = aWgt; + break; + } + else { // do not process invalid for greed widget selection + break; + } } } } else { - bool isSet = false; // 1. apply the selection to controls for (aWIt = aWidgets.constBegin(); aWIt != aWidgets.constEnd(); ++aWIt) { aWgt = (*aWIt); if (!aWgt->canAcceptFocus()) continue; aPropertyPanel->setPreselectionWidget(aWgt); - if (!aWgt->setSelection(myPreSelection, true)) { - isSet = false; + if (myPreSelection.empty() || !aWgt->setSelection(myPreSelection, true)) break; - } else { - isSet = true; + else aFilledWgt = aWgt; - } } } aPropertyPanel->setPreselectionWidget(NULL); // in order to redisplay object in the viewer, the update/redisplay signals should be flushed // it is better to perform it not in setSelection of each widget, but do it here, // after the preselection is processed - ModuleBase_ModelWidget::updateObject(myFeature); + ModuleBase_Tools::flushUpdated(myFeature); } } clearPreselection(); @@ -409,29 +443,31 @@ FeaturePtr ModuleBase_OperationFeature::previousCurrentFeature() return myPreviousCurrentFeature; } -void ModuleBase_OperationFeature::initSelection(ModuleBase_ISelection* theSelection, - ModuleBase_IViewer* theViewer) +void ModuleBase_OperationFeature::initSelection( + const QList& thePreSelected) { - QList aPreSelected; + QObjectPtrList aCurrentFeatureResults; + // Check that the selected result are not results of operation feature FeaturePtr aFeature = feature(); if (aFeature) { - QList aSelected = theSelection->getSelected(ModuleBase_ISelection::AllControls); - - std::list aResults = aFeature->results(); - QObjectPtrList aResList; + std::list aResults; + ModelAPI_Tools::allResults(aFeature, aResults); std::list::const_iterator aIt; for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) - aResList.append(*aIt); + aCurrentFeatureResults.append(*aIt); + } - foreach (ModuleBase_ViewerPrsPtr aPrs, aSelected) { - if ((!aResList.contains(aPrs->object())) && (aPrs->object() != aFeature)) + if (aCurrentFeatureResults.empty()) /// filtering of selection is not necessary + setPreselection(thePreSelected); + else { // create preselection list without results of current feature + QList aPreSelected; + foreach (ModuleBase_ViewerPrsPtr aPrs, thePreSelected) { + if ((!aCurrentFeatureResults.contains(aPrs->object())) && (aPrs->object() != aFeature)) aPreSelected.append(aPrs); } - } else - aPreSelected = theSelection->getSelected(ModuleBase_ISelection::AllControls); - - setPreselection(aPreSelected); + setPreselection(aPreSelected); + } } void ModuleBase_OperationFeature::setPreselection(const QList& theValues) @@ -445,7 +481,7 @@ void ModuleBase_OperationFeature::clearPreselection() myPreSelection.clear(); } -void ModuleBase_OperationFeature::setPropertyPanel(ModuleBase_IPropertyPanel* theProp) +void ModuleBase_OperationFeature::setPropertyPanel(ModuleBase_IPropertyPanel* theProp) { ModuleBase_Operation::setPropertyPanel(theProp); @@ -457,11 +493,12 @@ void ModuleBase_OperationFeature::setPropertyPanel(ModuleBase_IPropertyPanel* th for (aWIt = aWidgets.constBegin(); aWIt != aWidgets.constEnd(); ++aWIt) { ModuleBase_ModelWidget* aWgt = (*aWIt); connect(aWgt, SIGNAL(valuesChanged()), this, SLOT(onValuesChanged())); + connect(aWgt, SIGNAL(valueStateChanged(int)), this, SLOT(onValueStateChanged(int))); } } // Do not activate widgets by default if the current operation is editing operation - // Because we don't know which widget is going to be edited. + // Because we don't know which widget is going to be edited. if (!isEditOperation()) { // 4. activate the first obligatory widget theProp->activateNextWidget(NULL); @@ -472,3 +509,11 @@ void ModuleBase_OperationFeature::setPropertyPanel(ModuleBase_IPropertyPanel* th theProp->setFocusOnOkButton(); } } + +void ModuleBase_OperationFeature::resumeOperation() +{ + if (myRestartTransactionOnResume) { + ModelAPI_Session::get()->startOperation(this->id().toStdString(), true); + myRestartTransactionOnResume = false; + } +}