#include <ModelAPI_AttributeRefList.h>
#endif
+//#define DEBUG_OPERATION_START
+
#ifdef _DEBUG
#include <QDebug>
#endif
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;
}*/
}
- 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 (aFeature) {
if (aFeature == theObj)
return true;
- std::list<ResultPtr> aResults = aFeature->results();
+ std::list<ResultPtr> aResults;
+ ModelAPI_Tools::allResults(aFeature, aResults);
std::list<ResultPtr>::const_iterator aIt;
for (aIt = aResults.cbegin(); aIt != aResults.cend(); ++aIt) {
- if (theObj == (*aIt))
- return true;
+ ResultPtr aResult = *aIt;
+ if (theObj == aResult)
+ return true;
}
#ifdef DEBUG_DO_NOT_ACTIVATE_SUB_FEATURE
if (aFeature->isMacro()) {
bool ModuleBase_OperationFeature::start()
{
+#ifdef DEBUG_OPERATION_START
+ qDebug("ModuleBase_OperationFeature::start -- begin");
+#endif
setIsModified(false);
QString anId = getDescription()->operationId();
if (myIsEditing) {
// 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();
emit committed();
afterCommitOperation();
+#ifdef DEBUG_OPERATION_START
+ qDebug("ModuleBase_OperationFeature::commit -- end : IMPOSSIBLE to commit");
+#endif
return true;
}
+#ifdef DEBUG_OPERATION_START
+ qDebug("ModuleBase_OperationFeature::commit -- end");
+#endif
return false;
}
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;
QList<ModuleBase_ModelWidget*>::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;
+ }
}
}
}
// 1. apply the selection to controls
for (aWIt = aWidgets.constBegin(); aWIt != aWidgets.constEnd(); ++aWIt) {
aWgt = (*aWIt);
- if (!aWgt->canSetValue())
+ if (!aWgt->canAcceptFocus())
continue;
aPropertyPanel->setPreselectionWidget(aWgt);
- if (!aWgt->setSelection(myPreSelection, true)) {
+ if (myPreSelection.empty() || !aWgt->setSelection(myPreSelection, true)) {
isSet = false;
break;
} else {
// 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();
return myPreviousCurrentFeature;
}
-void ModuleBase_OperationFeature::initSelection(ModuleBase_ISelection* theSelection,
- ModuleBase_IViewer* theViewer)
+void ModuleBase_OperationFeature::initSelection(const QList<ModuleBase_ViewerPrsPtr>& thePreSelected)
{
- clearPreselection();
+ QObjectPtrList aCurrentFeatureResults;
- QList<ModuleBase_ViewerPrs> 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);
-
- 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);
-
- foreach (ModuleBase_ViewerPrs aPrs, aSelected) {
- if ((!aResList.contains(aPrs.object())) && (aPrs.object() != aFeature))
+ aCurrentFeatureResults.append(*aIt);
+ }
+
+ 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);
+ }
+}
- myPreSelection = aPreSelected;
+void ModuleBase_OperationFeature::setPreselection(const QList<ModuleBase_ViewerPrsPtr>& theValues)
+{
+ clearPreselection();
+ myPreSelection = theValues;
}
void ModuleBase_OperationFeature::clearPreselection()
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)));
}
}
