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

 #include "Menu.h"
 #include "ModelPackager.h"
 #include "Util.h"
+#include "InterfaceLogging.h"
 #include "avatar/AvatarManager.h"
     _applicationStartupTime = startup_time;
-    qDebug() << "[VERSION] Build sequence: " << qPrintable(applicationVersion());
+    qCDebug(interface) << "[VERSION] Build sequence: " << qPrintable(applicationVersion());
     _bookmarks = new Bookmarks();  // Before setting up the menu
     // check first run...
     if (_firstRun.get()) {
-        qDebug() << "This is a first run...";
+        qCDebug(interface) << "This is a first run...";
         // clear the scripts, and set out script to our default scripts
         clearScriptsBeforeRunning();
         loadScript(DEFAULT_SCRIPTS_JS_URL);
 }
 void Application::initializeGL() {
-    qDebug() << "Created Display Window.";
+    qCDebug(interface) << "Created Display Window.";
     // initialize glut for shape drawing; Qt apparently initializes it on OS X
     #ifndef __APPLE__
     }
     #endif
-    qDebug() << "GL Version: " << QString((const char*) glGetString(GL_VERSION));
+    qCDebug(interface) << "GL Version: " << QString((const char*) glGetString(GL_VERSION));
-    qDebug() << "GL Shader Language Version: " << QString((const char*) glGetString(GL_SHADING_LANGUAGE_VERSION));
+    qCDebug(interface) << "GL Shader Language Version: " << QString((const char*) glGetString(GL_SHADING_LANGUAGE_VERSION));
-    qDebug() << "GL Vendor: " << QString((const char*) glGetString(GL_VENDOR));
+    qCDebug(interface) << "GL Vendor: " << QString((const char*) glGetString(GL_VENDOR));
-    qDebug() << "GL Renderer: " << QString((const char*) glGetString(GL_RENDERER));
+    qCDebug(interface) << "GL Renderer: " << QString((const char*) glGetString(GL_RENDERER));
     #ifdef WIN32
     GLenum err = glewInit();
     if (GLEW_OK != err) {
-      /* Problem: glewInit failed, something is seriously wrong. */
+        /* Problem: glewInit failed, something is seriously wrong. */
-      qDebug("Error: %s\n", glewGetErrorString(err));
+        qCDebug(interface, "Error: %s\n", glewGetErrorString(err));
     }
-    qDebug("Status: Using GLEW %s\n", glewGetString(GLEW_VERSION));
+    qCDebug(interface, "Status: Using GLEW %s\n", glewGetString(GLEW_VERSION));
     if (wglewGetExtension("WGL_EXT_swap_control")) {
         int swapInterval = wglGetSwapIntervalEXT();
-        qDebug("V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
+        qCDebug(interface, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
     }
     #endif
     // TODO: Write the correct  code for Linux...
     /* if (wglewGetExtension("WGL_EXT_swap_control")) {
         int swapInterval = wglGetSwapIntervalEXT();
-        qDebug("V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
+        qCDebug(interface, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
     }*/
 #endif
     initDisplay();
-    qDebug( "Initialized Display.");
+    qCDebug(interface, "Initialized Display.");
     init();
-    qDebug( "init() complete.");
+    qCDebug(interface, "init() complete.");
     // create thread for parsing of octee data independent of the main network and rendering threads
     _octreeProcessor.initialize(_enableProcessOctreeThread);
     if (_justStarted) {
         float startupTime = (float)_applicationStartupTime.elapsed() / 1000.0;
         _justStarted = false;
-        qDebug("Startup time: %4.2f seconds.", startupTime);
+        qCDebug(interface, "Startup time: %4.2f seconds.", startupTime);
     }
     // update before the first render
         }
         exportTree.writeToSVOFile(filename.toLocal8Bit().constData());
     } else {
-        qDebug() << "No models were selected";
+        qCDebug(interface) << "No models were selected";
         return false;
     }
     DependencyManager::get<AddressManager>()->loadSettings(addressLookupString);
-    qDebug() << "Loaded settings";
+    qCDebug(interface) << "Loaded settings";
 #ifdef __APPLE__
     if (Menu::getInstance()->isOptionChecked(MenuOption::SixenseEnabled)) {
 void Application::queryOctree(NodeType_t serverType, PacketType packetType, NodeToJurisdictionMap& jurisdictions) {
-    //qDebug() << ">>> inside... queryOctree()... _viewFrustum.getFieldOfView()=" << _viewFrustum.getFieldOfView();
+    //qCDebug(interface) << ">>> inside... queryOctree()... _viewFrustum.getFieldOfView()=" << _viewFrustum.getFieldOfView();
     bool wantExtraDebugging = getLogger()->extraDebugging();
     // These will be the same for all servers, so we can set them up once and then reuse for each server we send to.
     });
     if (wantExtraDebugging) {
-        qDebug("Servers: total %d, in view %d, unknown jurisdiction %d",
+        qCDebug(interface, "Servers: total %d, in view %d, unknown jurisdiction %d",
             totalServers, inViewServers, unknownJurisdictionServers);
     }
     }
     if (wantExtraDebugging) {
-        qDebug("perServerPPS: %d perUnknownServer: %d", perServerPPS, perUnknownServer);
+        qCDebug(interface, "perServerPPS: %d perUnknownServer: %d", perServerPPS, perUnknownServer);
     }
     nodeList->eachNode([&](const SharedNodePointer& node){
             if (jurisdictions.find(nodeUUID) == jurisdictions.end()) {
                 unknownView = true; // assume it's in view
                 if (wantExtraDebugging) {
-                    qDebug() << "no known jurisdiction for node " << *node << ", assume it's visible.";
+                    qCDebug(interface) << "no known jurisdiction for node " << *node << ", assume it's visible.";
                 }
             } else {
                 const JurisdictionMap& map = (jurisdictions)[nodeUUID];
                     }
                 } else {
                     if (wantExtraDebugging) {
-                        qDebug() << "Jurisdiction without RootCode for node " << *node << ". That's unusual!";
+                        qCDebug(interface) << "Jurisdiction without RootCode for node " << *node << ". That's unusual!";
                     }
                 }
             }
                 _octreeQuery.setMaxOctreePacketsPerSecond(perServerPPS);
             } else if (unknownView) {
                 if (wantExtraDebugging) {
-                    qDebug() << "no known jurisdiction for node " << *node << ", give it budget of "
+                    qCDebug(interface) << "no known jurisdiction for node " << *node << ", give it budget of "
                     << perUnknownServer << " to send us jurisdiction.";
                 }
                     _octreeQuery.setCameraNearClip(0.1f);
                     _octreeQuery.setCameraFarClip(0.1f);
                     if (wantExtraDebugging) {
-                        qDebug() << "Using 'minimal' camera position for node" << *node;
+                        qCDebug(interface) << "Using 'minimal' camera position for node" << *node;
                     }
                 } else {
                     if (wantExtraDebugging) {
-                        qDebug() << "Using regular camera position for node" << *node;
+                        qCDebug(interface) << "Using regular camera position for node" << *node;
                     }
                 }
                 _octreeQuery.setMaxOctreePacketsPerSecond(perUnknownServer);
 #ifndef WIN32
     // crashes with vs2013/win32
-    qDebug("Application title set to: %s", title.toStdString().c_str());
+    qCDebug(interface, "Application title set to: %s", title.toStdString().c_str());
 #endif
     _window->setWindowTitle(title);
 }
 void Application::clearDomainOctreeDetails() {
-    qDebug() << "Clearing domain octree details...";
+    qCDebug(interface) << "Clearing domain octree details...";
     // reset the environment so that we don't erroneously end up with multiple
     _environment.resetToDefault();
             voxelDetailsForCode(rootCode, rootDetails);
             _entityServerJurisdictions.unlock();
-            qDebug("model server going away...... v[%f, %f, %f, %f]",
+            qCDebug(interface, "model server going away...... v[%f, %f, %f, %f]",
                 rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s);
             // Add the jurisditionDetails object to the list of "fade outs"
         if (jurisdiction->find(nodeUUID) == jurisdiction->end()) {
             jurisdiction->unlock();
-            qDebug("stats from new %s server... [%f, %f, %f, %f]",
+            qCDebug(interface, "stats from new %s server... [%f, %f, %f, %f]",
                 qPrintable(serverType), rootDetails.x, rootDetails.y, rootDetails.z, rootDetails.s);
             // Add the jurisditionDetails object to the list of "fade outs"
     QNetworkRequest networkRequest = QNetworkRequest(url);
     networkRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
     QNetworkReply* reply = networkAccessManager.get(networkRequest);
-    qDebug() << "Downloading avatar file at " << url;
+    qCDebug(interface) << "Downloading avatar file at " << url;
     QEventLoop loop;
     QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
     loop.exec();
     msgBox.exec();
     if (msgBox.clickedButton() == headButton) {
-        qDebug() << "Chose to use for head: " << url;
+        qCDebug(interface) << "Chose to use for head: " << url;
         _myAvatar->setFaceModelURL(url);
         UserActivityLogger::getInstance().changedModel("head", url);
         _myAvatar->sendIdentityPacket();
         emit faceURLChanged(url);
     } else if (msgBox.clickedButton() == bodyButton) {
-        qDebug() << "Chose to use for body: " << url;
+        qCDebug(interface) << "Chose to use for body: " << url;
         _myAvatar->setSkeletonModelURL(url);
         // if the head is empty, reset it to the default head.
         if (_myAvatar->getFaceModelURLString().isEmpty()) {
         _myAvatar->sendIdentityPacket();
         emit skeletonURLChanged(url);
     } else if (msgBox.clickedButton() == bodyAndHeadButton) {
-        qDebug() << "Chose to use for body + head: " << url;
+        qCDebug(interface) << "Chose to use for body + head: " << url;
         _myAvatar->setFaceModelURL(QString());
         _myAvatar->setSkeletonModelURL(url);
         UserActivityLogger::getInstance().changedModel("skeleton", url);
         emit faceURLChanged(QString());
         emit skeletonURLChanged(url);
     } else {
-        qDebug() << "Declined to use the avatar: " << url;
+        qCDebug(interface) << "Declined to use the avatar: " << url;
     }
     return true;
 }
     reply = QMessageBox::question(getWindow(), "Run Script", message, QMessageBox::Yes|QMessageBox::No);
     if (reply == QMessageBox::Yes) {
-        qDebug() << "Chose to run the script: " << scriptFilenameOrURL;
+        qCDebug(interface) << "Chose to run the script: " << scriptFilenameOrURL;
         loadScript(scriptFilenameOrURL);
     } else {
-        qDebug() << "Declined to run the script: " << scriptFilenameOrURL;
+        qCDebug(interface) << "Declined to run the script: " << scriptFilenameOrURL;
     }
     return true;
 }
 }
 void Application::handleScriptLoadError(const QString& scriptFilename) {
-    qDebug() << "Application::loadScript(), script failed to load...";
+    qCDebug(interface) << "Application::loadScript(), script failed to load...";
     QMessageBox::warning(getWindow(), "Error Loading Script", scriptFilename + " failed to load.");
 }
             connect(it.value(), SIGNAL(finished(const QString&)), SLOT(loadScript(const QString&)));
         }
         it.value()->stop();
-        qDebug() << "stopping script..." << it.key();
+        qCDebug(interface) << "stopping script..." << it.key();
     }
     // HACK: ATM scripts cannot set/get their animation priorities, so we clear priorities
     // whenever a script stops in case it happened to have been setting joint rotations.
     const QString& scriptURLString = QUrl(scriptName).toString();
     if (_scriptEnginesHash.contains(scriptURLString)) {
         _scriptEnginesHash.value(scriptURLString)->stop();
-        qDebug() << "stopping script..." << scriptName;
+        qCDebug(interface) << "stopping script..." << scriptName;
         // HACK: ATM scripts cannot set/get their animation priorities, so we clear priorities
         // whenever a script stops in case it happened to have been setting joint rotations.
         // TODO: expose animation priorities and provide a layered animation control system.
         voxelWalletUUID = QUuid(voxelObject[VOXEL_WALLET_UUID].toString());
     }
-    qDebug() << "Octree edits costs are" << satoshisPerVoxel << "per octree cell and" << satoshisPerMeterCubed << "per meter cubed";
+    qCDebug(interface) << "Octree edits costs are" << satoshisPerVoxel << "per octree cell and" << satoshisPerMeterCubed << "per meter cubed";
-    qDebug() << "Destination wallet UUID for edit payments is" << voxelWalletUUID;
+    qCDebug(interface) << "Destination wallet UUID for edit payments is" << voxelWalletUUID;
 }
 QString Application::getPreviousScriptLocation() {
     if (wglewGetExtension("WGL_EXT_swap_control")) {
         wglSwapIntervalEXT(vsyncOn);
         int swapInterval = wglGetSwapIntervalEXT();
-        qDebug("V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
+        qCDebug(interface, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
     } else {
-        qDebug("V-Sync is FORCED ON on this system\n");
+        qCDebug(interface, "V-Sync is FORCED ON on this system\n");
     }
 #elif defined(Q_OS_LINUX)
     // TODO: write the poper code for linux
         glxSwapIntervalEXT(vsyncOn);
         int swapInterval = xglGetSwapIntervalEXT();
         _isVSyncOn = swapInterval;
-        qDebug("V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
+        qCDebug(interface, "V-Sync is %s\n", (swapInterval > 0 ? "ON" : "OFF"));
     } else {
-    qDebug("V-Sync is FORCED ON on this system\n");
+    qCDebug(interface, "V-Sync is FORCED ON on this system\n");
     }
     */
 #else
-    qDebug("V-Sync is FORCED ON on this system\n");
+    qCDebug(interface, "V-Sync is FORCED ON on this system\n");
 #endif
 }
 void Application::checkSkeleton() {
     if (_myAvatar->getSkeletonModel().isActive() && !_myAvatar->getSkeletonModel().hasSkeleton()) {
-        qDebug() << "MyAvatar model has no skeleton";
+        qCDebug(interface) << "MyAvatar model has no skeleton";
         QString message = "Your selected avatar body has no skeleton.\n\nThe default body will be loaded...";
         QMessageBox msgBox;