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
Example "PythonFeatures" plugin removed
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_WidgetMultiSelector.cpp
diff --git
a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
index 87c62ba3909e0eae55b51f2e95a294a36b0e733b..5c50ce38e318088dcc86d4182a45c35fae5901de 100644
(file)
--- a/
src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
+++ b/
src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
@@
-1,3
+1,5
@@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
/*
* ModuleBase_WidgetMultiSelector.cpp
*
/*
* ModuleBase_WidgetMultiSelector.cpp
*
@@
-25,7
+27,7
@@
#include <QComboBox>
#include <QEvent>
#include <QComboBox>
#include <QEvent>
-#include <
boost/smart_ptr/shared_ptr.hpp
>
+#include <
memory
>
#include <string>
ModuleBase_WidgetMultiSelector::ModuleBase_WidgetMultiSelector(QWidget* theParent,
#include <string>
ModuleBase_WidgetMultiSelector::ModuleBase_WidgetMultiSelector(QWidget* theParent,
@@
-54,9
+56,10
@@
ModuleBase_WidgetMultiSelector::ModuleBase_WidgetMultiSelector(QWidget* theParen
myListControl = new QListWidget(myMainWidget);
aMainLay->addWidget(myListControl, 2, 0, 2, -1);
myListControl = new QListWidget(myMainWidget);
aMainLay->addWidget(myListControl, 2, 0, 2, -1);
- aMainLay->setColumnStretch(1, 1);
+ aMainLay->setRowStretch(2, 1);
+ aMainLay->addWidget(new QLabel(myMainWidget));
+ aMainLay->setRowMinimumHeight(3, 20);
myMainWidget->setLayout(aMainLay);
myMainWidget->setLayout(aMainLay);
-
//TODO: Move into the base class
myUseSubShapes = theData->getBooleanAttribute("use_subshapes", false);
//TODO_END
//TODO: Move into the base class
myUseSubShapes = theData->getBooleanAttribute("use_subshapes", false);
//TODO_END
@@
-78,7
+81,7
@@
bool ModuleBase_WidgetMultiSelector::storeValue() const
return false;
DataPtr aData = myFeature->data();
AttributeSelectionListPtr aSelectionListAttr =
return false;
DataPtr aData = myFeature->data();
AttributeSelectionListPtr aSelectionListAttr =
-
boost
::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(aData->attribute(attributeID()));
+
std
::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(aData->attribute(attributeID()));
if (aSelectionListAttr) {
aSelectionListAttr->clear();
if (aSelectionListAttr) {
aSelectionListAttr->clear();
@@
-104,7
+107,7
@@
bool ModuleBase_WidgetMultiSelector::restoreValue()
return false;
DataPtr aData = myFeature->data();
AttributeSelectionListPtr aSelectionListAttr =
return false;
DataPtr aData = myFeature->data();
AttributeSelectionListPtr aSelectionListAttr =
-
boost
::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(aData->attribute(attributeID()));
+
std
::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(aData->attribute(attributeID()));
if (aSelectionListAttr) {
mySelection.clear();
if (aSelectionListAttr) {
mySelection.clear();
@@
-163,7
+166,7
@@
void ModuleBase_WidgetMultiSelector::activateSelection(bool toActivate)
void ModuleBase_WidgetMultiSelector::onSelectionTypeChanged()
{
activateShapeSelection();
void ModuleBase_WidgetMultiSelector::onSelectionTypeChanged()
{
activateShapeSelection();
- Q
List<ObjectPtr>
anEmptyList;
+ Q
ObjectPtrList
anEmptyList;
myWorkshop->setSelected(anEmptyList);
// Clear mySelection, myListControl and storeValue()
onSelectionChanged();
myWorkshop->setSelected(anEmptyList);
// Clear mySelection, myListControl and storeValue()
onSelectionChanged();
@@
-182,7
+185,7
@@
void ModuleBase_WidgetMultiSelector::onSelectionChanged()
NCollection_List<TopoDS_Shape>::Iterator aShpIt(aSelectedShapes);
GeomShapePtr aShape;
for (aIt = aOwnersList.cbegin(); aIt != aOwnersList.cend(); aShpIt.Next(), aIt++) {
NCollection_List<TopoDS_Shape>::Iterator aShpIt(aSelectedShapes);
GeomShapePtr aShape;
for (aIt = aOwnersList.cbegin(); aIt != aOwnersList.cend(); aShpIt.Next(), aIt++) {
- ResultPtr aResult =
boost
::dynamic_pointer_cast<ModelAPI_Result>(*aIt);
+ ResultPtr aResult =
std
::dynamic_pointer_cast<ModelAPI_Result>(*aIt);
if (myFeature) {
// We can not select a result of our feature
const std::list<ResultPtr>& aResList = myFeature->results();
if (myFeature) {
// We can not select a result of our feature
const std::list<ResultPtr>& aResList = myFeature->results();
@@
-197,7
+200,7
@@
void ModuleBase_WidgetMultiSelector::onSelectionChanged()
if(isSkipSelf)
continue;
}
if(isSkipSelf)
continue;
}
- aShape =
boost
::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape());
+ aShape =
std
::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape());
aShape->setImpl(new TopoDS_Shape(aShpIt.Value()));
mySelection.append(GeomSelection(aResult, aShape));
}
aShape->setImpl(new TopoDS_Shape(aShpIt.Value()));
mySelection.append(GeomSelection(aResult, aShape));
}