ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-15 01:58:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

Improved fix for bug PAL12858 (EDF210 GEOM Preferences menu of GEOM: color of the wireframe?).

Browse Source
This commit is contained in:
mzn 2006-08-29 12:08:41 +00:00
parent 87e19c8d66
commit cff8a10b8f
3 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/SalomeApp.xml
View File

@ -14,9 +14,9 @@
<parameter name="display_mode" value="0" />
<parameter name="shading_color" value="255, 255, 0" />
<parameter name="wireframe_color" value="255, 255, 0" />
<parameter name="face_color" value="0, 255, 0" />
<parameter name="edge_wire_color" value="255, 0, 0" />
<parameter name="free_bound_color" value="0, 255, 0" />
<parameter name="line_color" value="255, 0, 0" />
<parameter name="point_color" value="255, 255, 0" />
<parameter name="isos_color" value="127, 127, 127" />
<parameter name="isos_color" value="200, 200, 200" />
</section>
</document>

8
src/GEOMGUI/GEOM_msg_en.po
View File

@ -2938,11 +2938,11 @@ msgstr "Default shading color"
msgid "PREF_WIREFRAME_COLOR"
msgstr "Default wireframe color"
msgid "PREF_FACE_COLOR"
msgstr "Color of faces"
msgid "PREF_FREE_BOUND_COLOR"
msgstr "Color of free boundaries"
msgid "PREF_EDGE_WIRE_COLOR"
msgstr "Color of edges and wires"
msgid "PREF_LINE_COLOR"
msgstr "Color of edges, vectors, wires"
msgid "PREF_POINT_COLOR"
msgstr "Color of points"

20
src/OBJECT/GEOM_AssemblyBuilder.cxx
View File

@ -112,7 +112,7 @@ void GEOM_AssemblyBuilder::InitProperties(vtkProperty* IsoProp,
EdgeSProp->SetSpecularColor(red, green, blue);
// Wireframe for free edge
aColor = aResMgr->colorValue( "Geometry", "face_color", QColor( 0, 255, 0 ) );
aColor = aResMgr->colorValue( "Geometry", "free_bound_color", QColor( 0, 255, 0 ) );
red = aColor.red()/255.0;
green = aColor.green()/255.0;
blue = aColor.blue()/255.0;
@ -122,7 +122,7 @@ void GEOM_AssemblyBuilder::InitProperties(vtkProperty* IsoProp,
EdgeFProp->SetSpecularColor(red, green, blue);
// Wireframe for isolated edge
aColor = aResMgr->colorValue( "Geometry", "edge_wire_color", QColor( 255, 0, 0 ) );
aColor = aResMgr->colorValue( "Geometry", "line_color", QColor( 255, 0, 0 ) );
red = aColor.red()/255.0;
green = aColor.green()/255.0;
blue = aColor.blue()/255.0;
@ -249,7 +249,6 @@ vtkActorCollection* GEOM_AssemblyBuilder::BuildActors(const TopoDS_Shape& myShap
continue;
}
/* PAL12858: we should to unify colors with OCC
// compute the number of faces
Standard_Integer nbf = edgemap.FindFromKey(ex2.Current()).Extent();
GEOM_Actor* EdgeActor = GEOM_Actor::New();
@ -278,21 +277,6 @@ vtkActorCollection* GEOM_AssemblyBuilder::BuildActors(const TopoDS_Shape& myShap
EdgeActor->SetWireframeProperty(EdgeSProp);
}
}
*/
GEOM_Actor* EdgeActor = GEOM_Actor::New();
EdgeActor->SubShapeOn();
EdgeActor->setInputShape(ex2.Current(),deflection,mode);
if ( myShape.ShapeType() == 4 )
{
EdgeActor->SetShadingProperty(EdgeFProp);
EdgeActor->SetWireframeProperty(EdgeFProp);
}
else
{
EdgeActor->SetShadingProperty(EdgeSProp);
EdgeActor->SetWireframeProperty(EdgeSProp);
}
EdgeActor->SetPreviewProperty(EdgePVProp);
AISActors->AddItem(EdgeActor);