[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 56ba033 2/3: Change an enumerative type's nam
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 56ba033 2/3: Change an enumerative type's names |
|
Date: |
Tue, 6 Feb 2018 06:24:20 -0500 (EST) |
branch: master
commit 56ba03360bfe0ab70ebd1436e21a621eb6df7980
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Change an enumerative type's names
---
group_quote_pdf_gen_wx.cpp | 16 +++++------
ledger_pdf_generator_wx.cpp | 70 ++++++++++++++++++++++-----------------------
output_mode.hpp | 11 +++----
pdf_writer_wx.cpp | 30 +++++++++----------
pdf_writer_wx.hpp | 22 +++++++-------
wx_table_generator.cpp | 35 ++++++++++++-----------
wx_table_generator.hpp | 22 +++++++-------
7 files changed, 103 insertions(+), 103 deletions(-)
diff --git a/group_quote_pdf_gen_wx.cpp b/group_quote_pdf_gen_wx.cpp
index a4ca1c3..226d3b6 100644
--- a/group_quote_pdf_gen_wx.cpp
+++ b/group_quote_pdf_gen_wx.cpp
@@ -312,9 +312,9 @@ class group_quote_pdf_generator_wx
,int* pos_y
);
void output_footer
- (pdf_writer_wx& pdf_writer
- ,int* pos_y
- ,enum_output_mode output_mode
+ (pdf_writer_wx& pdf_writer
+ ,int* pos_y
+ ,oenum_render_or_only_measure output_mode
);
class totals_data; // Fwd decl for fill_global_report_data() argument.
@@ -743,7 +743,7 @@ void group_quote_pdf_generator_wx::save(std::string const&
output_filename)
int const header_height = pos_y - y_before_header;
int y_after_footer = pos_y;
- output_footer(pdf_writer, &y_after_footer, e_output_measure_only);
+ output_footer(pdf_writer, &y_after_footer, oe_only_measure);
int const footer_height = y_after_footer - pos_y;
int const last_row_y = pdf_writer.get_page_bottom();
@@ -798,7 +798,7 @@ void group_quote_pdf_generator_wx::save(std::string const&
output_filename)
pos_y += 2 * vert_skip;
}
- output_footer(pdf_writer, &pos_y, e_output_normal);
+ output_footer(pdf_writer, &pos_y, oe_render);
LMI_ASSERT(current_page == total_pages);
output_page_number_and_version(pdf_writer, total_pages, current_page);
@@ -1173,9 +1173,9 @@ void group_quote_pdf_generator_wx::output_aggregate_values
}
void group_quote_pdf_generator_wx::output_footer
- (pdf_writer_wx& pdf_writer
- ,int* pos_y
- ,enum_output_mode output_mode
+ (pdf_writer_wx& pdf_writer
+ ,int* pos_y
+ ,oenum_render_or_only_measure output_mode
)
{
wxImage logo_image(load_image("company_logo.png"));
diff --git a/ledger_pdf_generator_wx.cpp b/ledger_pdf_generator_wx.cpp
index 9c36f98..a9b67c7 100644
--- a/ledger_pdf_generator_wx.cpp
+++ b/ledger_pdf_generator_wx.cpp
@@ -1017,7 +1017,7 @@ class page_with_footer : public page
,0
,frame_width
,get_footer_lower_html(interpolate_html)
- ,e_output_measure_only
+ ,oe_only_measure
);
auto const& upper_template = get_upper_footer_template_name();
@@ -1028,7 +1028,7 @@ class page_with_footer : public page
,0
,frame_width
,interpolate_html.expand_template(upper_template)
- ,e_output_measure_only
+ ,oe_only_measure
);
// Leave a gap between the upper part of the footer and the main
@@ -1302,7 +1302,7 @@ class numeric_summary_table_cell
public:
numeric_summary_table_cell()
{
- m_Height = render_or_measure(0, e_output_measure_only);
+ m_Height = render_or_measure(0, oe_only_measure);
}
// Override the base class method to actually render the table.
@@ -1321,7 +1321,7 @@ class numeric_summary_table_cell
// anyhow.
stifle_warning_for_unused_value(x);
- render_or_measure(y + m_PosY, e_output_normal);
+ render_or_measure(y + m_PosY, oe_render);
}
private:
@@ -1363,7 +1363,7 @@ class numeric_summary_table_cell
return columns;
}
- int render_or_measure(int pos_y, enum_output_mode output_mode)
+ int render_or_measure(int pos_y, oenum_render_or_only_measure output_mode)
{
auto const& ledger = pdf_context_for_html_output.ledger();
auto& writer = pdf_context_for_html_output.writer();
@@ -1477,11 +1477,11 @@ class numeric_summary_table_cell
switch(output_mode)
{
- case e_output_measure_only:
+ case oe_only_measure:
pos_y += table.row_height();
break;
- case e_output_normal:
+ case oe_render:
for(std::size_t col = 0; col < columns.size(); ++col)
{
std::string const variable_name =
columns[col].variable_name;
@@ -1616,7 +1616,7 @@ class page_with_tabular_report
(table
,writer
,interpolate_html
- ,e_output_normal
+ ,oe_render
);
for(;;)
@@ -1673,17 +1673,17 @@ class page_with_tabular_report
// Must be overridden to return the template containing the fixed page
part.
virtual std::string get_fixed_page_contents_template_name() const = 0;
- // May be overridden to render (only if output_mode is e_output_normal)
+ // May be overridden to render (only if output_mode is oe_render)
// the extra headers just above the regular table headers.
//
// If this function does anything, it must show the first super-header at
// pos_y and update it to account for the added lines. The base class
// version does nothing.
virtual void render_or_measure_extra_headers
- (illustration_table_generator& table
- ,html_interpolator const& interpolate_html
- ,int* pos_y
- ,enum_output_mode output_mode
+ (illustration_table_generator& table
+ ,html_interpolator const& interpolate_html
+ ,int* pos_y
+ ,oenum_render_or_only_measure output_mode
) const
{
stifle_warning_for_unused_value(table);
@@ -1693,14 +1693,14 @@ class page_with_tabular_report
}
private:
- // Render (only if output_mode is e_output_normal) the fixed page part and
+ // Render (only if output_mode is oe_render) the fixed page part and
// (in any case) return the vertical coordinate of its bottom, where the
// tabular report starts.
int render_or_measure_fixed_page_part
- (illustration_table_generator& table
- ,pdf_writer_wx& writer
- ,html_interpolator const& interpolate_html
- ,enum_output_mode output_mode
+ (illustration_table_generator& table
+ ,pdf_writer_wx& writer
+ ,html_interpolator const& interpolate_html
+ ,oenum_render_or_only_measure output_mode
) const
{
int pos_y = writer.get_vert_margin();
@@ -1750,7 +1750,7 @@ class page_with_tabular_report
(table
,writer
,interpolate_html
- ,e_output_measure_only
+ ,oe_only_measure
);
int const rows_per_page = (get_footer_top() - pos_y) /
table.row_height();
@@ -1825,10 +1825,10 @@ class reg_tabular_detail_page : public
page_with_tabular_report
}
void render_or_measure_extra_headers
- (illustration_table_generator& table
- ,html_interpolator const& interpolate_html
- ,int* pos_y
- ,enum_output_mode output_mode
+ (illustration_table_generator& table
+ ,html_interpolator const& interpolate_html
+ ,int* pos_y
+ ,oenum_render_or_only_measure output_mode
) const override
{
stifle_warning_for_unused_value(interpolate_html);
@@ -2233,10 +2233,10 @@ class page_with_basic_tabular_report : public
page_with_tabular_report
}
void render_or_measure_extra_headers
- (illustration_table_generator& table
- ,html_interpolator const& interpolate_html
- ,int* pos_y
- ,enum_output_mode output_mode
+ (illustration_table_generator& table
+ ,html_interpolator const& interpolate_html
+ ,int* pos_y
+ ,oenum_render_or_only_measure output_mode
) const override
{
// Output the first super header row.
@@ -2685,10 +2685,10 @@ class reg_d_individual_irr_base : public
page_with_tabular_report
}
void render_or_measure_extra_headers
- (illustration_table_generator& table
- ,html_interpolator const& interpolate_html
- ,int* pos_y
- ,enum_output_mode output_mode
+ (illustration_table_generator& table
+ ,html_interpolator const& interpolate_html
+ ,int* pos_y
+ ,oenum_render_or_only_measure output_mode
) const override
{
std::ostringstream header_zero;
@@ -2860,10 +2860,10 @@ class reg_d_individual_curr : public
page_with_tabular_report
}
void render_or_measure_extra_headers
- (illustration_table_generator& table
- ,html_interpolator const& interpolate_html
- ,int* pos_y
- ,enum_output_mode output_mode
+ (illustration_table_generator& table
+ ,html_interpolator const& interpolate_html
+ ,int* pos_y
+ ,oenum_render_or_only_measure output_mode
) const override
{
table.output_super_header
diff --git a/output_mode.hpp b/output_mode.hpp
index 9b7a05c..e10a9c2 100644
--- a/output_mode.hpp
+++ b/output_mode.hpp
@@ -24,13 +24,10 @@
#include "config.hpp"
-/// Convenient enum used with functions that can either actually render
-/// something or just pretend doing it in order to compute the space that would
-/// be taken by it, in the layout phase.
-
-enum enum_output_mode
- {e_output_normal
- ,e_output_measure_only
+enum oenum_render_or_only_measure
+ {oe_render
+ ,oe_only_measure
};
+// [...to be moved to 'oecumenic_enumerations.hpp' presently]
#endif // output_mode_hpp
diff --git a/pdf_writer_wx.cpp b/pdf_writer_wx.cpp
index 8a9228a..b72b51b 100644
--- a/pdf_writer_wx.cpp
+++ b/pdf_writer_wx.cpp
@@ -126,19 +126,19 @@ pdf_writer_wx::pdf_writer_wx
/// image at the given scale.
void pdf_writer_wx::output_image
- (wxImage const& image
- ,char const* image_name
- ,double scale
- ,int x
- ,int* pos_y
- ,enum_output_mode output_mode
+ (wxImage const& image
+ ,char const* image_name
+ ,double scale
+ ,int x
+ ,int* pos_y
+ ,oenum_render_or_only_measure output_mode
)
{
int const y = wxRound(image.GetHeight() / scale);
switch(output_mode)
{
- case e_output_normal:
+ case oe_render:
{
// Use wxPdfDocument API directly as wxDC doesn't provide a way to
// set the image scale at PDF level and also because passing via
@@ -152,7 +152,7 @@ void pdf_writer_wx::output_image
pdf_doc->SetImageScale(1);
}
break;
- case e_output_measure_only:
+ case oe_only_measure:
// Do nothing.
break;
default:
@@ -169,11 +169,11 @@ void pdf_writer_wx::output_image
/// Return the height of the output (using this width).
int pdf_writer_wx::output_html
- (int x
- ,int y
- ,int width
- ,html::text const& html
- ,enum_output_mode output_mode
+ (int x
+ ,int y
+ ,int width
+ ,html::text const& html
+ ,oenum_render_or_only_measure output_mode
)
{
// We don't really want to change the font, but to preserve the current DC
@@ -189,7 +189,7 @@ int pdf_writer_wx::output_html
cell->Layout(width);
switch(output_mode)
{
- case e_output_normal:
+ case oe_render:
{
wxHtmlRenderingInfo rendering_info;
cell->Draw
@@ -202,7 +202,7 @@ int pdf_writer_wx::output_html
);
}
break;
- case e_output_measure_only:
+ case oe_only_measure:
// Do nothing.
break;
default:
diff --git a/pdf_writer_wx.hpp b/pdf_writer_wx.hpp
index 3054fd7..b1bd9b2 100644
--- a/pdf_writer_wx.hpp
+++ b/pdf_writer_wx.hpp
@@ -56,20 +56,20 @@ class pdf_writer_wx
// High level functions which should be preferably used if possible.
int output_html
- (int x
- ,int y
- ,int width
- ,html::text const& html
- ,enum_output_mode output_mode = e_output_normal
+ (int x
+ ,int y
+ ,int width
+ ,html::text const& html
+ ,oenum_render_or_only_measure output_mode = oe_render
);
void output_image
- (wxImage const& image
- ,char const* image_name
- ,double scale
- ,int x
- ,int* pos_y
- ,enum_output_mode output_mode = e_output_normal
+ (wxImage const& image
+ ,char const* image_name
+ ,double scale
+ ,int x
+ ,int* pos_y
+ ,oenum_render_or_only_measure output_mode = oe_render
);
// Accessors allowing to use lower level wxDC API directly.
diff --git a/wx_table_generator.cpp b/wx_table_generator.cpp
index 22ccfaa..39715bc 100644
--- a/wx_table_generator.cpp
+++ b/wx_table_generator.cpp
@@ -331,17 +331,17 @@ void wx_table_generator::output_vert_separator
}
void wx_table_generator::output_horz_separator
- (std::size_t begin_column
- ,std::size_t end_column
- ,int y
- ,enum_output_mode output_mode
+ (std::size_t begin_column
+ ,std::size_t end_column
+ ,int y
+ ,oenum_render_or_only_measure output_mode
)
{
switch(output_mode)
{
- case e_output_normal:
+ case oe_render:
break;
- case e_output_measure_only:
+ case oe_only_measure:
return;
}
@@ -361,13 +361,16 @@ void wx_table_generator::output_horz_separator
do_output_horz_separator(x1, x2, y);
}
-void wx_table_generator::output_header(int* pos_y, enum_output_mode
output_mode)
+void wx_table_generator::output_header
+ (int* pos_y
+ ,oenum_render_or_only_measure output_mode
+ )
{
switch(output_mode)
{
- case e_output_normal:
+ case oe_render:
break;
- case e_output_measure_only:
+ case oe_only_measure:
*pos_y += max_header_lines_ * row_height_;
return;
}
@@ -424,20 +427,20 @@ void wx_table_generator::output_header(int* pos_y,
enum_output_mode output_mode)
}
void wx_table_generator::output_super_header
- (std::string const& header
- ,std::size_t begin_column
- ,std::size_t end_column
- ,int* pos_y
- ,enum_output_mode output_mode
+ (std::string const& header
+ ,std::size_t begin_column
+ ,std::size_t end_column
+ ,int* pos_y
+ ,oenum_render_or_only_measure output_mode
)
{
std::vector<std::string> const lines(split_into_lines(header));
switch(output_mode)
{
- case e_output_normal:
+ case oe_render:
break;
- case e_output_measure_only:
+ case oe_only_measure:
*pos_y += row_height_*lines.size();
return;
}
diff --git a/wx_table_generator.hpp b/wx_table_generator.hpp
index e9df872..8bc0af0 100644
--- a/wx_table_generator.hpp
+++ b/wx_table_generator.hpp
@@ -68,19 +68,19 @@ class wx_table_generator
// Render the headers at the given position and update it.
void output_header
- (int* pos_y
- ,enum_output_mode output_mode = e_output_normal
+ (int* pos_y
+ ,oenum_render_or_only_measure output_mode = oe_render
);
// Render a super-header, i.e. a header spanning over several columns. The
// columns range is specified as a close/open interval, as usual in C++.
// The header string may be multiline, just as with normal headers.
void output_super_header
- (std::string const& header
- ,std::size_t begin_column
- ,std::size_t end_column
- ,int* pos_y
- ,enum_output_mode output_mode = e_output_normal
+ (std::string const& header
+ ,std::size_t begin_column
+ ,std::size_t end_column
+ ,int* pos_y
+ ,oenum_render_or_only_measure output_mode = oe_render
);
// Render a row with the given values at the given position and update it.
@@ -114,10 +114,10 @@ class wx_table_generator
// Output a horizontal separator line across the specified columns,
// using the usual C++ close/open interval convention.
void output_horz_separator
- (std::size_t begin_column
- ,std::size_t end_column
- ,int y
- ,enum_output_mode output_mode = e_output_normal
+ (std::size_t begin_column
+ ,std::size_t end_column
+ ,int y
+ ,oenum_render_or_only_measure output_mode = oe_render
);
// Output a vertical separator line before the given column. Notice that