lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-20 03:16:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unsplit function

Browse Source
This commit is contained in:
Michele Sottile sottile 2010-04-07 12:55:14 +00:00
parent d5083a167d
commit cff314642f
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/meshlab_2.0/mainwindow.h
View File

@ -127,6 +127,7 @@ private slots:
///////////Slot Menu Preferences /////////////////
//void setCustomize();
void setSplit();
void setUnsplit();
///////////Slot Menu Help ////////////////////////
/*void about();
void aboutPlugins();*/
@ -310,6 +311,8 @@ private:
///////////Actions Menu Preferences /////////////////
QAction *setCustomizeAct;
QAction *setSplitAct;
QAction *setUnsplitAct;
///////////Actions Menu Help ////////////////////////
QAction *aboutAct;
QAction *aboutPluginsAct;

4
src/meshlab_2.0/mainwindow_Init.cpp
View File

@ -280,6 +280,9 @@ void MainWindow::createActions()
setSplitAct = new QAction(tr("&Split view"),this);
connect(setSplitAct, SIGNAL(triggered()), this, SLOT(setSplit()));
setUnsplitAct = new QAction(tr("&Close current view"),this);
connect(setUnsplitAct, SIGNAL(triggered()), this, SLOT(setUnsplit()));
//////////////Action Menu About ///////////////////////////////////////////////////////////////////////////
aboutAct = new QAction(tr("&About"), this);
connect(aboutAct, SIGNAL(triggered()), this, SLOT(about()));
@ -456,6 +459,7 @@ void MainWindow::createMenus()
preferencesMenu=menuBar()->addMenu(tr("&Tools"));
preferencesMenu->addAction(setCustomizeAct);
preferencesMenu->addAction(setSplitAct);
preferencesMenu->addAction(setUnsplitAct);
//////////////////// Menu Help ////////////////////////////////////////////////////////////////
helpMenu = menuBar()->addMenu(tr("&Help"));

27
src/meshlab_2.0/mainwindow_RunTime.cpp
View File

@ -225,8 +225,8 @@ void MainWindow::updateMenus()
setFancyLightingAct->setChecked(rm.fancyLighting);
setDoubleLightingAct->setChecked(rm.doubleSideLighting);
setSelectFaceRenderingAct->setChecked(rm.selectedFace);
setSelectVertRenderingAct->setChecked(rm.selectedVert);
setSelectFaceRenderingAct->setChecked(rm.selectedFace);
setSelectVertRenderingAct->setChecked(rm.selectedVert);
// Check only the active decorations
foreach (QAction *a, PM.decoratorActionList){a->setChecked(false);a->setEnabled(true);}
@ -244,6 +244,15 @@ void MainWindow::updateMenus()
}
//Viewer
if(active) {
MultiViewer_Container *mvc = qobject_cast<MultiViewer_Container *>(mdiarea->currentSubWindow());
if(!mvc)
mvc = qobject_cast<MultiViewer_Container *>(mdiarea->currentSubWindow()->widget());
setUnsplitAct->setEnabled(mvc->viewerCounter()>1);
setSplitAct->setEnabled(mvc->viewerCounter()<6);
}
/*if(GLA())
{
showLayerDlgAct->setChecked(GLA()->layerDialog->isVisible());
@ -1141,6 +1150,20 @@ void MainWindow::setSplit()
}
void MainWindow::setUnsplit()
{
if(mdiarea->currentSubWindow()==0) return;
MultiViewer_Container *mvc = qobject_cast<MultiViewer_Container *>(mdiarea->currentSubWindow());
if(!mvc)
mvc = qobject_cast<MultiViewer_Container *>(mdiarea->currentSubWindow()->widget());
assert(mvc->viewerCounter() >1);
mvc->removeView(mvc->currentView()->getId());
updateMenus();
}
void MainWindow::renderBbox() { GLA()->setDrawMode(GLW::DMBox ); }
void MainWindow::renderPoint() { GLA()->setDrawMode(GLW::DMPoints ); }
void MainWindow::renderWire() { GLA()->setDrawMode(GLW::DMWire ); }