X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_Operation.cpp;h=ae623079c0d85b9071b6a3c6d2dcfdb0df5883ac;hb=738a78303067900bf8e63f8918bdd1332af68605;hp=e906b93233b4d133af8559521507554c0cb887f4;hpb=98728587134b06fd3dfe2a158bd39015fa0df2ab;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_Operation.cpp b/src/ModuleBase/ModuleBase_Operation.cpp index e906b9323..ae623079c 100644 --- a/src/ModuleBase/ModuleBase_Operation.cpp +++ b/src/ModuleBase/ModuleBase_Operation.cpp @@ -1,3 +1,5 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + /* * ModuleBase_Operation.cpp * @@ -9,7 +11,6 @@ #include "ModuleBase_OperationDescription.h" #include "ModuleBase_ModelWidget.h" -#include "ModuleBase_WidgetValueFeature.h" #include "ModuleBase_ViewerPrs.h" #include "ModuleBase_IPropertyPanel.h" #include "ModuleBase_ISelection.h" @@ -30,6 +31,8 @@ #include +#include + #ifdef _DEBUG #include #endif @@ -61,78 +64,34 @@ FeaturePtr ModuleBase_Operation::feature() const bool ModuleBase_Operation::isValid() const { - if (!myFeature) + if (!myFeature || !myFeature->data().get()) return true; // rename operation + if (myFeature->isAction()) + return true; //Get validators for the Id SessionPtr aMgr = ModelAPI_Session::get(); ModelAPI_ValidatorsFactory* aFactory = aMgr->validators(); - return aFactory->validate(myFeature); -} - -bool ModuleBase_Operation::isNestedOperationsEnabled() const -{ - return true; -} - -void ModuleBase_Operation::storeCustomValue() -{ - if (!myFeature) { -#ifdef _DEBUG - qDebug() << "ModuleBase_Operation::storeCustom: " << - "trying to store value without opening a transaction."; -#endif - return; - } + bool aValid = aFactory->validate(myFeature); - ModuleBase_ModelWidget* aCustom = dynamic_cast(sender()); - if (aCustom) - aCustom->storeValue(); -} + // 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; -void ModuleBase_Operation::startOperation() -{ - if (!myIsEditing) - createFeature(); + return aValid && isDone; } -void ModuleBase_Operation::stopOperation() -{ -} - -void ModuleBase_Operation::abortOperation() -{ -} - -void ModuleBase_Operation::commitOperation() -{ -} - -void ModuleBase_Operation::afterCommitOperation() -{ -} bool ModuleBase_Operation::canBeCommitted() const { return isValid(); } -void ModuleBase_Operation::flushUpdated() +FeaturePtr ModuleBase_Operation::createFeature(const bool theFlushMessage) { - Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED)); -} - -void ModuleBase_Operation::flushCreated() -{ - Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED)); -} - -FeaturePtr ModuleBase_Operation::createFeature( - const bool theFlushMessage, CompositeFeaturePtr theCompositeFeature) -{ - if (theCompositeFeature) { - myFeature = theCompositeFeature->addFeature(getDescription()->operationId().toStdString()); + if (myParentFeature.get()) { + myFeature = myParentFeature->addFeature(getDescription()->operationId().toStdString()); } else { - boost::shared_ptr aDoc = document(); + 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 @@ -148,7 +107,7 @@ FeaturePtr ModuleBase_Operation::createFeature( } if (theFlushMessage) - flushCreated(); + Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED)); return myFeature; } @@ -167,44 +126,72 @@ bool ModuleBase_Operation::hasObject(ObjectPtr theObj) const std::list aResults = aFeature->results(); std::list::const_iterator aIt; for (aIt = aResults.cbegin(); aIt != aResults.cend(); ++aIt) { - if ((*aIt) == theObj) + if (theObj == (*aIt)) return true; } } return false; } - -boost::shared_ptr ModuleBase_Operation::document() const -{ - return ModelAPI_Session::get()->moduleDocument(); -} - - void ModuleBase_Operation::start() { - ModelAPI_Session::get()->startOperation(); + QString anId = getDescription()->operationId(); + if (myIsEditing) { + anId = anId.append(EditSuffix()); + } + ModelAPI_Session::get()->startOperation(anId.toStdString()); + + if (!myIsEditing) { + FeaturePtr aFeature = createFeature(); + // if the feature is not created, there is no sense to start the operation + if (aFeature.get() == NULL) { + // it is necessary to abor the operation in the session and emit the aborted signal + // in order to update commands status in the workshop, to be exact the feature action + // to be unchecked + abort(); + return; + } + } + /// Set current feature and remeber old current feature + if (myIsEditing) { + SessionPtr aMgr = ModelAPI_Session::get(); + DocumentPtr aDoc = aMgr->activeDocument(); + myCurrentFeature = aDoc->currentFeature(true); + aDoc->setCurrentFeature(feature(), false); + } startOperation(); emit started(); + +} + +void ModuleBase_Operation::postpone() +{ + postponeOperation(); + emit postponed(); } void ModuleBase_Operation::resume() { - if (myPropertyPanel) - connect(myPropertyPanel, SIGNAL(widgetActivated(ModuleBase_ModelWidget*)), - this, SLOT(onWidgetActivated(ModuleBase_ModelWidget*))); + resumeOperation(); emit resumed(); } void ModuleBase_Operation::abort() { + if (myIsEditing) { + SessionPtr aMgr = ModelAPI_Session::get(); + DocumentPtr aDoc = aMgr->activeDocument(); + aDoc->setCurrentFeature(myCurrentFeature, true); + myCurrentFeature = FeaturePtr(); + } abortOperation(); emit aborted(); - if (myPropertyPanel) - disconnect(myPropertyPanel, 0, this, 0); stopOperation(); + // is is necessary to deactivate current widgets before the model operation is aborted + // because abort removes the feature and activated filters should not check it + propertyPanel()->cleanContent(); ModelAPI_Session::get()->abortOperation(); emit stopped(); @@ -213,22 +200,30 @@ void ModuleBase_Operation::abort() bool ModuleBase_Operation::commit() { if (canBeCommitted()) { + SessionPtr aMgr = ModelAPI_Session::get(); + /// Set current feature and remeber old current feature + if (myIsEditing) { + DocumentPtr aDoc = aMgr->activeDocument(); + bool aIsOp = aMgr->isOperation(); + if (!aIsOp) + aMgr->startOperation(); + aDoc->setCurrentFeature(myCurrentFeature, true); + if (!aIsOp) + aMgr->finishOperation(); + myCurrentFeature = FeaturePtr(); + } commitOperation(); - emit committed(); - - if (myPropertyPanel) - disconnect(myPropertyPanel, 0, this, 0); - - stopOperation(); // check whether there are modifications performed during the current operation // in the model // in case if there are no modifications, do not increase the undo/redo stack - if (ModelAPI_Session::get()->isModified()) - ModelAPI_Session::get()->finishOperation(); + if (aMgr->isModified()) + aMgr->finishOperation(); else - ModelAPI_Session::get()->abortOperation(); + aMgr->abortOperation(); + stopOperation(); emit stopped(); + emit committed(); afterCommitOperation(); return true; @@ -238,31 +233,32 @@ bool ModuleBase_Operation::commit() void ModuleBase_Operation::setRunning(bool theState) { - if (!theState) { - abort(); - } + emit triggered(theState); } -bool ModuleBase_Operation::activateByPreselection() +void ModuleBase_Operation::activateByPreselection() { - if (!myPropertyPanel) - return false; - if (myPreSelection.empty()) - return false; + if (!myPropertyPanel || myPreSelection.empty()) { + myPropertyPanel->activateNextWidget(NULL); + return; + } const QList& aWidgets = myPropertyPanel->modelWidgets(); - if (aWidgets.empty()) - return false; + if (aWidgets.empty()) { + myPropertyPanel->activateNextWidget(NULL); + return; + } ModuleBase_ModelWidget* aWgt, *aFilledWgt = 0; QList::const_iterator aWIt; - QList::const_iterator aPIt; bool isSet = false; - for (aWIt = aWidgets.constBegin(), aPIt = myPreSelection.constBegin(); - (aWIt != aWidgets.constEnd()) && (aPIt != myPreSelection.constEnd()); - ++aWIt, ++aPIt) { + // 1. apply the selection to controls + int aCurrentPosition = 0; + for (aWIt = aWidgets.constBegin(); aWIt != aWidgets.constEnd(); ++aWIt) { aWgt = (*aWIt); - ModuleBase_WidgetValueFeature* aValue = (*aPIt); - if (!aWgt->setValue(aValue)) { + if (!aWgt->canSetValue()) + continue; + + if (!aWgt->setSelection(myPreSelection, aCurrentPosition/*aValue*/)) { isSet = false; break; } else { @@ -270,31 +266,29 @@ bool ModuleBase_Operation::activateByPreselection() aFilledWgt = aWgt; } } - if (isSet && canBeCommitted()) { - // if all widgets are filled with selection - commit(); - return true; - } - else { - //activate next widget - if (aFilledWgt) { - myPropertyPanel->activateNextWidget(aFilledWgt); - return true; - } - } + // 2. ignore not obligatory widgets + /*for (; aWIt != aWidgets.constEnd(); ++aWIt) { + aWgt = (*aWIt); + if (aWgt && aWgt->isObligatory()) + continue; + aFilledWgt = aWgt; + }*/ + + // 3. activate the next obligatory widget + myPropertyPanel->activateNextWidget(aFilledWgt); + if (aFilledWgt) + emit activatedByPreselection(); - //ModuleBase_ModelWidget* aActiveWgt = myPropertyPanel->activeWidget(); - //if ((myPreSelection.size() > 0) && aActiveWgt) { - // const ModuleBase_ViewerPrs& aPrs = myPreSelection.first(); - // ModuleBase_WidgetValueFeature aValue; - // aValue.setObject(aPrs.object()); - // if (aActiveWgt->setValue(&aValue)) { - // myPreSelection.removeOne(aPrs); - // myPropertyPanel->activateNextWidget(); - // } - // // If preselection is enough to make a valid feature - apply it immediately - //} - return false; +} + +void ModuleBase_Operation::setParentFeature(CompositeFeaturePtr theParent) +{ + myParentFeature = theParent; +} + +CompositeFeaturePtr ModuleBase_Operation::parentFeature() const +{ + return myParentFeature; } void ModuleBase_Operation::initSelection(ModuleBase_ISelection* theSelection, @@ -309,7 +303,7 @@ void ModuleBase_Operation::initSelection(ModuleBase_ISelection* theSelection, QList aSelected = theSelection->getSelected(); std::list aResults = aFeature->results(); - QList aResList; + QObjectPtrList aResList; std::list::const_iterator aIt; for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) aResList.append(*aIt); @@ -323,41 +317,42 @@ void ModuleBase_Operation::initSelection(ModuleBase_ISelection* theSelection, // convert the selection values to the values, which are set to the operation widgets - Handle(V3d_View) aView = theViewer->activeView(); - foreach (ModuleBase_ViewerPrs aPrs, aPreSelected) { - ModuleBase_WidgetValueFeature* aValue = new ModuleBase_WidgetValueFeature(); - aValue->setObject(aPrs.object()); + //Handle(V3d_View) aView = theViewer->activeView(); + //foreach (ModuleBase_ViewerPrs aPrs, aPreSelected) { + // ModuleBase_WidgetValueFeature* aValue = new ModuleBase_WidgetValueFeature(); + // aValue->setObject(aPrs.object()); - double aX, anY; - if (getViewerPoint(aPrs, theViewer, aX, anY)) - aValue->setPoint(boost::shared_ptr(new GeomAPI_Pnt2d(aX, anY))); - myPreSelection.append(aValue); - } -} - -void ModuleBase_Operation::onWidgetActivated(ModuleBase_ModelWidget* theWidget) -{ - //activateByPreselection(); - //if (theWidget && myPropertyPanel) { - // myPropertyPanel->activateNextWidget(); - //// //emit activateNextWidget(myActiveWidget); + // double aX, anY; + // if (getViewerPoint(aPrs, theViewer, aX, anY)) + // aValue->setPoint(std::shared_ptr(new GeomAPI_Pnt2d(aX, anY))); + // myPreSelection.append(aValue); //} + myPreSelection = aPreSelected; } -bool ModuleBase_Operation::setWidgetValue(ObjectPtr theFeature, double theX, double theY) -{ - ModuleBase_ModelWidget* aActiveWgt = myPropertyPanel->activeWidget(); - if (!aActiveWgt) - return false; - ModuleBase_WidgetValueFeature* aValue = new ModuleBase_WidgetValueFeature(); - aValue->setObject(theFeature); - aValue->setPoint(boost::shared_ptr(new GeomAPI_Pnt2d(theX, theY))); - bool isApplyed = aActiveWgt->setValue(aValue); - - delete aValue; - myIsModified = (myIsModified || isApplyed); - return isApplyed; -} +//void ModuleBase_Operation::onWidgetActivated(ModuleBase_ModelWidget* theWidget) +//{ +// //activateByPreselection(); +// //if (theWidget && myPropertyPanel) { +// // myPropertyPanel->activateNextWidget(); +// //// //emit activateNextWidget(myActiveWidget); +// //} +//} + +//bool ModuleBase_Operation::setWidgetValue(ObjectPtr theFeature, double theX, double theY) +//{ +// ModuleBase_ModelWidget* aActiveWgt = myPropertyPanel->activeWidget(); +// if (!aActiveWgt) +// return false; +// ModuleBase_WidgetValueFeature* aValue = new ModuleBase_WidgetValueFeature(); +// aValue->setObject(theFeature); +// aValue->setPoint(std::shared_ptr(new GeomAPI_Pnt2d(theX, theY))); +// bool isApplyed = aActiveWgt->setValue(aValue); +// +// delete aValue; +// myIsModified = (myIsModified || isApplyed); +// return isApplyed; +//} bool ModuleBase_Operation::getViewerPoint(ModuleBase_ViewerPrs thePrs, ModuleBase_IViewer* theViewer, @@ -368,14 +363,21 @@ bool ModuleBase_Operation::getViewerPoint(ModuleBase_ViewerPrs thePrs, void ModuleBase_Operation::clearPreselection() { - while (!myPreSelection.isEmpty()) { - delete myPreSelection.takeFirst(); - } + myPreSelection.clear(); } void ModuleBase_Operation::setPropertyPanel(ModuleBase_IPropertyPanel* theProp) { myPropertyPanel = theProp; - connect(myPropertyPanel, SIGNAL(widgetActivated(ModuleBase_ModelWidget*)), this, - SLOT(onWidgetActivated(ModuleBase_ModelWidget*))); + myPropertyPanel->setEditingMode(isEditOperation()); + + // 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. + if (!isEditOperation()) + activateByPreselection(); +} + +bool ModuleBase_Operation::isGranted(QString theId) const +{ + return myNestedFeatures.contains(theId); }