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 'master' of newgeom:newgeom
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_WidgetFeature.cpp
diff --git
a/src/ModuleBase/ModuleBase_WidgetFeature.cpp
b/src/ModuleBase/ModuleBase_WidgetFeature.cpp
index 6586a491a104783222dc1d23b58a43ffa35636c6..faf664fe53e9d48180ac7323988e5be4e256808f 100644
(file)
--- a/
src/ModuleBase/ModuleBase_WidgetFeature.cpp
+++ b/
src/ModuleBase/ModuleBase_WidgetFeature.cpp
@@
-6,6
+6,7
@@
#include <ModuleBase_WidgetValueFeature.h>
#include <ModuleBase_WidgetValue.h>
#include <ModuleBase_WidgetValueFeature.h>
#include <ModuleBase_WidgetValue.h>
+#include <ModuleBase_Tools.h>
#include <Config_Keywords.h>
#include <Config_WidgetAPI.h>
#include <Config_Keywords.h>
#include <Config_WidgetAPI.h>
@@
-20,6
+21,7
@@
#include <ModelAPI_Validator.h>
#include <ModelAPI_ResultValidator.h>
#include <ModelAPI_RefAttrValidator.h>
#include <ModelAPI_Validator.h>
#include <ModelAPI_ResultValidator.h>
#include <ModelAPI_RefAttrValidator.h>
+#include <ModelAPI_Session.h>
#include <QWidget>
#include <QLineEdit>
#include <QWidget>
#include <QLineEdit>
@@
-33,7
+35,7
@@
ModuleBase_WidgetFeature::ModuleBase_WidgetFeature(QWidget* theParent,
{
myContainer = new QWidget(theParent);
QHBoxLayout* aControlLay = new QHBoxLayout(myContainer);
{
myContainer = new QWidget(theParent);
QHBoxLayout* aControlLay = new QHBoxLayout(myContainer);
-
aControlLay->setContentsMargins(0, 0, 0, 0
);
+
ModuleBase_Tools::adjustMargins(aControlLay
);
QString aLabelText = QString::fromStdString(theData->widgetLabel());
myLabel = new QLabel(aLabelText, myContainer);
QString aLabelText = QString::fromStdString(theData->widgetLabel());
myLabel = new QLabel(aLabelText, myContainer);
@@
-47,7
+49,6
@@
ModuleBase_WidgetFeature::ModuleBase_WidgetFeature(QWidget* theParent,
QString aTTip = QString::fromStdString(theData->widgetTooltip());
myEditor->setToolTip(aTTip);
QString aTTip = QString::fromStdString(theData->widgetTooltip());
myEditor->setToolTip(aTTip);
-
aControlLay->addWidget(myEditor);
aControlLay->setStretch(1, 1);
}
aControlLay->addWidget(myEditor);
aControlLay->setStretch(1, 1);
}
@@
-137,10
+138,9
@@
bool ModuleBase_WidgetFeature::restoreValue()
boost::shared_ptr<ModelAPI_AttributeRefAttr> aRef = boost::dynamic_pointer_cast<
ModelAPI_AttributeRefAttr>(aData->attribute(attributeID()));
boost::shared_ptr<ModelAPI_AttributeRefAttr> aRef = boost::dynamic_pointer_cast<
ModelAPI_AttributeRefAttr>(aData->attribute(attributeID()));
- ObjectPtr aObj = aRef->object();
- FeaturePtr aFeature = boost::dynamic_pointer_cast<ModelAPI_Feature>(aRef->object());
- if (aFeature) {
- myObject = aFeature;
+ ObjectPtr anObjPtr = aRef->object();
+ if (anObjPtr) {
+ myObject = anObjPtr;
myEditor->setText(myObject ? myObject->data()->name().c_str() : "");
return true;
}
myEditor->setText(myObject ? myObject->data()->name().c_str() : "");
return true;
}