History

name the current domain server

stojce committed 13 years ago

Commit a362fdc1 parent 934e2e34 files · +87 −29Browse files

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

Unified · Split

interface/src/Application.cpp+6−2
@@ -147,6 +147,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 146 unmodified lines
147 147
148 NodeList::getInstance()->addHook(&_voxels);148 NodeList::getInstance()->addHook(&_voxels);
149 NodeList::getInstance()->addHook(this);149 NodeList::getInstance()->addHook(this);
150 NodeList::getInstance()->addDomainListener(this);
150 151
151 152
152 // network receive thread and voxel parsing thread are both controlled by the --nonblocking command line153 // network receive thread and voxel parsing thread are both controlled by the --nonblocking command line
@@ -236,6 +237,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 83 unmodified lines
236Application::~Application() {237Application::~Application() {
237 NodeList::getInstance()->removeHook(&_voxels);238 NodeList::getInstance()->removeHook(&_voxels);
238 NodeList::getInstance()->removeHook(this);239 NodeList::getInstance()->removeHook(this);
240 NodeList::getInstance()->removeDomainListener(this);
239 241
240 _sharedVoxelSystem.changeTree(new VoxelTree);242 _sharedVoxelSystem.changeTree(new VoxelTree);
241 243
@@ -314,8 +316,6 @@ void Application::initializeGL() { · 72 unmodified lines
314 char title[50];316 char title[50];
315 sprintf(title, "Interface: %4.2f seconds\n", startupTime);317 sprintf(title, "Interface: %4.2f seconds\n", startupTime);
316 qDebug("%s", title);318 qDebug("%s", title);
317 _window->setWindowTitle(title);
318
319 const char LOGSTASH_INTERFACE_START_TIME_KEY[] = "interface-start-time";319 const char LOGSTASH_INTERFACE_START_TIME_KEY[] = "interface-start-time";
320 320
321 // ask the Logstash class to record the startup time321 // ask the Logstash class to record the startup time
@@ -3235,6 +3235,10 @@ void Application::attachNewHeadToNode(Node* newNode) { · 2913 unmodified lines
3235 }3235 }
3236}3236}
3237 3237
3238void Application::domainChanged(QString domain) {
3239 _window->setWindowTitle(domain);
3240}
3241
3238void Application::nodeAdded(Node* node) {3242void Application::nodeAdded(Node* node) {
3239}3243}
3240 3244

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