Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Issue #1011 In sketch edition, the cross cursor must be displayed only in the 3D...
[modules/shaper.git]
/
src
/
PartSet
/
PartSet_MenuMgr.cpp
diff --git
a/src/PartSet/PartSet_MenuMgr.cpp
b/src/PartSet/PartSet_MenuMgr.cpp
index f9d7b2153ec2d071851a106f0302fb85b59b0850..9b82b66c3460a2bba5e43223dd5def81c76164ae 100644
(file)
--- a/
src/PartSet/PartSet_MenuMgr.cpp
+++ b/
src/PartSet/PartSet_MenuMgr.cpp
@@
-79,10
+79,6
@@
void PartSet_MenuMgr::createActions()
connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onActivatePart(bool)));
myActions["ACTIVATE_PART_CMD"] = aAction;
connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onActivatePart(bool)));
myActions["ACTIVATE_PART_CMD"] = aAction;
- aAction = new QAction(QIcon(":icons/deactivate.png"), tr("Deactivate"), this);
- connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onActivatePartSet(bool)));
- myActions["DEACTIVATE_PART_CMD"] = aAction;
-
// Activate PartSet
aAction = new QAction(QIcon(":icons/activate.png"), tr("Activate"), this);
connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onActivatePartSet(bool)));
// Activate PartSet
aAction = new QAction(QIcon(":icons/activate.png"), tr("Activate"), this);
connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onActivatePartSet(bool)));
@@
-481,16
+477,17
@@
void PartSet_MenuMgr::onActivatePartSet(bool)
{
if (myModule->workshop()->currentOperation())
return;
{
if (myModule->workshop()->currentOperation())
return;
+ activatePartSet();
+}
+
+void PartSet_MenuMgr::activatePartSet() const
+{
SessionPtr aMgr = ModelAPI_Session::get();
bool isNewTransaction = !aMgr->isOperation();
// activation may cause changes in current features in document, so it must be in transaction
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) {
- aMgr->startOperation("Activation");
- }
+ if (isNewTransaction) aMgr->startOperation("Activation");
aMgr->setActiveDocument(aMgr->moduleDocument());
aMgr->setActiveDocument(aMgr->moduleDocument());
- if (isNewTransaction) {
- aMgr->finishOperation();
- }
+ if (isNewTransaction) aMgr->finishOperation();
}
void PartSet_MenuMgr::onEdit(bool)
}
void PartSet_MenuMgr::onEdit(bool)