Measure tool and corrections

luiscuenca committed 8 years ago

Commit 027d2d31 parent 69299bd5 files · +368 −103Browse files

Showing the changes to interface/src/Menu.cpp (1 of 5 files). Show all

Unified · Split

interface/src/Menu.cpp+9−2

@@ -688,8 +688,15 @@ Menu::Menu() { · 687 unmodified lines
688		688
689	auto scope = DependencyManager::get<AudioScope>();	689	auto scope = DependencyManager::get<AudioScope>();
690	MenuWrapper* audioScopeMenu = audioDebugMenu->addMenu("Audio Scope");	690	MenuWrapper* audioScopeMenu = audioDebugMenu->addMenu("Audio Scope");
691	addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScope, Qt::CTRL \| Qt::Key_F2, false,	691
692	scope.data(), SLOT(toggle()));	692	action = addActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScope, Qt::CTRL \| Qt::Key_F2, false);
		693	connect(action, &QAction::triggered, [] {
		694	auto scriptEngines = DependencyManager::get<ScriptEngines>();
		695	QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
		696	defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/audio/audioScope.js");
		697	scriptEngines->loadScript(defaultScriptsLoc.toString());
		698	});
		699
693	addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopePause, Qt::CTRL \| Qt::SHIFT \| Qt::Key_F2, false,	700	addCheckableActionToQMenuAndActionHash(audioScopeMenu, MenuOption::AudioScopePause, Qt::CTRL \| Qt::SHIFT \| Qt::Key_F2, false,
694	scope.data(), SLOT(togglePause()));	701	scope.data(), SLOT(togglePause()));
695		702