Merge pull request #69 from thewtex/consistent-precision

thewtex · web-flow · commit 0ca29c4ecd96 · 2021-08-03T18:43:21.000-04:00
consistent precision
diff --git a/common/load.cc b/common/load.cc
@@ -39,6 +39,8 @@ std::string load_string( bool use_colors,
   short num_averages )
 {
   std::ostringstream ss;
+  ss.setf( std::ios::fixed, std::ios::floatfield );
+  ss.precision( 2 );
   double averages[num_averages];
   // based on: opensource.apple.com/source/Libc/Libc-262/gen/getloadavg.c
 
diff --git a/common/main.cc b/common/main.cc
@@ -87,7 +87,10 @@ std::string cpu_string( CPU_MODE cpu_mode, unsigned int cpu_usage_delay, unsigne
     oss << "]";
   }
   oss.width( 5 );
-  oss << percentage * multiplier;
+  oss.setf( std::ios::fixed, std::ios::floatfield );
+  oss.precision( 1 );
+  oss.fill( ' ' );
+  oss << std::right << percentage * multiplier;
   oss << "%";
   if( use_colors )
   {

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@ std::string load_string( bool use_colors,`
`39`	`39`	`short num_averages )`
`40`	`40`	`{`
`41`	`41`	`std::ostringstream ss;`
	`42`	`+ ss.setf( std::ios::fixed, std::ios::floatfield );`
	`43`	`+ ss.precision( 2 );`
`42`	`44`	`double averages[num_averages];`
`43`	`45`	`// based on: opensource.apple.com/source/Libc/Libc-262/gen/getloadavg.c`
`44`	`46`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,10 @@ std::string cpu_string( CPU_MODE cpu_mode, unsigned int cpu_usage_delay, unsigne`
`87`	`87`	`oss << "]";`
`88`	`88`	`}`
`89`	`89`	`oss.width( 5 );`
`90`		`- oss << percentage * multiplier;`
	`90`	`+ oss.setf( std::ios::fixed, std::ios::floatfield );`
	`91`	`+ oss.precision( 1 );`
	`92`	`+ oss.fill( ' ' );`
	`93`	`+ oss << std::right << percentage * multiplier;`
`91`	`94`	`oss << "%";`
`92`	`95`	`if( use_colors )`
`93`	`96`	`{`