History

cleanup printLogs reintroduce on merge with upstream master

Stephen Birarda committed 13 years ago

Commit c78759d1 parent 9d62e7f1 file · +7 −7Browse files

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

Unified · Split

interface/src/Application.cpp+7−7
@@ -1421,12 +1421,12 @@ bool Application::sendVoxelsOperation(VoxelNode* node, void* extraData) { · 1420 unmodified lines
1421 uint64_t elapsed = now - args->lastSendTime;1421 uint64_t elapsed = now - args->lastSendTime;
1422 int usecToSleep = CLIENT_TO_SERVER_VOXEL_SEND_INTERVAL_USECS - elapsed;1422 int usecToSleep = CLIENT_TO_SERVER_VOXEL_SEND_INTERVAL_USECS - elapsed;
1423 if (usecToSleep > 0) {1423 if (usecToSleep > 0) {
1424 printLog("sendVoxelsOperation: packet: %d bytes:%ld elapsed %ld usecs, sleeping for %d usecs!\n", 1424 qDebug("sendVoxelsOperation: packet: %d bytes:%ld elapsed %lld usecs, sleeping for %d usecs!\n",
1425 args->packetsSent, args->bytesSent, elapsed, usecToSleep);1425 args->packetsSent, args->bytesSent, elapsed, usecToSleep);
1426 usleep(usecToSleep);1426 usleep(usecToSleep);
1427 } else {1427 } else {
1428 printLog("sendVoxelsOperation: packet: %d bytes:%ld elapsed %ld usecs, no need to sleep!\n", 1428 qDebug("sendVoxelsOperation: packet: %d bytes:%ld elapsed %lld usecs, no need to sleep!\n",
1429 args->packetsSent, args->bytesSent, elapsed);1429 args->packetsSent, args->bytesSent, elapsed);
1430 }1430 }
1431 args->lastSendTime = now;1431 args->lastSendTime = now;
1432 }1432 }
@@ -1504,7 +1504,7 @@ void Application::importVoxels() { · 71 unmodified lines
1504 if (fileNameString.endsWith(".png", Qt::CaseInsensitive)) {1504 if (fileNameString.endsWith(".png", Qt::CaseInsensitive)) {
1505 QImage pngImage = QImage(fileName);1505 QImage pngImage = QImage(fileName);
1506 if (pngImage.height() != pngImage.width()) {1506 if (pngImage.height() != pngImage.width()) {
1507 printLog("ERROR: Bad PNG size: height != width.\n");1507 qDebug("ERROR: Bad PNG size: height != width.\n");
1508 return;1508 return;
1509 }1509 }
1510 1510
@@ -1609,9 +1609,9 @@ void Application::pasteVoxels() { · 98 unmodified lines
1609 // If we have voxels left in the packet, then send the packet1609 // If we have voxels left in the packet, then send the packet
1610 if (args.bufferInUse > (numBytesPacketHeader + sizeof(unsigned short int))) {1610 if (args.bufferInUse > (numBytesPacketHeader + sizeof(unsigned short int))) {
1611 controlledBroadcastToNodes(args.messageBuffer, args.bufferInUse, & NODE_TYPE_VOXEL_SERVER, 1);1611 controlledBroadcastToNodes(args.messageBuffer, args.bufferInUse, & NODE_TYPE_VOXEL_SERVER, 1);
1612 printLog("sending packet: %d\n", ++args.packetsSent);1612 qDebug("sending packet: %d\n", ++args.packetsSent);
1613 args.bytesSent += args.bufferInUse;1613 args.bytesSent += args.bufferInUse;
1614 printLog("total bytes sent: %ld\n", args.bytesSent);1614 qDebug("total bytes sent: %ld\n", args.bytesSent);
1615 }1615 }
1616 1616
1617 if (calculatedOctCode) {1617 if (calculatedOctCode) {

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