From: mzn <mzn@opencascade.com>
Date: Tue, 29 Aug 2006 12:08:41 +0000 (+0000)
Subject: Improved fix for bug  PAL12858 (EDF210 GEOM Preferences menu of GEOM: color of the... 
X-Git-Tag: V3_2_2pre~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cff8a10b8fffcb0d33fc03fc01b78ef27bafadb0;p=modules%2Fgeom.git

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

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 363d8a3d7..3c3b60aed 100644
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -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>
diff --git a/src/GEOMGUI/GEOM_msg_en.po b/src/GEOMGUI/GEOM_msg_en.po
index 92576204e..fc8253cc8 100644
--- a/src/GEOMGUI/GEOM_msg_en.po
+++ b/src/GEOMGUI/GEOM_msg_en.po
@@ -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"
diff --git a/src/OBJECT/GEOM_AssemblyBuilder.cxx b/src/OBJECT/GEOM_AssemblyBuilder.cxx
index b78e9f78a..b4d94c841 100644
--- a/src/OBJECT/GEOM_AssemblyBuilder.cxx
+++ b/src/OBJECT/GEOM_AssemblyBuilder.cxx
@@ -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);