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
Merge branch 'Dev_1.2.0' of newgeom:newgeom into Dev_1.2.0
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_Operation.cpp
diff --git
a/src/ModuleBase/ModuleBase_Operation.cpp
b/src/ModuleBase/ModuleBase_Operation.cpp
index ff2780957fc336c22171175d85433ee26ea824c0..1016d90e8e762decc26a335379bac3fbb1178789 100644
(file)
--- a/
src/ModuleBase/ModuleBase_Operation.cpp
+++ b/
src/ModuleBase/ModuleBase_Operation.cpp
@@
-199,9
+199,7
@@
bool ModuleBase_Operation::commit()
void ModuleBase_Operation::setRunning(bool theState)
{
void ModuleBase_Operation::setRunning(bool theState)
{
- if (!theState) {
- abort();
- }
+ emit triggered(theState);
}
void ModuleBase_Operation::activateByPreselection()
}
void ModuleBase_Operation::activateByPreselection()
@@
-220,6
+218,7
@@
void ModuleBase_Operation::activateByPreselection()
QList<ModuleBase_ModelWidget*>::const_iterator aWIt;
QList<ModuleBase_ViewerPrs>::const_iterator aPIt;
bool isSet = false;
QList<ModuleBase_ModelWidget*>::const_iterator aWIt;
QList<ModuleBase_ViewerPrs>::const_iterator aPIt;
bool isSet = false;
+ // 1. apply the selection to controls
for (aWIt = aWidgets.constBegin(), aPIt = myPreSelection.constBegin();
(aWIt != aWidgets.constEnd()) && (aPIt != myPreSelection.constEnd());
++aWIt) {
for (aWIt = aWidgets.constBegin(), aPIt = myPreSelection.constBegin();
(aWIt != aWidgets.constEnd()) && (aPIt != myPreSelection.constEnd());
++aWIt) {
@@
-237,7
+236,15
@@
void ModuleBase_Operation::activateByPreselection()
aFilledWgt = aWgt;
}
}
aFilledWgt = aWgt;
}
}
+ // 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();
myPropertyPanel->activateNextWidget(aFilledWgt);
if (aFilledWgt)
emit activatedByPreselection();