[lmi-commits] [6559] Refactor to increase flexibility

[Greg Chicares]

Revision: 6559
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6559
Author:   chicares
Date:     2016-05-05 11:20:18 +0000 (Thu, 05 May 2016)
Log Message:
-----------
Refactor to increase flexibility

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/group_quote_pdf_gen_wx.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2016-05-05 11:19:17 UTC (rev 6558)
+++ lmi/trunk/ChangeLog 2016-05-05 11:20:18 UTC (rev 6559)
@@ -38969,3 +38969,13 @@
   ledger_invariant.hpp
 Post recently-added product data to ledger.
 
+20160505T1119Z <address@hidden> [451]
+
+  illustrator.cpp
+Enforce rider consistency.
+
+20160505T1120Z <address@hidden> [451]
+
+  group_quote_pdf_gen_wx.cpp
+Refactor to increase flexibility.
+

Modified: lmi/trunk/group_quote_pdf_gen_wx.cpp
===================================================================
--- lmi/trunk/group_quote_pdf_gen_wx.cpp        2016-05-05 11:19:17 UTC (rev 
6558)
+++ lmi/trunk/group_quote_pdf_gen_wx.cpp        2016-05-05 11:20:18 UTC (rev 
6559)
@@ -695,14 +695,6 @@
 
     LedgerInvariant const& invar = ledger.GetLedgerInvariant();
 
-    // Initialize 'report_data_' the first time this function is
-    // called: i.e., iff its 'contract_state_' field is empty, because
-    // the state postal abbreviation in a ledger can never be empty.
-    if(report_data_.contract_state_.empty())
-        {
-        report_data_.fill_global_report_data(ledger);
-        }
-
     int const year = 0;
 
     std::pair<int, oenum_format_style> const f0(0, oe_format_normal);
@@ -813,10 +805,18 @@
             }
         }
 
-    // The last, composite, ledger is only used for the totals, it shouldn't be
-    // shown in the main table nor counted as a row.
-    if(!is_composite)
+    // The composite ledger arrives last. It is used only for global
+    // data (which have already been asserted, upstream, not to vary
+    // by cell) and for totals. It is neither shown in the main table
+    // nor counted as a row. Only at this point, after all the other
+    // ledgers have been seen, can all-zero columns (and corresponding
+    // total columns) be suppressed.
+    if(is_composite)
         {
+        report_data_.fill_global_report_data(ledger);
+        }
+    else
+        {
         rows_.push_back(rd);
         row_num_++;
         }