From cb10422e3ceaab789e56c1192b4f064e3906c8a0 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Wed, 16 Jan 2019 09:58:02 +0100 Subject: [PATCH] Fix indentation and markdown --- BGL/doc/BGL/PackageDescription.txt | 2 +- BGL/include/CGAL/IO/vtp_io.h | 42 ++++++++-------- .../Constrained_Delaunay_triangulation_2.cpp | 50 +++++++++---------- Installation/CHANGES.md | 8 +-- Mesh_3/doc/Mesh_3/CGAL/IO/vtk_io.h | 4 +- 5 files changed, 53 insertions(+), 53 deletions(-) diff --git a/BGL/doc/BGL/PackageDescription.txt b/BGL/doc/BGL/PackageDescription.txt index 0bb14dfbb42..cde8cb34f89 100644 --- a/BGL/doc/BGL/PackageDescription.txt +++ b/BGL/doc/BGL/PackageDescription.txt @@ -708,7 +708,7 @@ user might encounter. ## I/O Functions ## - \link PkgBGLIOFct CGAL::read_off() \endlink - \link PkgBGLIOFct CGAL::write_off() \endlink -- \link PkgBGLIOFct `CGAL::write_VTP()` \endlink +- \link PkgBGLIOFct CGAL::write_VTP() \endlink - \link PkgBGLIOFct CGAL::write_wrl() \endlink */ diff --git a/BGL/include/CGAL/IO/vtp_io.h b/BGL/include/CGAL/IO/vtp_io.h index 6a09aa5ae82..77e7c717e13 100644 --- a/BGL/include/CGAL/IO/vtp_io.h +++ b/BGL/include/CGAL/IO/vtp_io.h @@ -50,18 +50,18 @@ write_polys(std::ostream& os, std::vector connectivity_table; std::vector offsets; std::vector cell_type(num_faces(mesh),5); // triangle == 5 - + std::size_t off = 0; for( face_iterator fit = faces(mesh).begin() ; fit != faces(mesh).end() ; ++fit ) - { - off += 3; - offsets.push_back(off); - BOOST_FOREACH(vertex_descriptor v, - vertices_around_face(halfedge(*fit, mesh), mesh)) - connectivity_table.push_back(V[v]); - } + { + off += 3; + offsets.push_back(off); + BOOST_FOREACH(vertex_descriptor v, + vertices_around_face(halfedge(*fit, mesh), mesh)) + connectivity_table.push_back(V[v]); + } write_vector(os,connectivity_table); write_vector(os,offsets); write_vector(os,cell_type); @@ -105,13 +105,13 @@ write_polys_tag(std::ostream& os, else { os << "\">\n"; for( face_iterator fit = faces(mesh).begin() ; - fit != faces(mesh).end() ; - ++fit ) - { - BOOST_FOREACH(vertex_descriptor v, - vertices_around_face(halfedge(*fit, mesh), mesh)) - os << V[v] << " "; - } + fit != faces(mesh).end() ; + ++fit ) + { + BOOST_FOREACH(vertex_descriptor v, + vertices_around_face(halfedge(*fit, mesh), mesh)) + os << V[v] << " "; + } os << " \n"; } @@ -128,12 +128,12 @@ write_polys_tag(std::ostream& os, os << "\">\n"; std::size_t polys_offset = 0; for( face_iterator fit = faces(mesh).begin() ; - fit != faces(mesh).end() ; - ++fit ) - { - polys_offset += 3; - os << polys_offset << " "; - } + fit != faces(mesh).end() ; + ++fit ) + { + polys_offset += 3; + os << polys_offset << " "; + } os << " \n"; } diff --git a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp index 9aafc882385..efec041a6f3 100644 --- a/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp +++ b/GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp @@ -85,12 +85,12 @@ discoverInfiniteComponent(const CDT & ct) Face_handle fh = queue.front(); queue.pop_front(); fh->set_in_domain(false); - + for(int i = 0; i < 3; i++) { Face_handle fi = fh->neighbor(i); if(fi->is_in_domain() - && !ct.is_constrained(CDT::Edge(fh,i))) + && !ct.is_constrained(CDT::Edge(fh,i))) queue.push_back(fi); } } @@ -270,7 +270,7 @@ MainWindow::MainWindow() dgi->setFacesInDomainBrush(facesColor); QObject::connect(this, SIGNAL(changed()), - dgi, SLOT(modelChanged())); + dgi, SLOT(modelChanged())); dgi->setVerticesPen( QPen(Qt::red, 2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); dgi->setVoronoiPen( @@ -286,8 +286,8 @@ MainWindow::MainWindow() // the signal/slot mechanism pi = new CGAL::Qt::GraphicsViewPolylineInput(this, &scene, 0, true); // inputs polylines which are not closed QObject::connect(pi, SIGNAL(generate(CGAL::Object)), - this, SLOT(processInput(CGAL::Object))); - + this, SLOT(processInput(CGAL::Object))); + tcc = new CGAL::Qt::TriangulationCircumcircle(&scene, &cdt, this); tcc->setPen(QPen(Qt::red, 0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); @@ -299,8 +299,8 @@ MainWindow::MainWindow() // Manual handling of actions // QObject::connect(this->actionQuit, SIGNAL(triggered()), - this, SLOT(close())); - + this, SLOT(close())); + // We put mutually exclusive actions in an QActionGroup QActionGroup* ag = new QActionGroup(this); ag->addAction(this->actionInsertPolyline); @@ -339,7 +339,7 @@ MainWindow::MainWindow() this->addRecentFiles(this->menuFile, this->actionQuit); connect(this, SIGNAL(openRecentFile(QString)), - this, SLOT(open(QString))); + this, SLOT(open(QString))); } @@ -535,11 +535,11 @@ void MainWindow::on_actionLoadConstraints_triggered() { QString fileName = QFileDialog::getOpenFileName(this, - tr("Open Constraint File"), - ".", - tr("Edge files (*.edg);;" + tr("Open Constraint File"), + ".", + tr("Edge files (*.edg);;" "Plg files (*.plg);;" - "Poly files (*.poly)")); + "Poly files (*.poly)")); open(fileName); } @@ -656,10 +656,10 @@ void MainWindow::on_actionSaveConstraints_triggered() { QString fileName = QFileDialog::getSaveFileName(this, - tr("Save Constraints"), - ".", - tr("Poly files (*.poly)\n" - "Edge files (*.edg)\n" + tr("Save Constraints"), + ".", + tr("Poly files (*.poly)\n" + "Edge files (*.edg)\n" "VTU files (*.vtu)")); if(! fileName.isEmpty()){ saveConstraints(fileName); @@ -804,15 +804,15 @@ MainWindow::on_actionInsertRandomPoints_triggered() bool ok = false; const int number_of_points = - QInputDialog::getInt(this, - tr("Number of random points"), - tr("Enter number of random points"), - 100, - 0, - (std::numeric_limits::max)(), - 1, - &ok); - + QInputDialog::getInt(this, + tr("Number of random points"), + tr("Enter number of random points"), + 100, + 0, + (std::numeric_limits::max)(), + 1, + &ok); + if(!ok) { return; } diff --git a/Installation/CHANGES.md b/Installation/CHANGES.md index 800b85233fa..f98c94b84a4 100644 --- a/Installation/CHANGES.md +++ b/Installation/CHANGES.md @@ -63,10 +63,10 @@ Release date: March 2019 `Arr_polycurve_basic_traits_2`. ### 2D and 3D Mesh Generation -- Added 3 functions for writing in modern VTK formats: - -`CGAL::output_to_vtu()` - -`CGAL::write_VTU()` - -`CGAL::write_VTP()` +- Added 3 functions for writing in XML VTK formats: + - `CGAL::output_to_vtu()` + - `CGAL::write_VTU()` + - `CGAL::write_VTP()` ### CGAL and the Boost Graph Library (BGL) diff --git a/Mesh_3/doc/Mesh_3/CGAL/IO/vtk_io.h b/Mesh_3/doc/Mesh_3/CGAL/IO/vtk_io.h index a1727dec86d..952100e9b32 100644 --- a/Mesh_3/doc/Mesh_3/CGAL/IO/vtk_io.h +++ b/Mesh_3/doc/Mesh_3/CGAL/IO/vtk_io.h @@ -13,6 +13,6 @@ namespace CGAL{ //! template void output_to_vtu(std::ostream& os, - const C3T3& c3t3, - bool binary = true); + const C3T3& c3t3, + bool binary = true); }