[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 7721184 3/6: Allocate more space for illustra
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 7721184 3/6: Allocate more space for illustration table columns |
|
Date: |
Thu, 8 Mar 2018 21:04:49 -0500 (EST) |
branch: master
commit 7721184c8f9da6a63effb816fbd29d92e6c8a5a1
Author: Vadim Zeitlin <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Allocate more space for illustration table columns
"Premium Outlay" column needs to be wide enough to show numbers up to
10⁹ but was only wide enough for up to 10⁶, resulting in overlapping
with the numbers in the neighbouring columns.
Fix this for this column as well as "Cash Surrogate Value" and "Death
Benefit" ones, which contain values of similar orders of magnitude.
---
ledger_pdf_generator_wx.cpp | 174 ++++++++++++++++++++++----------------------
1 file changed, 87 insertions(+), 87 deletions(-)
diff --git a/ledger_pdf_generator_wx.cpp b/ledger_pdf_generator_wx.cpp
index 26971c8..23e3312 100644
--- a/ledger_pdf_generator_wx.cpp
+++ b/ledger_pdf_generator_wx.cpp
@@ -1345,19 +1345,19 @@ class numeric_summary_table_cell
illustration_table_columns const& get_table_columns() const override
{
static illustration_table_columns const columns =
- {{ "PolicyYear" , "Policy\nYear" , "999" }
- ,{ "GrossPmt" , "Premium\nOutlay" , "999,999" }
- ,{ "AcctVal_Guaranteed" , "Account\nValue" , "999,999" }
- ,{ "CSVNet_Guaranteed" , "Cash Surr\nValue" , "999,999" }
- ,{ "EOYDeathBft_Guaranteed" , "Death\nBenefit" , "9,999,999" }
- ,{ "" , " " , "-" }
- ,{ "AcctVal_Midpoint" , "Account\nValue" , "999,999" }
- ,{ "CSVNet_Midpoint" , "Cash Surr\nValue" , "999,999" }
- ,{ "EOYDeathBft_Midpoint" , "Death\nBenefit" , "9,999,999" }
- ,{ "" , " " , "-" }
- ,{ "AcctVal_Current" , "Account\nValue" , "999,999" }
- ,{ "CSVNet_Current" , "Cash Surr\nValue" , "999,999" }
- ,{ "EOYDeathBft_Current" , "Death\nBenefit" , "9,999,999" }
+ {{ "PolicyYear" , "Policy\nYear" , "999"
}
+ ,{ "GrossPmt" , "Premium\nOutlay" , "999,999,999"
}
+ ,{ "AcctVal_Guaranteed" , "Account\nValue" , "999,999,999"
}
+ ,{ "CSVNet_Guaranteed" , "Cash Surr\nValue" , "999,999,999"
}
+ ,{ "EOYDeathBft_Guaranteed" , "Death\nBenefit" , "999,999,999"
}
+ ,{ "" , " " , "-"
}
+ ,{ "AcctVal_Midpoint" , "Account\nValue" , "999,999,999"
}
+ ,{ "CSVNet_Midpoint" , "Cash Surr\nValue" , "999,999,999"
}
+ ,{ "EOYDeathBft_Midpoint" , "Death\nBenefit" , "999,999,999"
}
+ ,{ "" , " " , "-"
}
+ ,{ "AcctVal_Current" , "Account\nValue" , "999,999,999"
}
+ ,{ "CSVNet_Current" , "Cash Surr\nValue" , "999,999,999"
}
+ ,{ "EOYDeathBft_Current" , "Death\nBenefit" , "999,999,999"
}
};
return columns;
@@ -1846,16 +1846,16 @@ class ill_reg_tabular_detail_page : public
page_with_tabular_report
illustration_table_columns const& get_table_columns() const override
{
static illustration_table_columns const columns =
- {{ "PolicyYear" , "Policy\nYear" , "999" }
- ,{ "AttainedAge" , "End of\nYear Age" , "999" }
- ,{ "GrossPmt" , "Premium\nOutlay" , "999,999" }
- ,{ "AcctVal_Guaranteed" , "Account\nValue" , "999,999" }
- ,{ "CSVNet_Guaranteed" , "Cash Surr\nValue" , "999,999" }
- ,{ "EOYDeathBft_Guaranteed" , "Death\nBenefit" , "9,999,999" }
- ,{ "" , " " , "----" }
- ,{ "AcctVal_Current" , "Account\nValue" , "999,999" }
- ,{ "CSVNet_Current" , "Cash Surr\nValue" , "999,999" }
- ,{ "EOYDeathBft_Current" , "Death\nBenefit" , "9,999,999" }
+ {{ "PolicyYear" , "Policy\nYear" , "999"
}
+ ,{ "AttainedAge" , "End of\nYear Age" , "999"
}
+ ,{ "GrossPmt" , "Premium\nOutlay" , "999,999,999"
}
+ ,{ "AcctVal_Guaranteed" , "Account\nValue" , "999,999,999"
}
+ ,{ "CSVNet_Guaranteed" , "Cash Surr\nValue" , "999,999,999"
}
+ ,{ "EOYDeathBft_Guaranteed" , "Death\nBenefit" , "999,999,999"
}
+ ,{ "" , " " , "----"
}
+ ,{ "AcctVal_Current" , "Account\nValue" , "999,999,999"
}
+ ,{ "CSVNet_Current" , "Cash Surr\nValue" , "999,999,999"
}
+ ,{ "EOYDeathBft_Current" , "Death\nBenefit" , "999,999,999"
}
};
return columns;
@@ -2189,20 +2189,20 @@ class page_with_basic_tabular_report : public
page_with_tabular_report
illustration_table_columns const& get_table_columns() const override
{
static illustration_table_columns const columns =
- {{ "PolicyYear" , "Policy\nYear" , "999"
}
- ,{ "AttainedAge" , "End of\nYear Age" , "999"
}
- ,{ "GrossPmt" , "Premium\nOutlay" , "999,999"
}
- ,{ "CSVNet_GuaranteedZero" , "Cash Surr\nValue" , "999,999"
}
- ,{ "EOYDeathBft_GuaranteedZero" , "Death\nBenefit" , "9,999,999"
}
- ,{ "" , " " , "-"
}
- ,{ "CSVNet_Guaranteed" , "Cash Surr\nValue" , "999,999"
}
- ,{ "EOYDeathBft_Guaranteed" , "Death\nBenefit" , "9,999,999"
}
- ,{ "" , " " , "-"
}
- ,{ "CSVNet_CurrentZero" , "Cash Surr\nValue" , "999,999"
}
- ,{ "EOYDeathBft_CurrentZero" , "Death\nBenefit" , "9,999,999"
}
- ,{ "" , " " , "-"
}
- ,{ "CSVNet_Current" , "Cash Surr\nValue" , "999,999"
}
- ,{ "EOYDeathBft_Current" , "Death\nBenefit" , "9,999,999"
}
+ {{ "PolicyYear" , "Policy\nYear" ,
"999" }
+ ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
+ ,{ "GrossPmt" , "Premium\nOutlay" ,
"999,999,999" }
+ ,{ "CSVNet_GuaranteedZero" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_GuaranteedZero" , "Death\nBenefit" ,
"999,999,999" }
+ ,{ "" , " " ,
"-" }
+ ,{ "CSVNet_Guaranteed" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_Guaranteed" , "Death\nBenefit" ,
"999,999,999" }
+ ,{ "" , " " ,
"-" }
+ ,{ "CSVNet_CurrentZero" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_CurrentZero" , "Death\nBenefit" ,
"999,999,999" }
+ ,{ "" , " " ,
"-" }
+ ,{ "CSVNet_Current" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_Current" , "Death\nBenefit" ,
"999,999,999" }
};
return columns;
@@ -2384,21 +2384,21 @@ class nasd_supplemental : public
page_with_tabular_report
illustration_table_columns const& get_table_columns() const override
{
static illustration_table_columns const columns =
- {{ "PolicyYear" , "Policy\nYear" ,
"999" }
- ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
- ,{ "ErGrossPmt" , "ER Gross\nPayment" ,
"999,999" }
- ,{ "EeGrossPmt" , "EE Gross\nPayment" ,
"999,999" }
- ,{ "GrossPmt" , "Premium\nOutlay" ,
"999,999" }
- ,{ "PolicyFee_Current" , "Admin\nCharge" ,
"999,999" }
- ,{ "PremTaxLoad_Current" , "Premium\nTax Load" ,
"999,999" }
- ,{ "DacTaxLoad_Current" , "DAC\nTax Load" ,
"999,999" }
- ,{ "ErModalMinimumPremium", "ER Modal\nMinimum\nPremium" ,
"999,999" }
- ,{ "EeModalMinimumPremium", "EE Modal\nMinimum\nPremium" ,
"999,999" }
- ,{ "NetPmt_Current" , "Net\nPremium" ,
"999,999" }
- ,{ "COICharge_Current" , "Cost of\nInsurance\nCharges",
"999,999" }
- ,{ "AcctVal_Current" , "Current\nAccount\nValue" ,
"999,999" }
- ,{ "CSVNet_Current" , "Current\nCash Surr\nValue" ,
"999,999" }
- ,{ "EOYDeathBft_Current" , "Current\nDeath\nBenefit" ,
"9,999,999" }
+ {{ "PolicyYear" , "Policy\nYear" ,
"999" }
+ ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
+ ,{ "ErGrossPmt" , "ER Gross\nPayment" ,
"999,999" }
+ ,{ "EeGrossPmt" , "EE Gross\nPayment" ,
"999,999" }
+ ,{ "GrossPmt" , "Premium\nOutlay" ,
"999,999,999" }
+ ,{ "PolicyFee_Current" , "Admin\nCharge" ,
"999,999" }
+ ,{ "PremTaxLoad_Current" , "Premium\nTax Load" ,
"999,999" }
+ ,{ "DacTaxLoad_Current" , "DAC\nTax Load" ,
"999,999" }
+ ,{ "ErModalMinimumPremium", "ER Modal\nMinimum\nPremium" ,
"999,999" }
+ ,{ "EeModalMinimumPremium", "EE Modal\nMinimum\nPremium" ,
"999,999" }
+ ,{ "NetPmt_Current" , "Net\nPremium" ,
"999,999" }
+ ,{ "COICharge_Current" , "Cost of\nInsurance\nCharges",
"999,999" }
+ ,{ "AcctVal_Current" , "Current\nAccount\nValue" ,
"999,999" }
+ ,{ "CSVNet_Current" , "Current\nCash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_Current" , "Current\nDeath\nBenefit" ,
"999,999,999" }
};
return columns;
@@ -2741,18 +2741,18 @@ class reg_d_individual_guar_irr : public
reg_d_individual_irr_base
illustration_table_columns const& get_table_columns() const override
{
static illustration_table_columns const columns =
- {{ "PolicyYear" , "Policy\nYear" ,
"999" }
- ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
- ,{ "GrossPmt" , "Premium\nOutlay" ,
"999,999" }
- ,{ "CSVNet_GuaranteedZero" , "Cash Surr\nValue" ,
"999,999" }
- ,{ "EOYDeathBft_GuaranteedZero" , "Death\nBenefit" ,
"9,999,999" }
- ,{ "IrrCsv_GuaranteedZero" , "IRR on\nSurr Value" ,
"99.99%" }
- ,{ "IrrDb_GuaranteedZero" , "IRR on\nDeath Bft" ,
"99.99%" }
- ,{ "" , " " ,
"-" }
- ,{ "CSVNet_Guaranteed" , "Cash Surr\nValue" ,
"999,999" }
- ,{ "EOYDeathBft_Guaranteed" , "Death\nBenefit" ,
"9,999,999" }
- ,{ "IrrCsv_Guaranteed" , "IRR on\nSurr Value" ,
"99.99%" }
- ,{ "IrrDb_Guaranteed" , "IRR on\nDeath Bft" ,
"99.99%" }
+ {{ "PolicyYear" , "Policy\nYear" ,
"999" }
+ ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
+ ,{ "GrossPmt" , "Premium\nOutlay" ,
"999,999,999" }
+ ,{ "CSVNet_GuaranteedZero" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_GuaranteedZero" , "Death\nBenefit" ,
"999,999,999" }
+ ,{ "IrrCsv_GuaranteedZero" , "IRR on\nSurr Value" ,
"99.99%" }
+ ,{ "IrrDb_GuaranteedZero" , "IRR on\nDeath Bft" ,
"99.99%" }
+ ,{ "" , " " ,
"-" }
+ ,{ "CSVNet_Guaranteed" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_Guaranteed" , "Death\nBenefit" ,
"999,999,999" }
+ ,{ "IrrCsv_Guaranteed" , "IRR on\nSurr Value" ,
"99.99%" }
+ ,{ "IrrDb_Guaranteed" , "IRR on\nDeath Bft" ,
"99.99%" }
};
return columns;
@@ -2775,18 +2775,18 @@ class reg_d_individual_curr_irr : public
reg_d_individual_irr_base
illustration_table_columns const& get_table_columns() const override
{
static illustration_table_columns const columns =
- {{ "PolicyYear" , "Policy\nYear" ,
"999" }
- ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
- ,{ "GrossPmt" , "Premium\nOutlay" ,
"999,999" }
- ,{ "CSVNet_CurrentZero" , "Cash Surr\nValue" ,
"999,999" }
- ,{ "EOYDeathBft_CurrentZero" , "Death\nBenefit" ,
"9,999,999" }
- ,{ "IrrCsv_CurrentZero" , "IRR on\nSurr Value" ,
"99.99%" }
- ,{ "IrrDb_CurrentZero" , "IRR on\nDeath Bft" ,
"99.99%" }
- ,{ "" , " " ,
"-" }
- ,{ "CSVNet_Current" , "Cash Surr\nValue" ,
"999,999" }
- ,{ "EOYDeathBft_Current" , "Death\nBenefit" ,
"9,999,999" }
- ,{ "IrrCsv_Current" , "IRR on\nSurr Value" ,
"99.99%" }
- ,{ "IrrDb_Current" , "IRR on\nDeath Bft" ,
"99.99%" }
+ {{ "PolicyYear" , "Policy\nYear" ,
"999" }
+ ,{ "AttainedAge" , "End of\nYear Age" ,
"999" }
+ ,{ "GrossPmt" , "Premium\nOutlay" ,
"999,999,999" }
+ ,{ "CSVNet_CurrentZero" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_CurrentZero" , "Death\nBenefit" ,
"999,999,999" }
+ ,{ "IrrCsv_CurrentZero" , "IRR on\nSurr Value" ,
"99.99%" }
+ ,{ "IrrDb_CurrentZero" , "IRR on\nDeath Bft" ,
"99.99%" }
+ ,{ "" , " " ,
"-" }
+ ,{ "CSVNet_Current" , "Cash Surr\nValue" ,
"999,999,999" }
+ ,{ "EOYDeathBft_Current" , "Death\nBenefit" ,
"999,999,999" }
+ ,{ "IrrCsv_Current" , "IRR on\nSurr Value" ,
"99.99%" }
+ ,{ "IrrDb_Current" , "IRR on\nDeath Bft" ,
"99.99%" }
};
return columns;
@@ -2819,17 +2819,17 @@ class reg_d_individual_curr : public
page_with_tabular_report
illustration_table_columns const& get_table_columns() const override
{
static illustration_table_columns const columns =
- {{ "PolicyYear" , "Policy\nYear" , "999" }
- ,{ "AttainedAge" , "End of\nYear Age" , "999" }
- ,{ "GrossPmt" , "Premium\nOutlay" , "999,999" }
- ,{ "PremiumLoads" , "Premium\nLoads" , "999,999" }
- ,{ "AdminCharges" , "Admin\nCharges" , "999,999" }
- ,{ "COICharge_Current" , "Mortality\nCharges", "999,999" }
- ,{ "SepAcctCharges_Current" , "Asset\nCharges" , "999,999" }
- ,{ "GrossIntCredited_Current", "Investment\nIncome", "999,999" }
- ,{ "AcctVal_Current" , "Account\nValue" , "999,999" }
- ,{ "CSVNet_Current" , "Cash\nSurr Value" , "999,999" }
- ,{ "EOYDeathBft_Current" , "Death\nBenefit" , "9,999,999" }
+ {{ "PolicyYear" , "Policy\nYear" , "999"
}
+ ,{ "AttainedAge" , "End of\nYear Age" , "999"
}
+ ,{ "GrossPmt" , "Premium\nOutlay" , "999,999,999"
}
+ ,{ "PremiumLoads" , "Premium\nLoads" , "999,999"
}
+ ,{ "AdminCharges" , "Admin\nCharges" , "999,999"
}
+ ,{ "COICharge_Current" , "Mortality\nCharges", "999,999"
}
+ ,{ "SepAcctCharges_Current" , "Asset\nCharges" , "999,999"
}
+ ,{ "GrossIntCredited_Current", "Investment\nIncome", "999,999"
}
+ ,{ "AcctVal_Current" , "Account\nValue" , "999,999"
}
+ ,{ "CSVNet_Current" , "Cash\nSurr Value" , "999,999,999"
}
+ ,{ "EOYDeathBft_Current" , "Death\nBenefit" , "999,999,999"
}
};
return columns;
- [lmi-commits] [lmi] master updated (2c3b7b1 -> e5e8b40), Greg Chicares, 2018/03/08
- [lmi-commits] [lmi] master 5d77eed 1/6: Remove executable bit from a PNG file, Greg Chicares, 2018/03/08
- [lmi-commits] [lmi] master 59e8cfe 2/6: Decrease margins in PDF illustrations, Greg Chicares, 2018/03/08
- [lmi-commits] [lmi] master cc8d6e6 4/6: Fix table column shrinking when some columns are hidden, Greg Chicares, 2018/03/08
- [lmi-commits] [lmi] master c3055e7 5/6: Don't shrink PDF table columns too much, Greg Chicares, 2018/03/08
- [lmi-commits] [lmi] master e5e8b40 6/6: Rectify a technical term, Greg Chicares, 2018/03/08
- [lmi-commits] [lmi] master 7721184 3/6: Allocate more space for illustration table columns,
Greg Chicares <=