Merge pull request tpaviot#615 from tpaviot/review/fix-import-step-colors

Review/fix import step colors

Author: tpaviot

src/Display/WebGl/threejs_renderer.py

@@ -30,7 +30,7 @@
 from OCC.Extend.TopologyUtils import is_edge, is_wire, discretize_edge, discretize_wire
 from OCC.Display.WebGl.simple_server import start_server
 
-THREEJS_RELEASE = "r99"
+THREEJS_RELEASE = "r100"
 
 def spinning_cursor():
  while True:

src/Display/WebGl/x3dom_renderer.py

@@ -263,23 +263,19 @@ def to_x3dfile_string(self, shape_id):
 <Scene>
         """ % (OCC_VERSION, OCC_VERSION, OCC_VERSION)
  for triangle_set in self._triangle_sets:
- x3dfile_str += '<Shape DEF="shape%i" onclick="' % shape_id
+ x3dfile_str += "<Switch whichChoice='0' id='swBRP'><Transform scale='1 1 1'><Shape DEF='shape%i' onclick='" % shape_id
  x3dfile_str += "select(this);"
- x3dfile_str += '"><Appearance>\n'
+ x3dfile_str += "'><Appearance>\n"
  #
  # set Material or shader
  #
  if self._vs is None and self._fs is None:
  x3dfile_str += "<Material id='color' diffuseColor="
- x3dfile_str += "'%g %g %g'" % (self._color[0],
- self._color[1],
- self._color[2])
+ x3dfile_str += "'%g %g %g'" % (self._color[0], self._color[1], self._color[2])
  x3dfile_str += " shininess="
  x3dfile_str += "'%g'" % self._shininess
  x3dfile_str += " specularColor="
- x3dfile_str += "'%g %g %g'" % (self._specular_color[0],
- self._specular_color[1],
- self._specular_color[2])
+ x3dfile_str += "'%g %g %g'" % (self._specular_color[0], self._specular_color[1], self._specular_color[2])
  x3dfile_str += " transparency='%g'>\n" % self._transparency
  x3dfile_str += "</Material>\n"
  else:  # set shaders
@@ -292,20 +288,20 @@ def to_x3dfile_string(self, shape_id):
  x3dfile_str += '</Appearance>\n'
  # export triangles
  x3dfile_str += triangle_set
- x3dfile_str += "</Shape>\n"
+ x3dfile_str += "</Shape></Transform></Switch>\n"
  # and now, process edges
  if self._export_edges:
  edge_id = 0
  # below '0' means show all
  # -1 means doesn't show line
  # the "Switch" node selects the group to be displayed
- x3dfile_str += "<Switch whichChoice='0'>\n"
+ x3dfile_str += "<Switch whichChoice='0' id='swBRP'>\n"
  x3dfile_str += "\t<Group>\n"
  for line_set in self._line_sets:
- x3dfile_str += '\t\t<Shape DEF="edg%i">\n' % edge_id
- x3dfile_str += '\t\t\t<Appearance><Material emissiveColor="0 0 0"/></Appearance>\n\t\t' # empty appearance, but the x3d validator complains if nothing set
+ x3dfile_str += "\t\t<Transform scale='1 1 1'><Shape DEF='edg%i'>\n" % edge_id
+ x3dfile_str += "\t\t\t<Appearance><Material emissiveColor='0 0 0'/></Appearance>\n\t\t" # empty appearance, but the x3d validator complains if nothing set
  x3dfile_str += line_set
- x3dfile_str += "\t\t</Shape>\n"
+ x3dfile_str += "\t\t</Shape></Transform>\n"
  edge_id += 1
  x3dfile_str += "\t</Group>\n"
  x3dfile_str += "</Switch>\n"
@@ -332,8 +328,8 @@ def DisplayShape(self,
  vertex_shader=None,
  fragment_shader=None,
  export_edges=False,
- color=(0.65, 0.65, 0.65),
- specular_color=(1, 1, 1),
+ color=(0.65, 0.65, 0.7),
+ specular_color=(0.2, 0.2, 0.2),
  shininess=0.9,
  transparency=0.,
  line_color=(0, 0., 0.),

src/Extend/DataExchange.py

@@ -33,7 +33,7 @@
 from OCC.Core.TDF import TDF_LabelSequence, TDF_Label, TDF_Tool
 from OCC.Core.TDataStd import TDataStd_Name, TDataStd_Name_GetID
 from OCC.Core.TCollection import TCollection_ExtendedString, TCollection_AsciiString
-from OCC.Core.Quantity import Quantity_Color
+from OCC.Core.Quantity import Quantity_Color, Quantity_TOC_RGB
 from OCC.Core.TopLoc import TopLoc_Location
 from OCC.Core.BRepBuilderAPI import BRepBuilderAPI_Transform
 
@@ -43,7 +43,7 @@
 ##########################
 # Step import and export #
 ##########################
-def read_step_file(filename, return_as_shapes=False, verbosity=False):
+def read_step_file(filename, return_as_shapes=False, verbosity=True):
  """ read the STEP file and returns a compound
     filename: the file path
     return_as_shapes: optional, False by default. If True returns a list of shapes,
@@ -112,7 +112,8 @@ def read_step_file_with_names_colors(filename):
  if not os.path.isfile(filename):
  raise FileNotFoundError("%s not found." % filename)
  # the list:
- output_shapes = []
+ output_shapes = {}
+
  # create an handle to a document
  doc = TDocStd_Document(TCollection_ExtendedString("pythonocc-doc"))
 
@@ -127,14 +128,13 @@ def read_step_file_with_names_colors(filename):
  step_reader.SetLayerMode(True)
  step_reader.SetNameMode(True)
  step_reader.SetMatMode(True)
+ step_reader.SetGDTMode(True)
 
  status = step_reader.ReadFile(filename)
  if status == IFSelect_RetDone:
  step_reader.Transfer(doc)
 
- shape_tool.SetAutoNaming(True)
 
- 
  #lvl = 0
  locs = []
  #cnt = 0
@@ -144,7 +144,7 @@ def _get_label_name(lab):
  TDF_Tool.Entry(lab, entry)
  n = TDataStd_Name()
  lab.FindAttribute(TDataStd_Name_GetID(), n)
- if n:
+ if n is not None:
  return n.Get().PrintToString()
  return "No Name"
 
@@ -174,6 +174,8 @@ def _get_sub_shapes(lab, loc):
  shape_tool.GetComponents(lab, l_comps)
  #print("Nb components  :", l_comps.Length())
  #print()
+ name = _get_label_name(lab)
+ print("Name :", name)
 
  if shape_tool.IsAssembly(lab):
  l_c = TDF_LabelSequence()
@@ -232,9 +234,7 @@ def _get_sub_shapes(lab, loc):
  #print("    X            :", tran.X())
  #print("    Y            :", tran.Y())
  #print("    Z            :", tran.Z())
- shape = BRepBuilderAPI_Transform(shape, loc.Transformation()).Shape()
-
- c = Quantity_Color()
+ c = Quantity_Color(0.5, 0.5, 0.5, Quantity_TOC_RGB)  # default color
  colorSet = False
  if (color_tool.GetInstanceColor(shape, 0, c) or
  color_tool.GetInstanceColor(shape, 1, c) or
@@ -258,12 +258,15 @@ def _get_sub_shapes(lab, loc):
  #n = c.Name(c.Red(), c.Green(), c.Blue())
  #print('    shape color Name & RGB: ', c, n, c.Red(), c.Green(), c.Blue())
 
+ shape_disp = BRepBuilderAPI_Transform(shape, loc.Transformation()).Shape()
+ if not shape_disp in output_shapes:
+ output_shapes[shape_disp] = [_get_label_name(lab), c]
  for i in range(l_subss.Length()):
  lab = l_subss.Value(i+1)
- print("\n########  simpleshape subshape label :", lab)
+ #print("\n########  simpleshape subshape label :", lab)
  shape_sub = shape_tool.GetShape(lab)
 
- c = Quantity_Color()
+ c = Quantity_Color(0.5, 0.5, 0.5, Quantity_TOC_RGB)  # default color
  colorSet = False
  if (color_tool.GetInstanceColor(shape_sub, 0, c) or
  color_tool.GetInstanceColor(shape_sub, 1, c) or
@@ -283,8 +286,10 @@ def _get_sub_shapes(lab, loc):
 
  n = c.Name(c.Red(), c.Green(), c.Blue())
  #print('    shape color Name & RGB: ', c, n, c.Red(), c.Green(), c.Blue())
-
- output_shapes.append([shape, _get_label_name(lab), c])
+ shape_to_disp = BRepBuilderAPI_Transform(shape_sub, loc.Transformation()).Shape()
+ # position the subshape to display
+ if not shape_to_disp in output_shapes:
+ output_shapes[shape_to_disp] = [_get_label_name(lab), c]
 
 
  def _get_shapes():
@@ -296,9 +301,9 @@ def _get_shapes():
  print()
  print("Number of shapes at root :", labels.Length())
  print()
- root = labels.Value(1)
-
- _get_sub_shapes(root, None)
+ for i in range(labels.Length()):
+ root_item = labels.Value(i+1)
+  _get_sub_shapes(root_item, None)
  _get_shapes()
  return output_shapes
 

src/Visualization/Tesselator.cpp

@@ -52,17 +52,17 @@ Tesselator::Tesselator(TopoDS_Shape   aShape,
                        Standard_Real                    aScaleV,
                        Standard_Real                    aRotationAngle) :
  //set local variables
+  myShape(aShape),
+  myTxtMapType(aTxtMapType),
+  myAutoScaleSizeOnU(anAutoScaleSizeOnU),
+  myAutoScaleSizeOnV(anAutoScaleSizeOnV),
   myDeviation(aDeviation),
   myUOrigin(aUOrigin),
   myVOrigin(aVOrigin),
   myURepeat(aURepeat),
   myVRepeat(aVRepeat),
   myScaleU(aScaleU),
   myScaleV(aScaleV),
-  myAutoScaleSizeOnU(anAutoScaleSizeOnU),
-  myAutoScaleSizeOnV(anAutoScaleSizeOnV),
-  myTxtMapType(aTxtMapType),
-  myShape(aShape),
   myRotationAngle(aRotationAngle)
 {
  //prepare bbox tex coords
@@ -361,7 +361,7 @@ void Tesselator::ComputeDefaultDeviation()
     Standard_Real yDim = std::abs((long)aYmax - (long)aYmin);
     Standard_Real zDim = std::abs((long)aZmax - (long)aZmin);
 
-    Standard_Real adeviation = std::max(aXmax-aXmin, std::max(aYmax-aYmin, aZmax-aZmin)) * 2e-2 ;
+    Standard_Real adeviation = std::max(xDim, std::max(yDim, zDim)) * 2e-2 ;
     myDeviation = adeviation;
 }
 
@@ -446,7 +446,7 @@ std::string formatFloatNumber(float f)
 {
  // returns string representation of the float number f.
  // set epsilon to 1e-3
- float epsilon = 1e-3;
+ float epsilon = 1e-3f;
   std::stringstream formatted_float;
  if (std::abs(f) < epsilon) {
     f = 0.;
@@ -524,28 +524,28 @@ std::string Tesselator::ExportShapeToX3DIndexedFaceSet()
  // First Vertex
       str_vertices << formatFloatNumber(locVertexcoord[vertices_idx[0]]) << " ";
       str_vertices << formatFloatNumber(locVertexcoord[vertices_idx[0]+1]) <<" ";
-      str_vertices << formatFloatNumber(locVertexcoord[vertices_idx[0]+2]) <<"\n";
+      str_vertices << formatFloatNumber(locVertexcoord[vertices_idx[0]+2]) <<" ";
  // Second vertex
       str_vertices << formatFloatNumber(locVertexcoord[vertices_idx[1]]) << " ";
       str_vertices << formatFloatNumber(locVertexcoord[vertices_idx[1]+1]) << " ";
-      str_vertices << formatFloatNumber(locVertexcoord[vertices_idx[1]+2]) << "\n";
+      str_vertices << formatFloatNumber(locVertexcoord[vertices_idx[1]+2]) << " ";
  // Third vertex
       str_vertices << formatFloatNumber(locVertexcoord[vertices_idx[2]]) << " ";
       str_vertices << formatFloatNumber(locVertexcoord[vertices_idx[2]+1]) << " ";
-      str_vertices << formatFloatNumber(locVertexcoord[vertices_idx[2]+2]) << "\n";
+      str_vertices << formatFloatNumber(locVertexcoord[vertices_idx[2]+2]) << " ";
  // NORMALS
  // First normal
       str_normals << formatFloatNumber(locNormalcoord[normals_idx[0]]) << " ";
       str_normals << formatFloatNumber(locNormalcoord[normals_idx[0]+1]) << " ";
-      str_normals << formatFloatNumber(locNormalcoord[normals_idx[0]+2]) << "\n";
+      str_normals << formatFloatNumber(locNormalcoord[normals_idx[0]+2]) << " ";
  // Second normal
       str_normals << formatFloatNumber(locNormalcoord[normals_idx[1]]) << " ";
       str_normals << formatFloatNumber(locNormalcoord[normals_idx[1]+1]) << " ";
-      str_normals << formatFloatNumber(locNormalcoord[normals_idx[1]+2]) << "\n";
+      str_normals << formatFloatNumber(locNormalcoord[normals_idx[1]+2]) << " ";
  // Third normal
       str_normals << formatFloatNumber(locNormalcoord[normals_idx[2]]) << " ";
       str_normals << formatFloatNumber(locNormalcoord[normals_idx[2]+1]) << " ";
-      str_normals << formatFloatNumber(locNormalcoord[normals_idx[2]+2]) << "\n";
+      str_normals << formatFloatNumber(locNormalcoord[normals_idx[2]+2]) << " ";
   }
   str_ifs << "<TriangleSet solid='false'>\n";
  // write points coordinates
@@ -577,11 +577,11 @@ void Tesselator::ExportShapeToX3D(char * filename, int diffR, int diffG, int dif
     X3Dfile << "<Head>";
     X3Dfile << "<meta name='generator' content='pythonOCC, http://www.pythonocc.org'/>";
     X3Dfile << "</Head>";
-    X3Dfile << "<Scene><Shape><Appearance><Material DEF='Shape_Mat' diffuseColor='0.65 0.65 0.65' ";
-    X3Dfile << "shininess='0.9' specularColor='1 1 1'></Material></Appearance>";
+    X3Dfile << "<Scene><Transform scale='1 1 1'><Shape><Appearance><Material DEF='Shape_Mat' diffuseColor='0.65 0.65 0.7' ";
+    X3Dfile << "specularColor='0.2 0.2 0.2'></Material></Appearance>";
  // write tesselation
     X3Dfile << ExportShapeToX3DIndexedFaceSet();
-    X3Dfile << "</Shape></Scene></X3D>\n";
+    X3Dfile << "</Shape></Transform></Scene></X3D>\n";
     X3Dfile.close();
 
 }