From 3ee5124fe42b06e44b761eecb654c4f0c0dc71b2 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Fri, 5 Feb 2010 16:09:23 +0000 Subject: [PATCH] Updated the filters to do not refer anymore the old applyFilter function --- src/meshlabplugins/filter_unsharp/filter_unsharp.cpp | 5 +++-- src/meshlabplugins/filter_unsharp/filter_unsharp.h | 2 +- src/meshlabplugins/filter_zippering/filter_zippering.h | 1 - src/sampleplugins/filterborder/filterborder.cpp | 5 +++-- src/sampleplugins/filterborder/filterborder.h | 2 +- src/sampleplugins/filtercreateiso/filtercreateiso.cpp | 5 +++-- src/sampleplugins/filtercreateiso/filtercreateiso.h | 2 +- src/sampleplugins/filtergeodesic/filtergeodesic.cpp | 5 +++-- src/sampleplugins/filtergeodesic/filtergeodesic.h | 2 +- 9 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/meshlabplugins/filter_unsharp/filter_unsharp.cpp b/src/meshlabplugins/filter_unsharp/filter_unsharp.cpp index 82a0b7228..096d47fce 100644 --- a/src/meshlabplugins/filter_unsharp/filter_unsharp.cpp +++ b/src/meshlabplugins/filter_unsharp/filter_unsharp.cpp @@ -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"); diff --git a/src/meshlabplugins/filter_unsharp/filter_unsharp.h b/src/meshlabplugins/filter_unsharp/filter_unsharp.h index acbed8e48..aad47250e 100644 --- a/src/meshlabplugins/filter_unsharp/filter_unsharp.h +++ b/src/meshlabplugins/filter_unsharp/filter_unsharp.h @@ -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; diff --git a/src/meshlabplugins/filter_zippering/filter_zippering.h b/src/meshlabplugins/filter_zippering/filter_zippering.h index e0338d16d..f53400a91 100644 --- a/src/meshlabplugins/filter_zippering/filter_zippering.h +++ b/src/meshlabplugins/filter_zippering/filter_zippering.h @@ -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; } diff --git a/src/sampleplugins/filterborder/filterborder.cpp b/src/sampleplugins/filterborder/filterborder.cpp index c8600c2d9..c290c920e 100644 --- a/src/sampleplugins/filterborder/filterborder.cpp +++ b/src/sampleplugins/filterborder/filterborder.cpp @@ -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)) { diff --git a/src/sampleplugins/filterborder/filterborder.h b/src/sampleplugins/filterborder/filterborder.h index 310641b6d..8d1cfd235 100644 --- a/src/sampleplugins/filterborder/filterborder.h +++ b/src/sampleplugins/filterborder/filterborder.h @@ -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: diff --git a/src/sampleplugins/filtercreateiso/filtercreateiso.cpp b/src/sampleplugins/filtercreateiso/filtercreateiso.cpp index 33911a063..3e4db8c3d 100644 --- a/src/sampleplugins/filtercreateiso/filtercreateiso.cpp +++ b/src/sampleplugins/filtercreateiso/filtercreateiso.cpp @@ -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) ) { diff --git a/src/sampleplugins/filtercreateiso/filtercreateiso.h b/src/sampleplugins/filtercreateiso/filtercreateiso.h index 3211e4caf..3e951a18a 100644 --- a/src/sampleplugins/filtercreateiso/filtercreateiso.h +++ b/src/sampleplugins/filtercreateiso/filtercreateiso.h @@ -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: diff --git a/src/sampleplugins/filtergeodesic/filtergeodesic.cpp b/src/sampleplugins/filtergeodesic/filtergeodesic.cpp index 6e9d02949..5340aac24 100644 --- a/src/sampleplugins/filtergeodesic/filtergeodesic.cpp +++ b/src/sampleplugins/filtergeodesic/filtergeodesic.cpp @@ -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: diff --git a/src/sampleplugins/filtergeodesic/filtergeodesic.h b/src/sampleplugins/filtergeodesic/filtergeodesic.h index 52c2b0687..a80482f47 100644 --- a/src/sampleplugins/filtergeodesic/filtergeodesic.h +++ b/src/sampleplugins/filtergeodesic/filtergeodesic.h @@ -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*/);