renames and fixes

This commit is contained in:
alemuntoni 2021-03-03 13:42:47 +01:00
parent 831255a6e7
commit 1bd192bc4e
36 changed files with 43 additions and 40 deletions

View File

@ -46,7 +46,7 @@ public:
virtual ~EditPlugin() {}
//should return a sentence describing what the editing tool does
static const QString Info();
static const QString info();
virtual void suggestedRenderingData(MeshModel &/*m*/, MLRenderingData& /*dt*/) {}

View File

@ -1,6 +1,8 @@
#include "filter_plugin.h"
#include "../../python/python_utils.h"
#include <QtGlobal>
QString FilterPlugin::pythonFilterName(MeshLabPlugin::ActionIDType f) const
{
return pymeshlab::computePythonName(filterName(f));
@ -48,10 +50,10 @@ bool FilterPlugin::isFilterApplicable(const QAction* act, const MeshModel& m, QS
MeshLabPlugin::ActionIDType FilterPlugin::ID(const QAction* a) const
{
QString aa=a->text();
for(ActionIDType tt : types())
for(ActionIDType tt : qAsConst(typeList))
if (a->text() == this->filterName(tt)) return tt;
aa.replace("&","");
for(ActionIDType tt : types())
for(ActionIDType tt : qAsConst(typeList))
if (aa == this->filterName(tt)) return tt;
qDebug("unable to find the id corresponding to action '%s'", qUtf8Printable(a->text()));
@ -68,10 +70,10 @@ QAction* FilterPlugin::getFilterAction(MeshLabPlugin::ActionIDType filterID)
QAction* FilterPlugin::getFilterAction(const QString& idName)
{
QString i=idName;
for(QAction *tt : actionList)
for(QAction *tt : qAsConst(actionList))
if (idName == tt->text()) return tt;
i.replace("&","");
for(QAction *tt : actionList)
for(QAction *tt : qAsConst(actionList))
if (i == tt->text()) return tt;
qDebug("unable to find the action corresponding to action '%s'", qUtf8Printable(idName));

View File

@ -35,7 +35,7 @@
* @brief The MeshLabPlugin class is the base of all the plugin classes.
*
* The main idea common to all the framework is that each plugin export a set
* of actions, internally each action is associated to a FilterIDType, and for
* of actions, internally each action is associated to an ActionIDType, and for
* each action a name and a formatted INFO is defined.
*
* For coding easyness ID are more practical (you can use them in switches).
@ -46,7 +46,8 @@
* used only INTERNALLY
*
* Note: this class does NOT contain member functions that need to be
* implemented in base classes.
* implemented in base classes. It just provides some common functionalities
* like logs.
*/
class MeshLabPlugin
{

View File

@ -57,7 +57,7 @@ EditAlignPlugin::EditAlignPlugin()
trackball.radius= 1;
}
const QString EditAlignPlugin::Info()
const QString EditAlignPlugin::info()
{
return tr("Allows one to align different layers together.");
}

View File

@ -51,7 +51,7 @@ public:
virtual ~EditAlignPlugin() {
}
static const QString Info();
static const QString info();
bool isSingleMeshEdit() const { return false; }
void suggestedRenderingData(MeshModel &m, MLRenderingData& dt);

View File

@ -54,7 +54,7 @@ EditPlugin* EditAlignFactory::getMeshEditInterface(const QAction *action)
QString EditAlignFactory::getEditToolDescription(const QAction *)
{
return EditAlignPlugin::Info();
return EditAlignPlugin::info();
}
MESHLAB_PLUGIN_NAME_EXPORTER(EditAlignFactory)

View File

@ -46,7 +46,7 @@ EditManipulatorsPlugin::EditManipulatorsPlugin()
delta_Transform = Matrix44m::Identity();
}
const QString EditManipulatorsPlugin::Info()
const QString EditManipulatorsPlugin::info()
{
return tr("Provide tools for moving meshes around the space");
}

View File

@ -42,7 +42,7 @@ public:
EditManipulatorsPlugin();
virtual ~EditManipulatorsPlugin() {}
static const QString Info();
static const QString info();
virtual bool startEdit(MeshModel &/*m*/, GLArea * /*parent*/, MLSceneGLSharedDataContext* /*cont*/);
virtual void endEdit(MeshModel &/*m*/, GLArea * /*parent*/, MLSceneGLSharedDataContext* /*cont*/);
virtual void decorate(MeshModel &, GLArea *,QPainter*);

View File

@ -57,7 +57,7 @@ EditPlugin* EditManipulatorsFactory::getMeshEditInterface(const QAction *action)
QString EditManipulatorsFactory::getEditToolDescription(const QAction *)
{
return EditManipulatorsPlugin::Info();
return EditManipulatorsPlugin::info();
}
MESHLAB_PLUGIN_NAME_EXPORTER(EditManipulatorsFactory)

View File

@ -40,7 +40,7 @@ EditMeasurePlugin::EditMeasurePlugin()
mName = 0;
}
const QString EditMeasurePlugin::Info()
const QString EditMeasurePlugin::info()
{
return tr("Allows one to measure distances between points of a model");
}

View File

@ -56,7 +56,7 @@ class EditMeasurePlugin : public QObject, public EditPlugin
public:
EditMeasurePlugin();
virtual ~EditMeasurePlugin() {}
static const QString Info();
static const QString info();
virtual bool startEdit(MeshModel &/*m*/, GLArea * /*parent*/, MLSceneGLSharedDataContext* /*cont*/);
virtual void endEdit(MeshModel &/*m*/, GLArea * /*parent*/, MLSceneGLSharedDataContext* /*cont*/);
virtual void decorate(MeshModel &, GLArea *,QPainter*);

View File

@ -57,7 +57,7 @@ EditPlugin* EditMeasureFactory::getMeshEditInterface(const QAction *action)
QString EditMeasureFactory::getEditToolDescription(const QAction *)
{
return EditMeasurePlugin::Info();
return EditMeasurePlugin::info();
}
MESHLAB_PLUGIN_NAME_EXPORTER(EditMeasureFactory)

View File

@ -58,7 +58,7 @@ EditMutualCorrsPlugin::EditMutualCorrsPlugin() {
}
const QString EditMutualCorrsPlugin::Info()
const QString EditMutualCorrsPlugin::info()
{
return tr("Registration of images on 3D models using mutual correspondences");
}

View File

@ -43,7 +43,7 @@ public:
EditMutualCorrsPlugin();
virtual ~EditMutualCorrsPlugin() {}
static const QString Info();
static const QString info();
bool startEdit(MeshModel &/*m*/, GLArea * /*parent*/, MLSceneGLSharedDataContext* /*cont*/);
void endEdit(MeshModel &/*m*/, GLArea * /*parent*/, MLSceneGLSharedDataContext* /*cont*/);

View File

@ -57,7 +57,7 @@ EditPlugin* EditMutualCorrsFactory::getMeshEditInterface(const QAction *action)
QString EditMutualCorrsFactory::getEditToolDescription(const QAction *)
{
return EditMutualCorrsPlugin::Info();
return EditMutualCorrsPlugin::info();
}
MESHLAB_PLUGIN_NAME_EXPORTER(EditMutualCorrsFactory)

View File

@ -41,7 +41,7 @@ EditPaintPlugin::EditPaintPlugin()
EditPaintPlugin::~EditPaintPlugin() {}
const QString EditPaintPlugin::Info() {
const QString EditPaintPlugin::info() {
return tr("Improved Painting");
}

View File

@ -58,7 +58,7 @@ public:
EditPaintPlugin();
virtual ~EditPaintPlugin();
static const QString Info();
static const QString info();
void suggestedRenderingData(MeshModel &/*m*/, MLRenderingData& /*dt*/);
bool startEdit(MeshModel &/*m*/, GLArea * /*parent*/, MLSceneGLSharedDataContext* /*cont*/);

View File

@ -57,7 +57,7 @@ EditPlugin* EditPaintFactory::getMeshEditInterface(const QAction *action)
QString EditPaintFactory::getEditToolDescription(const QAction *)
{
return EditPaintPlugin::Info();
return EditPaintPlugin::info();
}
MESHLAB_PLUGIN_NAME_EXPORTER(EditPaintFactory)

View File

@ -58,7 +58,7 @@ EditPlugin* EditPickPointsFactory::getMeshEditInterface(const QAction *action)
QString EditPickPointsFactory::getEditToolDescription(const QAction *)
{
return EditPickPointsPlugin::Info();
return EditPickPointsPlugin::info();
}
MESHLAB_PLUGIN_NAME_EXPORTER(EditPickPointsFactory)

View File

@ -62,7 +62,7 @@ EditPickPointsPlugin::EditPickPointsPlugin()
//Constants
const QString EditPickPointsPlugin::Info()
const QString EditPickPointsPlugin::info()
{
return tr("Pick and save 3D points on the mesh");
}

View File

@ -49,7 +49,7 @@ public:
delete pickPointsDialog;
}
static const QString Info();
static const QString info();
virtual bool startEdit(MeshModel & mm, GLArea * gla, MLSceneGLSharedDataContext* /*cont*/);
virtual void endEdit(MeshModel & mm, GLArea * gla, MLSceneGLSharedDataContext* /*cont*/);

View File

@ -45,7 +45,7 @@ using namespace vcg;
EditPointPlugin::EditPointPlugin(int _editType) : editType(_editType) {}
const QString EditPointPlugin::Info() {
const QString EditPointPlugin::info() {
return tr("Select a region of the point cloud thought to be in the same connected component.");
}

View File

@ -39,7 +39,7 @@ public:
EditPointPlugin(int _editType);
virtual ~EditPointPlugin() {}
static const QString Info();
static const QString info();
void suggestedRenderingData(MeshModel & m, MLRenderingData& dt);
bool startEdit(MeshModel &/*m*/, GLArea * /*parent*/, MLSceneGLSharedDataContext* /*cont*/);

View File

@ -61,7 +61,7 @@ EditPlugin* PointEditFactory::getMeshEditInterface(const QAction *action)
QString PointEditFactory::getEditToolDescription(const QAction *)
{
return EditPointPlugin::Info();
return EditPointPlugin::info();
}
MESHLAB_PLUGIN_NAME_EXPORTER(PointEditFactory)

View File

@ -58,7 +58,7 @@ EditPlugin* QualityMapperFactory::getMeshEditInterface(const QAction *action)
QString QualityMapperFactory::getEditToolDescription(const QAction *)
{
return QualityMapperPlugin::Info();
return QualityMapperPlugin::info();
}
MESHLAB_PLUGIN_NAME_EXPORTER(QualityMapperFactory)

View File

@ -42,7 +42,7 @@ QualityMapperPlugin::QualityMapperPlugin()
_qualityMapperDialog = 0;
}
const QString QualityMapperPlugin::Info()
const QString QualityMapperPlugin::info()
{
return tr("Colorize mesh vertices by Quality");
}

View File

@ -51,7 +51,7 @@ public:
QualityMapperPlugin(void);
~QualityMapperPlugin(void) {};
static const QString Info();
static const QString info();
bool startEdit(MeshModel&, GLArea*, MLSceneGLSharedDataContext* cont);
void endEdit(MeshModel&, GLArea*, MLSceneGLSharedDataContext* cont);
void suggestedRenderingData(MeshModel &/*m*/, MLRenderingData& /*dt*/);

View File

@ -73,7 +73,7 @@ EditReferencingPlugin::EditReferencingPlugin() {
referencingResults.reserve(4096);
}
const QString EditReferencingPlugin::Info()
const QString EditReferencingPlugin::info()
{
return tr("Reference layer(s) using fiducial points or scale layer(s) using reference distances.");
}

View File

@ -45,7 +45,7 @@ public:
EditReferencingPlugin();
virtual ~EditReferencingPlugin() {}
static const QString Info();
static const QString info();
bool startEdit(MeshModel &/*m*/, GLArea * /*parent*/, MLSceneGLSharedDataContext* /*cont*/);
void endEdit(MeshModel &/*m*/, GLArea * /*parent*/, MLSceneGLSharedDataContext* /*cont*/);

View File

@ -57,7 +57,7 @@ EditPlugin* EditReferencingFactory::getMeshEditInterface(const QAction *action)
QString EditReferencingFactory::getEditToolDescription(const QAction *)
{
return EditReferencingPlugin::Info();
return EditReferencingPlugin::info();
}
MESHLAB_PLUGIN_NAME_EXPORTER(EditReferencingFactory)

View File

@ -48,7 +48,7 @@ SampleEditPlugin::SampleEditPlugin()
pIndex = 0;
}
const QString SampleEditPlugin::Info()
const QString SampleEditPlugin::info()
{
return tr("Return detailed info about a picked face or vertex of the model.");
}

View File

@ -37,7 +37,7 @@ public:
SampleEditPlugin();
virtual ~SampleEditPlugin() {}
static const QString Info();
static const QString info();
bool startEdit(MeshModel &/*m*/, GLArea * /*parent*/, MLSceneGLSharedDataContext* /*cont*/);
void endEdit(MeshModel &/*m*/, GLArea * /*parent*/, MLSceneGLSharedDataContext* /*cont*/);

View File

@ -57,7 +57,7 @@ EditPlugin* SampleEditFactory::getMeshEditInterface(const QAction *action)
QString SampleEditFactory::getEditToolDescription(const QAction *)
{
return SampleEditPlugin::Info();
return SampleEditPlugin::info();
}
MESHLAB_PLUGIN_NAME_EXPORTER(SampleEditFactory)

View File

@ -37,7 +37,7 @@ EditSelectPlugin::EditSelectPlugin(int ConnectedMode) :selectionMode(ConnectedMo
isDragging = false;
}
QString EditSelectPlugin::Info()
QString EditSelectPlugin::info()
{
return tr("Interactive selection inside a dragged rectangle in screen space");
}

View File

@ -39,7 +39,7 @@ public:
virtual ~EditSelectPlugin() {}
static QString Info();
static QString info();
void suggestedRenderingData(MeshModel & m, MLRenderingData& dt);
bool startEdit(MeshModel &/*m*/, GLArea * /*parent*/, MLSceneGLSharedDataContext* /*cont*/);
void endEdit(MeshModel &/*m*/, GLArea * /*parent*/, MLSceneGLSharedDataContext* /*cont*/) {}

View File

@ -69,7 +69,7 @@ EditPlugin* EditSelectFactory::getMeshEditInterface(const QAction *action)
QString EditSelectFactory::getEditToolDescription(const QAction * /*a*/)
{
return EditSelectPlugin::Info();
return EditSelectPlugin::info();
}
MESHLAB_PLUGIN_NAME_EXPORTER(EditSelectFactory)