Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up log

Browse source
This commit is contained in:
Atlante45 2014-05-22 11:11:22 -07:00
parent 3aa999bfc3
commit ea1359c10f
5 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -1476,10 +1476,10 @@ void Application::importVoxels() {
} }
if (!_voxelImporter->exec()) { if (!_voxelImporter->exec()) {
qDebug() << "[DEBUG] Import succeeded." << endl; qDebug() << "Import succeeded." << endl;
_importSucceded = true; _importSucceded = true;
} else { } else {
qDebug() << "[DEBUG] Import failed." << endl; qDebug() << "Import failed." << endl;
if (_sharedVoxelSystem.getTree() == _voxelImporter->getVoxelTree()) { if (_sharedVoxelSystem.getTree() == _voxelImporter->getVoxelTree()) {
_sharedVoxelSystem.killLocalVoxels(); _sharedVoxelSystem.killLocalVoxels();
_sharedVoxelSystem.changeTree(&_clipboard); _sharedVoxelSystem.changeTree(&_clipboard);

8
libraries/voxels/src/LocalVoxelsList.cpp
View file

@ -40,18 +40,17 @@ void LocalVoxelsList::addPersistantTree(QString treeName, VoxelTree* tree) {
StrongVoxelTreePointer treePtr(tree, doNothing); StrongVoxelTreePointer treePtr(tree, doNothing);
_persistantTrees.push_back(treePtr); _persistantTrees.push_back(treePtr);
_trees.insert(treeName, treePtr); _trees.insert(treeName, treePtr);
qDebug() << "[DEBUG] LocalVoxelsList : added persistant tree (" << treeName << ")";
} }
void LocalVoxelsList::insert(QString treeName, StrongVoxelTreePointer& tree) { void LocalVoxelsList::insert(QString treeName, StrongVoxelTreePointer& tree) {
// If the key don't already exist or the value is null // If the key don't already exist or the value is null
if (!_trees.contains(treeName) || !_trees.value(treeName)) { if (!_trees.contains(treeName) || !_trees.value(treeName)) {
_trees.insert(treeName, tree); _trees.insert(treeName, tree);
qDebug() << "[DEBUG] LocalVoxelsList : added local tree (" << treeName << ")"; qDebug() << "LocalVoxelsList : added local tree (" << treeName << ")";
} else { } else {
// if not we replace the tree created by the user with the existing one // if not we replace the tree created by the user with the existing one
tree = _trees.value(treeName); 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 the tree is not used anymore (no strong pointer)
if (!_trees.value(treeName)) { if (!_trees.value(treeName)) {
// then remove it from the list // then remove it from the list
qDebug() << "[DEBUG] LocalVoxelsList : removed unused tree (" << treeName << ")";
_trees.remove(treeName); _trees.remove(treeName);
} else {
qDebug() << "[DEBUG] LocalVoxelsList : tree still in use (" << treeName << ")";
} }
} }

2
libraries/voxels/src/Tags.cpp
View file

@ -186,7 +186,7 @@ int retrieveData(std::string filename, std::stringstream &ss) {
return ret; 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; return 1;
} }

2
libraries/voxels/src/VoxelTree.cpp
View file

@ -359,7 +359,7 @@ bool VoxelTree::readFromSchematicFile(const char *fileName) {
for (int x = 0; x < schematics.getWidth(); ++x) { for (int x = 0; x < schematics.getWidth(); ++x) {
if (_stopImport) { if (_stopImport) {
qDebug("[DEBUG] Canceled import at %d voxels.", count); qDebug("Canceled import at %d voxels.", count);
_stopImport = false; _stopImport = false;
return true; return true;
} }

1
libraries/voxels/src/VoxelTreeCommands.cpp
View file

@ -107,7 +107,6 @@ DeleteVoxelCommand::DeleteVoxelCommand(VoxelTree* tree, VoxelDetail& voxel, Voxe
_voxel.blue = element->getColor()[2]; _voxel.blue = element->getColor()[2];
} else { } else {
_voxel.s = 0.0f; _voxel.s = 0.0f;
qDebug() << "No element for delete.";
} }
_tree->unlock(); _tree->unlock();
} }