Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Color Number (Color Group) parameter is returned for compatibility
[modules/smesh.git]
/
src
/
DriverMED
/
DriverMED_Family.cxx
diff --git
a/src/DriverMED/DriverMED_Family.cxx
b/src/DriverMED/DriverMED_Family.cxx
index 46ae6549104403da0ac27c0c0ede12a86dc6ba3e..25646c67c45a768ae471f0ae52ead8a38a70ef78 100644
(file)
--- a/
src/DriverMED/DriverMED_Family.cxx
+++ b/
src/DriverMED/DriverMED_Family.cxx
@@
-217,7
+217,11
@@
DriverMED_Family
ColorMap aColorMap;
for (aGroupsIter = theGroups.begin(); aGroupsIter != theGroups.end(); aGroupsIter++)
{
ColorMap aColorMap;
for (aGroupsIter = theGroups.begin(); aGroupsIter != theGroups.end(); aGroupsIter++)
{
- SALOMEDS::Color aColor = (*aGroupsIter)->GetColor();
+ Quantity_Color aQColor = (*aGroupsIter)->GetColor();
+ SALOMEDS::Color aColor;
+ aColor.R = aQColor.Red();
+ aColor.G = aQColor.Green();
+ aColor.B = aQColor.Blue();
bool isFound = false;
for (ColorMap::iterator aColorIter = aColorMap.begin(); aColorIter != aColorMap.end(); aColorIter++)
bool isFound = false;
for (ColorMap::iterator aColorIter = aColorMap.begin(); aColorIter != aColorMap.end(); aColorIter++)
@@
-418,8
+422,14
@@
void DriverMED_Family::Init (SMESHDS_GroupBase* theGroup, const ColorMap& theCol
ColorMap::const_iterator aColorIter = theColorMap.begin();
for (; aColorIter != theColorMap.end(); aColorIter++)
{
ColorMap::const_iterator aColorIter = theColorMap.begin();
for (; aColorIter != theColorMap.end(); aColorIter++)
{
+ Quantity_Color aGroupQColor = theGroup->GetColor();
+ SALOMEDS::Color aGroupColor;
+ aGroupColor.R = aGroupQColor.Red();
+ aGroupColor.G = aGroupQColor.Green();
+ aGroupColor.B = aGroupQColor.Blue();
+
SALOMEDS::Color aColor = aColorIter->second;
SALOMEDS::Color aColor = aColorIter->second;
- if( CompareColors(
theGroup->GetColor()
, aColor ) )
+ if( CompareColors(
aGroupColor
, aColor ) )
{
myGroupAttributVal = aColorIter->first;
break;
{
myGroupAttributVal = aColorIter->first;
break;