Skip to content

Commit

Permalink
Fix typos, most noticed by codespell.
Browse files Browse the repository at this point in the history
  • Loading branch information
rpavlik committed Dec 11, 2019
1 parent 34b68e0 commit 6c8ab64
Show file tree
Hide file tree
Showing 124 changed files with 350 additions and 349 deletions.
2 changes: 1 addition & 1 deletion src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ You need Qt5.9 and we assume that we have qtcreator installed and you know how t
├──...
└──...

All the include paths inside the `.pro` assume this relative positioning of the `meshlab` and `vcglib` folders. Please note that, given the fact that the developement of the vcglib and meshlab are often intermixed, if you compile the devel branch of the meshlab repo (or the current master until we reach a distributable beta), you should use the devel branch of the vcglib.
All the include paths inside the `.pro` assume this relative positioning of the `meshlab` and `vcglib` folders. Please note that, given the fact that the development of the vcglib and meshlab are often intermixed, if you compile the devel branch of the meshlab repo (or the current master until we reach a distributable beta), you should use the devel branch of the vcglib.

### Compiling
MeshLab has a plugin architecture and therefore all the plugins are compiled separately; some of them are harder to be compiled. Don't worry, if a plugin fails to compile just remove it and you lose just that functionality. As a first step you should try to use the `src/meshlab_mini.pro` that contains the info for building meshlab with a minimal set of plugins with no external dependencies and usually compile with no problem.
Expand Down
18 changes: 9 additions & 9 deletions src/common/interfaces.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Moreover ID are UNSAFE (different plugin can have same id) so they should be use
class MeshLabInterface
{
public:
/** the type used to identify plugin actions; there is a one-to-one relation betweeen an ID and an Action.
/** the type used to identify plugin actions; there is a one-to-one relation between an ID and an Action.
\todo To be renamed as ActionIDType
*/

Expand All @@ -98,7 +98,7 @@ class MeshLabInterface

/// Standard stuff that usually should not be redefined.
void setLog(GLLogStream *log) { this->log = log; }
// This fucntion must be used to communicate useful information collected in the parsing/saving of the files.
// This function must be used to communicate useful information collected in the parsing/saving of the files.
// NEVER EVER use a msgbox to say something to the user.
template <typename... Ts>
void Log(const char * f, Ts&&... ts )
Expand Down Expand Up @@ -158,7 +158,7 @@ class MeshCommonInterface : public MeshLabInterface
\li reset: revert to the hardwired values
If your plugins/action has no GlobalParameter, do nothing.
The RichParameterSet comes to the StartDecorate already intialized with the values stored on the permanent storage.
The RichParameterSet comes to the StartDecorate already initialized with the values stored on the permanent storage.
At the start up the initGlobalParameterSet function is called with an empty RichParameterSet (to collect the default values)
If a filter wants to save some permanent stuff should set the permanent default values.
*/
Expand Down Expand Up @@ -247,7 +247,7 @@ class MeshFilterInterface : public MeshCommonInterface
{
public:
/** The FilterClass enum represents the set of keywords that must be used to categorize a filter.
Each filter can belong to one or more filtering class, or-ed togheter.
Each filter can belong to one or more filtering class, or-ed together.
*/
enum FilterClass
{
Expand Down Expand Up @@ -310,7 +310,7 @@ class MeshFilterInterface : public MeshCommonInterface

/**
The filters can have some additional requirements on the mesh capabiliteis.
// For example if a filters requires Face-Face Adjacency you shoud re-implement
// For example if a filters requires Face-Face Adjacency you should re-implement
// this function making it returns MeshModel::MM_FACEFACETOPO.
// The framework will ensure that the mesh has the requirements satisfied before invoking the applyFilter function
//
Expand Down Expand Up @@ -351,7 +351,7 @@ class MeshFilterInterface : public MeshCommonInterface

/** \brief tests if a filter is applicable to a mesh.
This function is a handy wrapper used by the framework for the \a getPreConditions callback;
For istance a colorize by quality filter cannot be applied to a mesh without per-vertex-quality.
For instance a colorize by quality filter cannot be applied to a mesh without per-vertex-quality.
On failure (returning false) the function fills the MissingItems list with strings describing the missing items.
*/
bool isFilterApplicable(QAction *act, const MeshModel& m, QStringList &MissingItems) const;
Expand Down Expand Up @@ -497,7 +497,7 @@ class MeshDecorateInterface : public MeshCommonInterface
public:

/** The DecorationClass enum represents the set of keywords that must be used to categorize a filter.
Each filter can belong to one or more filtering class, or-ed togheter.
Each filter can belong to one or more filtering class, or-ed together.
*/
enum DecorationClass
{
Expand Down Expand Up @@ -529,7 +529,7 @@ class MeshDecorateInterface : public MeshCommonInterface

/** \brief tests if a decoration is applicable to a mesh.
* used only for PerMesh Decorators.
For istance curvature cannot be shown on a mesh without curvature.
For instance curvature cannot be shown on a mesh without curvature.
On failure (returning false) the function fills the MissingItems list with strings describing the missing items.
It is invoked only for decoration of \i PerMesh class;
*/
Expand Down Expand Up @@ -606,7 +606,7 @@ class MeshEditInterface : public MeshCommonInterface

// Called when the user changes the selected layer
//by default it calls end edit with the layer that was selected and start with the new layer that is
//selected. This ensures that plugins who dont support layers do not get sent pointers to meshes
//selected. This ensures that plugins who don't support layers do not get sent pointers to meshes
//they are not expecting.
// If your editing plugins is not singleMesh you MUST reimplement this to correctly handle the change of layer.
virtual void LayerChanged(MeshDocument &md, MeshModel &oldMeshModel, GLArea *parent, MLSceneGLSharedDataContext* cont)
Expand Down
2 changes: 1 addition & 1 deletion src/meshlab/filterScriptDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ void FilterScriptDialog::editOldParameters( const int row )
return;
}

//fill the paramter set with all the names and descriptions which are lost in the
//fill the parameter set with all the names and descriptions which are lost in the
//filter script
RichParameterSet newParameterSet;
iFilter->initParameterSet(action, *(mainWindow->meshDoc()), newParameterSet);
Expand Down
2 changes: 1 addition & 1 deletion src/meshlab/glarea.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2229,7 +2229,7 @@ void GLArea::loadShot(const QPair<Shotm,float> &shotAndScale){
//Point3f tra = trackball.track.tra;
//
//// Apply this formula:
//// SR(t+p) -v = k[S'R'(t'+p) -v] forall p, R=R', k is a costant
//// SR(t+p) -v = k[S'R'(t'+p) -v] forall p, R=R', k is a constant
//// SR(t) -v = k[S'R(t') -v]
//// t' = 1/k* S'^-1St + (k-1)/k S'^-1*R^-1v
//Matrix44f s0 = Matrix44f().SetScale(trackball.track.sca,trackball.track.sca, trackball.track.sca);
Expand Down
2 changes: 1 addition & 1 deletion src/meshlab/glarea.h
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ public slots:

// the following pairs of slot/signal implements a very simple message passing mechanism.
// a widget that has a pointer to the glarea call the sendViewDir() slot and
// setup a connect to recive the transmitViewDir signal that actually contains the point3f.
// setup a connect to receive the transmitViewDir signal that actually contains the point3f.
// This mechanism is used to get the view direction/position and picking point on surface in the filter parameter dialog.
// See the Point3fWidget code.
signals :
Expand Down
4 changes: 2 additions & 2 deletions src/meshlab/images/onscreenHelp.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
</H2>
<table>
<tr><td width="200" align='right'>Click on eye icon: </td><td width="100">Toggle visibility status of the layer</td></tr>
<tr><td width="200" align='right'>Ctrl-Click on eye icon: </td><td width="100">Make Invisibile all other layers</td></tr>
<tr><td width="200" align='right'>Alt-Click on eye icon: </td><td width="100">Make Visibile all other layers</td></tr>
<tr><td width="200" align='right'>Ctrl-Click on eye icon: </td><td width="100">Make Invisible all other layers</td></tr>
<tr><td width="200" align='right'>Alt-Click on eye icon: </td><td width="100">Make Visible all other layers</td></tr>
<tr><td width="200" align='right'>Shift-Click on eye icon: </td><td width="100">Invert visibility status of all the layers</td></tr>
</table>
</font>
20 changes: 10 additions & 10 deletions src/meshlab/mainwindow_RunTime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ void MainWindow::setHandleMenu(QPoint point, Qt::Orientation orientation, QSplit
if(pickingId>=0)
splitUpAct->setEnabled(mvc->getViewer(pickingId)->size().width()/2 > mvc->getViewer(pickingId)->minimumSizeHint().width());

//the viewer on top can be closed only if the splitter over the handle that orginated the event has one child
//the viewer on top can be closed only if the splitter over the handle that originated the event has one child
bool unSplittabilityUp = true;
Splitter * upSplitter = qobject_cast<Splitter *>(origin->widget(0));
if(upSplitter)
Expand All @@ -600,7 +600,7 @@ void MainWindow::setHandleMenu(QPoint point, Qt::Orientation orientation, QSplit
if(pickingId>=0)
splitDownAct->setEnabled(mvc->getViewer(pickingId)->size().width()/2 > mvc->getViewer(pickingId)->minimumSizeHint().width());

//the viewer below can be closed only if the splitter ounder the handle that orginated the event has one child
//the viewer below can be closed only if the splitter ounder the handle that originated the event has one child
bool unSplittabilityDown = true;
Splitter * downSplitter = qobject_cast<Splitter *>(origin->widget(1));
if(downSplitter)
Expand All @@ -627,7 +627,7 @@ void MainWindow::setHandleMenu(QPoint point, Qt::Orientation orientation, QSplit
if(pickingId>=0)
splitRightAct->setEnabled(mvc->getViewer(pickingId)->size().height()/2 > mvc->getViewer(pickingId)->minimumSizeHint().height());

//the viewer on the rigth can be closed only if the splitter on the right the handle that orginated the event has one child
//the viewer on the right can be closed only if the splitter on the right the handle that originated the event has one child
bool unSplittabilityRight = true;
Splitter * rightSplitter = qobject_cast<Splitter *>(origin->widget(1));
if(rightSplitter)
Expand All @@ -639,7 +639,7 @@ void MainWindow::setHandleMenu(QPoint point, Qt::Orientation orientation, QSplit
if(pickingId>=0)
splitLeftAct->setEnabled(mvc->getViewer(pickingId)->size().height()/2 > mvc->getViewer(pickingId)->minimumSizeHint().height());

//the viewer on the left can be closed only if the splitter on the left of the handle that orginated the event has one child
//the viewer on the left can be closed only if the splitter on the left of the handle that originated the event has one child
bool unSplittabilityLeft = true;
Splitter * leftSplitter = qobject_cast<Splitter *>(origin->widget(0));
if(leftSplitter)
Expand Down Expand Up @@ -1101,7 +1101,7 @@ void MainWindow::showTooltip(QAction* q)
// /////////////////////////////////////////////////
// The Very Important Procedure of applying a filter
// /////////////////////////////////////////////////
// It is splitted in two part
// It is split in two part
// - startFilter that setup the dialogs and asks for parameters
// - executeFilter callback invoked when the params have been set up.

Expand Down Expand Up @@ -1156,7 +1156,7 @@ void MainWindow::startFilter()
xmldialog = NULL;
}

// (2) Ask for filter parameters and eventally directly invoke the filter
// (2) Ask for filter parameters and eventually directly invoke the filter
// showAutoDialog return true if a dialog have been created (and therefore the execution is demanded to the apply event)
// if no dialog is created the filter must be executed immediately
if(! stddialog->showAutoDialog(iFilter, meshDoc()->mm(), (meshDoc()), action, this, GLA()) )
Expand Down Expand Up @@ -1235,7 +1235,7 @@ void MainWindow::startFilter()
delete stddialog;
stddialog = NULL;
}
// (2) Ask for filter parameters and eventally directly invoke the filter
// (2) Ask for filter parameters and eventually directly invoke the filter
// showAutoDialog return true if a dialog have been created (and therefore the execution is demanded to the apply event)
// if no dialog is created the filter must be executed immediatel
if(!xmldialog->showAutoDialog(filt,PM,meshDoc(), this, GLA()))
Expand Down Expand Up @@ -1431,7 +1431,7 @@ void MainWindow::executeFilter(QAction *action, RichParameterSet &params, bool i
iFilter->setLog(&meshDoc()->Log);

// Ask for filter requirements (eg a filter can need topology, border flags etc)
// and statisfy them
// and satisfy them
qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
MainWindow::globalStatusBar()->showMessage("Starting Filter...",5000);
int req=iFilter->getRequirements(action);
Expand Down Expand Up @@ -1754,7 +1754,7 @@ void MainWindow::executeFilter(MeshLabXMLFilterContainer* mfc,const QMap<QString
iFilter->setLog(&meshDoc()->Log);

//// Ask for filter requirements (eg a filter can need topology, border flags etc)
//// and statisfy them
//// and satisfy them
qApp->setOverrideCursor(QCursor(Qt::WaitCursor));
MainWindow::globalStatusBar()->showMessage("Starting Filter...",5000);
//int req=iFilter->getRequirements(action);
Expand Down Expand Up @@ -1989,7 +1989,7 @@ void MainWindow::scriptCodeExecuted( const QScriptValue& val,const int time,cons
}
}

// Edit Mode Managment
// Edit Mode Management
// At any point there can be a single editing plugin active.
// When a plugin is active it intercept the mouse actions.
// Each active editing tools
Expand Down
2 changes: 1 addition & 1 deletion src/meshlab/multiViewer_Container.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ void MultiViewer_Container::addView(GLArea* viewer,Qt::Orientation orient)
/ \
View2 View3
In the GUI, when a viewer is splitted, the new one appears on its right (the space is split in two equal portions).
In the GUI, when a viewer is split, the new one appears on its right (the space is split in two equal portions).
*/
//CASE 0: only when the first viewer is opened, just add it and return;
if (viewerCounter()==0)
Expand Down
4 changes: 2 additions & 2 deletions src/meshlab/stdpardialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ class GetFileNameWidget : public MeshLabWidget
This class is used to automatically create a frame from a set of parameters.
it is used mostly for creating the main dialog of the filters, but it is used also
in the creation of the additional saving options, post and pre opening processing
and for general parameter setting in edit plugins (e.g. look at the aligment parameters)
and for general parameter setting in edit plugins (e.g. look at the alignment parameters)
*/
class StdParFrame : public QFrame
{
Expand Down Expand Up @@ -712,7 +712,7 @@ class StdParFrame : public QFrame


// This class provide a modal dialog box for asking a generic parameter set
// It can be used by anyone needing for some values in a structred form and having some integrated help
// It can be used by anyone needing for some values in a structured form and having some integrated help
class GenericParamDialog: public QDialog
{
Q_OBJECT
Expand Down
2 changes: 1 addition & 1 deletion src/meshlab/xmlstdpardialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ void XMLStdParFrame::savePersistentParameterValue(QString name)
XMLStringWidget* stringwid = qobject_cast<XMLStringWidget*>(widg);
if (stringwid != nullptr)
{
/*WARNING!!!! WHY NOT USING THE ENV PATTERN FOR ALL THE CASES? Because QT when convert a QScriptValue to a QString of a javascript array (eg. [i0,i1,...,in]) return a i0,i1,...,in without the square brackets, making impossible to correctly re evalute again the resulting value*/
/*WARNING!!!! WHY NOT USING THE ENV PATTERN FOR ALL THE CASES? Because QT when convert a QScriptValue to a QString of a javascript array (eg. [i0,i1,...,in]) return a i0,i1,...,in without the square brackets, making impossible to correctly re evaluate again the resulting value*/
Env e;
expr = e.evaluate(expr).toString();
}
Expand Down
2 changes: 1 addition & 1 deletion src/meshlab/xmlstdpardialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ private slots:
};

// This class provide a modal dialog box for asking a generic parameter set
// It can be used by anyone needing for some values in a structred form and having some integrated help
// It can be used by anyone needing for some values in a structured form and having some integrated help
class OldScriptingSystemXMLParamDialog: public QDialog
{
Q_OBJECT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ bool DecorateBackgroundPlugin::startDecorate( QAction * action, MeshDocument &/*
switch(ID(action))
{
case DP_SHOW_CUBEMAPPED_ENV :
if(parset->findParameter(CubeMapPathParam())== NULL) qDebug("CubeMapPath was not setted!!!");
if(parset->findParameter(CubeMapPathParam())== NULL) qDebug("CubeMapPath was not set!!!");
cubemapFileName = parset->getString(CubeMapPathParam());
break;
case DP_SHOW_GRID:
Expand All @@ -99,7 +99,7 @@ bool DecorateBackgroundPlugin::startDecorate( QAction * action, MeshDocument &/*

void DecorateBackgroundPlugin::decorateDoc(QAction *a, MeshDocument &m, RichParameterSet * parset,GLArea * gla, QPainter *, GLLogStream &)
{
static QString lastname("unitialized");
static QString lastname("uninitialized");
switch(ID(a))
{
case DP_SHOW_CUBEMAPPED_ENV :
Expand Down
4 changes: 2 additions & 2 deletions src/meshlabplugins/decorate_base/decorate_base.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ QString DecorateBasePlugin::decorationInfo(FilterIDType filter) const
case DP_SHOW_QUALITY_HISTOGRAM: return tr("Draw a (colored) Histogram of the per vertex/face quality");
case DP_SHOW_QUALITY_CONTOUR: return tr("Draw quality contours, e.g. the isolines of the quality field defined over the surface ");
case DP_SHOW_CAMERA: return tr("Draw the position of the mesh camera and raster cameras");
case DP_SHOW_TEXPARAM: return tr("Draw an overlayed flattened version of the current mesh that show the current parametrization");
case DP_SHOW_TEXPARAM: return tr("Draw an overlaid flattened version of the current mesh that show the current parametrization");
case DP_SHOW_SELECTED_MESH: return tr("Highlight the current mesh");
}
assert(0);
Expand Down Expand Up @@ -785,7 +785,7 @@ void DecorateBasePlugin::DisplayCamera(QString who, Shotm &ls, int cameraSourceI
// glLabel::render2D(painter,glLabel::TOP_LEFT,ln++, QString("axis 1 - %1 %2 %3").arg(ax1[0]).arg(ax1[1]).arg(ax1[2]));
// glLabel::render2D(painter,glLabel::TOP_LEFT,ln++, QString("axis 2 - %1 %2 %3").arg(ax2[0]).arg(ax2[1]).arg(ax2[2]));
// glLabel::render2D(painter,glLabel::TOP_LEFT,ln++, QString("Fov %1 ( %2 x %3) ").arg(fov).arg(ls.Intrinsics.ViewportPx[0]).arg(ls.Intrinsics.ViewportPx[1]));
// glLabel::render2D(painter,glLabel::TOP_LEFT,ln++, QString("Focal Lenght %1 (pxsize %2 x %3) ").arg(focal).arg(ls.Intrinsics.PixelSizeMm[0]).arg(ls.Intrinsics.PixelSizeMm[1]));
// glLabel::render2D(painter,glLabel::TOP_LEFT,ln++, QString("Focal Length %1 (pxsize %2 x %3) ").arg(focal).arg(ls.Intrinsics.PixelSizeMm[0]).arg(ls.Intrinsics.PixelSizeMm[1]));


this->RealTimeLog("Camera Info", who,
Expand Down
6 changes: 3 additions & 3 deletions src/meshlabplugins/decorate_shadow/decorate_shader.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class GLArea;
/**
* Base abstract class for all the four decorator methods(shadow mapping, VSM shadow mapping, VSM shadow mapping
* with blur and Screen Space Ambient Occlusion). It defines the method that should be implemented in the derived
* class(init(), runShader() and setup()). It defines a set of methods in common beetwen all the derived class too.
* class(init(), runShader() and setup()). It defines a set of methods in common between all the derived class too.
*/
class DecorateShader
{
Expand Down Expand Up @@ -305,9 +305,9 @@ class DecorateShader

/**
* Generates a texture color for the handler <b>tex</b> and attaches it to the FBO
* at the attachement target defined by <b>attachment</b>. The FBO should be binded before the method is called.
* at the attachment target defined by <b>attachment</b>. The FBO should be binded before the method is called.
* @param tex the texture handler
* @param attachement the FBO attachment target.
* @param attachment the FBO attachment target.
*/
void genColorTextureEXT(GLuint& tex, GLenum attachment){
glGenTextures(1, &tex);
Expand Down
Loading

0 comments on commit 6c8ab64

Please sign in to comment.