History

Merge pull request #9886 from vladest/tablet-ui-entity-statistics

Tablet ui entity statistics

Seth Alves committed 9 years ago

Commit 563d59b2 parents df82c30 181c7da8 files · +845 −1Browse files

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

Unified · Split

interface/src/Application.cpp+15−0
@@ -173,6 +173,7 @@ · 172 unmodified lines
173173 #include "ui/overlays/Overlays.h"
174174 #include "Util.h"
175175 #include "InterfaceParentFinder.h"
176+#include "ui/OctreeStatsProvider.h"
176177
177178 #include "FrameTimingsScriptingInterface.h"
178179 #include <GPUIdent.h>
@@ -523,6 +524,7 @@ bool setupEssentials(int& argc, char** argv) { · 344 unmodified lines
523524 DependencyManager::set<OffscreenQmlSurfaceCache>();
524525 DependencyManager::set<EntityScriptClient>();
525526 DependencyManager::set<EntityScriptServerLogClient>();
527+ DependencyManager::set<OctreeStatsProvider>(nullptr, qApp->getOcteeSceneStats());
526528 return previousSessionCrashed;
527529 }
528530
@@ -1807,6 +1809,7 @@ Application::~Application() { · 1278 unmodified lines
18071809 DependencyManager::destroy<GeometryCache>();
18081810 DependencyManager::destroy<ScriptCache>();
18091811 DependencyManager::destroy<SoundCache>();
1812+ DependencyManager::destroy<OctreeStatsProvider>();
18101813
18111814 ResourceManager::cleanup();
18121815
@@ -6398,6 +6401,18 @@ void Application::loadLODToolsDialog() { · 4585 unmodified lines
63986401
63996402 }
64006403
6404+
6405+void Application::loadEntityStatisticsDialog() {
6406+ auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
6407+ auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
6408+ if (tablet->getToolbarMode() || (!tablet->getTabletRoot() && !isHMDMode())) {
6409+ auto dialogsManager = DependencyManager::get<DialogsManager>();
6410+ dialogsManager->octreeStatsDetails();
6411+ } else {
6412+ tablet->pushOntoStack("../../hifi/dialogs/TabletEntityStatistics.qml");
6413+ }
6414+
6415+}
64016416 void Application::toggleLogDialog() {
64026417 if (! _logDialog) {
64036418 _logDialog = new LogDialog(nullptr, getLogger());

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