From b60efff9ebdee295ffe6688a368d8b8af4d78aa5 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Tue, 7 Nov 2006 09:10:32 +0000 Subject: [PATCH] Removed shorthHelp and added topo_non_coherent (draft) --- .../meshcolorize/meshcolorize.cpp | 51 +++++++++---------- .../meshcolorize/meshcolorize.h | 4 ++ 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/src/meshlabplugins/meshcolorize/meshcolorize.cpp b/src/meshlabplugins/meshcolorize/meshcolorize.cpp index b83629eaa..cced57dfb 100644 --- a/src/meshlabplugins/meshcolorize/meshcolorize.cpp +++ b/src/meshlabplugins/meshcolorize/meshcolorize.cpp @@ -23,6 +23,9 @@ /**************************************************************************** History $Log$ +Revision 1.28 2006/11/07 09:10:32 cignoni +Removed shorthHelp and added topo_non_coherent (draft) + Revision 1.27 2006/06/18 21:26:56 cignoni range color bug for quality/curvature @@ -132,6 +135,7 @@ ExtraMeshColorizePlugin::ExtraMeshColorizePlugin() { CP_BORDER << CP_COLOR_NON_MANIFOLD << CP_SMOOTH << + CP_COLOR_NON_TOPO_COHERENT << CP_RESTORE_ORIGINAL; FilterType tt; @@ -150,6 +154,7 @@ const QString ExtraMeshColorizePlugin::ST(FilterType c) { case CP_SELFINTERSECT: return QString("Self Intersections"); case CP_BORDER: return QString("Border"); case CP_COLOR_NON_MANIFOLD: return QString("Color non Manifold"); + case CP_COLOR_NON_TOPO_COHERENT: return QString("Color edges topologically non coherent"); case CP_SMOOTH: return QString("Smooth Color"); case CP_RESTORE_ORIGINAL: return QString("Restore Color"); default: assert(0); @@ -161,35 +166,28 @@ const ActionInfo &ExtraMeshColorizePlugin::Info(QAction *action) static ActionInfo ai; switch(ID(action)) { - case CP_MAP_QUALITY_INTO_COLOR : ai.Help = tr("Colorize vertex and faces depending on quality field (manually equalized)."); - ai.ShortHelp = tr("Colorize by quality");break; - case CP_GAUSSIAN : ai.Help = tr("Colorize vertex and faces depending on equalized gaussian curvature."); - ai.ShortHelp = tr("Colorize by gaussian curvature");break; - case CP_MEAN : ai.Help = tr("Colorize vertex and faces depending on equalized mean curvature."); - ai.ShortHelp = tr("Colorize by mean curvature");break; - case CP_RMS : ai.Help = tr("Colorize vertex and faces depending on equalized root mean square curvature."); - ai.ShortHelp = tr("Colorize by root mean square curvature");break; - case CP_ABSOLUTE : ai.Help = tr("Colorize vertex and faces depending on equalize absolute curvature."); - ai.ShortHelp = tr("Colorize by absolute curvature");break; - case CP_SELFINTERSECT: ai.Help = tr("Colorize only self intersecting faces."); - ai.ShortHelp = tr("Colorize only self intersecting faces");break; - case CP_BORDER : ai.Help = tr("Colorize only border edges."); - ai.ShortHelp = tr("Colorize only border edges");break; - case CP_COLOR_NON_MANIFOLD: ai.Help = tr("Colorize only non manifold edges."); - ai.ShortHelp = tr("Colorize only non manifold edges");break; - case CP_SMOOTH : ai.Help = tr("Apply laplacian smooth for colors."); - ai.ShortHelp = tr("Laplacian smooth for colors");break; - case CP_RESTORE_ORIGINAL : ai.Help = tr("Restore original per vertex color."); - ai.ShortHelp = tr("Restore original per vertex color"); break; + case CP_MAP_QUALITY_INTO_COLOR : ai.Help = tr("Colorize vertex and faces depending on quality field (manually equalized).");break; + case CP_GAUSSIAN : ai.Help = tr("Colorize vertex and faces depending on equalized gaussian curvature.");break; + case CP_MEAN : ai.Help = tr("Colorize vertex and faces depending on equalized mean curvature.");break; + case CP_RMS : ai.Help = tr("Colorize vertex and faces depending on equalized root mean square curvature.");break; + case CP_ABSOLUTE : ai.Help = tr("Colorize vertex and faces depending on equalize absolute curvature.");break; + case CP_SELFINTERSECT: ai.Help = tr("Colorize only self intersecting faces.");break; + case CP_BORDER : ai.Help = tr("Colorize only border edges.");break; + case CP_COLOR_NON_MANIFOLD: ai.Help = tr("Colorize only non manifold edges.");break; + case CP_SMOOTH : ai.Help = tr("Apply laplacian smooth for colors.");break; + case CP_RESTORE_ORIGINAL : ai.Help = tr("Restore original per vertex color.");break; + case CP_COLOR_NON_TOPO_COHERENT : ai.Help = tr("Color edges topologically non coherent.");break; + + default: assert(0); } return ai; } const PluginInfo &ExtraMeshColorizePlugin::Info() { static PluginInfo ai; - ai.Date=tr("January 2006"); - ai.Version = tr("1.0"); - ai.Author = ("Francesco Vannini, Giorgio Gangemi, Andrea Venturi"); + ai.Date=tr("Oct 2006"); + ai.Version = tr("1.1"); + ai.Author = ("Paolo Cignoni, Francesco Vannini, Giorgio Gangemi, Andrea Venturi"); return ai; } @@ -283,12 +281,12 @@ bool ExtraMeshColorizePlugin::applyFilter(QAction *filter, MeshModel &m, FilterP { vector IntersFace; tri::Clean::SelfIntersections(m.cm,IntersFace); - + tri::UpdateColor::FaceConstant(m.cm,Color4b::White); vector::iterator fpi; for(fpi=IntersFace.begin();fpi!=IntersFace.end();++fpi) (*fpi)->C()=Color4b::Red; - break; + break; } case CP_BORDER: @@ -320,7 +318,8 @@ const MeshFilterInterface::FilterClass ExtraMeshColorizePlugin::getClass(QAction case CP_MEAN: case CP_RMS: case CP_ABSOLUTE: - return MeshFilterInterface::VertexColoring; + case CP_COLOR_NON_TOPO_COHERENT: + return MeshFilterInterface::VertexColoring; case CP_SELFINTERSECT: return MeshFilterInterface::FaceColoring; default: assert(0); diff --git a/src/meshlabplugins/meshcolorize/meshcolorize.h b/src/meshlabplugins/meshcolorize/meshcolorize.h index 6df71c982..d0ee55258 100644 --- a/src/meshlabplugins/meshcolorize/meshcolorize.h +++ b/src/meshlabplugins/meshcolorize/meshcolorize.h @@ -23,6 +23,9 @@ /**************************************************************************** History $Log$ +Revision 1.20 2006/11/07 09:10:32 cignoni +Removed shorthHelp and added topo_non_coherent (draft) + Revision 1.19 2006/05/25 04:57:45 cignoni Major 0.7 release. A lot of things changed. Colorize interface gone away, Editing and selection start to work. Optional data really working. Clustering decimation totally rewrote. History start to work. Filters organized in classes. @@ -76,6 +79,7 @@ public: CP_BORDER, CP_COLOR_NON_MANIFOLD, CP_SMOOTH, + CP_COLOR_NON_TOPO_COHERENT, CP_RESTORE_ORIGINAL };