0029868: Draw Harness - help message for readstl command is unclear

readstl syntax has been modified, so that it creates a single-face triangulation by default.
The argument "trinagulation" is no more supported.
The new argument "-brep" has been introduced to generate
a compound of per-triangle faces instead (old default behavior of the command).

diff --git a/src/RWStl/RWStl_Reader.cxx b/src/RWStl/RWStl_Reader.cxx
index cb49a570f0061bd7aecd2f5cd53d1f89b142a422..19e22a3cff784e3f489423ba8564c80ff56967d6 100644 (file)
--- a/src/RWStl/RWStl_Reader.cxx
+++ b/src/RWStl/RWStl_Reader.cxx
@@ -416,7 +416,7 @@ Standard_Boolean RWStl_Reader::ReadBinary (Standard_IStream& theStream,
       const std::streamsize aDataToRead = aNbFacesInBuffer * aFaceDataLen;
       if (theStream.read (aBuffer, aDataToRead).gcount() != aDataToRead)
       {
-        Message::DefaultMessenger()->Send ("Error: read filed", Message_Fail);
+        Message::DefaultMessenger()->Send ("Error: binary STL read failed", Message_Fail);
         return false;
       }
       aBufferPtr = aBuffer;

diff --git a/src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx b/src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx
index fe80118545a4b734dc768179e75b95eec6f5f4df..c42e9314c8a77e01065ba75399f1497f41985b27 100644 (file)
--- a/src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx
+++ b/src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx
@@ -105,36 +105,61 @@ static Standard_Integer readstl(Draw_Interpretor& theDI,
                                 Standard_Integer theArgc,
                                 const char** theArgv)
 {
-  if (theArgc < 3)
-  {
-    theDI << "wrong number of parameters" << "\n";
-    return 1;
-  }
-  else
+  TCollection_AsciiString aShapeName, aFilePath;
+  bool toCreateCompOfTris = false;
+  for (Standard_Integer anArgIter = 1; anArgIter < theArgc; ++anArgIter)
   {
-    if (theArgc == 4 &&
-        strcmp("triangulation", theArgv[3]) == 0)
+    TCollection_AsciiString anArg (theArgv[anArgIter]);
+    anArg.LowerCase();
+    if (aShapeName.IsEmpty())
     {
-      // Read STL file to the triangulation.
-      Handle(Draw_ProgressIndicator) aProgress = new Draw_ProgressIndicator (theDI, 1);
-      Handle(Poly_Triangulation) aTriangulation = RWStl::ReadFile (theArgv[2], aProgress);
-
-      TopoDS_Face aFace;
-      BRep_Builder aB;
-      aB.MakeFace(aFace);
-      aB.UpdateFace(aFace, aTriangulation);
-      DBRep::Set(theArgv[1], aFace);
+      aShapeName = theArgv[anArgIter];
+    }
+    else if (aFilePath.IsEmpty())
+    {
+      aFilePath = theArgv[anArgIter];
+    }
+    else if (anArg == "-brep")
+    {
+      toCreateCompOfTris = true;
+      if (anArgIter + 1 < theArgc
+       && ViewerTest::ParseOnOff (theArgv[anArgIter + 1], toCreateCompOfTris))
+      {
+        ++anArgIter;
+      }
     }
     else
     {
-      TopoDS_Shape aShape;
-      Standard_DISABLE_DEPRECATION_WARNINGS
-      StlAPI::Read(aShape, theArgv[2]);
-      Standard_ENABLE_DEPRECATION_WARNINGS
-      DBRep::Set(theArgv[1], aShape);
+      std::cout << "Syntax error: unknown argument '" << theArgv[anArgIter] << "'\n";
+      return 1;
     }
   }
+  if (aFilePath.IsEmpty())
+  {
+    std::cout << "Syntax error: not enough arguments\n";
+    return 1;
+  }
 
+  TopoDS_Shape aShape;
+  if (!toCreateCompOfTris)
+  {
+    // Read STL file to the triangulation.
+    Handle(Draw_ProgressIndicator) aProgress = new Draw_ProgressIndicator (theDI, 1);
+    Handle(Poly_Triangulation) aTriangulation = RWStl::ReadFile (aFilePath.ToCString(), aProgress);
+
+    TopoDS_Face aFace;
+    BRep_Builder aB;
+    aB.MakeFace (aFace);
+    aB.UpdateFace (aFace, aTriangulation);
+    aShape = aFace;
+  }
+  else
+  {
+    Standard_DISABLE_DEPRECATION_WARNINGS
+    StlAPI::Read(aShape, aFilePath.ToCString());
+    Standard_ENABLE_DEPRECATION_WARNINGS
+  }
+  DBRep::Set (aShapeName.ToCString(), aShape);
   return 0;
 }
 
@@ -1233,7 +1258,12 @@ void  XSDRAWSTLVRML::InitCommands (Draw_Interpretor& theCommands)
 
   theCommands.Add ("writevrml", "shape file [version VRML#1.0/VRML#2.0 (1/2): 2 by default] [representation shaded/wireframe/both (0/1/2): 1 by default]",__FILE__,writevrml,g);
   theCommands.Add ("writestl",  "shape file [ascii/binary (0/1) : 1 by default] [InParallel (0/1) : 0 by default]",__FILE__,writestl,g);
-  theCommands.Add ("readstl",   "shape file [triangulation: no by default]",__FILE__,readstl,g);
+  theCommands.Add ("readstl",
+                   "readstl shape file [-brep]"
+                   "\n\t\t: Reads STL file and creates a new shape with specified name."
+                   "\n\t\t: When -brep is specified, creates a Compound of per-triangle Faces."
+                   "\n\t\t: Single triangulation-only Face is created otherwise (default).",
+                   __FILE__, readstl, g);
   theCommands.Add ("loadvrml" , "shape file",__FILE__,loadvrml,g);
 
   theCommands.Add ("meshfromstl",     "creates MeshVS_Mesh from STL file",            __FILE__, createmesh,      g );

diff --git a/tests/bugs/fclasses/bug23192_1 b/tests/bugs/fclasses/bug23192_1
index caf6ad76cdf1d4ff4ff2dd1e884ca2826a556ffe..56a7b162a58314a30987dd47a53965086fd9f37e 100755 (executable)
--- a/tests/bugs/fclasses/bug23192_1
+++ b/tests/bugs/fclasses/bug23192_1
@@ -22,7 +22,7 @@ writestl res ${aFile} ${anASCIImode}
 catch {exec chmod 777 ${aFile}}
 
 if { [file exists ${aFile}] } {
-  readstl result ${aFile}
+  readstl result ${aFile} -brep
 
 checknbshapes result -vertex 8 -edge 18 -wire 12 -face 12 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 51
   # Check file size

diff --git a/tests/bugs/fclasses/bug23192_2 b/tests/bugs/fclasses/bug23192_2
index 73fbd354488bfd562f0e23ccb27ffcd86c3a68e8..3081072bd201697b020f0668804450ddb1a2fd4e 100755 (executable)
--- a/tests/bugs/fclasses/bug23192_2
+++ b/tests/bugs/fclasses/bug23192_2
@@ -22,7 +22,7 @@ writestl res ${aFile} ${anASCIImode}
 catch {exec chmod 777 ${aFile}}
 
 if { [file exists ${aFile}] } {
-  readstl result ${aFile}
+  readstl result ${aFile} -brep
 
 checknbshapes result -vertex 8 -edge 18 -wire 12 -face 12 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 51
   # Check file size

diff --git a/tests/bugs/modalg_7/bug29524 b/tests/bugs/modalg_7/bug29524
index 49e5b390d93b2b993d9007da30d296913f737b6d..058c5f3d5593919083613334b0f2225b0f4af75d 100644 (file)
--- a/tests/bugs/modalg_7/bug29524
+++ b/tests/bugs/modalg_7/bug29524
@@ -4,7 +4,7 @@ puts "========"
 puts ""
 
 pload VISUALIZATION XDE MODELING
-readstl m [locate_data_file model_stl_045.stl] triangulation
+readstl m [locate_data_file model_stl_045.stl]
 vclear
 vinit View1
 vdisplay -dispMode 1 m

diff --git a/tests/bugs/stlvrml/bug26338 b/tests/bugs/stlvrml/bug26338
index 42817324543de4ff8c69a7dcb1e6d057c679e056..2a1a0f1a4c5edbd147d8583ca9123d455ef2a406 100644 (file)
--- a/tests/bugs/stlvrml/bug26338
+++ b/tests/bugs/stlvrml/bug26338
@@ -16,7 +16,7 @@ incmesh comp 1.
 writestl comp $imagedir/${casename}.stl 1
 
 # load STL
-readstl result $imagedir/${casename}.stl
+readstl result $imagedir/${casename}.stl -brep
 
 # check that bounding box is 
 bounding -s result -save Xmin Ymin Zmin Xmax Ymax Zmax -nodraw

diff --git a/tests/bugs/stlvrml/bug27622 b/tests/bugs/stlvrml/bug27622
index f6df1c9ef079da229b3a07438bba3cd70856edfb..a19f4d2fc809b06e1c3d0514327afc6697edf542 100644 (file)
--- a/tests/bugs/stlvrml/bug27622
+++ b/tests/bugs/stlvrml/bug27622
@@ -6,7 +6,7 @@ puts ""
 # Data Exchange - STL file having less than 4 triangles cannot be read
 ########################################################################
 
-readstl result [locate_data_file bug27622_Design1.stl]
+readstl result [locate_data_file bug27622_Design1.stl] -brep
 
 set nbshapes_expected "
 Number of shapes in result

diff --git a/tests/bugs/stlvrml/bug28680 b/tests/bugs/stlvrml/bug28680
index 03d360b01ed0ddf6df0136756125ca15a8ecc2a5..f71256f6ae129c4cdb2c6d14c9a787990e2b2b10 100644 (file)
--- a/tests/bugs/stlvrml/bug28680
+++ b/tests/bugs/stlvrml/bug28680
@@ -1,4 +1,4 @@
-readstl m [locate_data_file bug28680_sample01b.stl] triangulation
+readstl m [locate_data_file bug28680_sample01b.stl]
 
 # Number of triangles check
 checktrinfo m -tri 62075 -nod 31879

diff --git a/tests/bugs/xde/bug22670_1 b/tests/bugs/xde/bug22670_1
index 59705c766c7075ee23a1de69de181f128d86516a..1718c22caca41c0c5ca117a81acc005ba69cfb65 100755 (executable)
--- a/tests/bugs/xde/bug22670_1
+++ b/tests/bugs/xde/bug22670_1
@@ -8,7 +8,7 @@ puts ""
 
 set BugNumber OCC22670
 
-readstl res_mesh [locate_data_file OMF6391_box.stl]
+readstl res_mesh [locate_data_file OMF6391_box.stl] -brep
 
 set aFile ${imagedir}/OCC22670.stl
 file delete ${aFile}
@@ -19,7 +19,7 @@ set anASCIImode 0
 writestl res_mesh ${aFile} ${anASCIImode}
 catch {exec chmod 777 ${aFile}}
 
-readstl result ${aFile}
+readstl result ${aFile} -brep
 
 checknbshapes result -vertex 8 -edge 18 -wire 12 -face 12 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 51
 checkview -display result -2d -path ${imagedir}/${test_image}.png

diff --git a/tests/bugs/xde/bug22670_2 b/tests/bugs/xde/bug22670_2
index dbee0d88d53db79e1b80520117297cfc3010bd43..d9d4938f016de310d202ecbec744942c541879e2 100755 (executable)
--- a/tests/bugs/xde/bug22670_2
+++ b/tests/bugs/xde/bug22670_2
@@ -18,7 +18,7 @@ puts ""
 set BugNumber OCC22670
 
 set filepath [locate_data_file OMF6391_box.stl]
-if { [catch { readstl res_mesh $filepath } catch_result] } {
+if { [catch { readstl res_mesh $filepath -brep } catch_result] } {
     puts "Faulty ${BugNumber}: here is reading problem"
 } else {
     set aFile $imagedir/${test_image}.stl
@@ -30,7 +30,7 @@ if { [catch { readstl res_mesh $filepath } catch_result] } {
     writestl res_mesh ${aFile} ${anASCIImode}
     catch {exec chmod 777 ${aFile}}
 
-    readstl result ${aFile}
+    readstl result ${aFile} -brep
 
     checknbshapes result -vertex 8 -edge 18 -wire 12 -face 12 -shell 1 -solid 0 -compsolid 0 -compound 0 -shape 51
 }

diff --git a/tests/bugs/xde/bug22898 b/tests/bugs/xde/bug22898
index e6bbf4ff0815b0ba1bd20f67c9bfd78776cfe54e..eb57743479ec0622d3c6eaf8f17de954236d3b0b 100644 (file)
--- a/tests/bugs/xde/bug22898
+++ b/tests/bugs/xde/bug22898
@@ -43,7 +43,7 @@ checkarea step_1 3.978e8 1e6 0.001
 # STL
 incmesh hammer 38.9076
 writestl hammer $imagedir/hammer.stl 
-readstl stl $imagedir/hammer.stl
+readstl stl $imagedir/hammer.stl -brep
 checkshape stl
 tolerance stl
 checkarea stl 3.978e8 1e6 0.001

diff --git a/tests/bugs/xde/bug6384 b/tests/bugs/xde/bug6384
index aa5bc90c7dc59b010028e11e7e278159084b4371..17c5e0ac3f892e2631db1843528af056817b6d5b 100755 (executable)
--- a/tests/bugs/xde/bug6384
+++ b/tests/bugs/xde/bug6384
@@ -6,10 +6,8 @@ puts ""
 # StlAPI_Reader still use old Sewing algorithm
 #######################################################################################
 
-## readstl command from XSDRAWSTLVRML.cxx file !!!!!
-
 set BugNumber OCC6384
 
-readstl res_mesh [locate_data_file OMF6391_box.stl]
+readstl res_mesh [locate_data_file OMF6391_box.stl] -brep
 
 

diff --git a/tests/de_mesh/shape_write_stl/A1 b/tests/de_mesh/shape_write_stl/A1
index 56c8d9f56a45718a8e5248beeadae1ccd5995c78..02b9698cd0c6cbc5990710c34c72ce86e1da03d8 100644 (file)
--- a/tests/de_mesh/shape_write_stl/A1
+++ b/tests/de_mesh/shape_write_stl/A1
@@ -6,7 +6,7 @@ incmesh m 1.0
 
 # Save, read and delete file
 writestl m $imagedir/${casename}
-readstl res $imagedir/${casename} triangulation
+readstl res $imagedir/${casename}
 file delete $imagedir/${casename}
 
 checktrinfo res -tri 22748 -nod 11376

diff --git a/tests/de_mesh/shape_write_stl/A10 b/tests/de_mesh/shape_write_stl/A10
index 49e1f03405bbed41e64a9a8f6e4a1119c7e6e599..7742f527219663a59e360b759413b7e693b2607c 100644 (file)
--- a/tests/de_mesh/shape_write_stl/A10
+++ b/tests/de_mesh/shape_write_stl/A10
@@ -6,7 +6,7 @@ incmesh m 1.0
 
 # Save, read and delete file
 writestl m $imagedir/${casename}
-readstl res $imagedir/${casename} triangulation
+readstl res $imagedir/${casename}
 file delete $imagedir/${casename}
 
 checktrinfo res -tri 130 -nod 67

diff --git a/tests/de_mesh/shape_write_stl/A11 b/tests/de_mesh/shape_write_stl/A11
index 8e341640bb444597d26d955ca23e9d8af4a92933..129b48d780680af7da5ee5386ca18764d256ec43 100644 (file)
--- a/tests/de_mesh/shape_write_stl/A11
+++ b/tests/de_mesh/shape_write_stl/A11
@@ -6,7 +6,7 @@ incmesh m 1.0
 
 # Save, read and delete file
 writestl m $imagedir/${casename}
-readstl res $imagedir/${casename} triangulation
+readstl res $imagedir/${casename}
 file delete $imagedir/${casename}
 
 checktrinfo res -tri 150 -nod 77

diff --git a/tests/de_mesh/shape_write_stl/A12 b/tests/de_mesh/shape_write_stl/A12
index 8c5a21fb6e2e07e7228d9725deb1a720c4ee4975..e85d6a7dbf3dbc9eb9f737e47d2bace601cffd74 100644 (file)
--- a/tests/de_mesh/shape_write_stl/A12
+++ b/tests/de_mesh/shape_write_stl/A12
@@ -6,7 +6,7 @@ incmesh m 1.0
 
 # Save, read and delete file
 writestl m $imagedir/${casename}
-readstl res $imagedir/${casename} triangulation
+readstl res $imagedir/${casename}
 file delete $imagedir/${casename}
 
 checktrinfo res -tri 4396  -nod 2200

diff --git a/tests/de_mesh/shape_write_stl/A2 b/tests/de_mesh/shape_write_stl/A2
index 98ba1d9ff0671a90ffc5d61c2f811f15d57e1b96..efd25eb10777f83e4a53147dc7edbb5f369594d7 100644 (file)
--- a/tests/de_mesh/shape_write_stl/A2
+++ b/tests/de_mesh/shape_write_stl/A2
@@ -6,7 +6,7 @@ incmesh m 1.0
 
 # Save, read and delete file
 writestl m $imagedir/${casename}
-readstl res $imagedir/${casename} triangulation
+readstl res $imagedir/${casename}
 file delete $imagedir/${casename}
 
 checktrinfo res -tri 290 -nod 147

diff --git a/tests/de_mesh/shape_write_stl/A3 b/tests/de_mesh/shape_write_stl/A3
index fb4900b931d6770aa6d280beb46fbf4a7ef4b729..37d90b40c5ce6d838a44c9ac56c1d3e6346195ad 100644 (file)
--- a/tests/de_mesh/shape_write_stl/A3
+++ b/tests/de_mesh/shape_write_stl/A3
@@ -6,7 +6,7 @@ incmesh m 1.0
 
 # Save, read and delete file
 writestl m $imagedir/${casename}
-readstl res $imagedir/${casename} triangulation
+readstl res $imagedir/${casename}
 file delete $imagedir/${casename}
 
 checktrinfo res -tri 200 -nod 102

diff --git a/tests/de_mesh/shape_write_stl/A4 b/tests/de_mesh/shape_write_stl/A4
index c8494c0920f48f64d1018e891cc7d2080f4d31ec..ad125c7aa8f7c5733a821b3e23bb9ec8d57df36c 100644 (file)
--- a/tests/de_mesh/shape_write_stl/A4
+++ b/tests/de_mesh/shape_write_stl/A4
@@ -6,7 +6,7 @@ incmesh m 1.0
 
 # Save, read and delete file
 writestl m $imagedir/${casename}
-readstl res $imagedir/${casename} triangulation
+readstl res $imagedir/${casename}
 file delete $imagedir/${casename}
 
 checktrinfo res -tri 146 -nod 75

diff --git a/tests/de_mesh/shape_write_stl/A5 b/tests/de_mesh/shape_write_stl/A5
index 83367a17cfb52b667cece3fa2b0aa85d2dc524f5..26b708e409dc200385902f061a59e5e8eed2c0b1 100644 (file)
--- a/tests/de_mesh/shape_write_stl/A5
+++ b/tests/de_mesh/shape_write_stl/A5
@@ -6,7 +6,7 @@ incmesh m 1.0
 
 # Save, read and delete file
 writestl m $imagedir/${casename}
-readstl res $imagedir/${casename} triangulation
+readstl res $imagedir/${casename}
 file delete $imagedir/${casename}
 
 checktrinfo res -tri 13102 -nod 6553

diff --git a/tests/de_mesh/shape_write_stl/A6 b/tests/de_mesh/shape_write_stl/A6
index 83d7eceed73d4576e114f0c5b6f1551ad6e2debf..f8d423f902c0536140eea77958741cd39226efae 100644 (file)
--- a/tests/de_mesh/shape_write_stl/A6
+++ b/tests/de_mesh/shape_write_stl/A6
@@ -6,7 +6,7 @@ incmesh m 1.0
 
 # Save, read and delete file
 writestl m $imagedir/${casename}
-readstl res $imagedir/${casename} triangulation
+readstl res $imagedir/${casename}
 file delete $imagedir/${casename}
 
 checktrinfo res -tri 2398 -nod 1201

diff --git a/tests/de_mesh/shape_write_stl/A7 b/tests/de_mesh/shape_write_stl/A7
index ec1cedd84c1e73070fae8e7304782602a942de77..72d9e6a644a1776bf63474f7f24b9e5589a65828 100644 (file)
--- a/tests/de_mesh/shape_write_stl/A7
+++ b/tests/de_mesh/shape_write_stl/A7
@@ -6,7 +6,7 @@ incmesh m 1.0
 
 # Save, read and delete file
 writestl m $imagedir/${casename}
-readstl res $imagedir/${casename} triangulation
+readstl res $imagedir/${casename}
 file delete $imagedir/${casename}
 
 checktrinfo res -tri 40 -nod 22

diff --git a/tests/de_mesh/shape_write_stl/A8 b/tests/de_mesh/shape_write_stl/A8
index 0546cf0d52de0f314c2c23becdb3201247aad35a..0511e3450e4abf342243d7bbb2a4f80d3cfa8ce6 100644 (file)
--- a/tests/de_mesh/shape_write_stl/A8
+++ b/tests/de_mesh/shape_write_stl/A8
@@ -6,7 +6,7 @@ incmesh m 1.0
 
 # Save, read and delete file
 writestl m $imagedir/${casename}
-readstl res $imagedir/${casename} triangulation
+readstl res $imagedir/${casename}
 file delete $imagedir/${casename}
 
 checktrinfo res -tri 58 -nod 31

diff --git a/tests/de_mesh/shape_write_stl/A9 b/tests/de_mesh/shape_write_stl/A9
index 9284f43a31a2e6dad9da63376a5de5262d70a627..5acc70b927fef6d2ee6cb3babc133f4392ad62ff 100644 (file)
--- a/tests/de_mesh/shape_write_stl/A9
+++ b/tests/de_mesh/shape_write_stl/A9
@@ -6,7 +6,7 @@ incmesh m 1.0
 
 # Save, read and delete file
 writestl m $imagedir/${casename}
-readstl res $imagedir/${casename} triangulation
+readstl res $imagedir/${casename}
 file delete $imagedir/${casename}
 
 checktrinfo res -tri 56 -nod 30

diff --git a/tests/de_mesh/stl_read/A1 b/tests/de_mesh/stl_read/A1
index 05b7c6b05cd573d45c245f4c84918e7a883ba429..7f5980fa02893c7d72209e041a5f2e44c8ac00b5 100644 (file)
--- a/tests/de_mesh/stl_read/A1
+++ b/tests/de_mesh/stl_read/A1
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_001.stl] triangulation
+readstl m [locate_data_file model_stl_001.stl]
 
 # Number of triangles check
 checktrinfo m -tri 3609 -nod 1807

diff --git a/tests/de_mesh/stl_read/A10 b/tests/de_mesh/stl_read/A10
index e92d07b1bd308a2f05930422d30a613435f53af6..b1eccdbc2c65eea0cda933f82be33a8da35e8d3b 100644 (file)
--- a/tests/de_mesh/stl_read/A10
+++ b/tests/de_mesh/stl_read/A10
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_010.stl] triangulation
+readstl m [locate_data_file model_stl_010.stl]
 
 # Number of triangles check
 checktrinfo m -tri 26582 -nod 13346

diff --git a/tests/de_mesh/stl_read/A11 b/tests/de_mesh/stl_read/A11
index f653e3240a52ef89fc1bd302d01119f8111f478a..c02e3c3922280fe577de19ad6a63c94c6037e0b8 100644 (file)
--- a/tests/de_mesh/stl_read/A11
+++ b/tests/de_mesh/stl_read/A11
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_011.stl] triangulation
+readstl m [locate_data_file model_stl_011.stl]
 
 # Number of triangles check
 checktrinfo m -tri 9170 -nod 4595

diff --git a/tests/de_mesh/stl_read/A12 b/tests/de_mesh/stl_read/A12
index c6698965e7e86c40babbecad2f04e141428599b2..09d8b2bc50981dadebd5d555447a841b341b97cd 100644 (file)
--- a/tests/de_mesh/stl_read/A12
+++ b/tests/de_mesh/stl_read/A12
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_012.stl] triangulation
+readstl m [locate_data_file model_stl_012.stl]
 
 # Number of triangles check
 checktrinfo m -tri 10059 -nod 5036

diff --git a/tests/de_mesh/stl_read/A13 b/tests/de_mesh/stl_read/A13
index b2fe4492703cca07928b5694e259d9f1ce720677..b020f8bd504a0222caf05688c8b8cbc18700f9d3 100644 (file)
--- a/tests/de_mesh/stl_read/A13
+++ b/tests/de_mesh/stl_read/A13
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_013.stl] triangulation
+readstl m [locate_data_file model_stl_013.stl]
 
 # Number of triangles check
 checktrinfo m -tri 8773 -nod 4406

diff --git a/tests/de_mesh/stl_read/A14 b/tests/de_mesh/stl_read/A14
index 563490b35d606848ec380578b4edc9e1f151eb94..c98aed11ed103ed767648d8efada03fd416a252f 100644 (file)
--- a/tests/de_mesh/stl_read/A14
+++ b/tests/de_mesh/stl_read/A14
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_014.stl] triangulation
+readstl m [locate_data_file model_stl_014.stl]
 
 # Number of triangles check
 checktrinfo m -tri 18462 -nod 9272

diff --git a/tests/de_mesh/stl_read/A15 b/tests/de_mesh/stl_read/A15
index 7e4b2269b6bece7c4d002036638455b46e9b0d29..7b0e95bac1b51a6ca63b8be5497f0dffdb4a7c2a 100644 (file)
--- a/tests/de_mesh/stl_read/A15
+++ b/tests/de_mesh/stl_read/A15
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_015.stl] triangulation
+readstl m [locate_data_file model_stl_015.stl]
 
 # Number of triangles check
 checktrinfo m -tri 7662 -nod 3836

diff --git a/tests/de_mesh/stl_read/A2 b/tests/de_mesh/stl_read/A2
index 45540707e9745ab495f7a49c77def75258486a8d..d7b3bb6b685308e26c68c06a85b62ff7ef08af82 100644 (file)
--- a/tests/de_mesh/stl_read/A2
+++ b/tests/de_mesh/stl_read/A2
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_002.stl] triangulation
+readstl m [locate_data_file model_stl_002.stl]
 
 # Number of triangles check
 checktrinfo m -tri 19034 -nod 9535

diff --git a/tests/de_mesh/stl_read/A3 b/tests/de_mesh/stl_read/A3
index 27b3c5f4cbbd675d9e03965e846cd92e889797d8..a07092bce7e06abc31a4ab7e93eb9d76142a4705 100644 (file)
--- a/tests/de_mesh/stl_read/A3
+++ b/tests/de_mesh/stl_read/A3
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_003.stl] triangulation
+readstl m [locate_data_file model_stl_003.stl]
 
 # Number of triangles check
 checktrinfo m -tri 3236 -nod 1620

diff --git a/tests/de_mesh/stl_read/A4 b/tests/de_mesh/stl_read/A4
index 50a38c28bac6d06ef2b636c29b445dddfd4b52ba..5f6a3d26376b61d572117d6db563e01b6cba1cbd 100644 (file)
--- a/tests/de_mesh/stl_read/A4
+++ b/tests/de_mesh/stl_read/A4
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_004.stl] triangulation
+readstl m [locate_data_file model_stl_004.stl]
 
 # Number of triangles check
 checktrinfo m -tri 15479 -nod 7793

diff --git a/tests/de_mesh/stl_read/A5 b/tests/de_mesh/stl_read/A5
index 5afc02d98a939c4806bd44f41aa6688dd2cfbcf4..b2c51d7bcb3a958d96378e98a78d214317e0c14c 100644 (file)
--- a/tests/de_mesh/stl_read/A5
+++ b/tests/de_mesh/stl_read/A5
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_005.stl] triangulation
+readstl m [locate_data_file model_stl_005.stl]
 
 # Number of triangles check
 checktrinfo m -tri 10526 -nod 5265

diff --git a/tests/de_mesh/stl_read/A6 b/tests/de_mesh/stl_read/A6
index 0e48971355cb0f7f9ead14e027b3cb2e57f68e82..bd4d9c9d5ae7121f9b33492d8ba39d9a321df0e5 100644 (file)
--- a/tests/de_mesh/stl_read/A6
+++ b/tests/de_mesh/stl_read/A6
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_006.stl] triangulation
+readstl m [locate_data_file model_stl_006.stl]
 
 # Number of triangles check
 checktrinfo m -tri 14447 -nod 7264

diff --git a/tests/de_mesh/stl_read/A7 b/tests/de_mesh/stl_read/A7
index f12fbcea3048491769f3d513cebdf25cf792f408..ab6db8e7e010e2d4b273a56b0623f2454ebc807f 100644 (file)
--- a/tests/de_mesh/stl_read/A7
+++ b/tests/de_mesh/stl_read/A7
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_007.stl] triangulation
+readstl m [locate_data_file model_stl_007.stl]
 
 # Number of triangles check
 checktrinfo m -tri 4199 -nod 2109

diff --git a/tests/de_mesh/stl_read/A8 b/tests/de_mesh/stl_read/A8
index 90f24f77adf926b9cbce47754d8f1082a97caa24..302242e5a84cf594cd6944f9a5911df8cfea799d 100644 (file)
--- a/tests/de_mesh/stl_read/A8
+++ b/tests/de_mesh/stl_read/A8
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_008.stl] triangulation
+readstl m [locate_data_file model_stl_008.stl]
 
 # Number of triangles check
 checktrinfo m -tri 22149 -nod 11118

diff --git a/tests/de_mesh/stl_read/A9 b/tests/de_mesh/stl_read/A9
index 29414dae38d087435a0d8d38fd57da9d441cd9db..8bc8b2930cd4c5b59f52d8779f605e6bd67d85d7 100644 (file)
--- a/tests/de_mesh/stl_read/A9
+++ b/tests/de_mesh/stl_read/A9
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_009.stl] triangulation
+readstl m [locate_data_file model_stl_009.stl]
 
 # Number of triangles check
 checktrinfo m -tri 5678 -nod 2841

diff --git a/tests/de_mesh/stl_read/B1 b/tests/de_mesh/stl_read/B1
index 7471f26f26324c004a55c95d5ad6af48da146ef8..35debdfa8305b333a60771f83badefe89a335cd4 100644 (file)
--- a/tests/de_mesh/stl_read/B1
+++ b/tests/de_mesh/stl_read/B1
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_016.stl] triangulation
+readstl m [locate_data_file model_stl_016.stl]
 
 # Number of triangles check
 checktrinfo m -tri 68 -nod 36

diff --git a/tests/de_mesh/stl_read/B10 b/tests/de_mesh/stl_read/B10
index dc37f45b4887722de328e2ef923ad52fbdc31b3f..b8bf452961a951ec369ec25be7d72f9d5023dd89 100644 (file)
--- a/tests/de_mesh/stl_read/B10
+++ b/tests/de_mesh/stl_read/B10
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_025.stl] triangulation
+readstl m [locate_data_file model_stl_025.stl]
 
 # Number of triangles check
 checktrinfo m -tri 54364 -nod 24452

diff --git a/tests/de_mesh/stl_read/B11 b/tests/de_mesh/stl_read/B11
index 8d13a7e40bf623822e9a0026fb92ca96a66422e0..71a2ff477e8549498ad7a8bb0c64236df361fa23 100644 (file)
--- a/tests/de_mesh/stl_read/B11
+++ b/tests/de_mesh/stl_read/B11
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_026.stl] triangulation
+readstl m [locate_data_file model_stl_026.stl]
 
 # Number of triangles check
 checktrinfo m -tri 41113 -nod 18457

diff --git a/tests/de_mesh/stl_read/B12 b/tests/de_mesh/stl_read/B12
index d964b25e0eb4a0e691b2d5c21fc98b71c3c2ed06..c74e25108bd08973c2cbd9b583f5532b037919ea 100644 (file)
--- a/tests/de_mesh/stl_read/B12
+++ b/tests/de_mesh/stl_read/B12
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_027.stl] triangulation
+readstl m [locate_data_file model_stl_027.stl]
 
 # Number of triangles check
 checktrinfo m -tri 7440 -nod 3720

diff --git a/tests/de_mesh/stl_read/B13 b/tests/de_mesh/stl_read/B13
index 55170fcfbf8abdba8def0ad4a3c43629cf421d79..32db62ffc29c29d5a01e5420029d28c895857fe0 100644 (file)
--- a/tests/de_mesh/stl_read/B13
+++ b/tests/de_mesh/stl_read/B13
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_028.stl] triangulation
+readstl m [locate_data_file model_stl_028.stl]
 
 # Number of triangles check
 checktrinfo m -tri 10956 -nod 5238

diff --git a/tests/de_mesh/stl_read/B14 b/tests/de_mesh/stl_read/B14
index 9ec0c22023bf73068c65719a0ed87274e5028393..f4f08fd3b4b17fe1d4ffbbecfdf9d20514c82e2f 100644 (file)
--- a/tests/de_mesh/stl_read/B14
+++ b/tests/de_mesh/stl_read/B14
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_029.stl] triangulation
+readstl m [locate_data_file model_stl_029.stl]
 
 # Number of triangles check
 checktrinfo m -tri 33313 -nod 15442

diff --git a/tests/de_mesh/stl_read/B15 b/tests/de_mesh/stl_read/B15
index f50053bccc715690cfafb71e5df29238f3048720..1d0eacfb639f91a48abfe48b102efbe40bda4983 100644 (file)
--- a/tests/de_mesh/stl_read/B15
+++ b/tests/de_mesh/stl_read/B15
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_030.stl] triangulation
+readstl m [locate_data_file model_stl_030.stl]
 
 # Number of triangles check
 checktrinfo m -tri 38380 -nod 19158

diff --git a/tests/de_mesh/stl_read/B2 b/tests/de_mesh/stl_read/B2
index 29aee4924f7de15dc92aed3b85a10e75a5518eff..d4c2d4fedfe6a56a7a0b951a58770a0c31ac1520 100644 (file)
--- a/tests/de_mesh/stl_read/B2
+++ b/tests/de_mesh/stl_read/B2
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_017.stl] triangulation
+readstl m [locate_data_file model_stl_017.stl]
 
 # Number of triangles check
 checktrinfo m -tri 1 -nod 3

diff --git a/tests/de_mesh/stl_read/B3 b/tests/de_mesh/stl_read/B3
index 7e9a96860fcccebd6b2140e708a17f2dae42ca33..dea130753f5b5d4d2cbbc0f9c34a3d2c7601dcbd 100644 (file)
--- a/tests/de_mesh/stl_read/B3
+++ b/tests/de_mesh/stl_read/B3
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_018.stl] triangulation
+readstl m [locate_data_file model_stl_018.stl]
 
 # Number of triangles check
 checktrinfo m -tri 2 -nod 5

diff --git a/tests/de_mesh/stl_read/B4 b/tests/de_mesh/stl_read/B4
index aafd93362eef1b18c29b05d0d2906861a657021f..3cedd1601406fec43b152f8228142ba78544c443 100644 (file)
--- a/tests/de_mesh/stl_read/B4
+++ b/tests/de_mesh/stl_read/B4
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_019.stl] triangulation
+readstl m [locate_data_file model_stl_019.stl]
 
 # Number of triangles check
 checktrinfo m -tri 509952 -nod 254992

diff --git a/tests/de_mesh/stl_read/B5 b/tests/de_mesh/stl_read/B5
index b331d217c9d48ff7bfef840db134f48c057e867a..37030b03bfe980977987d77d6eea0779802e5fe4 100644 (file)
--- a/tests/de_mesh/stl_read/B5
+++ b/tests/de_mesh/stl_read/B5
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_020.stl] triangulation
+readstl m [locate_data_file model_stl_020.stl]
 
 # Number of triangles check
 checktrinfo m -tri 26840 -nod 13432

diff --git a/tests/de_mesh/stl_read/B6 b/tests/de_mesh/stl_read/B6
index cfe3e9eae2190723e9358b1ec96f0f568f3eb2cc..040e6a862c585f2a1ed118158dff2e5bc09bd22b 100644 (file)
--- a/tests/de_mesh/stl_read/B6
+++ b/tests/de_mesh/stl_read/B6
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_021.stl] triangulation
+readstl m [locate_data_file model_stl_021.stl]
 
 # Number of triangles check
 checktrinfo m -tri 63268 -nod 31445

diff --git a/tests/de_mesh/stl_read/B7 b/tests/de_mesh/stl_read/B7
index 1e90521217824024712aeb36fc71cfb708067407..128bff4f701eccf8c82b821f31b369b1dbe38203 100644 (file)
--- a/tests/de_mesh/stl_read/B7
+++ b/tests/de_mesh/stl_read/B7
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_022.stl] triangulation
+readstl m [locate_data_file model_stl_022.stl]
 
 # Number of triangles check
 checktrinfo m -tri 4388 -nod 2194

diff --git a/tests/de_mesh/stl_read/B8 b/tests/de_mesh/stl_read/B8
index 60a64f356a4a46dfcb62bbf35f7da076d3d8b3ad..e03dd631949307ba33483142f35952709498d906 100644 (file)
--- a/tests/de_mesh/stl_read/B8
+++ b/tests/de_mesh/stl_read/B8
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_023.stl] triangulation
+readstl m [locate_data_file model_stl_023.stl]
 
 # Number of triangles check
 checktrinfo m -tri 288 -nod 144

diff --git a/tests/de_mesh/stl_read/B9 b/tests/de_mesh/stl_read/B9
index 0d301f0df34bf1dcd09d5d8489a9cb79da97a0af..278ad3a82b8eb403ef59bc2939f376751558be50 100644 (file)
--- a/tests/de_mesh/stl_read/B9
+++ b/tests/de_mesh/stl_read/B9
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_024.stl] triangulation
+readstl m [locate_data_file model_stl_024.stl]
 
 # Number of triangles check
 checktrinfo m -tri 116 -nod 60

diff --git a/tests/de_mesh/stl_read/C1 b/tests/de_mesh/stl_read/C1
index 724a954b364855169d733fae1589cdbc25ac54db..59402d97166244188f6f59b404bcc69926cee8b0 100644 (file)
--- a/tests/de_mesh/stl_read/C1
+++ b/tests/de_mesh/stl_read/C1
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_031.stl] triangulation
+readstl m [locate_data_file model_stl_031.stl]
 
 # Number of triangles check
 checktrinfo m -tri 29606 -nod 14817

diff --git a/tests/de_mesh/stl_read/C10 b/tests/de_mesh/stl_read/C10
index b19ade9c37b464ecca21f5bd54ead2afed9379c1..ed77395e6f667c19eb32dc1c533e593778b5b924 100644 (file)
--- a/tests/de_mesh/stl_read/C10
+++ b/tests/de_mesh/stl_read/C10
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_040.stl] triangulation
+readstl m [locate_data_file model_stl_040.stl]
 
 # Number of triangles check
 checktrinfo m -tri 5720 -nod 2864

diff --git a/tests/de_mesh/stl_read/C11 b/tests/de_mesh/stl_read/C11
index d1015545e9d7898c1f783ea453e474c559983909..f8f8f7ced055048a8fe84645f7da545d2b93d03d 100644 (file)
--- a/tests/de_mesh/stl_read/C11
+++ b/tests/de_mesh/stl_read/C11
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_041.stl] triangulation
+readstl m [locate_data_file model_stl_041.stl]
 
 # Number of triangles check
 checktrinfo m -tri 6082 -nod 3052

diff --git a/tests/de_mesh/stl_read/C12 b/tests/de_mesh/stl_read/C12
index 33a35065c11dcaf6bb134eac44a67be1676b9821..4551264e8a547d03b560bb2bf6c390d49c4ed473 100644 (file)
--- a/tests/de_mesh/stl_read/C12
+++ b/tests/de_mesh/stl_read/C12
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_042.stl] triangulation
+readstl m [locate_data_file model_stl_042.stl]
 
 # Number of triangles check
 checktrinfo m -tri 10131 -nod 5068

diff --git a/tests/de_mesh/stl_read/C13 b/tests/de_mesh/stl_read/C13
index fbaa132ee9f77810910087f110a3a721ea52b10a..2bf0ce3cb3098ce9f0fc9dc6d319b2db15c61316 100644 (file)
--- a/tests/de_mesh/stl_read/C13
+++ b/tests/de_mesh/stl_read/C13
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_043.stl] triangulation
+readstl m [locate_data_file model_stl_043.stl]
 
 # Number of triangles check
 checktrinfo m -tri 17780 -nod 8954

diff --git a/tests/de_mesh/stl_read/C14 b/tests/de_mesh/stl_read/C14
index 3b2304effd3fa1e0bb1792e4484446c7dff931b4..e7dc7621cbd54dcf223961c945eac661e341f568 100644 (file)
--- a/tests/de_mesh/stl_read/C14
+++ b/tests/de_mesh/stl_read/C14
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_044.stl] triangulation
+readstl m [locate_data_file model_stl_044.stl]
 
 # Number of triangles check
 checktrinfo m -tri 5998 -nod 3002

diff --git a/tests/de_mesh/stl_read/C15 b/tests/de_mesh/stl_read/C15
index 380b0c7c65ea5de87f8668f21e460b20bb23d8fe..3c6fce881a4577649d9ac6c538dddb54eda97188 100644 (file)
--- a/tests/de_mesh/stl_read/C15
+++ b/tests/de_mesh/stl_read/C15
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_045.stl] triangulation
+readstl m [locate_data_file model_stl_045.stl]
 
 # Number of triangles check
 checktrinfo m -tri 19011 -nod 9598

diff --git a/tests/de_mesh/stl_read/C2 b/tests/de_mesh/stl_read/C2
index 92e960fe73a2596c141066f75f27f60fe2228fe6..58459f540254b0cc945f0928a4d5aae34f6a9d5f 100644 (file)
--- a/tests/de_mesh/stl_read/C2
+++ b/tests/de_mesh/stl_read/C2
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_032.stl] triangulation
+readstl m [locate_data_file model_stl_032.stl]
 
 # Number of triangles check
 checktrinfo m -tri 4340 -nod 2172

diff --git a/tests/de_mesh/stl_read/C3 b/tests/de_mesh/stl_read/C3
index 91c2b3a3d6edf5c5f45045d0f2178b8505d1fbf0..65cee8a70f5ee80e74924ca6e69450e9b7b90397 100644 (file)
--- a/tests/de_mesh/stl_read/C3
+++ b/tests/de_mesh/stl_read/C3
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_033.stl] triangulation
+readstl m [locate_data_file model_stl_033.stl]
 
 # Number of triangles check
 checktrinfo m -tri 25560 -nod 12928

diff --git a/tests/de_mesh/stl_read/C4 b/tests/de_mesh/stl_read/C4
index 550104d0561c62d3168c140cf3a694712cbeee89..2e2bf50ee65ad6b2fb66e34a3d34fab48a6069a6 100644 (file)
--- a/tests/de_mesh/stl_read/C4
+++ b/tests/de_mesh/stl_read/C4
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_034.stl] triangulation
+readstl m [locate_data_file model_stl_034.stl]
 
 # Number of triangles check
 checktrinfo m -tri 10762 -nod 5387

diff --git a/tests/de_mesh/stl_read/C5 b/tests/de_mesh/stl_read/C5
index 0a8e5b5c65d8260e02bb092fe88f9455e2603ad0..e9b284dd85f616fa045d8714b04447b34ca39732 100644 (file)
--- a/tests/de_mesh/stl_read/C5
+++ b/tests/de_mesh/stl_read/C5
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_035.stl] triangulation
+readstl m [locate_data_file model_stl_035.stl]
 
 # Number of triangles check
 checktrinfo m -tri 21778 -nod 10963

diff --git a/tests/de_mesh/stl_read/C6 b/tests/de_mesh/stl_read/C6
index 6be3e8faeb00e4a20928ddea28a7f7432585ef72..77c6534c9c97a1212592e1f1451d7d01544a85b2 100644 (file)
--- a/tests/de_mesh/stl_read/C6
+++ b/tests/de_mesh/stl_read/C6
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_036.stl] triangulation
+readstl m [locate_data_file model_stl_036.stl]
 
 # Number of triangles check
 checktrinfo m -tri 7806 -nod 3907

diff --git a/tests/de_mesh/stl_read/C7 b/tests/de_mesh/stl_read/C7
index 3ac2724399ffd47fab3c9376925f6228c8fd32de..f7d0b486e2f4a8ee4bc04f2a4e5caa5032f153d1 100644 (file)
--- a/tests/de_mesh/stl_read/C7
+++ b/tests/de_mesh/stl_read/C7
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_037.stl] triangulation
+readstl m [locate_data_file model_stl_037.stl]
 
 # Number of triangles check
 checktrinfo m -tri 8286 -nod 4164

diff --git a/tests/de_mesh/stl_read/C8 b/tests/de_mesh/stl_read/C8
index dcf04b71317334c6e1d124f6a81a61e3d9abeb27..87eb51ac9c088e4146037a0ea02e4c1c068f526c 100644 (file)
--- a/tests/de_mesh/stl_read/C8
+++ b/tests/de_mesh/stl_read/C8
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_038.stl] triangulation
+readstl m [locate_data_file model_stl_038.stl]
 
 # Number of triangles check
 checktrinfo m -tri 6811 -nod 3408

diff --git a/tests/de_mesh/stl_read/C9 b/tests/de_mesh/stl_read/C9
index 3d85f5109b295be9c866551693591332c3487e96..fc1729882c46c932df0ea645d03db181b9602984 100644 (file)
--- a/tests/de_mesh/stl_read/C9
+++ b/tests/de_mesh/stl_read/C9
@@ -1,4 +1,4 @@
-readstl m [locate_data_file model_stl_039.stl] triangulation
+readstl m [locate_data_file model_stl_039.stl]
 
 # Number of triangles check
 checktrinfo m -tri 19651 -nod 9862

diff --git a/tests/de_mesh/stl_read/D1 b/tests/de_mesh/stl_read/D1
index 2161e54e2ba7a11e2c7d1e6a9b1da99d5abfe144..e712b80e0175fe720cac327566620b20553ca9a6 100644 (file)
--- a/tests/de_mesh/stl_read/D1
+++ b/tests/de_mesh/stl_read/D1
@@ -19,7 +19,7 @@ set fd [open ${imagedir}/${casename}_one_ascii_dos.stl w]
 fconfigure $fd -translation crlf
 puts $fd $minimal_ascii_stl
 close $fd
-readstl res_one_ascii_dos ${imagedir}/${casename}_one_ascii_dos.stl
+readstl res_one_ascii_dos ${imagedir}/${casename}_one_ascii_dos.stl -brep
 checknbshapes res_one_ascii_dos -face 1
 
 puts "\n#======================================================================"
@@ -29,7 +29,7 @@ set fd [open ${imagedir}/${casename}_one_ascii_unix.stl w]
 fconfigure $fd -translation lf
 puts $fd $minimal_ascii_stl
 close $fd
-readstl res_one_ascii_unix ${imagedir}/${casename}_one_ascii_unix.stl
+readstl res_one_ascii_unix ${imagedir}/${casename}_one_ascii_unix.stl -brep
 checknbshapes res_one_ascii_unix -face 1
 
 puts "\n#======================================================================"
@@ -39,7 +39,7 @@ set fd [open ${imagedir}/${casename}_one_ascii_noeol.stl w]
 fconfigure $fd -translation lf
 puts -nonewline $fd $minimal_ascii_stl
 close $fd
-readstl res_one_ascii_noeol ${imagedir}/${casename}_one_ascii_noeol.stl
+readstl res_one_ascii_noeol ${imagedir}/${casename}_one_ascii_noeol.stl -brep
 checknbshapes res_one_ascii_noeol -face 1
 
 puts "\n#======================================================================"
@@ -49,7 +49,7 @@ set fd [open ${imagedir}/${casename}_zero_ascii_dos.stl w]
 fconfigure $fd -translation crlf
 puts $fd "solid \nendsolid"
 close $fd
-readstl res_zero_ascii_dos ${imagedir}/${casename}_zero_ascii_dos.stl
+readstl res_zero_ascii_dos ${imagedir}/${casename}_zero_ascii_dos.stl -brep
 
 puts "\n#======================================================================"
 puts "# Ascii file with no facets, LF"
@@ -58,7 +58,7 @@ set fd [open ${imagedir}/${casename}_zero_ascii_unix.stl w]
 fconfigure $fd -translation lf
 puts $fd "solid \nendsolid"
 close $fd
-readstl res_zero_ascii_unix ${imagedir}/${casename}_zero_ascii_unix.stl
+readstl res_zero_ascii_unix ${imagedir}/${casename}_zero_ascii_unix.stl -brep
 
 puts "\n#======================================================================"
 puts "# Binary file with single facet"
@@ -68,7 +68,7 @@ fconfigure $fd -translation binary
 puts -nonewline $fd "stl [string repeat { } 76]"
 puts -nonewline $fd [binary format if3f3f3f3t 1 {0 0 1} {0 0 0} {1 0 0} {0 1 0} 0]
 close $fd
-readstl res_one_binary ${imagedir}/${casename}_one_binary.stl
+readstl res_one_binary ${imagedir}/${casename}_one_binary.stl -brep
 checknbshapes res_one_binary -face 1
 
 puts "\n#======================================================================"
@@ -79,7 +79,7 @@ set fd [open ${imagedir}/${casename}_zero_binary.stl w]
 fconfigure $fd -translation binary
 puts -nonewline $fd "stl [string repeat { } 76][binary format i 0]"
 close $fd
-readstl res_zero_binary ${imagedir}/${casename}_zero_binary.stl
+readstl res_zero_binary ${imagedir}/${casename}_zero_binary.stl -brep
 
 puts "\n#======================================================================"
 puts "# Empty file"
@@ -87,5 +87,5 @@ puts "#======================================================================"
 puts "REQUIRED ALL: Error: unexpected format of facet at line 2"
 set fd [open ${imagedir}/${casename}_empty.stl w]
 close $fd
-readstl res_empty ${imagedir}/${casename}_empty.stl
+readstl res_empty ${imagedir}/${casename}_empty.stl -brep