History

logging groups for library/shared and interface

Seth Alves committed 11 years ago

Commit fb607e21 parent cd5245d30 files · +255 −172Browse files

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

Unified · Split

interface/src/Application.cpp+48−47
@@ -94,6 +94,7 @@ · 93 unmodified lines
9494 #include "Menu.h"
9595 #include "ModelPackager.h"
9696 #include "Util.h"
97+#include "InterfaceLogging.h"
9798
9899 #include "avatar/AvatarManager.h"
99100
@@ -330,7 +331,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 230 unmodified lines
330331
331332 _applicationStartupTime = startup_time;
332333
333− qDebug() << "[VERSION] Build sequence: " << qPrintable(applicationVersion());
334+ qCDebug(interface) << "[VERSION] Build sequence: " << qPrintable(applicationVersion());
334335
335336 _bookmarks = new Bookmarks(); // Before setting up the menu
336337
@@ -528,7 +529,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 191 unmodified lines
528529
529530 // check first run...
530531 if (_firstRun.get()) {
531− qDebug() << "This is a first run...";
532+ qCDebug(interface) << "This is a first run...";
532533 // clear the scripts, and set out script to our default scripts
533534 clearScriptsBeforeRunning();
534535 loadScript(DEFAULT_SCRIPTS_JS_URL);
@@ -649,7 +650,7 @@ Application::~Application() { · 114 unmodified lines
649650 }
650651
651652 void Application::initializeGL() {
652− qDebug() << "Created Display Window.";
653+ qCDebug(interface) << "Created Display Window.";
653654
654655 // initialize glut for shape drawing; Qt apparently initializes it on OS X
655656 #ifndef __APPLE__
@@ -661,22 +662,22 @@ void Application::initializeGL() { · 5 unmodified lines
661662 }
662663 #endif
663664
664− qDebug() << "GL Version: " << QString((const char*) glGetString(GL_VERSION));
665− qDebug() << "GL Shader Language Version: " << QString((const char*) glGetString(GL_SHADING_LANGUAGE_VERSION));
666− qDebug() << "GL Vendor: " << QString((const char*) glGetString(GL_VENDOR));
667− qDebug() << "GL Renderer: " << QString((const char*) glGetString(GL_RENDERER));
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));
668669
669670 #ifdef WIN32
670671 GLenum err = glewInit();
671672 if (GLEW_OK != err) {
672− /* Problem: glewInit failed, something is seriously wrong. */
673− qDebug("Error: %s\n", glewGetErrorString(err));
673+ /* Problem: glewInit failed, something is seriously wrong. */
674+ qCDebug(interface, "Error: %s\n", glewGetErrorString(err));
674675 }
675− qDebug("Status: Using GLEW %s\n", glewGetString(GLEW_VERSION));
676+ qCDebug(interface, "Status: Using GLEW %s\n", glewGetString(GLEW_VERSION));
676677
677678 if (wglewGetExtension("WGL_EXT_swap_control")) {
678679 int swapInterval = wglGetSwapIntervalEXT();
679− qDebug("V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
680+ qCDebug(interface, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
680681 }
681682 #endif
682683
@@ -684,15 +685,15 @@ void Application::initializeGL() { · 1 unmodified line
684685 // TODO: Write the correct code for Linux...
685686 /* if (wglewGetExtension("WGL_EXT_swap_control")) {
686687 int swapInterval = wglGetSwapIntervalEXT();
687− qDebug("V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
688+ qCDebug(interface, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
688689 }*/
689690 #endif
690691
691692 initDisplay();
692− qDebug( "Initialized Display.");
693+ qCDebug(interface, "Initialized Display.");
693694
694695 init();
695− qDebug( "init() complete.");
696+ qCDebug(interface, "init() complete.");
696697
697698 // create thread for parsing of octee data independent of the main network and rendering threads
698699 _octreeProcessor.initialize(_enableProcessOctreeThread);
@@ -713,7 +714,7 @@ void Application::initializeGL() { · 14 unmodified lines
713714 if (_justStarted) {
714715 float startupTime = (float)_applicationStartupTime.elapsed() / 1000.0;
715716 _justStarted = false;
716− qDebug("Startup time: %4.2f seconds.", startupTime);
717+ qCDebug(interface, "Startup time: %4.2f seconds.", startupTime);
717718 }
718719
719720 // update before the first render
@@ -1800,7 +1801,7 @@ bool Application::exportEntities(const QString& filename, float x, float y, floa · 1080 unmodified lines
18001801 }
18011802 exportTree.writeToSVOFile(filename.toLocal8Bit().constData());
18021803 } else {
1803− qDebug() << "No models were selected";
1804+ qCDebug(interface) << "No models were selected";
18041805 return false;
18051806 }
18061807
@@ -1898,7 +1899,7 @@ void Application::init() { · 91 unmodified lines
18981899
18991900 DependencyManager::get<AddressManager>()->loadSettings(addressLookupString);
19001901
1901− qDebug() << "Loaded settings";
1902+ qCDebug(interface) << "Loaded settings";
19021903
19031904 #ifdef __APPLE__
19041905 if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseEnabled)) {
@@ -2379,7 +2380,7 @@ int Application::sendNackPackets() { · 474 unmodified lines
23792380
23802381 void Application::queryOctree(NodeType_t serverType, PacketType packetType, NodeToJurisdictionMap& jurisdictions) {
23812382
2382− //qDebug() << ">>> inside... queryOctree()... _viewFrustum.getFieldOfView()=" << _viewFrustum.getFieldOfView();
2383+ //qCDebug(interface) << ">>> inside... queryOctree()... _viewFrustum.getFieldOfView()=" << _viewFrustum.getFieldOfView();
23832384 bool wantExtraDebugging = getLogger()->extraDebugging();
23842385
23852386 // These will be the same for all servers, so we can set them up once and then reuse for each server we send to.
@@ -2442,7 +2443,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 56 unmodified lines
24422443 });
24432444
24442445 if (wantExtraDebugging) {
2445− qDebug("Servers: total %d, in view %d, unknown jurisdiction %d",
2446+ qCDebug(interface, "Servers: total %d, in view %d, unknown jurisdiction %d",
24462447 totalServers, inViewServers, unknownJurisdictionServers);
24472448 }
24482449
@@ -2463,7 +2464,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 14 unmodified lines
24632464 }
24642465
24652466 if (wantExtraDebugging) {
2466− qDebug("perServerPPS: %d perUnknownServer: %d", perServerPPS, perUnknownServer);
2467+ qCDebug(interface, "perServerPPS: %d perUnknownServer: %d", perServerPPS, perUnknownServer);
24672468 }
24682469
24692470 nodeList->eachNode([&](const SharedNodePointer& node){
@@ -2482,7 +2483,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 12 unmodified lines
24822483 if (jurisdictions.find(nodeUUID) == jurisdictions.end()) {
24832484 unknownView = true; // assume it's in view
24842485 if (wantExtraDebugging) {
2485− qDebug() << "no known jurisdiction for node " << *node << ", assume it's visible.";
2486+ qCDebug(interface) << "no known jurisdiction for node " << *node << ", assume it's visible.";
24862487 }
24872488 } else {
24882489 const JurisdictionMap& map = (jurisdictions)[nodeUUID];
@@ -2502,7 +2503,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 13 unmodified lines
25022503 }
25032504 } else {
25042505 if (wantExtraDebugging) {
2505− qDebug() << "Jurisdiction without RootCode for node " << *node << ". That's unusual!";
2506+ qCDebug(interface) << "Jurisdiction without RootCode for node " << *node << ". That's unusual!";
25062507 }
25072508 }
25082509 }
@@ -2511,7 +2512,7 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 2 unmodified lines
25112512 _octreeQuery.setMaxOctreePacketsPerSecond(perServerPPS);
25122513 } else if (unknownView) {
25132514 if (wantExtraDebugging) {
2514− qDebug() << "no known jurisdiction for node " << *node << ", give it budget of "
2515+ qCDebug(interface) << "no known jurisdiction for node " << *node << ", give it budget of "
25152516 << perUnknownServer << " to send us jurisdiction.";
25162517 }
25172518
@@ -2525,11 +2526,11 @@ void Application::queryOctree(NodeType_t serverType, PacketType packetType, Node · 7 unmodified lines
25252526 _octreeQuery.setCameraNearClip(0.1f);
25262527 _octreeQuery.setCameraFarClip(0.1f);
25272528 if (wantExtraDebugging) {
2528− qDebug() << "Using 'minimal' camera position for node" << *node;
2529+ qCDebug(interface) << "Using 'minimal' camera position for node" << *node;
25292530 }
25302531 } else {
25312532 if (wantExtraDebugging) {
2532− qDebug() << "Using regular camera position for node" << *node;
2533+ qCDebug(interface) << "Using regular camera position for node" << *node;
25332534 }
25342535 }
25352536 _octreeQuery.setMaxOctreePacketsPerSecond(perUnknownServer);
@@ -3296,13 +3297,13 @@ void Application::updateWindowTitle(){ · 760 unmodified lines
32963297
32973298 #ifndef WIN32
32983299 // crashes with vs2013/win32
3299− qDebug("Application title set to: %s", title.toStdString().c_str());
3300+ qCDebug(interface, "Application title set to: %s", title.toStdString().c_str());
33003301 #endif
33013302 _window->setWindowTitle(title);
33023303 }
33033304
33043305 void Application::clearDomainOctreeDetails() {
3305− qDebug() << "Clearing domain octree details...";
3306+ qCDebug(interface) << "Clearing domain octree details...";
33063307 // reset the environment so that we don't erroneously end up with multiple
33073308 _environment.resetToDefault();
33083309
@@ -3374,7 +3375,7 @@ void Application::nodeKilled(SharedNodePointer node) { · 65 unmodified lines
33743375 voxelDetailsForCode(rootCode, rootDetails);
33753376 _entityServerJurisdictions.unlock();
33763377
3377− qDebug("model server going away...... v[%f, %f, %f, %f]",
3378+ qCDebug(interface, "model server going away...... v[%f, %f, %f, %f]",
33783379 rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s);
33793380
33803381 // Add the jurisditionDetails object to the list of "fade outs"
@@ -3460,7 +3461,7 @@ int Application::parseOctreeStats(const QByteArray& packet, const SharedNodePoin · 79 unmodified lines
34603461 if (jurisdiction->find(nodeUUID) == jurisdiction->end()) {
34613462 jurisdiction->unlock();
34623463
3463− qDebug("stats from new %s server... [%f, %f, %f, %f]",
3464+ qCDebug(interface, "stats from new %s server... [%f, %f, %f, %f]",
34643465 qPrintable(serverType), rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s);
34653466
34663467 // Add the jurisditionDetails object to the list of "fade outs"
@@ -3706,7 +3707,7 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 239 unmodified lines
37063707 QNetworkRequest networkRequest = QNetworkRequest(url);
37073708 networkRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
37083709 QNetworkReply* reply = networkAccessManager.get(networkRequest);
3709− qDebug() << "Downloading avatar file at " << url;
3710+ qCDebug(interface) << "Downloading avatar file at " << url;
37103711 QEventLoop loop;
37113712 QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
37123713 loop.exec();
@@ -3755,13 +3756,13 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 42 unmodified lines
37553756 msgBox.exec();
37563757
37573758 if (msgBox.clickedButton() == headButton) {
3758− qDebug() << "Chose to use for head: " << url;
3759+ qCDebug(interface) << "Chose to use for head: " << url;
37593760 _myAvatar->setFaceModelURL(url);
37603761 UserActivityLogger::getInstance().changedModel("head", url);
37613762 _myAvatar->sendIdentityPacket();
37623763 emit faceURLChanged(url);
37633764 } else if (msgBox.clickedButton() == bodyButton) {
3764− qDebug() << "Chose to use for body: " << url;
3765+ qCDebug(interface) << "Chose to use for body: " << url;
37653766 _myAvatar->setSkeletonModelURL(url);
37663767 // if the head is empty, reset it to the default head.
37673768 if (_myAvatar->getFaceModelURLString().isEmpty()) {
@@ -3773,7 +3774,7 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 5 unmodified lines
37733774 _myAvatar->sendIdentityPacket();
37743775 emit skeletonURLChanged(url);
37753776 } else if (msgBox.clickedButton() == bodyAndHeadButton) {
3776− qDebug() << "Chose to use for body + head: " << url;
3777+ qCDebug(interface) << "Chose to use for body + head: " << url;
37773778 _myAvatar->setFaceModelURL(QString());
37783779 _myAvatar->setSkeletonModelURL(url);
37793780 UserActivityLogger::getInstance().changedModel("skeleton", url);
@@ -3781,7 +3782,7 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 1 unmodified line
37813782 emit faceURLChanged(QString());
37823783 emit skeletonURLChanged(url);
37833784 } else {
3784− qDebug() << "Declined to use the avatar: " << url;
3785+ qCDebug(interface) << "Declined to use the avatar: " << url;
37853786 }
37863787 return true;
37873788 }
@@ -3793,10 +3794,10 @@ bool Application::askToLoadScript(const QString& scriptFilenameOrURL) { · 5 unmodified lines
37933794 reply = QMessageBox::question(getWindow(), "Run Script", message, QMessageBox::Yes|QMessageBox::No);
37943795
37953796 if (reply == QMessageBox::Yes) {
3796− qDebug() << "Chose to run the script: " << scriptFilenameOrURL;
3797+ qCDebug(interface) << "Chose to run the script: " << scriptFilenameOrURL;
37973798 loadScript(scriptFilenameOrURL);
37983799 } else {
3799− qDebug() << "Declined to run the script: " << scriptFilenameOrURL;
3800+ qCDebug(interface) << "Declined to run the script: " << scriptFilenameOrURL;
38003801 }
38013802 return true;
38023803 }
@@ -3854,7 +3855,7 @@ void Application::handleScriptEngineLoaded(const QString& scriptFilename) { · 51 unmodified lines
38543855 }
38553856
38563857 void Application::handleScriptLoadError(const QString& scriptFilename) {
3857− qDebug() << "Application::loadScript(), script failed to load...";
3858+ qCDebug(interface) << "Application::loadScript(), script failed to load...";
38583859 QMessageBox::warning(getWindow(), "Error Loading Script", scriptFilename + " failed to load.");
38593860 }
38603861
@@ -3876,7 +3877,7 @@ void Application::stopAllScripts(bool restart) { · 15 unmodified lines
38763877 connect(it.value(), SIGNAL(finished(const QString&)), SLOT(loadScript(const QString&)));
38773878 }
38783879 it.value()->stop();
3879− qDebug() << "stopping script..." << it.key();
3880+ qCDebug(interface) << "stopping script..." << it.key();
38803881 }
38813882 // HACK: ATM scripts cannot set/get their animation priorities, so we clear priorities
38823883 // whenever a script stops in case it happened to have been setting joint rotations.
@@ -3888,7 +3889,7 @@ void Application::stopScript(const QString &scriptName) { · 5 unmodified lines
38883889 const QString& scriptURLString = QUrl(scriptName).toString();
38893890 if (_scriptEnginesHash.contains(scriptURLString)) {
38903891 _scriptEnginesHash.value(scriptURLString)->stop();
3891− qDebug() << "stopping script..." << scriptName;
3892+ qCDebug(interface) << "stopping script..." << scriptName;
38923893 // HACK: ATM scripts cannot set/get their animation priorities, so we clear priorities
38933894 // whenever a script stops in case it happened to have been setting joint rotations.
38943895 // TODO: expose animation priorities and provide a layered animation control system.
@@ -3986,8 +3987,8 @@ void Application::domainSettingsReceived(const QJsonObject& domainSettingsObject · 91 unmodified lines
39863987 voxelWalletUUID = QUuid(voxelObject[VOXEL_WALLET_UUID].toString());
39873988 }
39883989
3989− qDebug() << "Octree edits costs are" << satoshisPerVoxel << "per octree cell and" << satoshisPerMeterCubed << "per meter cubed";
3990− qDebug() << "Destination wallet UUID for edit payments is" << voxelWalletUUID;
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;
39913992 }
39923993
39933994 QString Application::getPreviousScriptLocation() {
@@ -4152,9 +4153,9 @@ void Application::setVSyncEnabled() { · 158 unmodified lines
41524153 if (wglewGetExtension("WGL_EXT_swap_control")) {
41534154 wglSwapIntervalEXT(vsyncOn);
41544155 int swapInterval = wglGetSwapIntervalEXT();
4155− qDebug("V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
4156+ qCDebug(interface, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
41564157 } else {
4157− qDebug("V-Sync is FORCED ON on this system\n");
4158+ qCDebug(interface, "V-Sync is FORCED ON on this system\n");
41584159 }
41594160 #elif defined(Q_OS_LINUX)
41604161 // TODO: write the poper code for linux
@@ -4163,13 +4164,13 @@ void Application::setVSyncEnabled() { · 2 unmodified lines
41634164 glxSwapIntervalEXT(vsyncOn);
41644165 int swapInterval = xglGetSwapIntervalEXT();
41654166 _isVSyncOn = swapInterval;
4166− qDebug("V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
4167+ qCDebug(interface, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
41674168 } else {
4168− qDebug("V-Sync is FORCED ON on this system\n");
4169+ qCDebug(interface, "V-Sync is FORCED ON on this system\n");
41694170 }
41704171 */
41714172 #else
4172− qDebug("V-Sync is FORCED ON on this system\n");
4173+ qCDebug(interface, "V-Sync is FORCED ON on this system\n");
41734174 #endif
41744175 }
41754176
@@ -4285,7 +4286,7 @@ void Application::notifyPacketVersionMismatch() { · 109 unmodified lines
42854286
42864287 void Application::checkSkeleton() {
42874288 if (_myAvatar->getSkeletonModel().isActive() && !_myAvatar->getSkeletonModel().hasSkeleton()) {
4288− qDebug() << "MyAvatar model has no skeleton";
4289+ qCDebug(interface) << "MyAvatar model has no skeleton";
42894290
42904291 QString message = "Your selected avatar body has no skeleton.\n\nThe default body will be loaded...";
42914292 QMessageBox msgBox;