From 85481e3e69d0ac12b6a882547fc7920c9b268f76 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 7 Jun 2014 09:54:22 -0400 Subject: [PATCH] Diagnostics - Consolidated two debug lines into one, so that ViewTask::render now reports available width, and Context::getWidth does not. --- src/ViewTask.cpp | 5 +++-- src/interactive.cpp | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/ViewTask.cpp b/src/ViewTask.cpp index 096ec4666..16d5001a4 100644 --- a/src/ViewTask.cpp +++ b/src/ViewTask.cpp @@ -173,10 +173,11 @@ std::string ViewTask::render (std::vector & data, std::vector & seque // Calculate final column widths. int overage = _width - sum_minimal - all_extra; - context.debug (format ("ViewTask::render min={1} ideal={2} overage={3}", + context.debug (format ("ViewTask::render min={1} ideal={2} overage={3} width={4}", sum_minimal + all_extra, sum_ideal + all_extra, - overage)); + overage, + _width)); std::vector widths; diff --git a/src/interactive.cpp b/src/interactive.cpp index f9cfbb3ea..b1adeed5d 100644 --- a/src/interactive.cpp +++ b/src/interactive.cpp @@ -57,8 +57,6 @@ int Context::getWidth () { terminal_height = buff[0]; terminal_width = buff[1]; - - debug (format (STRING_INTERACTIVE_WIDTH, terminal_width)); } } @@ -94,8 +92,6 @@ int Context::getHeight () { terminal_height = buff[0]; terminal_width = buff[1]; - - debug (format (STRING_INTERACTIVE_HEIGHT, terminal_height)); } }