#3524 HoloLens : Add toolbar and icons for operations

This commit is contained in:
Magne Sjaastad
2018-10-19 10:08:33 +02:00
parent 1727ab959a
commit 822645e264
13 changed files with 128 additions and 20 deletions

View File

@@ -116,7 +116,8 @@ RiuMainWindow::RiuMainWindow()
m_pvtPlotPanel(nullptr),
m_mohrsCirclePlot(nullptr),
m_windowMenu(nullptr),
m_blockSlotSubWindowActivated(false)
m_blockSlotSubWindowActivated(false),
m_holoLensToolBar(nullptr)
{
CVF_ASSERT(sm_mainWindowInstance == nullptr);
@@ -581,17 +582,15 @@ void RiuMainWindow::createToolBars()
dsToolBar->addAction(m_drawStyleHideGridCellsAction);
dsToolBar->addAction(m_toggleFaultsLabelAction);
dsToolBar->addAction(m_showWellCellsAction);
dsToolBar->hide();
}
{
QToolBar* toolbar = addToolBar(tr("HoloLens"));
toolbar->setObjectName(toolbar->windowTitle());
m_holoLensToolBar = addToolBar(tr("HoloLens"));
m_holoLensToolBar->setObjectName(m_holoLensToolBar->windowTitle());
toolbar->addAction(cmdFeatureMgr->action("RicHoloLensCreateSessionFeature"));
toolbar->addAction(cmdFeatureMgr->action("RicHoloLensTerminateSessionFeature"));
toolbar->addAction(cmdFeatureMgr->action("RicHoloLensExportToSharingServerFeature"));
toolbar->hide();
m_holoLensToolBar->addAction(cmdFeatureMgr->action("RicHoloLensCreateSessionFeature"));
m_holoLensToolBar->addAction(cmdFeatureMgr->action("RicHoloLensTerminateSessionFeature"));
m_holoLensToolBar->addAction(cmdFeatureMgr->action("RicHoloLensExportToSharingServerFeature"));
}
RiaApplication* app = RiaApplication::instance();
@@ -1744,6 +1743,14 @@ void RiuMainWindow::showProcessMonitorDockPanel()
showDockPanel(RiuDockWidgetTools::instance()->processMonitorName());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::setDefaultToolbarVisibility()
{
m_holoLensToolBar->hide();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

View File

@@ -123,6 +123,7 @@ public:
RiuMessagePanel* messagePanel();
void showProcessMonitorDockPanel();
void setDefaultToolbarVisibility();
protected:
void closeEvent(QCloseEvent* event) override;
@@ -213,12 +214,12 @@ private slots:
void slotViewFromBelow();
void slotScaleChanged(int scaleValue);
void slotDrawStyleChanged(QAction* activatedAction);
void slotToggleHideGridCellsAction(bool);
void slotToggleFaultLabelsAction(bool);
void slotDisableLightingAction(bool);
void slotDrawStyleChanged(QAction* activatedAction);
void slotToggleHideGridCellsAction(bool);
void slotToggleFaultLabelsAction(bool);
void slotDisableLightingAction(bool);
void slotShowWellCellsAction(bool doAdd);
void slotShowWellCellsAction(bool doAdd);
// Debug slots
void slotSnapshotAllViewsToFile();
@@ -267,6 +268,8 @@ private:
QAction* m_drawStyleSurfOnlyAction;
QAction* m_showWellCellsAction;
QToolBar* m_holoLensToolBar;
std::vector<QPointer<QDockWidget> > additionalProjectViews;
bool m_blockSlotSubWindowActivated;