ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-05-25 21:40:48 +05:00
Code Issues Packages Projects Releases Wiki Activity

Implementation of the issue 20984: EDF 1566 SMESH: Better visibility of the elements in a shrinked representation.

Browse Source
This commit is contained in:
rnv 2011-09-28 11:36:47 +00:00
parent 48a0df2a9e
commit 3bf038b8b5
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/OBJECT/SMESH_Actor.cxx
View File

@ -566,6 +566,7 @@ SMESH_ActorDef::~SMESH_ActorDef()
mySurfaceProp->Delete(); mySurfaceProp->Delete();
myBackSurfaceProp->Delete(); myBackSurfaceProp->Delete();
myOutLineProp->Delete();
myEdgeProp->Delete(); myEdgeProp->Delete();
myHighlightProp->Delete(); myHighlightProp->Delete();

19
src/SMESHGUI/SMESHGUI.cxx
View File

@ -5140,14 +5140,14 @@ void SMESHGUI::storeVisualParameters (int savePoint)
colorStr += gDigitsSep; colorStr += QString::number(g); colorStr += gDigitsSep; colorStr += QString::number(g);
colorStr += gDigitsSep; colorStr += QString::number(b); colorStr += gDigitsSep; colorStr += QString::number(b);
aSmeshActor->GetOutlineColor(r, g, b); aSmeshActor->GetNodeColor(r, g, b);
colorStr += gDigitsSep; colorStr += "outline"; colorStr += gDigitsSep; colorStr += "node";
colorStr += gDigitsSep; colorStr += QString::number(r); colorStr += gDigitsSep; colorStr += QString::number(r);
colorStr += gDigitsSep; colorStr += QString::number(g); colorStr += gDigitsSep; colorStr += QString::number(g);
colorStr += gDigitsSep; colorStr += QString::number(b); colorStr += gDigitsSep; colorStr += QString::number(b);
aSmeshActor->GetNodeColor(r, g, b); aSmeshActor->GetOutlineColor(r, g, b);
colorStr += gDigitsSep; colorStr += "node"; colorStr += gDigitsSep; colorStr += "outline";
colorStr += gDigitsSep; colorStr += QString::number(r); colorStr += gDigitsSep; colorStr += QString::number(r);
colorStr += gDigitsSep; colorStr += QString::number(g); colorStr += gDigitsSep; colorStr += QString::number(g);
colorStr += gDigitsSep; colorStr += QString::number(b); colorStr += gDigitsSep; colorStr += QString::number(b);
@ -5503,9 +5503,10 @@ void SMESHGUI::restoreVisualParameters (int savePoint)
// Colors // Colors
else if (paramNameStr == "Colors") { else if (paramNameStr == "Colors") {
QStringList colors = val.split(gDigitsSep, QString::SkipEmptyParts); QStringList colors = val.split(gDigitsSep, QString::SkipEmptyParts);
if (colors.count() == 16 || colors.count() == 17 ) { if (colors.count() == 16 || colors.count() == 18 ) {
if (colors[0] != "surface" || colors[4] != "backsurface" || if (colors[0] != "surface" || colors[4] != "backsurface" ||
(colors[8] != "edge" && colors[6] != "edge" ) || (colors[12] != "node" && colors[10] != "node")) { (colors[8] != "edge" && colors[6] != "edge" ) || (colors[12] != "node" && colors[10] != "node") ||
(colors.count() == 18 && colors[14] != "outline")) {
MESSAGE("Invalid order of data in Colors, must be: " MESSAGE("Invalid order of data in Colors, must be: "
"surface:r:g:b:backsurface:r:g:b:edge:r:g:b:node:r:g:b or surface:r:g:b:backsurface:delta:edge:r:g:b:node:r:g:b:outline:r:g:b"); "surface:r:g:b:backsurface:r:g:b:edge:r:g:b:node:r:g:b or surface:r:g:b:backsurface:delta:edge:r:g:b:node:r:g:b:outline:r:g:b");
} }
@ -5538,9 +5539,9 @@ void SMESHGUI::restoreVisualParameters (int savePoint)
ng = colors[12].toFloat(); ng = colors[12].toFloat();
nb = colors[13].toFloat(); nb = colors[13].toFloat();
otr = colors[14].toFloat(); otr = colors[15].toFloat();
otg = colors[15].toFloat(); otg = colors[16].toFloat();
otb = colors[16].toFloat(); otb = colors[17].toFloat();
} }
aSmeshActor->SetSufaceColor(colors[1].toFloat(), colors[2].toFloat(), colors[3].toFloat(), delta); aSmeshActor->SetSufaceColor(colors[1].toFloat(), colors[2].toFloat(), colors[3].toFloat(), delta);
aSmeshActor->SetEdgeColor(er,eg,eb); aSmeshActor->SetEdgeColor(er,eg,eb);