Added new filter menu entry (and new filter class): raster Layer

This commit is contained in:
Paolo Cignoni cignoni 2012-06-28 10:02:29 +00:00
parent 06becc0492
commit 668cb2c970
4 changed files with 17 additions and 10 deletions

View File

@ -229,6 +229,7 @@ public:
Smoothing =0x00040, /*!< Stuff that does not change the topology, but just the vertex positions*/
Quality =0x00080,
Layer =0x00100, /*!< Layers, attributes */
RasterLayer =0x20000, /*!< Raster Layers, attributes */
Normal =0x00200, /*!< Normal, Curvature, orientation (rotations and transformations fall here)*/
Sampling =0x00400,
Texture =0x00800,

View File

@ -291,7 +291,7 @@ public:
static QStatusBar *_qsb=0;
return _qsb;
}
QMenu* layerMenu() { return filterMenuLayer; }
QMenu* layerMenu() { return filterMenuMeshLayer; }
private:
@ -315,7 +315,8 @@ private:
QMenu *filterMenuColorize;
QMenu *filterMenuSmoothing;
QMenu *filterMenuQuality;
QMenu *filterMenuLayer;
QMenu *filterMenuMeshLayer;
QMenu *filterMenuRasterLayer;
QMenu *filterMenuNormal;
QMenu *filterMenuRangeMap;
QMenu *filterMenuPointSet;

View File

@ -621,13 +621,14 @@ void MainWindow::fillFilterMenu()
filterMenuSelect = filterMenu->addMenu(tr("Selection"));
filterMenuClean = filterMenu->addMenu(tr("Cleaning and Repairing"));
filterMenuCreate = filterMenu->addMenu(tr("Create New Mesh Layer"));
filterMenuRemeshing = filterMenu->addMenu(tr("Remeshing, simplification and reconstruction"));
filterMenuRemeshing = filterMenu->addMenu(tr("Remeshing, Simplification and Reconstruction"));
filterMenuPolygonal = filterMenu->addMenu(tr("Polygonal and Quad Mesh"));
filterMenuColorize = filterMenu->addMenu(tr("Color Creation and Processing"));
filterMenuSmoothing = filterMenu->addMenu(tr("Smoothing, Fairing and Deformation"));
filterMenuQuality = filterMenu->addMenu(tr("Quality Measure and computations"));
filterMenuQuality = filterMenu->addMenu(tr("Quality Measure and Computations"));
filterMenuNormal = filterMenu->addMenu(tr("Normals, Curvatures and Orientation"));
filterMenuLayer = filterMenu->addMenu(tr("Layer and Attribute Management"));
filterMenuMeshLayer = filterMenu->addMenu(tr("Mesh Layer"));
filterMenuRasterLayer = filterMenu->addMenu(tr("Raster Layer"));
filterMenuRangeMap = filterMenu->addMenu(tr("Range Map"));
filterMenuPointSet = filterMenu->addMenu(tr("Point Set"));
filterMenuSampling = filterMenu->addMenu(tr("Sampling"));
@ -642,7 +643,8 @@ void MainWindow::fillFilterMenu()
connect(filterMenuColorize, SIGNAL(hovered(QAction*)), this, SLOT(showTooltip(QAction*)) );
connect(filterMenuQuality, SIGNAL(hovered(QAction*)), this, SLOT(showTooltip(QAction*)) );
connect(filterMenuNormal, SIGNAL(hovered(QAction*)), this, SLOT(showTooltip(QAction*)) );
connect(filterMenuLayer, SIGNAL(hovered(QAction*)), this, SLOT(showTooltip(QAction*)) );
connect(filterMenuMeshLayer, SIGNAL(hovered(QAction*)), this, SLOT(showTooltip(QAction*)) );
connect(filterMenuRasterLayer, SIGNAL(hovered(QAction*)), this, SLOT(showTooltip(QAction*)) );
connect(filterMenuRangeMap, SIGNAL(hovered(QAction*)), this, SLOT(showTooltip(QAction*)) );
connect(filterMenuPointSet, SIGNAL(hovered(QAction*)), this, SLOT(showTooltip(QAction*)) );
connect(filterMenuSampling, SIGNAL(hovered(QAction*)), this, SLOT(showTooltip(QAction*)) );
@ -666,8 +668,9 @@ void MainWindow::fillFilterMenu()
if( filterClass & MeshFilterInterface::Smoothing ) filterMenuSmoothing->addAction(filterAction);
if( filterClass & MeshFilterInterface::Normal ) filterMenuNormal->addAction(filterAction);
if( filterClass & MeshFilterInterface::Quality ) filterMenuQuality->addAction(filterAction);
if( filterClass & MeshFilterInterface::Measure ) filterMenuQuality->addAction(filterAction);
if( filterClass & MeshFilterInterface::Layer ) filterMenuLayer->addAction(filterAction);
if( filterClass & MeshFilterInterface::Measure ) filterMenuQuality->addAction(filterAction);
if( filterClass & MeshFilterInterface::Layer ) filterMenuMeshLayer->addAction(filterAction);
if( filterClass & MeshFilterInterface::RasterLayer ) filterMenuRasterLayer->addAction(filterAction);
if( filterClass & MeshFilterInterface::MeshCreation ) filterMenuCreate->addAction(filterAction);
if( filterClass & MeshFilterInterface::RangeMap ) filterMenuRangeMap->addAction(filterAction);
if( filterClass & MeshFilterInterface::PointSet ) filterMenuPointSet->addAction(filterAction);
@ -706,7 +709,8 @@ void MainWindow::fillFilterMenu()
if( nameClass == QString("Normal")) filterMenuNormal->addAction(filterAction);
if( nameClass == QString("Quality")) filterMenuQuality->addAction(filterAction);
if( nameClass == QString("Measure")) filterMenuQuality->addAction(filterAction);
if( nameClass == QString("Layer")) filterMenuLayer->addAction(filterAction);
if( nameClass == QString("Layer")) filterMenuMeshLayer->addAction(filterAction);
if( nameClass == QString("RasterLayer")) filterMenuRasterLayer->addAction(filterAction);
if( nameClass == QString("MeshCreation")) filterMenuCreate->addAction(filterAction);
if( nameClass == QString("RangeMap")) filterMenuRangeMap->addAction(filterAction);
if( nameClass == QString("PointSet")) filterMenuPointSet->addAction(filterAction);

View File

@ -263,7 +263,8 @@ void MainWindow::activateSubFiltersMenu( const bool create,const bool act )
filterMenuSmoothing->setEnabled(act);
filterMenuQuality->setEnabled(act);
filterMenuNormal->setEnabled(act);
filterMenuLayer->setEnabled(act);
filterMenuMeshLayer->setEnabled(act);
filterMenuRasterLayer->setEnabled(act);
filterMenuRangeMap->setEnabled(act);
filterMenuPointSet->setEnabled(act);
filterMenuSampling->setEnabled(act);