Re: [Powertop] [PATCH v3 09/31] report-html: Table generation

[Sergey Senozhatsky <sergey.senozhatsky at gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 5909 bytes --]

On (11/18/13 12:27), Alexandra Yates wrote:
> Generates modular html tables using table_size, css_attributes,
> and a set of data. The data is stored in a single dimesional array,
> using row major order.
> 
> Signed-off-by: Alexandra Yates <alexandra.yates(a)linux.intel.com>
> ---
>  src/report/report-data-html.h        |   18 +++++++++++
>  src/report/report-formatter-html.cpp |   59 +++++++++++++++++++++++++++++++---
>  src/report/report-formatter-html.h   |    9 ++++--
>  3 files changed, 79 insertions(+), 7 deletions(-)
> 
> diff --git a/src/report/report-data-html.h b/src/report/report-data-html.h
> index 70ccbdb..282d8b5 100644
> --- a/src/report/report-data-html.h
> +++ b/src/report/report-data-html.h
> @@ -2,3 +2,21 @@ struct tag_attr {
>  	const char *css_class;
>  	const char *css_id;
>  };
> +/* T:Top, L:Left, TL:Top-Left, TLC: Top-Left-Center */
> +enum position { T, L, TL, TC, TLC };
> +
> +struct table_attributes {
> +	const char *table_class;
> +	const char *td_class;
> +	const char *tr_class;
> +	const char *th_class;
> +	position pos_table_title;
> +	int title_mod;
> +};
> +
> +
> +struct table_size {
> +	int rows;
> +	int cols;
> +};
> +
> diff --git a/src/report/report-formatter-html.cpp b/src/report/report-formatter-html.cpp
> index 93a4c48..f508ae0 100644
> --- a/src/report/report-formatter-html.cpp
> +++ b/src/report/report-formatter-html.cpp
> @@ -420,10 +420,10 @@ report_formatter_html::end_paragraph()
>  
>  /* ************************************************************************ */
>  
> -std::string
> +string
>  report_formatter_html::escape_string(const char *str)
>  {
> -	std::string res;
> +	string res;
>  
>  	assert(str);
>  
> @@ -487,8 +487,8 @@ report_formatter_html::end_hheader()
>  void
>  report_formatter_html::add_div(struct tag_attr * div_attr)
>  {
> -	std::string empty="";
> -	std::string tmp_str;
> +	string empty="";
> +	string tmp_str;
>  
>  	if (div_attr->css_class == empty && div_attr->css_id == empty)
>  		add_exact("<div>\n");
> @@ -523,7 +523,7 @@ report_formatter_html::add_navigation()
>  }
>  
>  void
> -report_formatter_html::add_summary_list(std::string *list, int size)
> +report_formatter_html::add_summary_list(string *list, int size)
>  {
>  	int i;
>  	add_exact("<div><br/> <ul>\n");
> @@ -534,3 +534,52 @@ report_formatter_html::add_summary_list(std::string *list, int size)
>  	add_exact("</ul> </div> <br />\n");
>  }
>  
> +
> +void
> +report_formatter_html::add_table(string *system_data, struct table_size *size, struct table_attributes* tb_attr)
> +{
> +	int i, j;
> +	int offset=0;
> +	string  empty="";
> +
> +	if (tb_attr->table_class == empty)
> +		add_exact("<table>\n");
> +	else
> +		addf_exact("<table class=\"%s\">\n", tb_attr->table_class);
> +
> +	for (i=0; i < size->rows; i++){
> +		if (tb_attr->tr_class == empty)
> +			add_exact("<tr> ");
> +		else
> +			addf_exact("<tr class=\"%s\"> ", tb_attr->tr_class);
> +
> +		for (j=0; j < size->cols; j++){
> +			offset = i * (size->cols) + j;
> +
> +			if (tb_attr->pos_table_title == T &&  i==0)
> +				addf_exact("<th class=\"%s\"> %s </th> ",
> +				tb_attr->th_class,system_data[offset].c_str());
> +			else if (tb_attr->pos_table_title == L &&  j==0)
> +				addf_exact("<th class=\"%s\"> %s </th> ",
> +				tb_attr->th_class, system_data[offset].c_str());
> +			else if (tb_attr->pos_table_title == TL && ( i==0 || j==0 ))
> +				addf_exact("<th class=\"%s\"> %s </th> ",
> +				tb_attr->th_class, system_data[offset].c_str());
> +			else if (tb_attr->pos_table_title == TC && ((i % tb_attr->title_mod ) == 0))
> +				addf_exact("<th class=\"%s\"> %s </th> ", tb_attr->th_class,
> +					system_data[offset].c_str());
> +			else if (tb_attr->pos_table_title == TLC && ((i % tb_attr->title_mod) == 0 || j==0))

this is cryptic.
can we change enum to contain TOP, LEFT, CENTER and so, it will make
code better:

	`tb_attr->pos_table_title == T' vs `tb_attr->pos_table_title == POSITION_TOP'
	or `tb_attr->pos_table_title == TOP'

	-ss


> +				addf_exact("<th class=\"%s\"> %s </th> ", tb_attr->th_class,
> +				system_data[offset].c_str());
> +			else
> +				if ( tb_attr->td_class == empty)
> +					addf_exact("<td > %s </td> ", system_data[offset].c_str());
> +				else
> +					addf_exact("<td class=\"%s\"> %s </td> ", tb_attr->td_class,
> +						system_data[offset].c_str());
> +		}
> +		add_exact("</tr>\n");
> +	}
> +	add_exact("</table>\n");
> +}
> +
> diff --git a/src/report/report-formatter-html.h b/src/report/report-formatter-html.h
> index 261e0dd..d625ced 100644
> --- a/src/report/report-formatter-html.h
> +++ b/src/report/report-formatter-html.h
> @@ -30,6 +30,9 @@
>  
>  #include "report-formatter-base.h"
>  #include "report-data-html.h"
> +
> +using namespace std;
> +
>  /* Whether to replace " and ' in HTML by &quot; and &apos; respectively */
>  /*#define REPORT_HTML_ESCAPE_QUOTES*/
>  
> @@ -90,7 +93,9 @@ public:
>  	void end_div();
>  	void add_title(struct tag_attr *title_att, const char *title);
>  	void add_navigation();
> -	void add_summary_list(std::string *list, int size);
> +	void add_summary_list(string *list, int size);
> +	void add_table(string *system_data, struct table_size *size,
> +			struct table_attributes *tb_attr);
>  
>  private:
>  	/* Document structure related functions */
> @@ -113,7 +118,7 @@ private:
>  	void add_doc_header();
>  	void add_doc_footer();
>  
> -	std::string escape_string(const char *str);
> +	string escape_string(const char *str);
>  
>  	html_section sections[SECTION_MAX];
>  	html_table tables[TABLE_MAX];
> -- 
> 1.7.9.5
> 
> _______________________________________________
> PowerTop mailing list
> PowerTop(a)lists.01.org
> https://lists.01.org/mailman/listinfo/powertop
>