filter mutualinfo, mutualglobal and colorproj python rename

This commit is contained in:
alemuntoni 2021-11-09 17:37:37 +01:00
parent 94a091cd18
commit b2277c74d4
6 changed files with 919 additions and 800 deletions

View File

@ -40,6 +40,7 @@ class FilterColorProjectionPlugin : public QObject, public FilterPlugin
QString pluginName() const;
QString filterName(ActionIDType filter) const;
QString pythonFilterName(ActionIDType f) const;
QString filterInfo(ActionIDType filter) const;
int postCondition( const QAction* ) const;
@ -50,7 +51,6 @@ class FilterColorProjectionPlugin : public QObject, public FilterPlugin
std::map<std::string, QVariant> applyFilter(const QAction* action, const RichParameterList & /*parent*/, MeshDocument &md, unsigned int& postConditionMask, vcg::CallBackPos * cb);
FilterArity filterArity(const QAction *) const {return SINGLE_MESH;}
private:
int calculateNearFarAccurate(MeshDocument &md, std::vector<float> *near, std::vector<float> *far);
};

View File

@ -61,15 +61,22 @@ QString FilterMutualGlobal::pluginName() const
return "FilterMutualGlobal";
}
// ST() must return the very short string describing each filtering action
// (this string is used also to define the menu entry)
QString FilterMutualGlobal::filterName(ActionIDType filterId) const
{
switch(filterId) {
case FP_IMAGE_GLOBALIGN : return QString("Image Registration: Global refinement using Mutual Information");
default : assert(0);
}
return QString();
switch (filterId) {
case FP_IMAGE_GLOBALIGN:
return QString("Image Registration: Global refinement using Mutual Information");
default: assert(0); return QString();
}
}
QString FilterMutualGlobal::pythonFilterName(ActionIDType f) const
{
switch (f) {
case FP_IMAGE_GLOBALIGN:
return QString("raster_global_refinement_mutual_information");
default: assert(0); return QString();
}
}
// Info() must return the longer string describing each filtering action

View File

@ -54,6 +54,8 @@ public:
QString filterName(ActionIDType filter) const;
QString filterInfo(ActionIDType filter) const;
QString pythonFilterName(ActionIDType f) const;
RichParameterList initParameterList(const QAction*, const MeshDocument & md);
std::map<std::string, QVariant> applyFilter(
const QAction* action,
@ -83,7 +85,6 @@ public:
void initGL();
};

View File

@ -49,12 +49,17 @@ QString FilterMutualInfoPlugin::pluginName() const
QString FilterMutualInfoPlugin::filterName(ActionIDType filterId) const
{
switch(filterId) {
case FP_IMAGE_MUTUALINFO:
return "Image alignment: Mutual Information";
default :
assert(0);
return "";
switch (filterId) {
case FP_IMAGE_MUTUALINFO: return "Image alignment: Mutual Information";
default: assert(0); return QString();
}
}
QString FilterMutualInfoPlugin::pythonFilterName(ActionIDType f) const
{
switch (f) {
case FP_IMAGE_MUTUALINFO: return "raster_alignment_mutual_information";
default: assert(0); return QString();
}
}

View File

@ -44,6 +44,7 @@ public:
QString pluginName() const;
QString filterName(ActionIDType filter) const;
QString pythonFilterName(ActionIDType f) const;
QString filterInfo(ActionIDType filter) const;
FilterClass getClass(const QAction* a) const;
bool requiresGLContext(const QAction* action) const;
@ -56,7 +57,6 @@ public:
unsigned int& postConditionMask,
vcg::CallBackPos * cb);
int postCondition(const QAction*) const;
private:
AlignSet align;