Fix GOCAD IO plugin (#9445)

Author: sloriot

BGL/include/CGAL/boost/graph/IO/GOCAD.h

@@ -103,6 +103,11 @@ class GOCAD_builder
 ///     \cgalParamType{Boolean}
 ///     \cgalParamDefault{`false`}
 ///   \cgalParamNEnd
+///   \cgalParamNBegin{read_only_one_object}
+///     \cgalParamDescription{if `true` only one GOCAD object will be read in the stream,  and the stream will be left ready for the reading of the next GOCAD object.}
+///     \cgalParamType{Boolean}
+///     \cgalParamDefault{`false`}
+///   \cgalParamNEnd
 /// \cgalNamedParamsEnd
 ///
 /// \returns `true` if reading was successful and the resulting mesh is valid, `false` otherwise.
@@ -175,6 +180,11 @@ bool read_GOCAD(std::istream& is, Graph& g, const CGAL_NP_CLASS& np = parameters
 ///     \cgalParamType{Boolean}
 ///     \cgalParamDefault{`false`}
 ///   \cgalParamNEnd
+///   \cgalParamNBegin{read_only_one_object}
+///     \cgalParamDescription{if `true` only one GOCAD object will be read in the stream,  and the stream will be left ready for the reading of the next GOCAD object.}
+///     \cgalParamType{Boolean}
+///     \cgalParamDefault{`false`}
+///   \cgalParamNEnd
 /// \cgalNamedParamsEnd
 ///
 /// \sa Overloads of this function for specific models of the concept `FaceGraph`.

BGL/include/CGAL/boost/graph/IO/Generic_facegraph_builder.h

@@ -88,6 +88,7 @@ class Generic_facegraph_builder
 
     const bool verbose = choose_parameter(get_parameter(np, internal_np::verbose), false);
     const bool binary = choose_parameter(get_parameter(np, internal_np::use_binary_mode), true);
+    const bool read_only_one_object = choose_parameter(get_parameter(np, internal_np::read_only_one_object), false);
 
     bool ok =
         static_cast<Derived*>(this)->read(m_is, m_points, m_faces,
@@ -96,7 +97,8 @@ class Generic_facegraph_builder
                                                      .vertex_texture_output_iterator(std::back_inserter(vertex_textures))
                                                      .face_color_output_iterator(std::back_inserter(face_colors))
                                                      .verbose(verbose)
-                                                     .use_binary_mode(binary));
+                                                     .use_binary_mode(binary)
+                                                     .read_only_one_object(read_only_one_object));
     if(!ok)
       return false;
 

BGL/test/BGL/test_bgl_read_write.cpp

@@ -710,7 +710,9 @@ void test_bgl_GOCAD(const char* filename)
   assert(ok);
   assert(num_vertices(fg) != 0 && num_faces(fg) != 0);
 
-  is.seekg(0);
+  is.close();
+  is.open(filename);
+
   CGAL::clear(fg);
   std::pair<std::string, std::string> name_and_color;
   ok = CGAL::IO::read_GOCAD(is, name_and_color, fg);

Lab/demo/Lab/Plugins/IO/GOCAD_io_plugin.cpp

@@ -39,7 +39,8 @@ class CGAL_Lab_gocad_plugin :
 };
 
 QString CGAL_Lab_gocad_plugin::nameFilters() const {
-  return "GOCAD files (*.ts)";
+  return "GOCAD files (*.ts *.ml)";
+
 }
 
 bool CGAL_Lab_gocad_plugin::canLoad(QFileInfo) const {
@@ -52,53 +53,72 @@ CGAL_Lab_gocad_plugin::load(QFileInfo fileinfo, bool& ok, bool add_to_scene) {
 
   // Open file
   std::ifstream in(fileinfo.filePath().toUtf8());
+  QList<Scene_item*>  new_item_list;
   if(!in) {
     std::cerr << "Error! Cannot open file " << (const char*)fileinfo.filePath().toUtf8() << std::endl;
     ok = false;
-    return QList<Scene_item*>();
+    return new_item_list;
   }
-  in.close();
 
   CGAL::Timer t;
   t.start();
-  // Try to read GOCAD file in a surface_mesh
-  Scene_surface_mesh_item* item = new Scene_surface_mesh_item(new SMesh());
-  if(fileinfo.size() == 0)
+
+  SMesh P;
+  std::pair<std::string,std::string> name_and_color;
+  while(!in.eof() && CGAL::IO::read_GOCAD(in, name_and_color, P, CGAL::parameters::read_only_one_object(true)))
   {
-    CGAL::Three::Three::warning( tr("The file you are trying to load is empty."));
-    ok = true;
+    if (P.is_empty()) continue; // skip non-handled objects
+
+    Scene_surface_mesh_item* item = new Scene_surface_mesh_item(new SMesh(std::move(P)));
+
+    P = SMesh();
+
+    if(name_and_color.first.size() == 0){
+      item->setName(fileinfo.completeBaseName());
+    } else {
+      item->setName(name_and_color.first.c_str());
+    }
+    QColor qcolor(name_and_color.second.c_str());
+    if(qcolor.isValid())
+    {
+      item->setColor(qcolor);
+    }
+    item->invalidateOpenGLBuffers();
+
     if(add_to_scene)
        CGAL::Three::Three::scene()->addItem(item);
-    return QList<Scene_item*>()<<item;
+
+    new_item_list << item;
   }
-  SMesh& P = * const_cast<SMesh*>(item->polyhedron());
 
-  std::pair<std::string,std::string> name_and_color;
-  if(! CGAL::IO::read_GOCAD(in, name_and_color, P))
+  std::cout << new_item_list.size() << "\n";
+
+  if (in.bad())
   {
-    std::cerr << "Error: Invalid polyhedron" << std::endl;
-    delete item;
-    ok = false;
-    return QList<Scene_item*>();
+    std::cerr << "Error while parsing file" << std::endl;
+    ok=false;
+    for(auto item : new_item_list)
+      delete item;
+    new_item_list.clear();
+    return new_item_list;
   }
 
+  ok = true;
+
   t.stop();
   std::cerr << "Reading took " << t.time() << " sec." << std::endl;
-  if(name_and_color.first.size() == 0){
-    item->setName(fileinfo.completeBaseName());
-  } else {
-    item->setName(name_and_color.first.c_str());
-  }
-  QColor qcolor(name_and_color.second.c_str());
-  if(qcolor.isValid())
+
+  if (new_item_list.size()>1)
   {
-    item->setColor(qcolor);
+    Scene_group_item* group = new Scene_group_item(fileinfo.completeBaseName());
+    if(add_to_scene)
+      CGAL::Three::Three::scene()->addItem(group);
+    for (Scene_item* item : new_item_list)
+      CGAL::Three::Three::scene()->changeGroup(item, group);
+    return QList<Scene_item*>()<<group;
   }
-  item->invalidateOpenGLBuffers();
-  ok = true;
-  if(add_to_scene)
-     CGAL::Three::Three::scene()->addItem(item);
-  return QList<Scene_item*>()<<item;
+
+  return new_item_list;
 }
 
 bool CGAL_Lab_gocad_plugin::canSave(const CGAL::Three::Scene_item* item)

STL_Extension/include/CGAL/STL_Extension/internal/parameters_interface.h

@@ -65,6 +65,7 @@ CGAL_add_named_parameter(face_color_map_t, face_color_map, face_color_map)
 CGAL_add_named_parameter(repair_polygon_soup_t, repair_polygon_soup, repair_polygon_soup)
 CGAL_add_named_parameter(output_color_t, output_color, output_color)
 CGAL_add_named_parameter(stream_precision_t, stream_precision, stream_precision)
+CGAL_add_named_parameter(read_only_one_object_t, read_only_one_object, read_only_one_object)
 
 // List of named parameters that we use in the package 'Mesh_3'
 CGAL_add_named_parameter(vertex_feature_degree_t, vertex_feature_degree, vertex_feature_degree_map)

Stream_support/include/CGAL/IO/GOCAD.h

@@ -53,6 +53,8 @@ bool read_GOCAD(std::istream& is,
   typedef typename boost::range_value<PolygonRange>::type   Poly;
 
   const bool verbose = parameters::choose_parameter(parameters::get_parameter(np, internal_np::verbose), false);
+  const bool read_only_one_object = parameters::choose_parameter(parameters::get_parameter(np, internal_np::read_only_one_object), false);
+
 
   if(!is)
   {
@@ -63,15 +65,17 @@ bool read_GOCAD(std::istream& is,
 
   set_ascii_mode(is); // GOCAD is ASCII only
 
-  int offset = 0;
   std::string s;
   Point p;
-  bool vertices_read = false,
-      end_read = false;
+
+  bool vertices_read = false;
+  std::size_t offset=0;
+  int l_offset=0;
+  int nb_gocad=0;
+  int nb_end=0;
+  bool end_read=true;
 
   std::string line;
-  std::size_t nb_gocad=1, //don't read the first one, it is optional anyway.
-      nb_end=0;
   while(std::getline(is, line))
   {
     if(line.empty())
@@ -81,39 +85,18 @@ bool read_GOCAD(std::istream& is,
     if(!(iss >> s))
       continue; // can't read anything on the line, whitespace only?
 
-    if(s == "TFACE")
-    {
-      break;
-    }
-
-    std::string::size_type idx;
-    if((idx = s.find("name")) != std::string::npos)
+    if(s == "GOCAD")
     {
-      std::size_t pos = s.find(":")+1;
-      name_and_color.first = s.substr(pos, s.length());
+      ++nb_gocad;
+      offset=points.size();
+      vertices_read = false;
+      end_read = false;
     }
-
-    if((idx = s.find("color")) != std::string::npos)
-    {
-      std::size_t pos = s.find(":")+1;
-      name_and_color.second = s.substr(pos, s.length());
-    }
-  }
-
-  while(std::getline(is, line))
-  {
-    if(line.empty())
-      continue;
-
-    std::istringstream iss(line);
-    if(line.find("GOCAD ") != std::string::npos) //the whitespace matters, it is used to define a gocad type, but not in the coord system keyword, for example.
-      nb_gocad++;
-
-    if((line.find("VRTX") != std::string::npos))
+    else if(s=="VRTX")
     {
       int i;
       double x, y, z;
-      if(!(iss >> s >> i >> IO::iformat(x) >> IO::iformat(y) >> IO::iformat(z)))
+      if(!(iss >> i >> IO::iformat(x) >> IO::iformat(y) >> IO::iformat(z)))
       {
         if(verbose)
           std::cerr << "error while reading vertex." << std::endl;
@@ -123,18 +106,14 @@ bool read_GOCAD(std::istream& is,
       if(!vertices_read)
       {
         vertices_read = true;
-        offset -= i; // Some files start with index 0 others with 1
+        l_offset = -i;
       }
 
       internal::fill_point(x, y, z, 1., p);
       points.push_back(p);
     }
-    else if(line[0] == 'T')
+    else if(s == "TRGL")
     {
-      iss >> s;
-      if(s != "TRGL")
-        continue;
-
       int i,j,k;
       if(!(iss >> i >> j >> k))
       {
@@ -145,20 +124,40 @@ bool read_GOCAD(std::istream& is,
 
       Poly new_face;
       ::CGAL::internal::resize(new_face, 3);
-      new_face[0] = offset + i;
-      new_face[1] = offset + j;
-      new_face[2] = offset + k;
+      new_face[0] =  offset + (l_offset + i);
+      new_face[1] =  offset + (l_offset + j);
+      new_face[2] =  offset + (l_offset + k);
       polygons.push_back(new_face);
     }
-    else if(line == "END")
+    else if (s=="END")
     {
+      ++nb_end;
       end_read=true;
-      nb_end++;
+      if (read_only_one_object)
+        break;
+    }
+    else if (s=="HEADER")
+    {
+      while(std::getline(is, line))
+      {
+        std::string::size_type idx;
+        if((idx = line.find("name")) != std::string::npos)
+        {
+          std::size_t pos = line.find(":")+1;
+          name_and_color.first = line.substr(pos, line.length());
+        }
+        else if((idx = line.find("color")) != std::string::npos)
+        {
+          std::size_t pos = line.find(":")+1;
+          name_and_color.second = line.substr(pos, line.length());
+        }
+        else if((idx = line.find("}")) != std::string::npos)
+          break;
+      }
     }
   }
-  if(is.eof())
-    is.clear(std::ios::goodbit);
-  return end_read && nb_gocad == nb_end && !is.bad();
+
+  return nb_gocad!=0 && end_read && nb_gocad == nb_end && !is.bad();
 }
 /// \endcond
 
@@ -187,6 +186,11 @@ bool read_GOCAD(std::istream& is,
  *     \cgalParamType{Boolean}
  *     \cgalParamDefault{`false`}
  *   \cgalParamNEnd
+ *   \cgalParamNBegin{read_only_one_object}
+ *     \cgalParamDescription{if `true` only one GOCAD object will be read in the stream,  and the stream will be left ready for the reading of the next GOCAD object.}
+ *     \cgalParamType{Boolean}
+ *     \cgalParamDefault{`false`}
+ *   \cgalParamNEnd
  * \cgalNamedParamsEnd
  *
  * \returns `true` if the reading was successful, `false` otherwise.
@@ -230,6 +234,11 @@ bool read_GOCAD(std::istream& is,
  *     \cgalParamType{Boolean}
  *     \cgalParamDefault{`false`}
  *   \cgalParamNEnd
+ *   \cgalParamNBegin{read_only_one_object}
+ *     \cgalParamDescription{if `true` only one GOCAD object will be read in the stream,  and the stream will be left ready for the reading of the next GOCAD object.}
+ *     \cgalParamType{Boolean}
+ *     \cgalParamDefault{`false`}
+ *   \cgalParamNEnd
  * \cgalNamedParamsEnd
  *
  * \returns `true` if the reading was successful, `false` otherwise.