#include "ModuleBase_IPropertyPanel.h"
#include "ModuleBase_ISelection.h"
#include "ModuleBase_IViewer.h"
+#include "ModuleBase_Tools.h"
#include <ModelAPI_AttributeDouble.h>
#include <ModelAPI_Document.h>
#include <QTimer>
+// the define to check the activated object as a sub-feature by argument of
+// the operation feature. E.g. rectangle feature(operation), line(in argument) to be not activated
+#define DEBUG_DO_NOT_ACTIVATE_SUB_FEATURE
+#ifdef DEBUG_DO_NOT_ACTIVATE_SUB_FEATURE
+#include <ModelAPI_AttributeRefList.h>
+#endif
+
#ifdef _DEBUG
#include <QDebug>
#endif
clearPreselection();
}
-void ModuleBase_OperationFeature::setEditOperation(const bool theRestartTransaction)
+void ModuleBase_OperationFeature::setEditOperation(const bool& isEditState
+ /*const bool theRestartTransaction*/)
{
- if (isEditOperation())
+ bool isCurrentEditState = isEditOperation();
+ if (isCurrentEditState == isEditState)
return;
+ /*
+ // this case is obsolete as it was not approved for reentrant sketch operation
+ // it was implemented when isEditState did not exist and only edit operation can be set
if (theRestartTransaction) {
// finsh previous create operation
emit beforeCommitted();
}
ModelAPI_Session::get()->startOperation(anId.toStdString());
emit beforeStarted();
- }
- else
- myIsEditing = true;
+ } else*/
+ myIsEditing = isEditState;
propertyPanel()->setEditingMode(isEditOperation());
}
return true; // rename operation
if (myFeature->isAction())
return true;
- //Get validators for the Id
- SessionPtr aMgr = ModelAPI_Session::get();
- ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
- bool aValid = aFactory->validate(myFeature);
-
- // the feature exec state should be checked in order to do not apply features, which result can not
- // be built. E.g. extrusion on sketch, where the "to" is a perpendicular plane to the sketch
- bool isDone = ( myFeature->data()->execState() == ModelAPI_StateDone
- || myFeature->data()->execState() == ModelAPI_StateMustBeUpdated );
- return aValid && isDone;
+ std::string anError = ModelAPI_Tools::getFeatureError(myFeature);
+ return anError.empty();
}
void ModuleBase_OperationFeature::startOperation()
}*/
}
- if (theFlushMessage)
+ 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 (theObj == (*aIt))
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
+ // 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();
+ bool aFoundObject = false;
+ for (; anIt != aLast && !aFoundObject; anIt++) {
+ std::shared_ptr<ModelAPI_AttributeRefList> aCurSelList =
+ 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;
+ }
+ }
+ }
+ return aFoundObject;
+ }
+#endif
}
return false;
}
bool ModuleBase_OperationFeature::commit()
{
+ ModuleBase_IPropertyPanel* aPanel = propertyPanel();
+ if (aPanel) {
+ ModuleBase_ModelWidget* anActiveWidget = aPanel->activeWidget();
+ if (anActiveWidget && anActiveWidget->getValueState() == ModuleBase_ModelWidget::ModifiedInPP) {
+ anActiveWidget->storeValue();
+ }
+ }
if (canBeCommitted()) {
emit beforeCommitted();
// the widgets of property panel should not process any events come from data mode
return false;
}
-void ModuleBase_OperationFeature::activateByPreselection()
+ModuleBase_ModelWidget* ModuleBase_OperationFeature::activateByPreselection(
+ const std::string& theGreedAttributeId)
{
+ ModuleBase_ModelWidget* aWidget = 0;
if (myPreSelection.empty())
- return;
-
+ return aWidget;
+ // equal vertices should not be used here
ModuleBase_ISelection::filterSelectionOnEqualPoints(myPreSelection);
- ModuleBase_ModelWidget* aFilledWgt = 0;
ModuleBase_IPropertyPanel* aPropertyPanel = propertyPanel();
+ ModuleBase_ModelWidget* aFilledWgt = 0;
if (aPropertyPanel) {
const QList<ModuleBase_ModelWidget*>& aWidgets = aPropertyPanel->modelWidgets();
+ QList<ModuleBase_ModelWidget*>::const_iterator aWIt;
+ ModuleBase_ModelWidget* aWgt = 0;
if (!aWidgets.empty()) {
- ModuleBase_ModelWidget* aWgt = 0;
- QList<ModuleBase_ModelWidget*>::const_iterator aWIt;
- bool isSet = false;
- // 1. apply the selection to controls
- for (aWIt = aWidgets.constBegin(); aWIt != aWidgets.constEnd(); ++aWIt) {
- aWgt = (*aWIt);
- if (!aWgt->canSetValue())
- continue;
- aPropertyPanel->setPreselectionWidget(aWgt);
- if (!aWgt->setSelection(myPreSelection, true)) {
- isSet = false;
- break;
- } else {
- isSet = true;
- aFilledWgt = aWgt;
+ 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;
+ }
+ }
+ }
+ 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;
+ break;
+ } else {
+ isSet = true;
+ 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);
-
- // 3. a signal should be emitted before the next widget activation
- // because, the activation of the next widget will give a focus to the widget. As a result
- // the value of the widget is initialized. And commit may happens until the value is entered.
- if (aFilledWgt)
- emit activatedByPreselection();
+ ModuleBase_Tools::flushUpdated(myFeature);
}
- // 4. activate the next obligatory widget
- aPropertyPanel->activateNextWidget(aFilledWgt);
}
-
clearPreselection();
+
+ return aFilledWgt;
}
void ModuleBase_OperationFeature::setParentFeature(CompositeFeaturePtr theParent)
void ModuleBase_OperationFeature::initSelection(ModuleBase_ISelection* theSelection,
ModuleBase_IViewer* theViewer)
{
- clearPreselection();
-
- QList<ModuleBase_ViewerPrs> aPreSelected;
+ QList<ModuleBase_ViewerPrsPtr> aPreSelected;
// Check that the selected result are not results of operation feature
FeaturePtr aFeature = feature();
if (aFeature) {
- QList<ModuleBase_ViewerPrs> aSelected = theSelection->getSelected(ModuleBase_ISelection::AllControls);
+ QList<ModuleBase_ViewerPrsPtr> aSelected = theSelection->getSelected(ModuleBase_ISelection::AllControls);
std::list<ResultPtr> aResults = aFeature->results();
QObjectPtrList aResList;
for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt)
aResList.append(*aIt);
- foreach (ModuleBase_ViewerPrs aPrs, aSelected) {
- if ((!aResList.contains(aPrs.object())) && (aPrs.object() != aFeature))
+ foreach (ModuleBase_ViewerPrsPtr aPrs, aSelected) {
+ if ((!aResList.contains(aPrs->object())) && (aPrs->object() != aFeature))
aPreSelected.append(aPrs);
}
} else
aPreSelected = theSelection->getSelected(ModuleBase_ISelection::AllControls);
- myPreSelection = aPreSelected;
+ setPreselection(aPreSelected);
+}
+
+void ModuleBase_OperationFeature::setPreselection(const QList<ModuleBase_ViewerPrsPtr>& theValues)
+{
+ clearPreselection();
+ myPreSelection = theValues;
}
void ModuleBase_OperationFeature::clearPreselection()