X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_Operation.cpp;h=89b1957d30a4585c5d0827674d2c6875c7645df6;hb=6f1da290c7a4db4432c28887ad9d4073c8d443cb;hp=30062efc4ff272badda30a9454a1d6c0b940003f;hpb=d77708ba98445935aae7a0d93b5506e1f16018de;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_Operation.cpp b/src/ModuleBase/ModuleBase_Operation.cpp index 30062efc4..89b1957d3 100644 --- a/src/ModuleBase/ModuleBase_Operation.cpp +++ b/src/ModuleBase/ModuleBase_Operation.cpp @@ -9,6 +9,10 @@ #include "ModuleBase_OperationDescription.h" #include "ModuleBase_ModelWidget.h" +#include "ModuleBase_ViewerPrs.h" +#include "ModuleBase_IPropertyPanel.h" +#include "ModuleBase_ISelection.h" +#include "ModuleBase_IViewer.h" #include #include @@ -17,21 +21,33 @@ #include #include #include +#include #include +#include + +#include #include +#include + #ifdef _DEBUG #include #endif ModuleBase_Operation::ModuleBase_Operation(const QString& theId, QObject* theParent) - : ModuleBase_IOperation(theId, theParent) + : QObject(theParent), + myIsEditing(false), + myIsModified(false), + myPropertyPanel(NULL) { + myDescription = new ModuleBase_OperationDescription(theId); } ModuleBase_Operation::~ModuleBase_Operation() { + delete myDescription; + clearPreselection(); } QString ModuleBase_Operation::id() const @@ -44,76 +60,40 @@ FeaturePtr ModuleBase_Operation::feature() const return 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; - } - - ModuleBase_ModelWidget* aCustom = dynamic_cast(sender()); - if (aCustom) - aCustom->storeValue(); -} - -void ModuleBase_Operation::onWidgetActivated(ModuleBase_ModelWidget* theWidget) +bool ModuleBase_Operation::isValid() const { + if (!myFeature) + return true; // rename operation + //Get validators for the Id + SessionPtr aMgr = ModelAPI_Session::get(); + ModelAPI_ValidatorsFactory* aFactory = aMgr->validators(); + return aFactory->validate(myFeature); } -void ModuleBase_Operation::startOperation() -{ - if (!myIsEditing) - createFeature(); - //emit callSlot(); - //commit(); -} - -void ModuleBase_Operation::stopOperation() -{ -} - -void ModuleBase_Operation::abortOperation() +bool ModuleBase_Operation::isNestedOperationsEnabled() const { + return true; } -void ModuleBase_Operation::commitOperation() -{ -} +//void ModuleBase_Operation::storeCustomValue() +//{ +// if (!myFeature) { +//#ifdef _DEBUG +// qDebug() << "ModuleBase_Operation::storeCustom: " << +// "trying to store value without opening a transaction."; +//#endif +// return; +// } +// +// ModuleBase_ModelWidget* aCustom = dynamic_cast(sender()); +// if (aCustom) +// aCustom->storeValue(); +//} -void ModuleBase_Operation::afterCommitOperation() -{ -} bool ModuleBase_Operation::canBeCommitted() const { - if (ModuleBase_IOperation::canBeCommitted()) { - /* FeaturePtr aFeature = feature(); - std::string aId = aFeature->getKind(); - - SessionPtr aMgr = ModelAPI_Session::get(); - ModelAPI_ValidatorsFactory* aFactory = aMgr->validators(); - std::list aValidators; - aFactory->validators(aId, aValidators); - std::list::const_iterator aIt; - for (aIt = aValidators.cbegin(); aIt != aValidators.cend(); ++aIt) { - const ModuleBase_FeatureValidator* aFValidator = - dynamic_cast(*aIt); - if (aFValidator) { - if (!aFValidator->isValid(aFeature)) - return false; - } - }*/ - return true; - } - return false; + return isValid(); } void ModuleBase_Operation::flushUpdated() @@ -128,8 +108,12 @@ void ModuleBase_Operation::flushCreated() FeaturePtr ModuleBase_Operation::createFeature(const bool theFlushMessage) { - boost::shared_ptr aDoc = document(); - myFeature = aDoc->addFeature(getDescription()->operationId().toStdString()); + if (myParentFeature) { + myFeature = myParentFeature->addFeature(getDescription()->operationId().toStdString()); + } else { + std::shared_ptr aDoc = document(); + myFeature = aDoc->addFeature(getDescription()->operationId().toStdString()); + } if (myFeature) { // TODO: generate an error if feature was not created myIsModified = true; // Model update should call "execute" of a feature. @@ -150,11 +134,6 @@ FeaturePtr ModuleBase_Operation::createFeature(const bool theFlushMessage) void ModuleBase_Operation::setFeature(FeaturePtr theFeature) { myFeature = theFeature; -} - -void ModuleBase_Operation::setEditingFeature(FeaturePtr theFeature) -{ - setFeature(theFeature); myIsEditing = true; } @@ -167,15 +146,221 @@ 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; } -void ModuleBase_Operation::keyReleased(const int theKey) + +std::shared_ptr ModuleBase_Operation::document() const { - // Do nothing... + return ModelAPI_Session::get()->moduleDocument(); } + +void ModuleBase_Operation::start() +{ + ModelAPI_Session::get()->startOperation(); + + if (!myIsEditing) + createFeature(); + + startOperation(); + emit started(); +} + +void ModuleBase_Operation::postpone() +{ + if (myPropertyPanel) + disconnect(myPropertyPanel, 0, this, 0); + emit postponed(); +} + +void ModuleBase_Operation::resume() +{ + // connect(myPropertyPanel, SIGNAL(widgetActivated(ModuleBase_ModelWidget*)), + // this, SLOT(onWidgetActivated(ModuleBase_ModelWidget*))); + emit resumed(); +} + +void ModuleBase_Operation::abort() +{ + abortOperation(); + emit aborted(); + if (myPropertyPanel) + disconnect(myPropertyPanel, 0, this, 0); + + stopOperation(); + + ModelAPI_Session::get()->abortOperation(); + emit stopped(); +} + +bool ModuleBase_Operation::commit() +{ + if (canBeCommitted()) { + if (myPropertyPanel) + disconnect(myPropertyPanel, 0, this, 0); + + commitOperation(); + // 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(); + else + ModelAPI_Session::get()->abortOperation(); + + stopOperation(); + emit stopped(); + emit committed(); + + afterCommitOperation(); + return true; + } + return false; +} + +void ModuleBase_Operation::setRunning(bool theState) +{ + if (!theState) { + abort(); + } +} + +bool ModuleBase_Operation::activateByPreselection() +{ + if (!myPropertyPanel) + return false; + if (myPreSelection.empty()) + return false; + const QList& aWidgets = myPropertyPanel->modelWidgets(); + if (aWidgets.empty()) + return false; + + 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) { + aWgt = (*aWIt); + ModuleBase_ViewerPrs aValue = (*aPIt); + if (!aWgt->canSetValue()) + continue; + + ++aPIt; + if (!aWgt->setSelection(aValue)) { + isSet = false; + break; + } else { + isSet = true; + aFilledWgt = aWgt; + } + } + if (isSet && canBeCommitted()) { + // if all widgets are filled with selection - commit + // in order to commit the operation outside of starting procedure - use timer event + QTimer::singleShot(50, this, SLOT(commit())); + return true; + } + else { + //activate next widget + if (aFilledWgt) { + myPropertyPanel->activateNextWidget(aFilledWgt); + return true; + } + } + return false; +} + +void ModuleBase_Operation::initSelection(ModuleBase_ISelection* theSelection, + ModuleBase_IViewer* theViewer) +{ + clearPreselection(); + + QList aPreSelected; + // Check that the selected result are not results of operation feature + FeaturePtr aFeature = feature(); + if (aFeature) { + QList aSelected = theSelection->getSelected(); + + std::list aResults = aFeature->results(); + QObjectPtrList aResList; + std::list::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)) + aPreSelected.append(aPrs); + } + } else + aPreSelected = theSelection->getSelected(); + + // 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()); + + // double aX, anY; + // if (getViewerPoint(aPrs, theViewer, aX, anY)) + // aValue->setPoint(std::shared_ptr(new GeomAPI_Pnt2d(aX, anY))); + // myPreSelection.append(aValue); + //} + myPreSelection = aPreSelected; +} + +//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, + double& theX, double& theY) +{ + return false; +} + +void ModuleBase_Operation::clearPreselection() +{ + myPreSelection.clear(); +} + +void ModuleBase_Operation::setPropertyPanel(ModuleBase_IPropertyPanel* theProp) +{ + myPropertyPanel = theProp; + myPropertyPanel->setEditingMode(isEditOperation()); + //connect(myPropertyPanel, SIGNAL(widgetActivated(ModuleBase_ModelWidget*)), this, + // SLOT(onWidgetActivated(ModuleBase_ModelWidget*))); +} + +bool ModuleBase_Operation::isGranted(QString theId) const +{ + return myNestedFeatures.contains(theId); +} \ No newline at end of file