songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4076 from maxGimeno/Demo-Restore_View_menu-GF 

Polyhedron Demo: Fix View Menu
This commit is contained in:
Sebastien Loriot 2019-07-18 16:34:34 +02:00 committed by GitHub
parent a55c2acc36 0ed8ed17b7
commit 0425b77ce4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Polyhedron/demo/Polyhedron/MainWindow.cpp
View File

@ -180,6 +180,18 @@ MainWindow::MainWindow(const QStringList &keywords, bool verbose, QWidget* paren
shortcut = new QShortcut(QKeySequence(Qt::Key_F11), this);
connect(shortcut, SIGNAL(activated()),
this, SLOT(toggleFullScreen()));
shortcut = new QShortcut(QKeySequence(Qt::CTRL+Qt::Key_R), this);
connect(shortcut, &QShortcut::activated,
this, &MainWindow::recenterScene);
shortcut = new QShortcut(QKeySequence(Qt::CTRL+Qt::Key_T), this);
connect(shortcut, &QShortcut::activated,
this,
[](){
Viewer* viewer = qobject_cast<Viewer*>(CGAL::Three::Three::activeViewer());
bool b = viewer->property("draw_two_sides").toBool();
viewer->setTwoSides(!b);
}
);
}
proxyModel = new QSortFilterProxyModel(this);
@ -2397,7 +2409,7 @@ void MainWindow::setAddKeyFrameKeyboardModifiers(::Qt::KeyboardModifiers m)
viewer->setAddKeyFrameKeyboardModifiers(m);
}
void MainWindow::on_actionRecenterScene_triggered()
void MainWindow::recenterScene()
{
//force the recomputaion of the bbox
bbox_need_update = true;
@ -3000,7 +3012,7 @@ QObject* MainWindow::getDirectChild(QObject* widget)
return getDirectChild(widget->parent());
}
void MainWindow::on_action_Organize_Viewers_triggered()
void MainWindow::on_action_Rearrange_Viewers_triggered()
{
if(ui->mdiArea->subWindowList().size() == 1)
ui->mdiArea->subWindowList().first()->showMaximized();
@ -3051,7 +3063,7 @@ SubViewer::SubViewer(QWidget *parent, MainWindow* mw, Viewer* mainviewer)
actionCopyCamera->setObjectName("actionCopyCamera");
QAction* actionPasteCamera = new QAction("&Paste Camera",this);
actionPasteCamera->setObjectName("actionPasteCamera");
QMenu* cameraMenu = new QMenu("Camera", mw);
QMenu* cameraMenu = new QMenu("Ca&mera", mw);
cameraMenu->addAction(actionDumpCamera);
cameraMenu->addAction(actionCopyCamera);
cameraMenu->addAction(actionPasteCamera);
@ -3067,12 +3079,12 @@ SubViewer::SubViewer(QWidget *parent, MainWindow* mw, Viewer* mainviewer)
actionDrawTwoSide->setCheckable(true);
actionDrawTwoSide->setChecked(false);
viewMenu->addAction(actionDrawTwoSide);
QAction* actionQuick = new QAction("Quick Camera Mode",this);
QAction* actionQuick = new QAction("&Quick Camera Mode",this);
actionQuick->setObjectName("actionQuick");
actionQuick->setCheckable(true);
actionQuick->setChecked(true);
viewMenu->addAction(actionQuick);
QAction* actionOrtho = new QAction("Orthographic Projection",this);
QAction* actionOrtho = new QAction("&Orthographic Projection",this);
actionOrtho->setObjectName("actionOrtho");
actionOrtho->setCheckable(true);
actionOrtho->setChecked(false);
@ -3155,6 +3167,9 @@ void SubViewer::changeEvent(QEvent *event)
//| Qt::WindowSystemMenuHint
| Qt::WindowTitleHint
);
QAction* action = mw->findChild<QAction*>("action_Rearrange_Viewers");
action->setVisible(false);
viewer->update();
}
else
{
@ -3170,6 +3185,10 @@ void SubViewer::changeEvent(QEvent *event)
| Qt::WindowSystemMenuHint
| Qt::WindowTitleHint
);
QAction* action = mw->findChild<QAction*>("action_Rearrange_Viewers");
action->setVisible(true);
for(auto v : CGAL::QGLViewer::QGLViewerPool())
v->update();
}
}
}

4
Polyhedron/demo/Polyhedron/MainWindow.h
View File

@ -362,7 +362,7 @@ protected Q_SLOTS:
//!menus.
void filterOperations();
//!Updates the bounding box and moves the camera to fits the scene.
void on_actionRecenterScene_triggered();
void recenterScene();
//!Resizes the header of the scene view
void resetHeader();
//!apply an action named `name` to all selected items
@ -463,7 +463,7 @@ private:
private Q_SLOTS:
void on_actionAdd_Viewer_triggered();
void on_action_Organize_Viewers_triggered();
void on_action_Rearrange_Viewers_triggered();
void recenterViewer();
private:

17
Polyhedron/demo/Polyhedron/MainWindow.ui
View File

@ -93,8 +93,7 @@
<addaction name="dummyAction"/>
</widget>
<addaction name="actionAdd_Viewer"/>
<addaction name="action_Organize_Viewers"/>
<addaction name="actionRecenterScene"/>
<addaction name="action_Rearrange_Viewers"/>
<addaction name="menuDockWindows"/>
<addaction name="separator"/>
</widget>
@ -449,17 +448,9 @@
<string>Add &amp;Viewer</string>
</property>
</action>
<action name="action_Organize_Viewers">
<action name="action_Rearrange_Viewers">
<property name="text">
<string>&amp;Organize Viewers</string>
</property>
</action>
<action name="actionRecenterScene">
<property name="text">
<string>Recenter Scene</string>
</property>
<property name="shortcut">
<string>Ctrl+R</string>
<string>&amp;Rearrange Viewers</string>
</property>
</action>
<action name="actionSa_ve_Scene_as_Script">
@ -476,8 +467,6 @@
<resources>
<include location="Polyhedron_3.qrc"/>
<include location="Polyhedron_3.qrc"/>
<include location="Polyhedron_3.qrc"/>
<include location="Polyhedron_3.qrc"/>
</resources>
<connections/>
</ui>