From cdd03a96f6b11b1ac4fd6f8dc059d35fa3c24a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Mon, 8 Jun 2009 20:15:20 +0000 Subject: [PATCH] update text --- CGAL_ipelets/demo/CGAL_ipelets/alpha_shapes.cpp | 2 +- CGAL_ipelets/demo/CGAL_ipelets/bbox_restriction.cpp | 6 +++--- CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp | 8 ++++---- CGAL_ipelets/demo/CGAL_ipelets/hilbert_sort.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/hull.cpp | 2 +- CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp | 2 +- CGAL_ipelets/demo/CGAL_ipelets/multi_delaunay.cpp | 2 +- CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/partition.cpp | 4 ++-- CGAL_ipelets/demo/CGAL_ipelets/pca.cpp | 2 +- CGAL_ipelets/demo/CGAL_ipelets/simple_triangulation.cpp | 2 +- CGAL_ipelets/demo/CGAL_ipelets/triangulation.cpp | 8 ++++---- CGAL_ipelets/include/CGAL/CGAL_Ipelet_base.h | 2 +- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CGAL_ipelets/demo/CGAL_ipelets/alpha_shapes.cpp b/CGAL_ipelets/demo/CGAL_ipelets/alpha_shapes.cpp index 4de3e8f1c36..cb04651b3a1 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/alpha_shapes.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/alpha_shapes.cpp @@ -81,7 +81,7 @@ void ASphapeIpelet::protected_run(int fn) if (pt_list.empty() and cir_list.empty()) { - print_error_message("No circle or point selected"); + print_error_message("No circle nor point selected"); return; } diff --git a/CGAL_ipelets/demo/CGAL_ipelets/bbox_restriction.cpp b/CGAL_ipelets/demo/CGAL_ipelets/bbox_restriction.cpp index 527a07d890f..69315b65d4b 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/bbox_restriction.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/bbox_restriction.cpp @@ -32,7 +32,7 @@ namespace CGAL_bbox_restriction{ typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; const std::string sublabel[] ={ - "Bbox restriction", "Help" + "Bounding box restriction", "Help" }; const std::string helpmsg[] = { @@ -43,7 +43,7 @@ struct hilbertsortIpelet : CGAL::Ipelet_base { hilbertsortIpelet() - : CGAL::Ipelet_base("Bbox restriction",sublabel, helpmsg) {} + : CGAL::Ipelet_base("Bounding box restriction",sublabel, helpmsg) {} void protected_run(int); }; @@ -74,7 +74,7 @@ void hilbertsortIpelet::protected_run(int fn) if (pt_list.size()<2) { - print_error_message("No points to define a bounding box"); + print_error_message("No point selected to define a bounding box"); return; } diff --git a/CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp b/CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp index df270087bc3..a26dc73d830 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/diagrams.cpp @@ -53,10 +53,10 @@ const std::string sublabel[] = { }; const std::string helpmsg[] = { - "Draw Voronoi diagram of a set of points and segments, circles and circle arcs", - "Draw the segment Voronoi diagram except the edges of the diagram corresponding to a segment and its endpoints", - "Draw a Power diagram of a set of weighted points (circles, points)", - "Draw Apollonius diagram of a set of circles" + "Draw the Voronoi diagram of a set of points and segments, circles and circle arcs", + "Draw the segment Voronoi diagram except the bisectors between a segment and its own endpoints", + "Draw the Power diagram of a set of weighted points (circles, points)", + "Draw the Apollonius diagram of a set of circles" }; class diagrammeIpelet diff --git a/CGAL_ipelets/demo/CGAL_ipelets/hilbert_sort.cpp b/CGAL_ipelets/demo/CGAL_ipelets/hilbert_sort.cpp index ad4e2faa5fe..e08181eead2 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/hilbert_sort.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/hilbert_sort.cpp @@ -34,7 +34,7 @@ const std::string sublabel[] ={ }; const std::string helpmsg[] = { - "Sorts the points along a Hilbert curve" + "Sort the points along a Hilbert curve" }; struct hilbertsortIpelet @@ -61,7 +61,7 @@ void hilbertsortIpelet::protected_run(int fn) read_active_objects( CGAL::dispatch_or_drop_output( std::back_inserter(pt_list) ) ); if (pt_list.empty()) { - print_error_message("No marks selected"); + print_error_message("No mark selected"); return; } diff --git a/CGAL_ipelets/demo/CGAL_ipelets/hull.cpp b/CGAL_ipelets/demo/CGAL_ipelets/hull.cpp index 95c24c993eb..4b96dc26972 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/hull.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/hull.cpp @@ -105,7 +105,7 @@ void enveloppeIpelet::protected_run(int fn) ); if (pt_list.empty() && cir_list.empty()) { - print_error_message("No marks nor circles nor segments selected"); + print_error_message("No mark nor circle nor segment selected"); return; } diff --git a/CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp b/CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp index cd845c42c78..99d96bb778f 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/mesh_2.cpp @@ -78,7 +78,7 @@ void IpeletMesh2::protected_run(int fn) ); if (pt_list.empty() and sg_list.empty() and pol_list.empty()) { - print_error_message("No marks selected"); + print_error_message("No mark selected"); return; } diff --git a/CGAL_ipelets/demo/CGAL_ipelets/multi_delaunay.cpp b/CGAL_ipelets/demo/CGAL_ipelets/multi_delaunay.cpp index 57cfe7f3d2f..0683d1572b1 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/multi_delaunay.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/multi_delaunay.cpp @@ -87,7 +87,7 @@ void MdelaunayIpelet::protected_run(int fn) Iso_rectangle_2 bbox=read_active_objects( CGAL::dispatch_or_drop_output( std::back_inserter(pt_list) ) ); if (pt_list.empty()){ - print_error_message("No marks selected"); + print_error_message("No mark selected"); return; } diff --git a/CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp b/CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp index 047aba6a260..a9a9b19c6dd 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/multi_regular.cpp @@ -42,7 +42,7 @@ const std::string sublabel[] = { }; const std::string hlpmsg[] = { - "Generate k-th regular triangulation and k-th dual Voronoi diagram. Note : k must be smaller than the number of input circles." + "Generate k-th regular triangulation and k-th dual Power diagram. Note : k must be smaller than the number of input circles." }; class MregularIpelet @@ -78,7 +78,7 @@ void MregularIpelet::protected_run(int fn) ); if (!input_wpt.size()) { - print_error_message("No circles selected"); + print_error_message("No circle selected"); return; } diff --git a/CGAL_ipelets/demo/CGAL_ipelets/partition.cpp b/CGAL_ipelets/demo/CGAL_ipelets/partition.cpp index 5933d2aa665..d7a5392a9b9 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/partition.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/partition.cpp @@ -33,8 +33,8 @@ const std::string Slab[] = { const std::string Hmsg[] = { "Y monotonic decomposition of a polygon", - "Approximation of convex decomposition of a polygon using Greene algorithm", - "Approximation of convex decomposition of a polygon using Hertel and Mehlhorn algorithm", + "Approximation of convex decomposition of a polygon using Greene's algorithm", + "Approximation of convex decomposition of a polygon using Hertel and Mehlhorn's algorithm", "Optimal convex decomposition of a polygon" }; diff --git a/CGAL_ipelets/demo/CGAL_ipelets/pca.cpp b/CGAL_ipelets/demo/CGAL_ipelets/pca.cpp index 3478c7332bf..b1b35878607 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/pca.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/pca.cpp @@ -116,7 +116,7 @@ void pcaIpelet::protected_run(int fn) linear_least_squares_fitting_2(sg_list.begin(),sg_list.end(),line,centroid,CGAL::Dimension_tag<1>()); break; default: - print_error_message("Please selected a set of points or segments or triangles or circles"); + print_error_message("Please select a set of points or segments or triangles or circles"); return; } diff --git a/CGAL_ipelets/demo/CGAL_ipelets/simple_triangulation.cpp b/CGAL_ipelets/demo/CGAL_ipelets/simple_triangulation.cpp index 2da335ee4d0..aba6b100e6b 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/simple_triangulation.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/simple_triangulation.cpp @@ -40,7 +40,7 @@ void Triangulation_ipelet::protected_run(int fn) ); if (pt_lst.empty()) { - print_error_message("No marks selected"); + print_error_message("No mark selected"); return; } diff --git a/CGAL_ipelets/demo/CGAL_ipelets/triangulation.cpp b/CGAL_ipelets/demo/CGAL_ipelets/triangulation.cpp index f2e4d55214d..f96435eadb4 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/triangulation.cpp +++ b/CGAL_ipelets/demo/CGAL_ipelets/triangulation.cpp @@ -93,7 +93,7 @@ void triangulationIpelet::protected_run(int fn) switch(fn){ case 0://Delaunay if (pt_list.empty()) { - print_error_message("No marks selected"); + print_error_message("No mark selected"); return; } dt.insert(pt_list.begin(),pt_list.end()); @@ -103,7 +103,7 @@ void triangulationIpelet::protected_run(int fn) case 3: case 1://Constraint delaunay if (pt_list.empty() && sg_list.empty()){ - print_error_message("No marks or polygons selected"); + print_error_message("No mark nor polygon selected"); } //insert points Cdt.insert(pt_list.begin(),pt_list.end()); @@ -120,7 +120,7 @@ void triangulationIpelet::protected_run(int fn) } if (!Cdt.number_of_vertices()) { - print_error_message("No marks or polygons selected"); + print_error_message("No mark nor polygon selected"); return; } @@ -130,7 +130,7 @@ void triangulationIpelet::protected_run(int fn) break; case 4: //regular if (pt_list.empty() && cir_list.empty()){ - print_error_message("No circles or marks selected"); + print_error_message("No circle nor mark selected"); } //insert points for (std::list::iterator it_pt=pt_list.begin();it_pt!=pt_list.end();++it_pt) diff --git a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base.h b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base.h index 7dd955c2206..7f97b03ee05 100644 --- a/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base.h +++ b/CGAL_ipelets/include/CGAL/CGAL_Ipelet_base.h @@ -82,7 +82,7 @@ namespace CGAL{ protected_run(i); } catch(...){ - helper->MessageBox("Error : Save your page in a file and submit it to \n https://gforge.inria.fr/tracker/?atid=3253&group_id=801&func=browse","OK",NULL,NULL); + helper->MessageBox("Error : Save your page in a file and submit it to \n http://www.cgal.org/bug_report.html","OK",NULL,NULL); } };