-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File: PartSet_MenuMgr.cpp
-// Created: 03 April 2015
-// Author: Vitaly SMETANNIKOV
+// Copyright (C) 2014-2019 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 "PartSet_MenuMgr.h"
#include "PartSet_Module.h"
if (aCoincident.get() != NULL) {
QList<FeaturePtr> aCoins;
mySelectedFeature = aCoincident;
+ QList<bool> anIsAttributes;
PartSet_Tools::findCoincidences(mySelectedFeature, myCoinsideLines, aCoins,
- SketchPlugin_ConstraintCoincidence::ENTITY_A());
+ SketchPlugin_ConstraintCoincidence::ENTITY_A(),
+ anIsAttributes);
PartSet_Tools::findCoincidences(mySelectedFeature, myCoinsideLines, aCoins,
- SketchPlugin_ConstraintCoincidence::ENTITY_B());
+ SketchPlugin_ConstraintCoincidence::ENTITY_B(),
+ anIsAttributes);
if (myCoinsideLines.size() > 0) {
aIsDetach = true;
QMenu* aSubMenu = new QMenu(tr("Detach"), theParent);
QAction* aAction;
int i = 0;
foreach (FeaturePtr aCoins, myCoinsideLines) {
- aAction = aSubMenu->addAction(aCoins->data()->name().c_str());
+ QString anItemText = aCoins->data()->name().c_str();
+#ifdef _DEBUG
+ if (anIsAttributes[i])
+ anItemText += " [attribute]";
+#endif
+ aAction = aSubMenu->addAction(anItemText);
aAction->setData(QVariant(i));
i++;
}
// the active nested sketch operation should be aborted unconditionally
// the Delete action should be additionally granted for the Sketch operation
// in order to do not abort/commit it
- if (!anOpMgr->canStartOperation(tr("Detach")))
+ bool isCommitted;
+ if (!anOpMgr->canStartOperation(tr("Detach"), isCommitted))
return; // the objects are processed but can not be deleted
anOpMgr->startOperation(anOpAction);
anOpAction = new ModuleBase_OperationAction(anAction->text(), myModule);
bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation);
- if (!anOpMgr->canStartOperation(anOpAction->id()))
+ bool isCommitted;
+ if (!anOpMgr->canStartOperation(anOpAction->id(), isCommitted))
return; // the objects are processed but can not be deleted
anOpMgr->startOperation(anOpAction);
SessionPtr aMgr = ModelAPI_Session::get();
bool isNewTransaction = !aMgr->isOperation();
// activation may cause changes in current features in document, so it must be in transaction
- if (isNewTransaction)
+ if (isNewTransaction)
aMgr->startOperation("Activation");
aMgr->setActiveDocument(aMgr->moduleDocument());
if (isNewTransaction) aMgr->finishOperation();
void PartSet_MenuMgr::onEdit(bool)
{
QObjectPtrList aObjects = myModule->workshop()->selection()->selectedObjects();
- FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObjects.first());
- if (aFeature == NULL) {
- ResultParameterPtr aParam =
- std::dynamic_pointer_cast<ModelAPI_ResultParameter>(aObjects.first());
- if (aParam.get() != NULL) {
- aFeature = ModelAPI_Feature::feature(aParam);
+ FeaturePtr aFeature;
+ foreach(ObjectPtr aObj, aObjects) {
+ aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
+ if (aFeature.get())
+ break;
+ }
+ if (aFeature.get() == NULL) {
+ ResultParameterPtr aParam;
+ foreach(ObjectPtr aObj, aObjects) {
+ aParam = std::dynamic_pointer_cast<ModelAPI_ResultParameter>(aObj);
+ if (aParam.get())
+ break;
}
+ if (aParam.get() != NULL)
+ aFeature = ModelAPI_Feature::feature(aParam);
}
if (aFeature.get() != NULL)
myModule->editFeature(aFeature);