ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-05 06:10:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for Bug IPAL17943

Browse Source 
4.x: log file, generated by "mdump_V2_1" for the mesh with set color number differs from the initial one (3x)
This commit is contained in:
apo 2007-12-05 14:19:29 +00:00
parent 216d4924a0
commit e913c3429b
2 changed files with 7 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/DriverMED/DriverMED_Family.cxx
View File

@ -129,17 +129,6 @@ DriverMED_Family
return myElements.empty();
}
bool CompareColors( const Quantity_Color& theColor, const Quantity_Color& theRefColor )
{
float aTolerance = 0.01;
if( fabs( theColor.Red() - theRefColor.Red() ) < aTolerance &&
fabs( theColor.Green() - theRefColor.Green() ) < aTolerance &&
fabs( theColor.Blue() - theRefColor.Blue() ) < aTolerance )
return true;
return false;
}
//=============================================================================
/*!
* Split each group from list <aGroups> on some parts (families)
@ -212,33 +201,11 @@ DriverMED_Family
}
// Process groups
SMESHDS_GroupBasePtrList::const_iterator aGroupsIter;
int id = 0;
ColorMap aColorMap;
for (aGroupsIter = theGroups.begin(); aGroupsIter != theGroups.end(); aGroupsIter++)
{
Quantity_Color aColor = (*aGroupsIter)->GetColor();
bool isFound = false;
for (ColorMap::iterator aColorIter = aColorMap.begin(); aColorIter != aColorMap.end(); aColorIter++)
{
Quantity_Color aRefColor = aColorIter->second;
if( CompareColors( aColor, aRefColor ) )
{
isFound = true;
break;
}
}
if( !isFound )
aColorMap[ id++ ] = aColor;
}
for (aGroupsIter = theGroups.begin(); aGroupsIter != theGroups.end(); aGroupsIter++)
SMESHDS_GroupBasePtrList::const_iterator aGroupsIter = theGroups.begin();
for (; aGroupsIter != theGroups.end(); aGroupsIter++)
{
DriverMED_FamilyPtr aFam2 (new DriverMED_Family);
aFam2->Init(*aGroupsIter, aColorMap);
aFam2->Init(*aGroupsIter);
DriverMED_FamilyPtrList::iterator aFamsIter = aFamilies.begin();
while (aFamsIter != aFamilies.end())
@ -397,7 +364,7 @@ DriverMED_Family::GetFamilyInfo(const MED::PWrapper& theWrapper,
* Initialize the tool by SMESHDS_GroupBase
*/
//=============================================================================
void DriverMED_Family::Init (SMESHDS_GroupBase* theGroup, const ColorMap& theColorMap)
void DriverMED_Family::Init (SMESHDS_GroupBase* theGroup)
{
// Elements
myElements.clear();
@ -414,17 +381,8 @@ void DriverMED_Family::Init (SMESHDS_GroupBase* theGroup, const ColorMap& theCol
myGroupNames.clear();
myGroupNames.insert(string(theGroup->GetStoreName()));
myGroupAttributVal = 0;
ColorMap::const_iterator aColorIter = theColorMap.begin();
for (; aColorIter != theColorMap.end(); aColorIter++)
{
if( CompareColors( theGroup->GetColor(), aColorIter->second ) )
{
myGroupAttributVal = aColorIter->first;
break;
}
}
Quantity_Color aColor = theGroup->GetColor();
myGroupAttributVal = aColor.Hue();
}
//=============================================================================

3
src/DriverMED/DriverMED_Family.h
View File

@ -51,7 +51,6 @@ typedef std::list<DriverMED_FamilyPtr> DriverMED_FamilyPtrList;
typedef std::map<int,SMESHDS_SubMesh*> SMESHDS_SubMeshPtrMap;
typedef std::list<SMESHDS_GroupBase*> SMESHDS_GroupBasePtrList;
typedef std::set<const SMDS_MeshElement*> ElementsSet;
typedef std::map<int,Quantity_Color> ColorMap;
class MESHDRIVERMED_EXPORT DriverMED_Family
{
@ -108,7 +107,7 @@ class MESHDRIVERMED_EXPORT DriverMED_Family
private:
//! Initialize the tool by SMESHDS_GroupBase
void Init (SMESHDS_GroupBase* theGroup, const ColorMap& theColorMap);
void Init (SMESHDS_GroupBase* group);
//! Split <theSubMesh> on some parts (families) on the basis of the elements type.
static