add column spacing to SimpleRowFormatter, can be specified in ctor

obiltschnig · obiltschnig · commit d663a6b57052 · 2014-09-23T22:32:00.000+02:00
diff --git a/Data/src/SimpleRowFormatter.cpp b/Data/src/SimpleRowFormatter.cpp
@@ -23,15 +23,17 @@ namespace Poco {
 namespace Data {
 
 
-SimpleRowFormatter::SimpleRowFormatter(std::streamsize columnWidth):
-	_colWidth(columnWidth), _rowCount(0)
+SimpleRowFormatter::SimpleRowFormatter(std::streamsize columnWidth, std::streamsize spacing):
+	_colWidth(columnWidth), _spacing(spacing), _rowCount(0)
 {
 }
 
 
 SimpleRowFormatter::SimpleRowFormatter(const SimpleRowFormatter& other):
 	RowFormatter(other.prefix(), other.postfix()),
-	_colWidth(other._colWidth)
+	_colWidth(other._colWidth),
+	_spacing(other._spacing),
+	_rowCount(0)
 {
 }
 
@@ -56,6 +58,7 @@ void SimpleRowFormatter::swap(SimpleRowFormatter& other)
 	setPrefix(other.prefix());
 	setPostfix(other.postfix());
 	swap(_colWidth, other._colWidth);
+	swap(_spacing, other._spacing);
 }
 
 
@@ -64,12 +67,13 @@ std::string& SimpleRowFormatter::formatNames(const NameVecPtr pNames, std::strin
 	_rowCount = 0;
 
 	std::ostringstream str;
-	std::string line(std::string::size_type(pNames->size() * _colWidth), '-');
-
+	std::string line(std::string::size_type(pNames->size()*_colWidth + (pNames->size() - 1)*_spacing), '-');
+	std::string space(_spacing, ' ');
 	NameVec::const_iterator it = pNames->begin();
 	NameVec::const_iterator end = pNames->end();
 	for (; it != end; ++it)
 	{
+		if (it != pNames->begin()) str << space;
 		str << std::left << std::setw(_colWidth) << *it;
 	}
 	str << std::endl << line << std::endl;
@@ -81,11 +85,12 @@ std::string& SimpleRowFormatter::formatNames(const NameVecPtr pNames, std::strin
 std::string& SimpleRowFormatter::formatValues(const ValueVec& vals, std::string& formattedValues)
 {
 	std::ostringstream str;
-
+	std::string space(_spacing, ' ');
 	ValueVec::const_iterator it = vals.begin();
 	ValueVec::const_iterator end = vals.end();
 	for (; it != end; ++it)
 	{
+		if (it != vals.begin()) str << space;
 		if (it->isNumeric())
 		{
 			str << std::right 

Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,17 @@ namespace Poco {`
`23`	`23`	`namespace Data {`
`24`	`24`
`25`	`25`
`26`		`-SimpleRowFormatter::SimpleRowFormatter(std::streamsize columnWidth):`
`27`		`- _colWidth(columnWidth), _rowCount(0)`
	`26`	`+SimpleRowFormatter::SimpleRowFormatter(std::streamsize columnWidth, std::streamsize spacing):`
	`27`	`+ _colWidth(columnWidth), _spacing(spacing), _rowCount(0)`
`28`	`28`	`{`
`29`	`29`	`}`
`30`	`30`
`31`	`31`
`32`	`32`	`SimpleRowFormatter::SimpleRowFormatter(const SimpleRowFormatter& other):`
`33`	`33`	`RowFormatter(other.prefix(), other.postfix()),`
`34`		`- _colWidth(other._colWidth)`
	`34`	`+ _colWidth(other._colWidth),`
	`35`	`+ _spacing(other._spacing),`
	`36`	`+ _rowCount(0)`
`35`	`37`	`{`
`36`	`38`	`}`
`37`	`39`
`@@ -56,6 +58,7 @@ void SimpleRowFormatter::swap(SimpleRowFormatter& other)`
`56`	`58`	`setPrefix(other.prefix());`
`57`	`59`	`setPostfix(other.postfix());`
`58`	`60`	`swap(_colWidth, other._colWidth);`
	`61`	`+ swap(_spacing, other._spacing);`
`59`	`62`	`}`
`60`	`63`
`61`	`64`
`@@ -64,12 +67,13 @@ std::string& SimpleRowFormatter::formatNames(const NameVecPtr pNames, std::strin`
`64`	`67`	`_rowCount = 0;`
`65`	`68`
`66`	`69`	`std::ostringstream str;`
`67`		`- std::string line(std::string::size_type(pNames->size() * _colWidth), '-');`
`68`		`-`
	`70`	`+ std::string line(std::string::size_type(pNames->size()_colWidth + (pNames->size() - 1)_spacing), '-');`
	`71`	`+ std::string space(_spacing, ' ');`
`69`	`72`	`NameVec::const_iterator it = pNames->begin();`
`70`	`73`	`NameVec::const_iterator end = pNames->end();`
`71`	`74`	`for (; it != end; ++it)`
`72`	`75`	`{`
	`76`	`+ if (it != pNames->begin()) str << space;`
`73`	`77`	`str << std::left << std::setw(_colWidth) << *it;`
`74`	`78`	`}`
`75`	`79`	`str << std::endl << line << std::endl;`
`@@ -81,11 +85,12 @@ std::string& SimpleRowFormatter::formatNames(const NameVecPtr pNames, std::strin`
`81`	`85`	`std::string& SimpleRowFormatter::formatValues(const ValueVec& vals, std::string& formattedValues)`
`82`	`86`	`{`
`83`	`87`	`std::ostringstream str;`
`84`		`-`
	`88`	`+ std::string space(_spacing, ' ');`
`85`	`89`	`ValueVec::const_iterator it = vals.begin();`
`86`	`90`	`ValueVec::const_iterator end = vals.end();`
`87`	`91`	`for (; it != end; ++it)`
`88`	`92`	`{`
	`93`	`+ if (it != vals.begin()) str << space;`
`89`	`94`	`if (it->isNumeric())`
`90`	`95`	`{`
`91`	`96`	`str << std::right`