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
bos #26374 Merge branch 'CR26374'
[modules/shaper.git]
/
src
/
Model
/
Model_AttributeSelectionList.cpp
diff --git
a/src/Model/Model_AttributeSelectionList.cpp
b/src/Model/Model_AttributeSelectionList.cpp
index 95a17e9d2e4713dd25844253413fb61bde52c353..0ed47aca4a6952184f3d71473ea39c9e1e4c7a6f 100644
(file)
--- a/
src/Model/Model_AttributeSelectionList.cpp
+++ b/
src/Model/Model_AttributeSelectionList.cpp
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
19
CEA/DEN, EDF R&D
+// Copyright (C) 2014-20
21
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
@@
-88,7
+88,7
@@
void Model_AttributeSelectionList::append(
}
void Model_AttributeSelectionList::append(
}
void Model_AttributeSelectionList::append(
- const std::string& theNamingName, const std::string& theType)
+ const std::
w
string& theNamingName, const std::string& theType)
{
int aNewTag = mySize->Get() + 1;
TDF_Label aNewLab = mySize->Label().FindChild(aNewTag);
{
int aNewTag = mySize->Get() + 1;
TDF_Label aNewLab = mySize->Label().FindChild(aNewTag);
@@
-123,7
+123,7
@@
void Model_AttributeSelectionList::append(const GeomPointPtr& thePoint, const st
}
void Model_AttributeSelectionList::append(const std::string& theType,
}
void Model_AttributeSelectionList::append(const std::string& theType,
- const std::string& theContextName, const int theIndex)
+ const std::
w
string& theContextName, const int theIndex)
{
int aNewTag = mySize->Get() + 1;
TDF_Label aNewLab = mySize->Label().FindChild(aNewTag);
{
int aNewTag = mySize->Get() + 1;
TDF_Label aNewLab = mySize->Label().FindChild(aNewTag);
@@
-301,7
+301,7
@@
static bool isIn(GeomShapePtr theInList, GeomShapePtr theShape) {
bool Model_AttributeSelectionList::isInList(const ObjectPtr& theContext,
const std::shared_ptr<GeomAPI_Shape>& theSubShape,
bool Model_AttributeSelectionList::isInList(const ObjectPtr& theContext,
const std::shared_ptr<GeomAPI_Shape>& theSubShape,
- const bool
theTemporarily
)
+ const bool
/*theTemporarily*/
)
{
if (myIsCashed) { // the cashing is active
if (theContext.get()) {
{
if (myIsCashed) { // the cashing is active
if (theContext.get()) {