From 74733452da2cdda7ead883bb680983f0ac809df2 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sat, 4 Jul 2015 11:25:27 -0700 Subject: [PATCH] some tweaks to make stats dialog more readable --- interface/src/Menu.cpp | 1 + interface/src/Menu.h | 1 + interface/src/ui/OctreeStatsDialog.cpp | 48 ++++++++++++++++---------- interface/src/ui/OctreeStatsDialog.h | 2 ++ 4 files changed, 33 insertions(+), 19 deletions(-) diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index c70d11b837..9f49361f79 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -531,6 +531,7 @@ Menu::Menu() { addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::PipelineWarnings); addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::LogExtraTimings); addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::SuppressShortTimings); + addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::ShowRealtimeEntityStats); auto audioIO = DependencyManager::get(); MenuWrapper* audioDebugMenu = developerMenu->addMenu("Audio"); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index fae7092989..043bb53a7f 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -269,6 +269,7 @@ namespace MenuOption { const QString ShowDSConnectTable = "Show Domain Connection Timing"; const QString ShowBordersEntityNodes = "Show Entity Nodes"; const QString ShowIKConstraints = "Show IK Constraints"; + const QString ShowRealtimeEntityStats = "Show Realtime Entity Stats"; const QString SimpleShadows = "Simple"; const QString SixenseEnabled = "Enable Hydra Support"; const QString SixenseMouseInput = "Enable Sixense Mouse Input"; diff --git a/interface/src/ui/OctreeStatsDialog.cpp b/interface/src/ui/OctreeStatsDialog.cpp index eea962b412..94f91a5ab7 100644 --- a/interface/src/ui/OctreeStatsDialog.cpp +++ b/interface/src/ui/OctreeStatsDialog.cpp @@ -129,6 +129,34 @@ OctreeStatsDialog::~OctreeStatsDialog() { void OctreeStatsDialog::paintEvent(QPaintEvent* event) { + // Processed Entities Related stats + auto entities = Application::getInstance()->getEntities(); + auto entitiesTree = entities->getTree(); + + // Do this ever paint event... even if we don't update + auto totalTrackedEdits = entitiesTree->getTotalTrackedEdits(); + + // track our updated per second + const quint64 SAMPLING_WINDOW = USECS_PER_SECOND / SAMPLES_PER_SECOND; + quint64 now = usecTimestampNow(); + quint64 sinceLastWindow = now - _lastWindowAt; + auto editsInLastWindow = totalTrackedEdits - _lastKnownTrackedEdits; + float sinceLastWindowInSeconds = (float)sinceLastWindow / (float)USECS_PER_SECOND; + float recentUpdatesPerSecond = (float)editsInLastWindow / sinceLastWindowInSeconds; + if (sinceLastWindow > SAMPLING_WINDOW) { + _averageUpdatesPerSecond.updateAverage(recentUpdatesPerSecond); + _lastWindowAt = now; + _lastKnownTrackedEdits = totalTrackedEdits; + } + + // Only refresh our stats every once in a while, unless asked for realtime + quint64 REFRESH_AFTER = Menu::getInstance()->isOptionChecked(MenuOption::ShowRealtimeEntityStats) ? 0 : USECS_PER_SECOND; + quint64 sinceLastRefresh = now - _lastRefresh; + if (sinceLastRefresh < REFRESH_AFTER) { + return QDialog::paintEvent(event); + } + _lastRefresh = now; + // Update labels QLabel* label; @@ -213,10 +241,6 @@ void OctreeStatsDialog::paintEvent(QPaintEvent* event) { "Leaves: " << qPrintable(serversLeavesString) << ""; label->setText(statsValue.str().c_str()); - // Processed Entities Related stats - auto entities = Application::getInstance()->getEntities(); - auto entitiesTree = entities->getTree(); - // Processed Packets Elements auto averageElementsPerPacket = entities->getAverageElementsPerPacket(); auto averageEntitiesPerPacket = entities->getAverageEntitiesPerPacket(); @@ -289,22 +313,8 @@ void OctreeStatsDialog::paintEvent(QPaintEvent* event) { // Entity Edits label = _labels[_entityUpdates]; - auto totalTrackedEdits = entitiesTree->getTotalTrackedEdits(); auto bytesPerEdit = entitiesTree->getAverageEditBytes(); - // track our updated per second - const quint64 SAMPLING_WINDOW = USECS_PER_SECOND / SAMPLES_PER_SECOND; - quint64 now = usecTimestampNow(); - quint64 sinceLastWindow = now - _lastWindowAt; - auto editsInLastWindow = totalTrackedEdits - _lastKnownTrackedEdits; - float sinceLastWindowInSeconds = (float)sinceLastWindow / (float)USECS_PER_SECOND; - float recentUpdatesPerSecond = (float)editsInLastWindow / sinceLastWindowInSeconds; - if (sinceLastWindow > SAMPLING_WINDOW) { - _averageUpdatesPerSecond.updateAverage(recentUpdatesPerSecond); - _lastWindowAt = now; - _lastKnownTrackedEdits = totalTrackedEdits; - } - auto updatesPerSecond = _averageUpdatesPerSecond.getAverage(); if (updatesPerSecond < 1) { updatesPerSecond = 0; // we don't really care about small updates per second so suppress those @@ -324,7 +334,7 @@ void OctreeStatsDialog::paintEvent(QPaintEvent* event) { showAllOctreeServers(); - this->QDialog::paintEvent(event); + QDialog::paintEvent(event); } void OctreeStatsDialog::showAllOctreeServers() { int serverCount = 0; diff --git a/interface/src/ui/OctreeStatsDialog.h b/interface/src/ui/OctreeStatsDialog.h index f56a00bc86..063c04b295 100644 --- a/interface/src/ui/OctreeStatsDialog.h +++ b/interface/src/ui/OctreeStatsDialog.h @@ -76,6 +76,8 @@ private: quint64 _lastWindowAt = 0; quint64 _lastKnownTrackedEdits = 0; + quint64 _lastRefresh = 0; + int _octreeServerLables[MAX_VOXEL_SERVERS]; int _octreeServerLabelsCount; details _extraServerDetails[MAX_VOXEL_SERVERS];