From ec2c8b7608fc45fcff14263ebdf4f159a2060bc7 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Fri, 5 Feb 2010 16:19:15 +0000 Subject: [PATCH] Updated the filters to do not refer anymore the old applyFilter function --- src/meshlabplugins/filter_splitter/filter_splitter.h | 3 +-- src/meshlabplugins/filter_texture/filter_texture.cpp | 3 ++- src/meshlabplugins/filter_texture/filter_texture.h | 2 +- src/sampleplugins/samplefilter/samplefilter.cpp | 4 ++-- src/sampleplugins/samplefilter/samplefilter.h | 2 +- src/sampleplugins/samplefilterdoc/samplefilterdoc.h | 1 - src/sampleplugins/samplefilterdyn/samplefilterdyn.cpp | 3 ++- src/sampleplugins/samplefilterdyn/samplefilterdyn.h | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/meshlabplugins/filter_splitter/filter_splitter.h b/src/meshlabplugins/filter_splitter/filter_splitter.h index 3c9a63c1b..5f001874e 100644 --- a/src/meshlabplugins/filter_splitter/filter_splitter.h +++ b/src/meshlabplugins/filter_splitter/filter_splitter.h @@ -43,8 +43,7 @@ public: virtual bool autoDialog(QAction *); virtual FilterClass getClass(QAction *); virtual void initParameterSet(QAction *,MeshDocument &/*m*/, RichParameterSet & /*parent*/); - virtual bool applyFilter(QAction *filter, MeshDocument &m, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ; - virtual bool applyFilter(QAction *, MeshModel &, RichParameterSet &, vcg::CallBackPos * ) { assert(0); return false;} ; + virtual bool applyFilter(QAction *filter, MeshDocument &md, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ; }; #endif diff --git a/src/meshlabplugins/filter_texture/filter_texture.cpp b/src/meshlabplugins/filter_texture/filter_texture.cpp index 594ec9af4..6a0a886bd 100644 --- a/src/meshlabplugins/filter_texture/filter_texture.cpp +++ b/src/meshlabplugins/filter_texture/filter_texture.cpp @@ -315,8 +315,9 @@ T log_2(const T num) } // The Real Core Function doing the actual mesh processing. -bool FilterTexturePlugin::applyFilter(QAction *filter, MeshModel &m, RichParameterSet &par, vcg::CallBackPos *cb) +bool FilterTexturePlugin::applyFilter(QAction *filter, MeshDocument &md, RichParameterSet &par, vcg::CallBackPos *cb) { + MeshModel &m=*(md.mm()); switch(ID(filter)) { case FP_UV_TO_COLOR : { int vcount = m.cm.vert.size(); diff --git a/src/meshlabplugins/filter_texture/filter_texture.h b/src/meshlabplugins/filter_texture/filter_texture.h index d94a1494c..ee56fb0e5 100644 --- a/src/meshlabplugins/filter_texture/filter_texture.h +++ b/src/meshlabplugins/filter_texture/filter_texture.h @@ -54,7 +54,7 @@ public: virtual QString filterInfo(FilterIDType filter) const; virtual bool autoDialog(QAction *) {return true;} virtual void initParameterSet(QAction *,MeshDocument &/*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); virtual int getRequirements(QAction *); virtual int getPreConditions(QAction *) const; virtual int postCondition( QAction* ) const; diff --git a/src/sampleplugins/samplefilter/samplefilter.cpp b/src/sampleplugins/samplefilter/samplefilter.cpp index e40074a48..ddbb0e929 100644 --- a/src/sampleplugins/samplefilter/samplefilter.cpp +++ b/src/sampleplugins/samplefilter/samplefilter.cpp @@ -97,9 +97,9 @@ void ExtraSamplePlugin::initParameterSet(QAction *action,MeshModel &m, RichParam // The Real Core Function doing the actual mesh processing. // Move Vertex of a random quantity -bool ExtraSamplePlugin::applyFilter(QAction *filter, MeshModel &m, RichParameterSet & par, vcg::CallBackPos *cb) +bool ExtraSamplePlugin::applyFilter(QAction *filter, MeshDocument &md, RichParameterSet & par, vcg::CallBackPos *cb) { - //MeshModel &m=*md->mm(); + MeshModel &m=*md.mm(); srand(time(NULL)); const float max_displacement =par.getAbsPerc("Displacement"); diff --git a/src/sampleplugins/samplefilter/samplefilter.h b/src/sampleplugins/samplefilter/samplefilter.h index d5aec6bb7..d040ab01b 100644 --- a/src/sampleplugins/samplefilter/samplefilter.h +++ b/src/sampleplugins/samplefilter/samplefilter.h @@ -52,7 +52,7 @@ public: virtual QString filterInfo(FilterIDType filter) const; 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) ; virtual int postCondition( QAction* ) const {return MeshModel::MM_VERTCOORD | MeshModel::MM_FACENORMAL | MeshModel::MM_VERTNORMAL;}; FilterClass getClass(QAction *a); diff --git a/src/sampleplugins/samplefilterdoc/samplefilterdoc.h b/src/sampleplugins/samplefilterdoc/samplefilterdoc.h index 7d7ca1d19..633c0998f 100644 --- a/src/sampleplugins/samplefilterdoc/samplefilterdoc.h +++ b/src/sampleplugins/samplefilterdoc/samplefilterdoc.h @@ -54,7 +54,6 @@ public: virtual FilterClass getClass(QAction *); virtual void initParameterSet(QAction *,MeshDocument &/*m*/, RichParameterSet & /*parent*/); virtual bool applyFilter(QAction *filter, MeshDocument &m, RichParameterSet & /*parent*/, vcg::CallBackPos * cb) ; - virtual bool applyFilter(QAction */*filter*/, MeshModel &, RichParameterSet & /*parent*/, vcg::CallBackPos *) { assert(0); return false;} ; }; #endif diff --git a/src/sampleplugins/samplefilterdyn/samplefilterdyn.cpp b/src/sampleplugins/samplefilterdyn/samplefilterdyn.cpp index 28d695872..a69821dcc 100644 --- a/src/sampleplugins/samplefilterdyn/samplefilterdyn.cpp +++ b/src/sampleplugins/samplefilterdyn/samplefilterdyn.cpp @@ -114,8 +114,9 @@ void ExtraSampleDynPlugin::initParameterSet(QAction *action,MeshModel &/*m*/, Ri // The Real Core Function doing the actual mesh processing. // It changes the color of the mesh according to a perlin noise function -bool ExtraSampleDynPlugin::applyFilter(QAction *, MeshModel &m, RichParameterSet & par, vcg::CallBackPos *) +bool ExtraSampleDynPlugin::applyFilter(QAction *, MeshDocument &md, RichParameterSet & par, vcg::CallBackPos *) { + MeshModel &m=*(md.mm()); const Color4b baseColor = par.getColor4b("baseColor"); const float percentage = par.getDynamicFloat("percentage"); const float frequency = math::Clamp(par.getDynamicFloat("frequency"),1.f,1000.f); diff --git a/src/sampleplugins/samplefilterdyn/samplefilterdyn.h b/src/sampleplugins/samplefilterdyn/samplefilterdyn.h index 6b6293e0f..a0831b813 100644 --- a/src/sampleplugins/samplefilterdyn/samplefilterdyn.h +++ b/src/sampleplugins/samplefilterdyn/samplefilterdyn.h @@ -43,7 +43,7 @@ public: virtual bool autoDialog(QAction *) {return true;} virtual void initParameterSet(QAction *,MeshModel &/*m*/, RichParameterSet & /*parent*/); virtual int postCondition( QAction* ) const {return MeshModel::MM_VERTCOLOR;}; - 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 FilterClass getClass(QAction *); };