[lmi-commits] [6345] Improve the 20151006T1517Z change

[Greg Chicares]

Revision: 6345
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=6345
Author:   chicares
Date:     2015-10-10 17:13:44 +0000 (Sat, 10 Oct 2015)
Log Message:
-----------
Improve the 20151006T1517Z change

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/emit_ledger.cpp
    lmi/trunk/emit_ledger.hpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2015-10-10 17:12:43 UTC (rev 6344)
+++ lmi/trunk/ChangeLog 2015-10-10 17:13:44 UTC (rev 6345)
@@ -37132,3 +37132,38 @@
   group_quote_pdf_gen_wx.cpp
 Fix defect introduced 20150819T1702Z: wrong product name (KMM).
 
+20151010T0037Z <address@hidden> [473]
+
+  miscellany.cpp
+  miscellany.hpp
+  wx_table_generator.cpp
+Refactor for clarity in a fencepost zone.
+
+20151010T1710Z <address@hidden> [473]
+
+  miscellany.cpp
+Improve documentation.
+
+20151010T1711Z <address@hidden> [473]
+
+  ihs_avdebug.cpp
+  illustration_view.cpp
+  illustrator.cpp
+  wx_test_config_settings.cpp
+Improve concinnity and microefficiency.
+
+20151010T1712Z <address@hidden> [473]
+
+  preferences_view.cpp
+  wx_test_input_sequences.cpp
+  wx_test_input_validation.cpp
+  wx_test_pdf_create.cpp
+Remove disused headers.
+
+20151010T1713Z <address@hidden> [473]
+
+  emit_ledger.cpp
+  emit_ledger.hpp
+Improve the 20151006T1517Z change. See:
+  http://lists.nongnu.org/archive/html/lmi/2015-10/msg00029.html
+

Modified: lmi/trunk/emit_ledger.cpp
===================================================================
--- lmi/trunk/emit_ledger.cpp   2015-10-10 17:12:43 UTC (rev 6344)
+++ lmi/trunk/emit_ledger.cpp   2015-10-10 17:13:44 UTC (rev 6345)
@@ -56,14 +56,26 @@
     (fs::path const& case_filepath
     ,mcenum_emission emission
     )
-    :case_filepath_              (case_filepath)
-    ,tsv_ext_                    
(configurable_settings::instance().spreadsheet_file_extension())
-    ,case_filepath_spreadsheet_  (unique_filepath(case_filepath,             
tsv_ext_))
-    ,case_filepath_group_roster_ (unique_filepath(case_filepath, ".roster" + 
tsv_ext_))
-    ,case_filepath_group_quote_  (unique_filepath(case_filepath, ".quote.pdf"  
      ))
-    ,emission_                   (emission)
+    :case_filepath_ (case_filepath)
+    ,emission_      (emission)
 {
     LMI_ASSERT(!case_filepath_.empty());
+
+    configurable_settings const& c = configurable_settings::instance();
+    std::string const& tsv_ext = c.spreadsheet_file_extension();
+
+    if(emission_ & mce_emit_spreadsheet)
+        {
+        case_filepath_spreadsheet_  = unique_filepath(case_filepath,           
  tsv_ext);
+        }
+    if(emission_ & mce_emit_group_roster)
+        {
+        case_filepath_group_roster_ = unique_filepath(case_filepath, ".roster" 
+ tsv_ext);
+        }
+    if(emission_ & mce_emit_group_quote)
+        {
+        case_filepath_group_quote_  = unique_filepath(case_filepath, 
".quote.pdf"       );
+        }
 }
 
 ledger_emitter::~ledger_emitter()

Modified: lmi/trunk/emit_ledger.hpp
===================================================================
--- lmi/trunk/emit_ledger.hpp   2015-10-10 17:12:43 UTC (rev 6344)
+++ lmi/trunk/emit_ledger.hpp   2015-10-10 17:13:44 UTC (rev 6345)
@@ -55,14 +55,15 @@
     double finish   ();
 
   private:
-    fs::path    const& case_filepath_;
-    std::string const  tsv_ext_;
-    fs::path    const  case_filepath_spreadsheet_;
-    fs::path    const  case_filepath_group_roster_;
-    fs::path    const  case_filepath_group_quote_;
-    mcenum_emission    emission_;
+    fs::path const& case_filepath_;
+    mcenum_emission emission_;
 
-    // Used only if emission includes mce_emit_group_quote; empty otherwise.
+    // Initialized only if required by emission_; empty otherwise.
+    fs::path case_filepath_spreadsheet_;
+    fs::path case_filepath_group_roster_;
+    fs::path case_filepath_group_quote_;
+
+    // Used only if emission_ includes mce_emit_group_quote; empty otherwise.
     boost::shared_ptr<group_quote_pdf_generator> group_quote_gen_;
 };