From 3e4a7ac69b95f2a91024a316e02759c81722b46a Mon Sep 17 00:00:00 2001 From: Guido Ranzuglia granzuglia Date: Fri, 11 Oct 2013 14:33:53 +0000 Subject: [PATCH] - temporary disabled the showselectedfaces and showselectedvertices decorators --- .../decorate_base/decorate_base.cpp | 16 ++++++++-------- src/meshlabplugins/decorate_base/decorate_base.h | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/meshlabplugins/decorate_base/decorate_base.cpp b/src/meshlabplugins/decorate_base/decorate_base.cpp index fe9bce946..609392354 100644 --- a/src/meshlabplugins/decorate_base/decorate_base.cpp +++ b/src/meshlabplugins/decorate_base/decorate_base.cpp @@ -55,8 +55,8 @@ QString ExtraMeshDecoratePlugin::decorationInfo(FilterIDType filter) const case DP_SHOW_CAMERA: return tr("Draw the position of the camera, if present in the current mesh"); case DP_SHOW_TEXPARAM: return tr("Draw an overlayed flattened version of the current mesh that show the current parametrization"); case DP_SHOW_SELECTED_MESH: return tr("Enlighten the current mesh"); - case DP_SHOW_SELECTED_FACE: return tr("Show the selected faces of the current mesh"); - case DP_SHOW_SELECTED_VERT: return tr("Show the selected vertices of the current mesh"); + /* case DP_SHOW_SELECTED_FACE: return tr("Show the selected faces of the current mesh"); + case DP_SHOW_SELECTED_VERT: return tr("Show the selected vertices of the current mesh");*/ } assert(0); return QString(); @@ -83,8 +83,8 @@ QString ExtraMeshDecoratePlugin::decorationName(FilterIDType filter) const case DP_SHOW_QUALITY_HISTOGRAM: return QString("Show Quality Histogram"); case DP_SHOW_QUALITY_CONTOUR: return QString("Show Quality Contour"); case DP_SHOW_SELECTED_MESH: return QString("Show Current Mesh"); - case DP_SHOW_SELECTED_FACE: return QString("Show Selected Faces"); - case DP_SHOW_SELECTED_VERT: return QString("Show Selected Vertices"); + /* case DP_SHOW_SELECTED_FACE: return QString("Show Selected Faces"); + case DP_SHOW_SELECTED_VERT: return QString("Show Selected Vertices");*/ default: assert(0); } @@ -432,12 +432,12 @@ void ExtraMeshDecoratePlugin::decorateMesh(QAction *a, MeshModel &m, RichParamet glPopAttrib(); } } break; - case DP_SHOW_SELECTED_FACE : + /*case DP_SHOW_SELECTED_FACE : m.renderSelectedFace(); break; case DP_SHOW_SELECTED_VERT : m.renderSelectedVert(); - break; + break;*/ } // end switch; glPopMatrix(); } @@ -838,8 +838,8 @@ int ExtraMeshDecoratePlugin::getDecorationClass(QAction *action) const case DP_SHOW_LABEL : case DP_SHOW_CAMERA : case DP_SHOW_TEXPARAM : - case DP_SHOW_SELECTED_FACE : - case DP_SHOW_SELECTED_VERT : + /*case DP_SHOW_SELECTED_FACE : + case DP_SHOW_SELECTED_VERT :*/ case DP_SHOW_BOUNDARY_TEX : return ExtraMeshDecoratePlugin::PerMesh; case DP_SHOW_AXIS : return ExtraMeshDecoratePlugin::PerDocument; case DP_SHOW_SELECTED_MESH : return ExtraMeshDecoratePlugin::PerDocument; diff --git a/src/meshlabplugins/decorate_base/decorate_base.h b/src/meshlabplugins/decorate_base/decorate_base.h index 74a6f523e..26a91a47a 100644 --- a/src/meshlabplugins/decorate_base/decorate_base.h +++ b/src/meshlabplugins/decorate_base/decorate_base.h @@ -58,9 +58,9 @@ class ExtraMeshDecoratePlugin : public QObject, public MeshDecorateInterface DP_SHOW_CAMERA, DP_SHOW_TEXPARAM, DP_SHOW_BOUNDARY_TEX, - DP_SHOW_SELECTED_MESH, + DP_SHOW_SELECTED_MESH/*, DP_SHOW_SELECTED_FACE, - DP_SHOW_SELECTED_VERT + DP_SHOW_SELECTED_VERT*/ }; @@ -95,18 +95,18 @@ public: DP_SHOW_CAMERA << DP_SHOW_TEXPARAM << DP_SHOW_SELECTED_MESH << - DP_SHOW_SELECTED_FACE << - DP_SHOW_SELECTED_VERT << + /*DP_SHOW_SELECTED_FACE << + DP_SHOW_SELECTED_VERT <<*/ DP_SHOW_BOUNDARY_TEX; FilterIDType tt; foreach(tt , types()) { actionList << new QAction(decorationName(tt), this); - if(tt==DP_SHOW_SELECTED_VERT) + /*if(tt==DP_SHOW_SELECTED_VERT) actionList.last()->setIcon(QIcon(":/images/selected_vert.png")); if(tt==DP_SHOW_SELECTED_FACE) - actionList.last()->setIcon(QIcon(":/images/selected_face.png")); + actionList.last()->setIcon(QIcon(":/images/selected_face.png"));*/ } QAction *ap;