[Erp5-report] r14233 - in /erp5/trunk/bt5/erp5_pdf_style: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Apr 25 23:48:58 2007
New Revision: 14233

URL: http://svn.erp5.org?rev=14233&view=rev
Log:
Improve ListBox_getColumnWithDict:
  * give more imporance to title columns, because they are using a smaller font
  * make sure a column doesn't get too much width allocated

Modified:
    erp5/trunk/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/ListBox_getColumnWithDict.xml
    erp5/trunk/bt5/erp5_pdf_style/bt/revision

Modified: erp5/trunk/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/ListBox_getColumnWithDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/ListBox_getColumnWithDict.xml?rev=14233&r1=14232&r2=14233&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/ListBox_getColumnWithDict.xml (original)
+++ erp5/trunk/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/ListBox_getColumnWithDict.xml Wed Apr 25 23:48:58 2007
@@ -149,9 +149,9 @@
 max_line_len = {}\n
 number = (int, float, long)\n
 for listboxline in listboxline_list:\n
-  line_width = 0\n
   col_count = 0\n
   for column_id, column_property in listboxline.getColumnItemList():\n
+    col_count += 1\n
     if isinstance(column_property, number):\n
       string_property = "%s+++" % (column_property)\n
     elif isinstance(column_property, DateTime):\n
@@ -161,9 +161,9 @@
     if listboxline.isStatLine():\n
       string_property = "%s+++++" % string_property\n
     elif listboxline.isTitleLine():\n
-      string_property = str(N_(string_property))\n
-    line_width += len(string_property)\n
-    new_column_max_len = max(len(string_property), max_line_len.get(column_id, 0))\n
+      string_property = "%s++++++++" % str(N_(string_property))\n
+    new_column_max_len = max(len(string_property),\n
+                             max_line_len.get(column_id, 0))\n
     update_dict = {}\n
     update_dict[column_id] = new_column_max_len\n
     max_line_len.update(update_dict)\n
@@ -171,7 +171,10 @@
 total_max_len = float(sum(max_line_len.values()))\n
 result = {}\n
 for column_id, max_len in max_line_len.items() :\n
-  result[column_id] = max( (max(max_len, 1) / total_max_len) * frame_width, min_column_width)\n
+  result[column_id] = min(\n
+                       max((max(max_len, 1) / total_max_len) * frame_width,\n
+                          min_column_width),\n
+                       frame_width / col_count + 5)\n
 \n
 return result\n
 </string> </value>

Modified: erp5/trunk/bt5/erp5_pdf_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdf_style/bt/revision?rev=14233&r1=14232&r2=14233&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdf_style/bt/revision (original)
+++ erp5/trunk/bt5/erp5_pdf_style/bt/revision Wed Apr 25 23:48:58 2007
@@ -1,1 +1,1 @@
-28
+29