diff --git a/src/meshlabplugins/edit_align/align/AlignPair.cpp b/src/meshlabplugins/edit_align/align/AlignPair.cpp index c30bfbb40..b27925178 100644 --- a/src/meshlabplugins/edit_align/align/AlignPair.cpp +++ b/src/meshlabplugins/edit_align/align/AlignPair.cpp @@ -271,7 +271,7 @@ we have two meshes: - Fix the mesh that does not move and stays in the spatial indexing structure. - Mov the mesh we 'move' e.g. the one for which we search the transforamtion. -requires normalize normals for vertexes AND faces +requires normalize normals for vertices AND faces Allinea due mesh; Assume che: la uniform grid sia gia' inizializzata con la mesh fix diff --git a/src/meshlabplugins/edit_align/align/Guess.h b/src/meshlabplugins/edit_align/align/Guess.h index a4a813000..ab120e4f3 100644 --- a/src/meshlabplugins/edit_align/align/Guess.h +++ b/src/meshlabplugins/edit_align/align/Guess.h @@ -176,7 +176,7 @@ public: qDebug("Created grid of %i (%i %i %i)\n",u[kk].size(),u[kk].siz[0],u[kk].siz[1],u[kk].siz[2]); } - // Step 2: add all the Vertexes of Fix Meshes to the UG; + // Step 2: add all the Vertices of Fix Meshes to the UG; typename MeshType::VertexIterator vi; Point3x tp; for(size_t i=0;i movVert; std::vector< Point3x > movNorm; Box3x movBox; diff --git a/src/meshlabplugins/edit_hole/fgtBridge.h b/src/meshlabplugins/edit_hole/fgtBridge.h index 7d9e9ed38..1adcf52fd 100644 --- a/src/meshlabplugins/edit_hole/fgtBridge.h +++ b/src/meshlabplugins/edit_hole/fgtBridge.h @@ -679,7 +679,7 @@ private: } }; - /* Set bridge vertexes according bridge build option + /* Set bridge vertices according bridge build option */ static void setVertexByOption(AbutmentType &sideA, AbutmentType &sideB, BridgeOption o, FaceType &bf0, FaceType &bf1) diff --git a/src/meshlabplugins/edit_hole/fgtHole.h b/src/meshlabplugins/edit_hole/fgtHole.h index 994295072..e046c8db1 100644 --- a/src/meshlabplugins/edit_hole/fgtHole.h +++ b/src/meshlabplugins/edit_hole/fgtHole.h @@ -407,7 +407,7 @@ private: perimeter = HoleInfo::Perimeter(); }; - /* Walking the hole storing vertexes and finding non manifold one */ + /* Walking the hole storing vertices and finding non manifold one */ void findNonManifoldness() { assert(!IsFilled()); @@ -457,7 +457,7 @@ private: /* First patch face is the adjacent one to initial Pos ("p" field of Hole::Info) * Other patch face are found looking adjacent face on each vertex of known patch faces. - * NB: looking adjacent faces to vertexes it can find patches also for non manifold hole. + * NB: looking adjacent faces to vertices it can find patches also for non manifold hole. */ void getPatchFaces(int patchFlag) { @@ -475,7 +475,7 @@ private: stack.pop_back(); patches.push_back(f); - // visit faces adjacent to f's vertexes + // visit faces adjacent to f's vertices for(int v=0; v<3; v++) { pos = PosType(f, v); diff --git a/src/meshlabplugins/edit_paint/edit_paint.cpp b/src/meshlabplugins/edit_paint/edit_paint.cpp index 209001f7a..89d432908 100644 --- a/src/meshlabplugins/edit_paint/edit_paint.cpp +++ b/src/meshlabplugins/edit_paint/edit_paint.cpp @@ -592,7 +592,7 @@ inline void EditPaintPlugin::smooth(vector< pair > * ve CFaceO * f = one_face; do - { /// calc the sum of the surrounding vertexes pos or and vertexes color + { /// calc the sum of the surrounding vertices pos or and vertices color CFaceO * temp = one_face->VFp(pos); //next face in VF list if (one_face != 0 && !one_face->IsD()) { diff --git a/src/meshlabplugins/edit_paint/paintbox.ui b/src/meshlabplugins/edit_paint/paintbox.ui index 7b64c944f..838175ed6 100644 --- a/src/meshlabplugins/edit_paint/paintbox.ui +++ b/src/meshlabplugins/edit_paint/paintbox.ui @@ -1394,7 +1394,7 @@ p, li { white-space: pre-wrap; } <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">fast:</span> works better with big meshes, but can lose some vertexes when faces are not direct connected<br /><span style=" font-weight:600;">slow but accurate: </span>sholud be used with small meshes, because it finds every vertex during painting</p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">fast:</span> works better with big meshes, but can lose some vertices when faces are not direct connected<br /><span style=" font-weight:600;">slow but accurate: </span>sholud be used with small meshes, because it finds every vertex during painting</p></body></html> diff --git a/src/meshlabplugins/edit_point/edit_point_factory.cpp b/src/meshlabplugins/edit_point/edit_point_factory.cpp index cb63e3b33..c318ea87a 100644 --- a/src/meshlabplugins/edit_point/edit_point_factory.cpp +++ b/src/meshlabplugins/edit_point/edit_point_factory.cpp @@ -27,7 +27,7 @@ PointEditFactory::PointEditFactory() { editPoint = new QAction(QIcon(":/images/select_vertex_geodesic.png"),"Select Vertex Clusters", this); - editPointFittingPlane = new QAction(QIcon(":/images/select_vertex_plane.png"),"Select Vertexes on a Plane", this); + editPointFittingPlane = new QAction(QIcon(":/images/select_vertex_plane.png"),"Select Vertices on a Plane", this); actionList << editPoint; actionList << editPointFittingPlane; diff --git a/src/meshlabplugins/edit_quality/common/meshmethods.h b/src/meshlabplugins/edit_quality/common/meshmethods.h index 5135c445d..3bea2f654 100644 --- a/src/meshlabplugins/edit_quality/common/meshmethods.h +++ b/src/meshlabplugins/edit_quality/common/meshmethods.h @@ -36,7 +36,7 @@ using namespace std; using namespace vcg; -// Applies colors to mesh vertexes by quality +// Applies colors to mesh vertices by quality void applyColorByVertexQuality(MeshModel& mesh, TransferFunction *transferFunction, float minQuality, float maxQuality, float midHandlePercentilePosition, float brightness); // Opens a CSV file and gets its equalizer parameters diff --git a/src/meshlabplugins/edit_quality/qualitymapper.cpp b/src/meshlabplugins/edit_quality/qualitymapper.cpp index 07363da17..d32f1aa5e 100644 --- a/src/meshlabplugins/edit_quality/qualitymapper.cpp +++ b/src/meshlabplugins/edit_quality/qualitymapper.cpp @@ -42,7 +42,7 @@ QualityMapperPlugin::QualityMapperPlugin() const QString QualityMapperPlugin::Info() { - return tr("Colorize mesh vertexes by Quality"); + return tr("Colorize mesh vertices by Quality"); } bool QualityMapperPlugin::StartEdit(MeshModel& m, GLArea *gla,MLSceneGLSharedDataContext* cont ) diff --git a/src/meshlabplugins/edit_texture/renderarea.cpp b/src/meshlabplugins/edit_texture/renderarea.cpp index b0d449f18..5d12e22fa 100644 --- a/src/meshlabplugins/edit_texture/renderarea.cpp +++ b/src/meshlabplugins/edit_texture/renderarea.cpp @@ -1251,7 +1251,7 @@ void RenderArea::SelectVertexes() void RenderArea::CheckVertex() { - // Search for unselected vertexes in UV Space + // Search for unselected vertices in UV Space banList.clear(); CMeshO::FaceIterator fi; for(fi = model->cm.face.begin(); fi != model->cm.face.end(); ++fi) @@ -1373,7 +1373,7 @@ void RenderArea::SelectConnectedComponent(QPoint e) } } -// Clear every selected faces or vertexes +// Clear every selected faces or vertices void RenderArea::ClearSelection() { //selBit = CFaceO::NewBitFlag(); @@ -1444,10 +1444,10 @@ void RenderArea::Flip(bool mode) } } -// Collapse a couple of vertexes +// Collapse a couple of vertices void RenderArea::UnifyCouple() { - // Calculate the average coordinates and unify a couple of vertexes + // Calculate the average coordinates and unify a couple of vertices if (VCount == 2) { float tu = (vc1.u() + vc2.u())/2.0; @@ -1474,10 +1474,10 @@ void RenderArea::UnifyCouple() } } -// Unify a set of border vertexes among the selected path +// Unify a set of border vertices among the selected path void RenderArea::UnifySet() { - // Unify a set of vertexes + // Unify a set of vertices if (path.size() == path1.size() && drawP && drawP1) { for (unsigned i = 0; i < path.size(); i++) @@ -1802,7 +1802,7 @@ void RenderArea::UpdateSelectionArea(int x, int y) void RenderArea::UpdateSelectionAreaV(int x, int y) { - // Update the buttons of the selection area for vertexes + // Update the buttons of the selection area for vertices selection.moveCenter(QPoint(selection.center().x() + x, selection.center().y() + y)); selRect[0].moveBottomRight(selection.topLeft()); selRect[1].moveBottomLeft(selection.topRight()); @@ -1812,7 +1812,7 @@ void RenderArea::UpdateSelectionAreaV(int x, int y) void RenderArea::UpdateVertexSelection() { - // Recalcultate the rectangle for selection of vertexes + // Recalculate the rectangle for selection of vertices selStart = QPoint(MAX,MAX); selEnd = QPoint(-MAX,-MAX); selectedV = false; @@ -1893,7 +1893,7 @@ void RenderArea::DrawCircle(QPoint origin) void RenderArea::UpdateBoundingArea(QPoint topLeft, QPoint topRight) { - // Update the bounding box (selection rectangle) of the selected faces/vertexes + // Update the bounding box (selection rectangle) of the selected faces/vertices if (topLeft.x() < selStart.x()) selStart.setX(topLeft.x()); if (topLeft.y() < selStart.y()) selStart.setY(topLeft.y()); if (topRight.x() > selEnd.x()) selEnd.setX(topRight.x()); @@ -1932,7 +1932,7 @@ void RenderArea::ImportSelection() void RenderArea::CountVertexes() { - // Count the number of selected UV vertexes (not so easy...) + // Count the number of selected UV vertices (not so easy...) VCount = 0; collapse1 = 0; collapse2 = 0; diff --git a/src/meshlabplugins/edit_texture/renderarea.h b/src/meshlabplugins/edit_texture/renderarea.h index 85a37e9a8..2d281ea53 100644 --- a/src/meshlabplugins/edit_texture/renderarea.h +++ b/src/meshlabplugins/edit_texture/renderarea.h @@ -126,11 +126,11 @@ class RenderArea : public QGLWidget QPoint start, end; // Selection area QRect area; // Dragged rectangle - QRectF areaUV; // Area of selected vertexes + QRectF areaUV; // Area of selected vertices // Info for interactive editing vector selRect; // Vector of buttons area - QRect vertRect; // Rectangle for vertexes + QRect vertRect; // Rectangle for vertices QRect selection; // Selection area QPoint selStart, selEnd; int posX, posY, rectX, rectY, oldSRX, oldSRY; // Stored value diff --git a/src/meshlabplugins/edit_texture/textureeditor.ui b/src/meshlabplugins/edit_texture/textureeditor.ui index 071399129..49a0ae065 100644 --- a/src/meshlabplugins/edit_texture/textureeditor.ui +++ b/src/meshlabplugins/edit_texture/textureeditor.ui @@ -189,7 +189,7 @@ - Allow the selection of vertexes inside a dragged area + Allow the selection of vertices inside a dragged area @@ -231,7 +231,7 @@ - Collapse a couple of vertexes + Collapse a couple of vertices @@ -353,7 +353,7 @@ - Invert selected faces/vertexes + Invert selected faces/vertices @@ -382,7 +382,7 @@ - Clear selected faces/vertexes + Clear selected faces/vertices diff --git a/src/meshlabplugins/filter_aging/edgepred.h b/src/meshlabplugins/filter_aging/edgepred.h index 68c5b50ce..a6a22c1c5 100644 --- a/src/meshlabplugins/filter_aging/edgepred.h +++ b/src/meshlabplugins/filter_aging/edgepred.h @@ -53,7 +53,7 @@ class QualityEdgePred return (lenp(ep) && testQuality(ep)); } - // Tests quality predicate but only on the first of the two vertexes of the edge + // Tests quality predicate but only on the first of the two vertices of the edge bool qVertTest(face::Pos ep) const { return (ep.f->V(ep.z)->Q() > qthVal); } diff --git a/src/meshlabplugins/filter_aging/filter_aging.cpp b/src/meshlabplugins/filter_aging/filter_aging.cpp index 03fb1ca53..9d4609a21 100644 --- a/src/meshlabplugins/filter_aging/filter_aging.cpp +++ b/src/meshlabplugins/filter_aging/filter_aging.cpp @@ -105,7 +105,7 @@ void GeometryAgingPlugin::initParameterSet(QAction *action, MeshModel &m, RichPa "area affected by the erosion process.")); params.addParam(new RichAbsPerc("QualityThreshold", qRange.first+(qRange.second-qRange.first)*0.66, qRange.first, qRange.second, "Min quality threshold", - "Represents the minimum quality value two vertexes must have
" + "Represents the minimum quality value two vertices must have
" "to consider the edge they are sharing.")); params.addParam(new RichAbsPerc("EdgeLenThreshold", m.cm.bbox.Diag()*0.02, 0,m.cm.bbox.Diag()*0.5, "Edge len threshold", @@ -197,7 +197,7 @@ bool GeometryAgingPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPar // refine needed edges refineMesh(m.cm, ep, selected, cb); - // if requested, add erosion attribute to vertexes and initialize it + // if requested, add erosion attribute to vertices and initialize it if(storeDispl) { CMeshO::PerVertexAttributeHandle vah = tri::Allocator::GetPerVertexAttribute(m.cm, "Erosion"); for(CMeshO::VertexIterator vi=m.cm.vert.begin(); vi!=m.cm.vert.end(); vi++) @@ -205,13 +205,13 @@ bool GeometryAgingPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPar } CMeshO::PerVertexAttributeHandle vah = vcg::tri::Allocator::GetPerVertexAttribute(m.cm, "Erosion"); - // vertexes along selection border will not be displaced + // vertices along selection border will not be displaced if(selected) tri::UpdateSelection::VertexFromFaceStrict(m.cm); - // clear vertexes V bit (will be used to mark the vertexes as displaced) + // clear vertices V bit (will be used to mark the vertices as displaced) tri::UpdateFlags::VertexClearV(m.cm); - // displace vertexes + // displace vertices for(int i=0; i gM; gM.Set(m.cm.face.begin(), m.cm.face.end()); @@ -252,7 +252,7 @@ bool GeometryAgingPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPar } } } - // clear vertexes V bit again + // clear vertices V bit again tri::UpdateFlags::VertexClearV(m.cm); } @@ -384,7 +384,7 @@ void GeometryAgingPlugin::smoothPeaks(CMeshO &m, bool selected, bool updateErosi vcg::tri::UpdateNormal::PerVertexNormalizedPerFace(m); - // clear vertexes V bit again + // clear vertices V bit again tri::UpdateFlags::VertexClearV(m); } diff --git a/src/meshlabplugins/filter_clean/cleanfilter.cpp b/src/meshlabplugins/filter_clean/cleanfilter.cpp index 8c414a65d..14e82a30e 100644 --- a/src/meshlabplugins/filter_clean/cleanfilter.cpp +++ b/src/meshlabplugins/filter_clean/cleanfilter.cpp @@ -246,7 +246,7 @@ void CleanFilter::initParameterSet(QAction *action,MeshDocument &md, RichParamet parlst.addParam(new RichFloat("MergeThr",1.0f/10000.0f,"Merging Threshold","All the per-wedge texture coords that are on the same vertex and are distant less then the given threshold are merged together. It can be used to remove the fake texture seams that arise from error. Distance is in texture space (the default, 1e-4, corresponds to one texel on a 10kx10x texture) ")); break; case FP_SNAP_MISMATCHED_BORDER: - parlst.addParam(new RichFloat("EdgeDistRatio",1/100.0f,"Edge Distance Ratio", "Collapse edge when the edge / distance ratio is greater than this value. E.g. for default value 1000 two straight border edges are collapsed if the central vertex dist from the straight line composed by the two edges less than a 1/1000 of the sum of the edges length. Larger values enforce that only vertexes very close to the line are removed.")); + parlst.addParam(new RichFloat("EdgeDistRatio",1/100.0f,"Edge Distance Ratio", "Collapse edge when the edge / distance ratio is greater than this value. E.g. for default value 1000 two straight border edges are collapsed if the central vertex dist from the straight line composed by the two edges less than a 1/1000 of the sum of the edges length. Larger values enforce that only vertices very close to the line are removed.")); parlst.addParam(new RichBool("UnifyVertices",true,"UnifyVertices","if true the snap vertices are weld together.")); break; case FP_REMOVE_TVERTEX_COLLAPSE : diff --git a/src/meshlabplugins/filter_create/filter_create.cpp b/src/meshlabplugins/filter_create/filter_create.cpp index 26d3bc4a7..c4513f3d4 100644 --- a/src/meshlabplugins/filter_create/filter_create.cpp +++ b/src/meshlabplugins/filter_create/filter_create.cpp @@ -235,7 +235,7 @@ bool FilterCreate::applyFilter(QAction *filter, MeshDocument &md, RichParameterS selected_pts.push_back(p); Naccum = Naccum + (*vi).N(); } - Log("Using %i vertexes to build a fitting plane", int(selected_pts.size())); + Log("Using %i vertices to build a fitting plane", int(selected_pts.size())); Plane3m plane; FitPlaneToPointSet(selected_pts, plane); plane.Normalize(); diff --git a/src/meshlabplugins/filter_fractal/fractal_utils.h b/src/meshlabplugins/filter_fractal/fractal_utils.h index 5706e8345..727707ab1 100644 --- a/src/meshlabplugins/filter_fractal/fractal_utils.h +++ b/src/meshlabplugins/filter_fractal/fractal_utils.h @@ -182,7 +182,7 @@ public: ivp[i++] = &*vi; } - // defines the vertexes of each face + // defines the vertices of each face FaceIterator fi = m.face.begin(); int evenFace[3] = {0, 1, k2}, oddFace[3] = {1, k2+1, k2}; for(i=0; i::IsBitTriQuadOnly(m)) { diff --git a/src/meshlabplugins/filter_meshing/meshfilter.cpp b/src/meshlabplugins/filter_meshing/meshfilter.cpp index fbdd72e7f..1399f8c1c 100644 --- a/src/meshlabplugins/filter_meshing/meshfilter.cpp +++ b/src/meshlabplugins/filter_meshing/meshfilter.cpp @@ -292,7 +292,7 @@ QString ExtraMeshFilterPlugin::filterInfo(FilterIDType filterID) const "strip) the filter will not build a consistent orientation simply because it is not possible. The filter can end up in a consistent orientation that can be exactly the opposite of the expected one; in that case simply invert the whole mesh orientation."); case FP_INVERT_FACES : return tr("Invert faces orientation, flipping the normals of the mesh.
" "If requested, it tries to guess the right orientation; " - "mainly it decide to flip all the faces if the minimum/maximum vertexes have not outward point normals for a few directions.
" + "mainly it decide to flip all the faces if the minimum/maximum vertices have not outward point normals for a few directions.
" "Works well for single component watertight objects."); case FP_SCALE : return tr("Generate a matrix transformation that scale the mesh. The mesh can be also automatically scaled to a unit side box. "); case FP_CENTER : return tr("Generate a matrix transformation that translate the mesh. The mesh can be translated around one of the axis or a given axis and w.r.t. to the origin or the baricenter, or a given point."); @@ -1008,7 +1008,7 @@ switch(ID(filter)) selBox.Add(p); selected_pts.push_back(p); } - Log("Using %i vertexes to build a fitting plane", int(selected_pts.size())); + Log("Using %i vertices to build a fitting plane", int(selected_pts.size())); Plane3m plane; FitPlaneToPointSet(selected_pts, plane); float errorSum = 0; diff --git a/src/meshlabplugins/filter_quality/filterqualitymapper.cpp b/src/meshlabplugins/filter_quality/filterqualitymapper.cpp index 79b61106c..2dcad2e3e 100644 --- a/src/meshlabplugins/filter_quality/filterqualitymapper.cpp +++ b/src/meshlabplugins/filter_quality/filterqualitymapper.cpp @@ -58,7 +58,7 @@ QualityMapperFilter::QualityMapperFilter() QString QualityMapperFilter::filterInfo(FilterIDType filterId) const { switch(filterId) { - case FP_QUALITY_MAPPER : return QString("The filter maps quality levels into colors using a colorband built from a transfer function (may be loaded from an external file) and colorizes the mesh vertexes. The minimum, medium and maximum quality values can be set by user to obtain a custom quality range for mapping"); + case FP_QUALITY_MAPPER : return QString("The filter maps quality levels into colors using a colorband built from a transfer function (may be loaded from an external file) and colorizes the mesh vertices. The minimum, medium and maximum quality values can be set by user to obtain a custom quality range for mapping"); default : assert(0); } return QString(""); @@ -119,7 +119,7 @@ void QualityMapperFilter::initParameterSet(QAction *action,MeshModel &m, RichPar } // The Real Core Function doing the actual mesh processing. -// Apply color to mesh vertexes +// Apply color to mesh vertices bool QualityMapperFilter::applyFilter(QAction *filter, MeshDocument &md, RichParameterSet & par, vcg::CallBackPos *cb) { MeshModel &m=*(md.mm()); diff --git a/src/meshlabplugins/filter_sampling/filter_sampling.cpp b/src/meshlabplugins/filter_sampling/filter_sampling.cpp index 1028ffaa1..c7b1fe677 100644 --- a/src/meshlabplugins/filter_sampling/filter_sampling.cpp +++ b/src/meshlabplugins/filter_sampling/filter_sampling.cpp @@ -401,7 +401,7 @@ QString FilterDocSampling::filterInfo(FilterIDType filterId) const case FP_ELEMENT_SUBSAMPLING : return QString("Create a new layer populated with a point sampling of the current mesh; at most one sample for each element of the mesh is created. Samples are taking in a uniform way, one for each element (vertex/edge/face); all the elements have the same probability of being chosen."); case FP_MONTECARLO_SAMPLING : return QString("Create a new layer populated with a point sampling of the current mesh; samples are generated in a randomly uniform way, or with a distribution biased by the per-vertex quality values of the mesh."); case FP_STRATIFIED_SAMPLING : return QString("Create a new layer populated with a point sampling of the current mesh; to generate multiple samples inside a triangle each triangle is subdivided according to various stratified strategies. Distribution is often biased by triangle shape."); - case FP_CLUSTERED_SAMPLING : return QString("Create a new layer populated with a subsampling of the vertexes of the current mesh; the subsampling is driven by a simple one-per-gridded cell strategy."); + case FP_CLUSTERED_SAMPLING : return QString("Create a new layer populated with a subsampling of the vertices of the current mesh; the subsampling is driven by a simple one-per-gridded cell strategy."); case FP_POINTCLOUD_SIMPLIFICATION : return QString("Create a new layer populated with a simplified version of the current point cloud."); case FP_POISSONDISK_SAMPLING : return QString("Create a new layer populated with a point sampling of the current mesh;" "samples are generated according to a Poisson-disk distribution, using the algorithm described in:
" @@ -565,9 +565,9 @@ void FilterDocSampling::initParameterSet(QAction *action, MeshDocument & md, Ric "The mesh that is sampled for the comparison.")); parlst.addParam(new RichBool("SaveSample", false, "Save Samples", "Save the position and distance of all the used samples on both the two surfaces, creating two new layers with two point clouds representing the used samples.")); - parlst.addParam(new RichBool("SampleVert", true, "Sample Vertexes", + parlst.addParam(new RichBool("SampleVert", true, "Sample Vertices", "For the search of maxima it is useful to sample vertices and edges of the mesh with a greater care. " - "It is quite probably the the farthest points falls along edges or on mesh vertexes, and with uniform montecarlo sampling approaches" + "It is quite probably the the farthest points falls along edges or on mesh vertices, and with uniform montecarlo sampling approaches" "the probability of taking a sample over a vertex or an edge is theoretically null.
" "On the other hand this kind of sampling could make the overall sampling distribution slightly biased and slightly affects the cumulative results.")); parlst.addParam(new RichBool("SampleEdge", false, "Sample Edges", "See the above comment.")); @@ -606,7 +606,7 @@ void FilterDocSampling::initParameterSet(QAction *action, MeshDocument & md, Ric parlst.addParam(new RichMesh ("SourceMesh", md.mm(),&md, "Source Mesh", "The mesh that contains the source data that we want to transfer.")); parlst.addParam(new RichMesh ("TargetMesh", vertexMesh,&md, "Target Mesh", - "The mesh whose vertexes will receive the data from the source.")); + "The mesh whose vertices will receive the data from the source.")); parlst.addParam(new RichBool ("GeomTransfer", false, "Transfer Geometry", "if enabled, the position of each vertex of the target mesh will be snapped onto the corresponding closest point on the source mesh")); parlst.addParam(new RichBool ("NormalTransfer", false, "Transfer Normal", @@ -663,7 +663,7 @@ void FilterDocSampling::initParameterSet(QAction *action, MeshDocument & md, Ric parlst.addParam(new RichMesh ("ColoredMesh", colorMesh,&md, "To be Colored Mesh", "The mesh whose surface is colored. For each vertex of this mesh we decide the color according the below parameters.")); parlst.addParam(new RichMesh ("VertexMesh", vertexMesh,&md, "Vertex Mesh", - "The mesh whose vertexes are used as seed points for the color computation. These seeds point are projected onto the above mesh.")); + "The mesh whose vertices are used as seed points for the color computation. These seeds point are projected onto the above mesh.")); if(ID(action) == FP_DISK_COLORING) { float Diag = md.mm()->cm.bbox.Diag(); parlst.addParam(new RichDynamicFloat("Radius", Diag/10.0f, 0.0f, Diag/3.0f, tr("Radius"), @@ -1272,7 +1272,7 @@ switch(ID(action)) for(CMeshO::VertexIterator vi= mmV->cm.vert.begin(); vi!= mmV->cm.vert.end(); ++vi) if(!(*vi).IsD()) vecP.push_back((*vi).cP()); - vector vecV; // points to vertexes of ColoredMesh; + vector vecV; // points to vertices of ColoredMesh; tri::VoronoiProcessing::SeedToVertexConversion (mmM->cm, vecP, vecV); Log("Converted %ui points into %ui vertex ",vecP.size(),vecV.size()); tri::EuclideanDistance edFunc; diff --git a/src/meshlabplugins/filter_select/meshselect.cpp b/src/meshlabplugins/filter_select/meshselect.cpp index 0f5a6cc7b..db1afedf2 100644 --- a/src/meshlabplugins/filter_select/meshselect.cpp +++ b/src/meshlabplugins/filter_select/meshselect.cpp @@ -167,8 +167,8 @@ QString SelectionFilterPlugin::filterInfo(FilterIDType filterId) const case FP_SELECT_VERT_FROM_FACE : return tr("Select vertices from selected faces."); case FP_SELECT_FACES_BY_EDGE : return tr("Select all triangles having an edge with length greater or equal than a given threshold."); case FP_SELECT_BORDER : return tr("Select vertices and faces on the boundary."); - case FP_SELECT_BY_VERT_QUALITY : return tr("Select all the faces/vertexes within the specified vertex quality range."); - case FP_SELECT_BY_FACE_QUALITY : return tr("Select all the faces/vertexes with within the specified face quality range."); + case FP_SELECT_BY_VERT_QUALITY : return tr("Select all the faces/vertices within the specified vertex quality range."); + case FP_SELECT_BY_FACE_QUALITY : return tr("Select all the faces/vertices with within the specified face quality range."); case FP_SELECT_BY_COLOR : return tr("Select part of the mesh based on its color."); case CP_SELECT_TEXBORDER : return tr("Colorize only border edges."); case CP_SELECT_NON_MANIFOLD_FACE: return tr("Select the faces and the vertices incident on non manifold edges (e.g. edges where more than two faces are incident); note that this function select the components that are related to non manifold edges. The case of non manifold vertices is specifically managed by the pertinent filter."); diff --git a/src/meshlabplugins/filter_trioptimize/curvedgeflip.h b/src/meshlabplugins/filter_trioptimize/curvedgeflip.h index c708c9022..ebddd3432 100644 --- a/src/meshlabplugins/filter_trioptimize/curvedgeflip.h +++ b/src/meshlabplugins/filter_trioptimize/curvedgeflip.h @@ -65,7 +65,7 @@ protected: typedef typename TRIMESH_TYPE::VertContainer VertContainer; - // New curvature precomputed for the vertexes of the faces + // New curvature precomputed for the vertices of the faces // adjacent to edge to be flipped ScalarType _cv0, _cv1, _cv2, _cv3; @@ -258,7 +258,7 @@ public: FacePointer f2 = this->_pos.F()->FFp(i); v3 = f2->V2(f1->FFi(i)); - // save sum of curvatures of vertexes + // save sum of curvatures of vertices float cbefore = v0->Q() + v1->Q() + v2->Q() + v3->Q(); // saving current vertex normals diff --git a/src/meshlabplugins/filter_unsharp/filter_unsharp.cpp b/src/meshlabplugins/filter_unsharp/filter_unsharp.cpp index 8b2ad2e14..322c54deb 100644 --- a/src/meshlabplugins/filter_unsharp/filter_unsharp.cpp +++ b/src/meshlabplugins/filter_unsharp/filter_unsharp.cpp @@ -107,7 +107,7 @@ QString FilterUnsharp::filterInfo(FilterIDType filterId) const case FP_LAPLACIAN_SMOOTH : return tr("Laplacian smooth of the mesh: for each vertex it calculates the average position with nearest vertex"); case FP_HC_LAPLACIAN_SMOOTH : return tr("HC Laplacian Smoothing, extended version of Laplacian Smoothing, based on the paper of Vollmer, Mencl, and Muller"); case FP_SD_LAPLACIAN_SMOOTH : return tr("Scale Dependent Laplacian Smoothing, extended version of Laplacian Smoothing, based on the Fujiwara extended umbrella operator"); - case FP_TWO_STEP_SMOOTH : return tr("Two Step Smoothing, a feature preserving/enhancing fairing filter. It is based on a Normal Smoothing step where similar normals are averaged together and a step where the vertexes are fitted on the new normals. Based on:
" + case FP_TWO_STEP_SMOOTH : return tr("Two Step Smoothing, a feature preserving/enhancing fairing filter. It is based on a Normal Smoothing step where similar normals are averaged together and a step where the vertices are fitted on the new normals. Based on:
" "A. Belyaev and Y. Ohtake, A Comparison of Mesh Smoothing Methods, Proc. Israel-Korea Bi-National Conf. Geometric Modeling and Computer Graphics, pp. 83-87, 2003."); case FP_TAUBIN_SMOOTH : return tr("The λ-μ Taubin smoothing, it make two steps of smoothing, forth and back, for each iteration. Based on:
" "Gabriel Taubin,
A signal processing approach to fair surface design
Siggraph 1995" ); diff --git a/src/meshlabplugins/filter_voronoi/filter_voronoi.xml b/src/meshlabplugins/filter_voronoi/filter_voronoi.xml index 429aa8140..88b3154be 100644 --- a/src/meshlabplugins/filter_voronoi/filter_voronoi.xml +++ b/src/meshlabplugins/filter_voronoi/filter_voronoi.xml @@ -125,7 +125,7 @@ - + @@ -133,7 +133,7 @@ - + diff --git a/src/meshlabplugins/io_3ds/io_3ds.h b/src/meshlabplugins/io_3ds/io_3ds.h index 2df29c7ff..0749b3513 100644 --- a/src/meshlabplugins/io_3ds/io_3ds.h +++ b/src/meshlabplugins/io_3ds/io_3ds.h @@ -46,7 +46,7 @@ public: int mask; /// a Simple callback that can be used for long obj parsing. - // it returns the current position, and formats a string with a description of what th efunction is doing (loading vertexes, faces...) + // it returns the current position, and formats a string with a description of what th efunction is doing (loading vertices, faces...) CallBackPos *cb; /// number of vertices