-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-/*
- * ModuleBase_OperationFeature.cpp
- *
- * Created on: Apr 2, 2014
- * 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 "ModuleBase_OperationFeature.h"
#include <ModelAPI_AttributeRefList.h>
#endif
+//#define DEBUG_OPERATION_START
+
#ifdef _DEBUG
#include <QDebug>
#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)
{
}
return true;
std::string anError = ModelAPI_Tools::getFeatureError(myFeature);
+ //ModuleBase_Tools::translate(myFeature->getKind(), anError);
return anError.empty();
}
myVisualizedObjects.clear();
// store hidden result features
- std::list<ResultPtr> aResults = aFeature->results();
+ std::list<ResultPtr> aResults;
+ ModelAPI_Tools::allResults(aFeature, aResults);
std::list<ResultPtr>::const_iterator aIt;
for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) {
ObjectPtr anObject = *aIt;
return;
// store hidden result features
- std::list<ResultPtr> aResults = aFeature->results();
+ std::list<ResultPtr> aResults;
+ ModelAPI_Tools::allResults(aFeature, aResults);
std::list<ResultPtr>::const_iterator aIt;
for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) {
ObjectPtr anObject = *aIt;
std::shared_ptr<ModelAPI_Document> 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<ModuleBase_ModelWidget*> aWidgets = getDescription()->modelWidgets();
- QList<ModuleBase_ModelWidget*>::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));
- Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
- }
return myFeature;
}
if (aFeature) {
if (aFeature == theObj)
return true;
- std::list<ResultPtr> aResults = aFeature->results();
- std::list<ResultPtr>::const_iterator aIt;
- for (aIt = aResults.cbegin(); aIt != aResults.cend(); ++aIt) {
- if (theObj == (*aIt))
- return true;
+ ResultPtr anObjRes = std::dynamic_pointer_cast<ModelAPI_Result>(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<AttributePtr> anAttributes = aFeature->data()->attributes(
ModelAPI_AttributeRefList::typeId());
- std::list<AttributePtr>::const_iterator anIt = anAttributes.begin(), aLast = anAttributes.end();
+ std::list<AttributePtr>::const_iterator
+ anIt = anAttributes.begin(), aLast = anAttributes.end();
bool aFoundObject = false;
for (; anIt != aLast && !aFoundObject; anIt++) {
std::shared_ptr<ModelAPI_AttributeRefList> aCurSelList =
- std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(*anIt);
+ std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(*anIt);
for (int i = 0, aNb = aCurSelList->size(); i < aNb && !aFoundObject; i++) {
- ObjectPtr anObject = aCurSelList->object(i);
- FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(anObject);
- if (aFeature.get()) {
- aFoundObject = anObjectFeature == aFeature;
+ ObjectPtr aCurObj = aCurSelList->object(i);
+ FeaturePtr aCurFeat = std::dynamic_pointer_cast<ModelAPI_Feature>(aCurObj);
+ if (aCurFeat.get()) {
+ aFoundObject = anObjectFeature == aCurFeat;
}
}
}
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());
// 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
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();
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;
}
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);
return myPreviousCurrentFeature;
}
-void ModuleBase_OperationFeature::initSelection(ModuleBase_ISelection* theSelection,
- ModuleBase_IViewer* theViewer)
+void ModuleBase_OperationFeature::initSelection(
+ const QList<ModuleBase_ViewerPrsPtr>& thePreSelected)
{
- QList<ModuleBase_ViewerPrsPtr> aPreSelected;
+ QObjectPtrList aCurrentFeatureResults;
+
// Check that the selected result are not results of operation feature
FeaturePtr aFeature = feature();
if (aFeature) {
- QList<ModuleBase_ViewerPrsPtr> aSelected = theSelection->getSelected(ModuleBase_ISelection::AllControls);
-
- std::list<ResultPtr> aResults = aFeature->results();
- QObjectPtrList aResList;
+ std::list<ResultPtr> aResults;
+ ModelAPI_Tools::allResults(aFeature, aResults);
std::list<ResultPtr>::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<ModuleBase_ViewerPrsPtr> 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<ModuleBase_ViewerPrsPtr>& theValues)
myPreSelection.clear();
}
-void ModuleBase_OperationFeature::setPropertyPanel(ModuleBase_IPropertyPanel* theProp)
+void ModuleBase_OperationFeature::setPropertyPanel(ModuleBase_IPropertyPanel* theProp)
{
ModuleBase_Operation::setPropertyPanel(theProp);
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);
theProp->setFocusOnOkButton();
}
}
+
+void ModuleBase_OperationFeature::resumeOperation()
+{
+ if (myRestartTransactionOnResume) {
+ ModelAPI_Session::get()->startOperation(this->id().toStdString(), true);
+ myRestartTransactionOnResume = false;
+ }
+}