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
Simplified calculation of fly out distance and creation of constraints limited only...
[modules/shaper.git]
/
src
/
XGUI
/
XGUI_PropertyPanel.cpp
diff --git
a/src/XGUI/XGUI_PropertyPanel.cpp
b/src/XGUI/XGUI_PropertyPanel.cpp
index 26ea5d021e587ad4a7a5820c1b3373a5e38bdb2f..888d96c3e4a28b94ce7def47fad9efaec95da831 100644
(file)
--- a/
src/XGUI/XGUI_PropertyPanel.cpp
+++ b/
src/XGUI/XGUI_PropertyPanel.cpp
@@
-34,6
+34,7
@@
XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent)
: ModuleBase_IPropertyPanel(theParent),
myActiveWidget(NULL),
XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent)
: ModuleBase_IPropertyPanel(theParent),
myActiveWidget(NULL),
+ myPreselectionWidget(NULL),
myPanelPage(NULL)
{
this->setWindowTitle(tr("Property Panel"));
myPanelPage(NULL)
{
this->setWindowTitle(tr("Property Panel"));
@@
-55,6
+56,8
@@
XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent)
ModuleBase_Tools::zeroMargins(aBtnLay);
aMainLayout->addWidget(aFrm, aPanelRow++, kPanelColumn);
ModuleBase_Tools::zeroMargins(aBtnLay);
aMainLayout->addWidget(aFrm, aPanelRow++, kPanelColumn);
+ myHeaderWidget = aFrm;
+
QStringList aBtnNames;
aBtnNames << QString(PROP_PANEL_HELP)
<< QString(PROP_PANEL_OK)
QStringList aBtnNames;
aBtnNames << QString(PROP_PANEL_HELP)
<< QString(PROP_PANEL_OK)
@@
-132,7
+135,8
@@
void XGUI_PropertyPanel::updateContentWidget(FeaturePtr theFeature)
if (theFeature->isAction() || !theFeature->data())
return;
foreach(ModuleBase_ModelWidget* eachWidget, myWidgets) {
if (theFeature->isAction() || !theFeature->data())
return;
foreach(ModuleBase_ModelWidget* eachWidget, myWidgets) {
- eachWidget->setFeature(theFeature);
+ if (!eachWidget->feature().get())
+ eachWidget->setFeature(theFeature);
eachWidget->restoreValue();
}
// the repaint is used here to immediately react in GUI to the values change.
eachWidget->restoreValue();
}
// the repaint is used here to immediately react in GUI to the values change.
@@
-149,6
+153,7
@@
void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget)
ModuleBase_ModelWidget* aNextWidget = 0;
QList<ModuleBase_ModelWidget*>::const_iterator anIt = myWidgets.begin(), aLast = myWidgets.end();
bool isFoundWidget = false;
ModuleBase_ModelWidget* aNextWidget = 0;
QList<ModuleBase_ModelWidget*>::const_iterator anIt = myWidgets.begin(), aLast = myWidgets.end();
bool isFoundWidget = false;
+ activateWindow();
for (; anIt != aLast && !aNextWidget; anIt++) {
if (isFoundWidget || !theWidget) {
if ((*anIt)->focusTo()) {
for (; anIt != aLast && !aNextWidget; anIt++) {
if (isFoundWidget || !theWidget) {
if ((*anIt)->focusTo()) {
@@
-224,3
+229,13
@@
void XGUI_PropertyPanel::setupActions(XGUI_ActionsMgr* theMgr)
aBtn->setDefaultAction(anAct);
}
}
aBtn->setDefaultAction(anAct);
}
}
+
+ModuleBase_ModelWidget* XGUI_PropertyPanel::preselectionWidget() const
+{
+ return myPreselectionWidget;
+}
+
+void XGUI_PropertyPanel::setPreselectionWidget(ModuleBase_ModelWidget* theWidget)
+{
+ myPreselectionWidget = theWidget;
+}