Updated the filters to do not refer anymore the old applyFilter function

This commit is contained in:
Paolo Cignoni cignoni 2010-02-05 16:09:23 +00:00
parent 8321f759ce
commit 3ee5124fe4
9 changed files with 16 additions and 13 deletions

View File

@ -382,9 +382,10 @@ void FilterUnsharp::initParameterSet(QAction *action, MeshDocument &md, RichPara
}
}
bool FilterUnsharp::applyFilter(QAction *filter, MeshModel &m, RichParameterSet & par, vcg::CallBackPos * cb)
bool FilterUnsharp::applyFilter(QAction *filter, MeshDocument &md, RichParameterSet & par, vcg::CallBackPos * cb)
{
switch(ID(filter))
MeshModel &m=*(md.mm());
switch(ID(filter))
{
case FP_CREASE_CUT :{
float angleDeg = par.getFloat("angleDeg");

View File

@ -73,7 +73,7 @@ class FilterUnsharp : public QObject, public MeshFilterInterface
virtual bool autoDialog(QAction *);
virtual FilterClass getClass(QAction *);
virtual int getRequirements(QAction *);
virtual bool applyFilter(QAction *filter, MeshModel &m, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ;
virtual bool applyFilter(QAction *filter, MeshDocument &md, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ;
virtual void initParameterSet(QAction *action, MeshDocument &/*m*/, RichParameterSet & parlst);
virtual int postCondition( QAction* ) const;
virtual int getPreConditions(QAction *) const;

View File

@ -275,7 +275,6 @@ public:
virtual void initParameterSet(QAction *,MeshDocument &/*m*/, RichParameterSet & /*parent*/);
int getRequirements(QAction *action);
virtual bool applyFilter(QAction *filter, MeshDocument &md, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ;
virtual bool applyFilter(QAction *filter, MeshModel &md, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) {return true;}
FilterClass getClass(QAction *a);
virtual int postCondition( QAction *a ) const { return MeshModel::MM_FACEFACETOPO|MeshModel::MM_VERTNORMAL; }

View File

@ -112,9 +112,10 @@ void FilterBorder::initParameterSet(QAction *action,MeshModel &m, RichParameterS
bool FilterBorder::applyFilter(QAction *filter, MeshModel &m, RichParameterSet & par, vcg::CallBackPos * cb)
bool FilterBorder::applyFilter(QAction *filter, MeshDocument &md, RichParameterSet & par, vcg::CallBackPos * cb)
{
CMeshO::FaceIterator fi;
MeshModel &m=*(md.mm());
CMeshO::FaceIterator fi;
CMeshO::VertexIterator vi;
switch(ID(filter))
{

View File

@ -62,7 +62,7 @@ class FilterBorder : public QObject, public MeshFilterInterface
virtual bool autoDialog(QAction *) {return true;}
virtual void initParameterSet(QAction *,MeshModel &/*m*/, RichParameterSet & /*parent*/);
virtual bool applyFilter(QAction *filter, MeshModel &m, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ;
virtual bool applyFilter(QAction *filter, MeshDocument &md, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ;
protected:

View File

@ -96,9 +96,10 @@ FilterCreateIso::~FilterCreateIso() {
return 0;
}
bool FilterCreateIso::applyFilter(QAction *filter, MeshModel &m, RichParameterSet & par, vcg::CallBackPos * cb)
bool FilterCreateIso::applyFilter(QAction *filter, MeshDocument &md, RichParameterSet & par, vcg::CallBackPos * cb)
{
CMeshO::FaceIterator fi;
MeshModel &m=*(md.mm());
CMeshO::FaceIterator fi;
CMeshO::VertexIterator vi;
if(filter->text() == filterName(FP_CREATEISO) )
{

View File

@ -62,7 +62,7 @@ class FilterCreateIso : public QObject, public MeshFilterInterface
virtual bool autoDialog(QAction *) {return true;}
virtual void initParameterSet(QAction *,MeshModel &/*m*/, RichParameterSet & /*parent*/);
virtual bool applyFilter(QAction *filter, MeshModel &m, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ;
virtual bool applyFilter(QAction *filter, MeshDocument &md, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ;
protected:

View File

@ -105,9 +105,10 @@ QString FilterGeodesic::filterName(FilterIDType filter) const
return 0;
}
bool FilterGeodesic::applyFilter(QAction *filter, MeshModel &m, RichParameterSet & par, vcg::CallBackPos * /*cb*/)
bool FilterGeodesic::applyFilter(QAction *filter, MeshDocument &md, RichParameterSet & par, vcg::CallBackPos * /*cb*/)
{
CMeshO::FaceIterator fi;
MeshModel &m=*(md.mm());
CMeshO::FaceIterator fi;
CMeshO::VertexIterator vi;
switch (ID(filter)) {
case FP_QUALITY_POINT_GEODESIC:

View File

@ -64,7 +64,7 @@ class FilterGeodesic : public QObject, public MeshFilterInterface
virtual FilterClass getClass(QAction *);
virtual int getRequirements(QAction *);
virtual bool applyFilter(QAction *filter, MeshModel &m, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ;
virtual bool applyFilter(QAction *filter, MeshDocument &md, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ;
virtual bool autoDialog(QAction *) ;
virtual void initParameterSet(QAction *,MeshModel &/*m*/, RichParameterSet & /*parent*/);