History

interface is reserved, so use interfaceapp as the logging tag for interface. also experiment with a macro for logging

Seth Alves committed 11 years ago

Commit fc5b4421 parent fb607e222 files · +127 −125Browse files

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

Unified · Split

interface/src/Application.cpp+46−46
@@ -331,7 +331,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 330 unmodified lines
331331
332332 _applicationStartupTime = startup_time;
333333
334− qCDebug(interface) << "[VERSION] Build sequence: " << qPrintable(applicationVersion());
334+ debugLog << "[VERSION] Build sequence: " << qPrintable(applicationVersion());
335335
336336 _bookmarks = new Bookmarks(); // Before setting up the menu
337337
@@ -529,7 +529,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 191 unmodified lines
529529
530530 // check first run...
531531 if (_firstRun.get()) {
532− qCDebug(interface) << "This is a first run...";
532+ debugLog << "This is a first run...";
533533 // clear the scripts, and set out script to our default scripts
534534 clearScriptsBeforeRunning();
535535 loadScript(DEFAULT_SCRIPTS_JS_URL);
@@ -650,7 +650,7 @@ Application::~Application() { · 114 unmodified lines
650650 }
651651
652652 void Application::initializeGL() {
653− qCDebug(interface) << "Created Display Window.";
653+ debugLog << "Created Display Window.";
654654
655655 // initialize glut for shape drawing; Qt apparently initializes it on OS X
656656 #ifndef __APPLE__
@@ -662,22 +662,22 @@ void Application::initializeGL() { · 5 unmodified lines
662662 }
663663 #endif
664664
665− qCDebug(interface) << "GL Version: " << QString((const char*) glGetString(GL_VERSION));
666− qCDebug(interface) << "GL Shader Language Version: " << QString((const char*) glGetString(GL_SHADING_LANGUAGE_VERSION));
667− qCDebug(interface) << "GL Vendor: " << QString((const char*) glGetString(GL_VENDOR));
668− qCDebug(interface) << "GL Renderer: " << QString((const char*) glGetString(GL_RENDERER));
665+ debugLog << "GL Version: " << QString((const char*) glGetString(GL_VERSION));
666+ debugLog << "GL Shader Language Version: " << QString((const char*) glGetString(GL_SHADING_LANGUAGE_VERSION));
667+ debugLog << "GL Vendor: " << QString((const char*) glGetString(GL_VENDOR));
668+ debugLog << "GL Renderer: " << QString((const char*) glGetString(GL_RENDERER));
669669
670670 #ifdef WIN32
671671 GLenum err = glewInit();
672672 if (GLEW_OK != err) {
673673 /* Problem: glewInit failed, something is seriously wrong. */
674− qCDebug(interface, "Error: %s\n", glewGetErrorString(err));
674+ qCDebug(interfaceapp, "Error: %s\n", glewGetErrorString(err));
675675 }
676− qCDebug(interface, "Status: Using GLEW %s\n", glewGetString(GLEW_VERSION));
676+ qCDebug(interfaceapp, "Status: Using GLEW %s\n", glewGetString(GLEW_VERSION));
677677
678678 if (wglewGetExtension("WGL_EXT_swap_control")) {
679679 int swapInterval = wglGetSwapIntervalEXT();
680− qCDebug(interface, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
680+ qCDebug(interfaceapp, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
681681 }
682682 #endif
683683
@@ -685,15 +685,15 @@ void Application::initializeGL() { · 1 unmodified line
685685 // TODO: Write the correct code for Linux...
686686 /* if (wglewGetExtension("WGL_EXT_swap_control")) {
687687 int swapInterval = wglGetSwapIntervalEXT();
688− qCDebug(interface, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
688+ qCDebug(interfaceapp, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
689689 }*/
690690 #endif
691691
692692 initDisplay();
693− qCDebug(interface, "Initialized Display.");
693+ qCDebug(interfaceapp, "Initialized Display.");
694694
695695 init();
696− qCDebug(interface, "init() complete.");
696+ qCDebug(interfaceapp, "init() complete.");
697697
698698 // create thread for parsing of octee data independent of the main network and rendering threads
699699 _octreeProcessor.initialize(_enableProcessOctreeThread);
@@ -714,7 +714,7 @@ void Application::initializeGL() { · 14 unmodified lines
714714 if (_justStarted) {
715715 float startupTime = (float)_applicationStartupTime.elapsed() / 1000.0;
716716 _justStarted = false;
717− qCDebug(interface, "Startup time: %4.2f seconds.", startupTime);
717+ qCDebug(interfaceapp, "Startup time: %4.2f seconds.", startupTime);
718718 }
719719
720720 // update before the first render
@@ -1801,7 +1801,7 @@ bool Application::exportEntities(const QString& filename, float x, float y, floa · 1080 unmodified lines
18011801 }
18021802 exportTree.writeToSVOFile(filename.toLocal8Bit().constData());
18031803 } else {
1804− qCDebug(interface) << "No models were selected";
1804+ debugLog << "No models were selected";
18051805 return false;
18061806 }
18071807
@@ -1899,7 +1899,7 @@ void Application::init() { · 91 unmodified lines
18991899
19001900 DependencyManager::get<AddressManager>()->loadSettings(addressLookupString);
19011901
1902− qCDebug(interface) << "Loaded settings";
1902+ debugLog << "Loaded settings";
19031903
19041904 #ifdef __APPLE__
19051905 if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseEnabled)) {
@@ -2380,7 +2380,7 @@ int Application::sendNackPackets() { · 474 unmodified lines
23802380
23812381 void Application::queryOctree(NodeType_t serverType, PacketType packetType, NodeToJurisdictionMap& jurisdictions) {
23822382
2383− //qCDebug(interface) << ">>> inside... queryOctree()... _viewFrustum.getFieldOfView()=" << _viewFrustum.getFieldOfView();
2383+ //debugLog << ">>> inside... queryOctree()... _viewFrustum.getFieldOfView()=" << _viewFrustum.getFieldOfView();
23842384 bool wantExtraDebugging = getLogger()->extraDebugging();
23852385
23862386 // These will be the same for all servers, so we can set them up once and then reuse for each server we send to.
@@ -2443,7 +2443,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 56 unmodified lines
24432443 });
24442444
24452445 if (wantExtraDebugging) {
2446− qCDebug(interface, "Servers: total %d, in view %d, unknown jurisdiction %d",
2446+ qCDebug(interfaceapp, "Servers: total %d, in view %d, unknown jurisdiction %d",
24472447 totalServers, inViewServers, unknownJurisdictionServers);
24482448 }
24492449
@@ -2464,7 +2464,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 14 unmodified lines
24642464 }
24652465
24662466 if (wantExtraDebugging) {
2467− qCDebug(interface, "perServerPPS: %d perUnknownServer: %d", perServerPPS, perUnknownServer);
2467+ qCDebug(interfaceapp, "perServerPPS: %d perUnknownServer: %d", perServerPPS, perUnknownServer);
24682468 }
24692469
24702470 nodeList->eachNode([&](const SharedNodePointer& node){
@@ -2483,7 +2483,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 12 unmodified lines
24832483 if (jurisdictions.find(nodeUUID) == jurisdictions.end()) {
24842484 unknownView = true; // assume it's in view
24852485 if (wantExtraDebugging) {
2486− qCDebug(interface) << "no known jurisdiction for node " << *node << ", assume it's visible.";
2486+ debugLog << "no known jurisdiction for node " << *node << ", assume it's visible.";
24872487 }
24882488 } else {
24892489 const JurisdictionMap& map = (jurisdictions)[nodeUUID];
@@ -2503,7 +2503,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 13 unmodified lines
25032503 }
25042504 } else {
25052505 if (wantExtraDebugging) {
2506− qCDebug(interface) << "Jurisdiction without RootCode for node " << *node << ". That's unusual!";
2506+ debugLog << "Jurisdiction without RootCode for node " << *node << ". That's unusual!";
25072507 }
25082508 }
25092509 }
@@ -2512,7 +2512,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 2 unmodified lines
25122512 _octreeQuery.setMaxOctreePacketsPerSecond(perServerPPS);
25132513 } else if (unknownView) {
25142514 if (wantExtraDebugging) {
2515− qCDebug(interface) << "no known jurisdiction for node " << *node << ", give it budget of "
2515+ debugLog << "no known jurisdiction for node " << *node << ", give it budget of "
25162516 << perUnknownServer << " to send us jurisdiction.";
25172517 }
25182518
@@ -2526,11 +2526,11 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 7 unmodified lines
25262526 _octreeQuery.setCameraNearClip(0.1f);
25272527 _octreeQuery.setCameraFarClip(0.1f);
25282528 if (wantExtraDebugging) {
2529− qCDebug(interface) << "Using 'minimal' camera position for node" << *node;
2529+ debugLog << "Using 'minimal' camera position for node" << *node;
25302530 }
25312531 } else {
25322532 if (wantExtraDebugging) {
2533− qCDebug(interface) << "Using regular camera position for node" << *node;
2533+ debugLog << "Using regular camera position for node" << *node;
25342534 }
25352535 }
25362536 _octreeQuery.setMaxOctreePacketsPerSecond(perUnknownServer);
@@ -3297,13 +3297,13 @@ void Application::updateWindowTitle(){ · 760 unmodified lines
32973297
32983298 #ifndef WIN32
32993299 // crashes with vs2013/win32
3300− qCDebug(interface, "Application title set to: %s", title.toStdString().c_str());
3300+ qCDebug(interfaceapp, "Application title set to: %s", title.toStdString().c_str());
33013301 #endif
33023302 _window->setWindowTitle(title);
33033303 }
33043304
33053305 void Application::clearDomainOctreeDetails() {
3306− qCDebug(interface) << "Clearing domain octree details...";
3306+ debugLog << "Clearing domain octree details...";
33073307 // reset the environment so that we don't erroneously end up with multiple
33083308 _environment.resetToDefault();
33093309
@@ -3375,7 +3375,7 @@ void Application::nodeKilled(SharedNodePointer node) { · 65 unmodified lines
33753375 voxelDetailsForCode(rootCode, rootDetails);
33763376 _entityServerJurisdictions.unlock();
33773377
3378− qCDebug(interface, "model server going away...... v[%f, %f, %f, %f]",
3378+ qCDebug(interfaceapp, "model server going away...... v[%f, %f, %f, %f]",
33793379 rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s);
33803380
33813381 // Add the jurisditionDetails object to the list of "fade outs"
@@ -3461,7 +3461,7 @@ int Application::parseOctreeStats(const QByteArray& packet, const SharedNodePoin · 79 unmodified lines
34613461 if (jurisdiction->find(nodeUUID) == jurisdiction->end()) {
34623462 jurisdiction->unlock();
34633463
3464− qCDebug(interface, "stats from new %s server... [%f, %f, %f, %f]",
3464+ qCDebug(interfaceapp, "stats from new %s server... [%f, %f, %f, %f]",
34653465 qPrintable(serverType), rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s);
34663466
34673467 // Add the jurisditionDetails object to the list of "fade outs"
@@ -3707,7 +3707,7 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 239 unmodified lines
37073707 QNetworkRequest networkRequest = QNetworkRequest(url);
37083708 networkRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
37093709 QNetworkReply* reply = networkAccessManager.get(networkRequest);
3710− qCDebug(interface) << "Downloading avatar file at " << url;
3710+ debugLog << "Downloading avatar file at " << url;
37113711 QEventLoop loop;
37123712 QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
37133713 loop.exec();
@@ -3756,13 +3756,13 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 42 unmodified lines
37563756 msgBox.exec();
37573757
37583758 if (msgBox.clickedButton() == headButton) {
3759− qCDebug(interface) << "Chose to use for head: " << url;
3759+ debugLog << "Chose to use for head: " << url;
37603760 _myAvatar->setFaceModelURL(url);
37613761 UserActivityLogger::getInstance().changedModel("head", url);
37623762 _myAvatar->sendIdentityPacket();
37633763 emit faceURLChanged(url);
37643764 } else if (msgBox.clickedButton() == bodyButton) {
3765− qCDebug(interface) << "Chose to use for body: " << url;
3765+ debugLog << "Chose to use for body: " << url;
37663766 _myAvatar->setSkeletonModelURL(url);
37673767 // if the head is empty, reset it to the default head.
37683768 if (_myAvatar->getFaceModelURLString().isEmpty()) {
@@ -3774,7 +3774,7 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 5 unmodified lines
37743774 _myAvatar->sendIdentityPacket();
37753775 emit skeletonURLChanged(url);
37763776 } else if (msgBox.clickedButton() == bodyAndHeadButton) {
3777− qCDebug(interface) << "Chose to use for body + head: " << url;
3777+ debugLog << "Chose to use for body + head: " << url;
37783778 _myAvatar->setFaceModelURL(QString());
37793779 _myAvatar->setSkeletonModelURL(url);
37803780 UserActivityLogger::getInstance().changedModel("skeleton", url);
@@ -3782,7 +3782,7 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 1 unmodified line
37823782 emit faceURLChanged(QString());
37833783 emit skeletonURLChanged(url);
37843784 } else {
3785− qCDebug(interface) << "Declined to use the avatar: " << url;
3785+ debugLog << "Declined to use the avatar: " << url;
37863786 }
37873787 return true;
37883788 }
@@ -3794,10 +3794,10 @@ bool Application::askToLoadScript(const QString& scriptFilenameOrURL) { · 5 unmodified lines
37943794 reply = QMessageBox::question(getWindow(), "Run Script", message, QMessageBox::Yes|QMessageBox::No);
37953795
37963796 if (reply == QMessageBox::Yes) {
3797− qCDebug(interface) << "Chose to run the script: " << scriptFilenameOrURL;
3797+ debugLog << "Chose to run the script: " << scriptFilenameOrURL;
37983798 loadScript(scriptFilenameOrURL);
37993799 } else {
3800− qCDebug(interface) << "Declined to run the script: " << scriptFilenameOrURL;
3800+ debugLog << "Declined to run the script: " << scriptFilenameOrURL;
38013801 }
38023802 return true;
38033803 }
@@ -3855,7 +3855,7 @@ void Application::handleScriptEngineLoaded(const QString& scriptFilename) { · 51 unmodified lines
38553855 }
38563856
38573857 void Application::handleScriptLoadError(const QString& scriptFilename) {
3858− qCDebug(interface) << "Application::loadScript(), script failed to load...";
3858+ debugLog << "Application::loadScript(), script failed to load...";
38593859 QMessageBox::warning(getWindow(), "Error Loading Script", scriptFilename + " failed to load.");
38603860 }
38613861
@@ -3877,7 +3877,7 @@ void Application::stopAllScripts(bool restart) { · 15 unmodified lines
38773877 connect(it.value(), SIGNAL(finished(const QString&)), SLOT(loadScript(const QString&)));
38783878 }
38793879 it.value()->stop();
3880− qCDebug(interface) << "stopping script..." << it.key();
3880+ debugLog << "stopping script..." << it.key();
38813881 }
38823882 // HACK: ATM scripts cannot set/get their animation priorities, so we clear priorities
38833883 // whenever a script stops in case it happened to have been setting joint rotations.
@@ -3889,7 +3889,7 @@ void Application::stopScript(const QString &scriptName) { · 5 unmodified lines
38893889 const QString& scriptURLString = QUrl(scriptName).toString();
38903890 if (_scriptEnginesHash.contains(scriptURLString)) {
38913891 _scriptEnginesHash.value(scriptURLString)->stop();
3892− qCDebug(interface) << "stopping script..." << scriptName;
3892+ debugLog << "stopping script..." << scriptName;
38933893 // HACK: ATM scripts cannot set/get their animation priorities, so we clear priorities
38943894 // whenever a script stops in case it happened to have been setting joint rotations.
38953895 // TODO: expose animation priorities and provide a layered animation control system.
@@ -3987,8 +3987,8 @@ void Application::domainSettingsReceived(const QJsonObject& domainSettingsObject · 91 unmodified lines
39873987 voxelWalletUUID = QUuid(voxelObject[VOXEL_WALLET_UUID].toString());
39883988 }
39893989
3990− qCDebug(interface) << "Octree edits costs are" << satoshisPerVoxel << "per octree cell and" << satoshisPerMeterCubed << "per meter cubed";
3991− qCDebug(interface) << "Destination wallet UUID for edit payments is" << voxelWalletUUID;
3990+ debugLog << "Octree edits costs are" << satoshisPerVoxel << "per octree cell and" << satoshisPerMeterCubed << "per meter cubed";
3991+ debugLog << "Destination wallet UUID for edit payments is" << voxelWalletUUID;
39923992 }
39933993
39943994 QString Application::getPreviousScriptLocation() {
@@ -4153,9 +4153,9 @@ void Application::setVSyncEnabled() { · 158 unmodified lines
41534153 if (wglewGetExtension("WGL_EXT_swap_control")) {
41544154 wglSwapIntervalEXT(vsyncOn);
41554155 int swapInterval = wglGetSwapIntervalEXT();
4156− qCDebug(interface, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
4156+ qCDebug(interfaceapp, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
41574157 } else {
4158− qCDebug(interface, "V-Sync is FORCED ON on this system\n");
4158+ qCDebug(interfaceapp, "V-Sync is FORCED ON on this system\n");
41594159 }
41604160 #elif defined(Q_OS_LINUX)
41614161 // TODO: write the poper code for linux
@@ -4164,13 +4164,13 @@ void Application::setVSyncEnabled() { · 2 unmodified lines
41644164 glxSwapIntervalEXT(vsyncOn);
41654165 int swapInterval = xglGetSwapIntervalEXT();
41664166 _isVSyncOn = swapInterval;
4167− qCDebug(interface, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
4167+ qCDebug(interfaceapp, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
41684168 } else {
4169− qCDebug(interface, "V-Sync is FORCED ON on this system\n");
4169+ qCDebug(interfaceapp, "V-Sync is FORCED ON on this system\n");
41704170 }
41714171 */
41724172 #else
4173− qCDebug(interface, "V-Sync is FORCED ON on this system\n");
4173+ qCDebug(interfaceapp, "V-Sync is FORCED ON on this system\n");
41744174 #endif
41754175 }
41764176
@@ -4286,7 +4286,7 @@ void Application::notifyPacketVersionMismatch() { · 109 unmodified lines
42864286
42874287 void Application::checkSkeleton() {
42884288 if (_myAvatar->getSkeletonModel().isActive() && !_myAvatar->getSkeletonModel().hasSkeleton()) {
4289− qCDebug(interface) << "MyAvatar model has no skeleton";
4289+ debugLog << "MyAvatar model has no skeleton";
42904290
42914291 QString message = "Your selected avatar body has no skeleton.\n\nThe default body will be loaded...";
42924292 QMessageBox msgBox;

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