History

hook timing tests to Menu

Stephen Birarda committed 13 years ago

Commit eb4508a1 parent 87bb2604 files · +7 −10Browse files

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

Unified · Split

interface/src/Menu.cpp+6−4
@@ -22,6 +22,7 @@ · 21 unmodified lines
22#include "Application.h"22#include "Application.h"
23#include "PairingHandler.h"23#include "PairingHandler.h"
24#include "Menu.h"24#include "Menu.h"
25#include "Util.h"
25 26
26Menu* Menu::_instance = NULL;27Menu* Menu::_instance = NULL;
27 28
@@ -253,10 +254,7 @@ Menu::Menu() : · 225 unmodified lines
253 SLOT(cycleFrustumRenderMode()));254 SLOT(cycleFrustumRenderMode()));
254 updateFrustumRenderModeAction();255 updateFrustumRenderModeAction();
255 256
256 addActionToQMenuAndActionHash(debugMenu, MenuOption::RunTimingTests, NULL, NULL);257 addActionToQMenuAndActionHash(debugMenu, MenuOption::RunTimingTests, 0, this, SLOT(runTests()));
257
258 // debugMenu->addAction("Run Timing Tests", this, SLOT(runTests()));
259
260 addActionToQMenuAndActionHash(debugMenu, MenuOption::TreeStats, Qt::SHIFT | Qt::Key_S);258 addActionToQMenuAndActionHash(debugMenu, MenuOption::TreeStats, Qt::SHIFT | Qt::Key_S);
261 259
262 // debugMenu->addAction("Calculate Tree Stats", this, SLOT(doTreeStats()), Qt::SHIFT | Qt::Key_S);260 // debugMenu->addAction("Calculate Tree Stats", this, SLOT(doTreeStats()), Qt::SHIFT | Qt::Key_S);
@@ -711,6 +709,10 @@ void Menu::chooseVoxelPaintColor() { · 448 unmodified lines
711 appInstance->getWindow()->activateWindow();709 appInstance->getWindow()->activateWindow();
712}710}
713 711
712void Menu::runTests() {
713 runTimingTests();
714}
715
714void Menu::updateFrustumRenderModeAction() {716void Menu::updateFrustumRenderModeAction() {
715 QAction* frustumRenderModeAction = _actionHash.value(MenuOption::FrustumRenderMode);717 QAction* frustumRenderModeAction = _actionHash.value(MenuOption::FrustumRenderMode);
716 switch (_frustumDrawMode) {718 switch (_frustumDrawMode) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t