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 #3230: Optional box should not change focus widget
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_WidgetFeatureSelector.cpp
diff --git
a/src/ModuleBase/ModuleBase_WidgetFeatureSelector.cpp
b/src/ModuleBase/ModuleBase_WidgetFeatureSelector.cpp
index aeebdfa1e81af6de738978d89718fdc9d12e942b..6052fe7a1dfff135d4d3c9d03fe2901ae9edc1b8 100644
(file)
--- a/
src/ModuleBase/ModuleBase_WidgetFeatureSelector.cpp
+++ b/
src/ModuleBase/ModuleBase_WidgetFeatureSelector.cpp
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
17
CEA/DEN, EDF R&D
+// Copyright (C) 2014-20
20
CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-12,10
+12,9
@@
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA
//
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <ModuleBase_WidgetFeatureSelector.h>
//
#include <ModuleBase_WidgetFeatureSelector.h>
@@
-99,7
+98,6
@@
ModuleBase_WidgetFeatureSelector::~ModuleBase_WidgetFeatureSelector()
//********************************************************************
bool ModuleBase_WidgetFeatureSelector::setSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs)
{
//********************************************************************
bool ModuleBase_WidgetFeatureSelector::setSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs)
{
- ModuleBase_ISelection* aSelection = myWorkshop->selection();
ObjectPtr anObject = ModelAPI_Feature::feature(thePrs->object());
GeomShapePtr aShape;
ObjectPtr anObject = ModelAPI_Feature::feature(thePrs->object());
GeomShapePtr aShape;
@@
-185,8
+183,8
@@
void ModuleBase_WidgetFeatureSelector::updateSelectionName()
ObjectPtr anObject = ModuleBase_Tools::getObject(myFeature->attribute(attributeID()));
if (anObject.get() != NULL) {
ObjectPtr anObject = ModuleBase_Tools::getObject(myFeature->attribute(attributeID()));
if (anObject.get() != NULL) {
- std::string aName = anObject->data()->name();
- myTextLine->setText(QString::fromStdString(aName));
+ std::
w
string aName = anObject->data()->name();
+ myTextLine->setText(QString::fromStd
W
String(aName));
} else {
myTextLine->clear();
}
} else {
myTextLine->clear();
}