songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Factorization

This commit is contained in:
Maxime Gimeno 2021-01-28 10:01:52 +01:00
parent 2d59464b2b
commit 7bf9c14f72
16 changed files with 31 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BGL/include/CGAL/boost/graph/IO/GOCAD.h
View File

@ -18,7 +18,7 @@
#include <CGAL/boost/graph/IO/Generic_facegraph_builder.h> #include <CGAL/boost/graph/IO/Generic_facegraph_builder.h>
#include <CGAL/boost/graph/iterator.h> #include <CGAL/boost/graph/iterator.h>
#include <CGAL/boost/graph/Named_function_parameters.h> #include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <boost/container/flat_map.hpp> #include <boost/container/flat_map.hpp>
#include <fstream> #include <fstream>
@ -303,12 +303,7 @@ bool write_GOCAD(std::ostream& os,
if(!os.good()) if(!os.good())
return false; return false;
if(!parameters::is_default_parameter( set_default_stream_precision(os, np);
parameters::get_parameter(np, internal_np::stream_precision)))
{
const int precision = choose_parameter(get_parameter(np, internal_np::stream_precision), 6);
os.precision(precision);
}
os << "GOCAD TSurf 1\n" os << "GOCAD TSurf 1\n"
"HEADER {\n" "HEADER {\n"

8
BGL/include/CGAL/boost/graph/IO/Generic_facegraph_printer.h
View File

@ -117,13 +117,7 @@ public:
if(!m_os.good()) if(!m_os.good())
return false; return false;
if(!CGAL::parameters::is_default_parameter( set_default_stream_precision(m_os, np);
get_parameter(np, internal_np::stream_precision)))
{
const int precision = choose_parameter(
get_parameter(np, internal_np::stream_precision), 6);
m_os.precision(precision);
}
VPM vpm = choose_parameter(get_parameter(np, internal_np::vertex_point), VPM vpm = choose_parameter(get_parameter(np, internal_np::vertex_point),
get_const_property_map(CGAL::vertex_point, g)); get_const_property_map(CGAL::vertex_point, g));

7
BGL/include/CGAL/boost/graph/IO/PLY.h
View File

@ -361,12 +361,7 @@ bool write_PLY(std::ostream& os,
if(!os.good()) if(!os.good())
return false; return false;
if(!parameters::is_default_parameter( set_default_stream_precision(os, np);
parameters::get_parameter(np, internal_np::stream_precision)))
{
const int precision = choose_parameter(get_parameter(np, internal_np::stream_precision), 6);
os.precision(precision);
}
// Write header // Write header
os << "ply" << std::endl os << "ply" << std::endl

7
BGL/include/CGAL/boost/graph/IO/STL.h
View File

@ -262,12 +262,7 @@ bool write_STL(std::ostream& os,
if(!os.good()) if(!os.good())
return false; return false;
if(!parameters::is_default_parameter( set_default_stream_precision(os, np);
parameters::get_parameter(np, internal_np::stream_precision)))
{
const int precision = choose_parameter(get_parameter(np, internal_np::stream_precision), 6);
os.precision(precision);
}
if(get_mode(os) == IO::BINARY) if(get_mode(os) == IO::BINARY)
{ {

7
BGL/include/CGAL/boost/graph/IO/VTK.h
View File

@ -439,12 +439,7 @@ bool write_VTP(std::ostream& os,
if(!os.good()) if(!os.good())
return false; return false;
if(!parameters::is_default_parameter( set_default_stream_precision(os, np);
parameters::get_parameter(np, internal_np::stream_precision)))
{
const int precision = choose_parameter(get_parameter(np, internal_np::stream_precision), 6);
os.precision(precision);
}
os << "<?xml version=\"1.0\"?>\n" os << "<?xml version=\"1.0\"?>\n"
<< "<VTKFile type=\"PolyData\" version=\"0.1\""; << "<VTKFile type=\"PolyData\" version=\"0.1\"";

12
BGL/include/CGAL/boost/graph/named_params_helper.h
View File

@ -560,6 +560,18 @@ CGAL_DEF_GET_INITIALIZED_INDEX_MAP(face, typename boost::graph_traits<Graph>::fa
Alpha_expansion_boost_adjacency_list_tag Alpha_expansion_boost_adjacency_list_tag
>::type type; >::type type;
}; };
template<typename NP>
void set_default_stream_precision(std::ostream& os, const NP& np)
{
if(!parameters::is_default_parameter(
parameters::get_parameter(np, internal_np::stream_precision)))
{
const int precision = parameters::choose_parameter<int>(
parameters::get_parameter(np, internal_np::stream_precision));
os.precision(precision);
}
}
} //namespace CGAL } //namespace CGAL

7
Point_set_3/include/CGAL/Point_set_3/IO/PLY.h
View File

@ -493,12 +493,7 @@ bool write_PLY(std::ostream& os,
return false; return false;
} }
if(!parameters::is_default_parameter( set_default_stream_precision(os, np);
parameters::get_parameter(np, internal_np::stream_precision)))
{
const int precision = choose_parameter(get_parameter(np, internal_np::stream_precision), 6);
os.precision(precision);
}
os << "ply" << std::endl os << "ply" << std::endl
<< ((get_mode(os) == IO::BINARY) ? "format binary_little_endian 1.0" : "format ascii 1.0") << std::endl << ((get_mode(os) == IO::BINARY) ? "format binary_little_endian 1.0" : "format ascii 1.0") << std::endl

7
Point_set_processing_3/include/CGAL/IO/write_off_points.h
View File

@ -66,12 +66,7 @@ bool write_OFF_PSP(std::ostream& os,
return false; return false;
} }
if(!parameters::is_default_parameter( set_default_stream_precision(os, np);
parameters::get_parameter(np, internal_np::stream_precision)))
{
const int precision = choose_parameter(get_parameter(np, internal_np::stream_precision), 6);
os.precision(precision);
}
// Write header // Write header
os << "NOFF" << std::endl; os << "NOFF" << std::endl;

7
Point_set_processing_3/include/CGAL/IO/write_ply_points.h
View File

@ -212,12 +212,7 @@ bool write_PLY(std::ostream& os,
return false; return false;
} }
if(!parameters::is_default_parameter( set_default_stream_precision(os, np);
parameters::get_parameter(np, internal_np::stream_precision)))
{
const int precision = choose_parameter(get_parameter(np, internal_np::stream_precision), 6);
os.precision(precision);
}
if (has_normals) if (has_normals)
return write_PLY_with_properties(os, points, return write_PLY_with_properties(os, points,

7
Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
View File

@ -67,12 +67,7 @@ bool write_XYZ_PSP(std::ostream& os,
return false; return false;
} }
if(!parameters::is_default_parameter( set_default_stream_precision(os, np);
parameters::get_parameter(np, internal_np::stream_precision)))
{
const int precision = choose_parameter(get_parameter(np, internal_np::stream_precision), 6);
os.precision(precision);
}
// Write positions + normals // Write positions + normals
for(typename PointRange::const_iterator it = points.begin(); it != points.end(); it++) for(typename PointRange::const_iterator it = points.begin(); it != points.end(); it++)

7
Stream_support/include/CGAL/IO/GOCAD.h
View File

@ -299,12 +299,7 @@ bool write_GOCAD(std::ostream& os,
set_ascii_mode(os); // GOCAD is ASCII only set_ascii_mode(os); // GOCAD is ASCII only
if(!parameters::is_default_parameter( set_default_stream_precision(os, np);
parameters::get_parameter(np, internal_np::stream_precision)))
{
const int precision = choose_parameter(get_parameter(np, internal_np::stream_precision), 6);
os.precision(precision);
}
os << "GOCAD TSurf 1\n" os << "GOCAD TSurf 1\n"
"HEADER {\n" "HEADER {\n"

7
Stream_support/include/CGAL/IO/Generic_writer.h
View File

@ -49,12 +49,7 @@ public:
if(!m_os.good()) if(!m_os.good())
return false; return false;
if(!parameters::is_default_parameter( set_default_stream_precision(m_os, np);
parameters::get_parameter(np, internal_np::stream_precision)))
{
const int precision = choose_parameter(get_parameter(np, internal_np::stream_precision), 6);
m_os.precision(precision);
}
m_writer.write_header(m_os, points.size(), 0, polygons.size()); m_writer.write_header(m_os, points.size(), 0, polygons.size());
for(std::size_t i=0, end=points.size(); i<end; ++i) for(std::size_t i=0, end=points.size(); i<end; ++i)

8
Stream_support/include/CGAL/IO/PLY.h
View File

@ -17,6 +17,7 @@
#include <CGAL/IO/helpers.h> #include <CGAL/IO/helpers.h>
#include <CGAL/boost/graph/Named_function_parameters.h> #include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <CGAL/property_map.h> #include <CGAL/property_map.h>
#include <CGAL/iterator.h> #include <CGAL/iterator.h>
@ -467,12 +468,7 @@ bool write_PLY(std::ostream& out,
if(!out.good()) if(!out.good())
return false; return false;
if(!parameters::is_default_parameter( set_default_stream_precision(out, np);
parameters::get_parameter(np, internal_np::stream_precision)))
{
const int precision = choose_parameter(get_parameter(np, internal_np::stream_precision), 6);
out.precision(precision);
}
// Write header // Write header
out << "ply" << std::endl out << "ply" << std::endl

7
Stream_support/include/CGAL/IO/STL.h
View File

@ -317,12 +317,7 @@ bool write_STL(std::ostream& os,
if(!os.good()) if(!os.good())
return false; return false;
if(!parameters::is_default_parameter( set_default_stream_precision(os, np);
parameters::get_parameter(np, internal_np::stream_precision)))
{
const int precision = choose_parameter(get_parameter(np, internal_np::stream_precision), 6);
os.precision(precision);
}
if(get_mode(os) == IO::BINARY) if(get_mode(os) == IO::BINARY)
{ {

9
Stream_support/include/CGAL/IO/VTK.h
View File

@ -19,6 +19,8 @@
#include <CGAL/IO/VTK/VTK_writer.h> #include <CGAL/IO/VTK/VTK_writer.h>
#include <CGAL/boost/graph/Named_function_parameters.h> #include <CGAL/boost/graph/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#ifdef CGAL_USE_VTK #ifdef CGAL_USE_VTK
#include <vtkSmartPointer.h> #include <vtkSmartPointer.h>
@ -393,12 +395,7 @@ bool write_VTP(std::ostream& os,
if(!os.good()) if(!os.good())
return false; return false;
if(!parameters::is_default_parameter( set_default_stream_precision(os, np);
parameters::get_parameter(np, internal_np::stream_precision)))
{
const int precision = choose_parameter(get_parameter(np, internal_np::stream_precision), 6);
os.precision(precision);
}
os << "<?xml version=\"1.0\"?>\n" os << "<?xml version=\"1.0\"?>\n"
<< "<VTKFile type=\"PolyData\" version=\"0.1\""; << "<VTKFile type=\"PolyData\" version=\"0.1\"";

7
Surface_mesh/include/CGAL/Surface_mesh/IO/PLY.h
View File

@ -921,12 +921,7 @@ bool write_PLY(std::ostream& os,
if(!os.good()) if(!os.good())
return false; return false;
if(!parameters::is_default_parameter( set_default_stream_precision(os, np);
parameters::get_parameter(np, internal_np::stream_precision)))
{
const int precision = parameters::choose_parameter(parameters::get_parameter(np, internal_np::stream_precision), 6);
os.precision(precision);
}
os << "ply" << std::endl os << "ply" << std::endl
<< ((get_mode(os) == IO::BINARY) ? "format binary_little_endian 1.0" : "format ascii 1.0") << std::endl << ((get_mode(os) == IO::BINARY) ? "format binary_little_endian 1.0" : "format ascii 1.0") << std::endl