From ea1359c10f237cbab2bd2b53dc3759f036c316cf Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 22 May 2014 11:11:22 -0700 Subject: [PATCH] Clean up log --- interface/src/Application.cpp | 4 ++-- libraries/voxels/src/LocalVoxelsList.cpp | 8 ++------ libraries/voxels/src/Tags.cpp | 2 +- libraries/voxels/src/VoxelTree.cpp | 2 +- libraries/voxels/src/VoxelTreeCommands.cpp | 1 - 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 2b552de0ee..fd09e530c1 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1476,10 +1476,10 @@ void Application::importVoxels() { } if (!_voxelImporter->exec()) { - qDebug() << "[DEBUG] Import succeeded." << endl; + qDebug() << "Import succeeded." << endl; _importSucceded = true; } else { - qDebug() << "[DEBUG] Import failed." << endl; + qDebug() << "Import failed." << endl; if (_sharedVoxelSystem.getTree() == _voxelImporter->getVoxelTree()) { _sharedVoxelSystem.killLocalVoxels(); _sharedVoxelSystem.changeTree(&_clipboard); diff --git a/libraries/voxels/src/LocalVoxelsList.cpp b/libraries/voxels/src/LocalVoxelsList.cpp index 4324306161..55becb0976 100644 --- a/libraries/voxels/src/LocalVoxelsList.cpp +++ b/libraries/voxels/src/LocalVoxelsList.cpp @@ -40,18 +40,17 @@ void LocalVoxelsList::addPersistantTree(QString treeName, VoxelTree* tree) { StrongVoxelTreePointer treePtr(tree, doNothing); _persistantTrees.push_back(treePtr); _trees.insert(treeName, treePtr); - qDebug() << "[DEBUG] LocalVoxelsList : added persistant tree (" << treeName << ")"; } void LocalVoxelsList::insert(QString treeName, StrongVoxelTreePointer& tree) { // If the key don't already exist or the value is null if (!_trees.contains(treeName) || !_trees.value(treeName)) { _trees.insert(treeName, tree); - qDebug() << "[DEBUG] LocalVoxelsList : added local tree (" << treeName << ")"; + qDebug() << "LocalVoxelsList : added local tree (" << treeName << ")"; } else { // if not we replace the tree created by the user with the existing one tree = _trees.value(treeName); - qDebug() << "[DEBUG] LocalVoxelsList : local tree already exist (" << treeName << ")"; + qDebug() << "[WARNING] LocalVoxelsList : local tree already exist (" << treeName << ")"; } } @@ -59,9 +58,6 @@ void LocalVoxelsList::remove(QString treeName) { // if the tree is not used anymore (no strong pointer) if (!_trees.value(treeName)) { // then remove it from the list - qDebug() << "[DEBUG] LocalVoxelsList : removed unused tree (" << treeName << ")"; _trees.remove(treeName); - } else { - qDebug() << "[DEBUG] LocalVoxelsList : tree still in use (" << treeName << ")"; } } diff --git a/libraries/voxels/src/Tags.cpp b/libraries/voxels/src/Tags.cpp index 8f8228faae..d3c534735e 100644 --- a/libraries/voxels/src/Tags.cpp +++ b/libraries/voxels/src/Tags.cpp @@ -186,7 +186,7 @@ int retrieveData(std::string filename, std::stringstream &ss) { return ret; } - std::cerr << "[DEBUG] Schematic compression type not recognize : " << type << std::endl; + std::cerr << "[ERROR] Schematic compression type not recognize : " << type << std::endl; return 1; } diff --git a/libraries/voxels/src/VoxelTree.cpp b/libraries/voxels/src/VoxelTree.cpp index 6372d7fd6d..5fe3fbdf05 100644 --- a/libraries/voxels/src/VoxelTree.cpp +++ b/libraries/voxels/src/VoxelTree.cpp @@ -359,7 +359,7 @@ bool VoxelTree::readFromSchematicFile(const char *fileName) { for (int x = 0; x < schematics.getWidth(); ++x) { if (_stopImport) { - qDebug("[DEBUG] Canceled import at %d voxels.", count); + qDebug("Canceled import at %d voxels.", count); _stopImport = false; return true; } diff --git a/libraries/voxels/src/VoxelTreeCommands.cpp b/libraries/voxels/src/VoxelTreeCommands.cpp index 39e08d3bc2..4ddc280749 100644 --- a/libraries/voxels/src/VoxelTreeCommands.cpp +++ b/libraries/voxels/src/VoxelTreeCommands.cpp @@ -107,7 +107,6 @@ DeleteVoxelCommand::DeleteVoxelCommand(VoxelTree* tree, VoxelDetail& voxel, Voxe _voxel.blue = element->getColor()[2]; } else { _voxel.s = 0.0f; - qDebug() << "No element for delete."; } _tree->unlock(); }