[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 5d101bb 3/3: Integrate '.lingo' files with ot
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master 5d101bb 3/3: Integrate '.lingo' files with other product files |
|
Date: |
Mon, 9 Nov 2020 17:12:09 -0500 (EST) |
branch: master
commit 5d101bb987456a864129e1f8aa8a09ac52dd4036
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Integrate '.lingo' files with other product files
---
generate_product_files.cpp | 3 +++
my_prod.cpp | 1 +
policy_document.cpp | 1 +
policy_view.xrc | 11 +++++++++++
product_data.cpp | 3 +++
product_data.hpp | 1 +
product_file_test.cpp | 12 ++++++++++++
skeleton.cpp | 3 ++-
workhorse.make | 3 ++-
9 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/generate_product_files.cpp b/generate_product_files.cpp
index 0ce7db0..075c13b 100644
--- a/generate_product_files.cpp
+++ b/generate_product_files.cpp
@@ -23,6 +23,7 @@
#include "dbdict.hpp"
#include "fund_data.hpp"
+#include "lingo.hpp"
#include "main_common.hpp"
#include "path_utility.hpp" // initialize_filesystem()
#include "product_data.hpp"
@@ -40,12 +41,14 @@ int try_main(int, char*[])
DBDictionary ::write_database_files ();
FundData ::write_funds_files ();
+ lingo ::write_lingo_files ();
product_data ::write_policy_files ();
rounding_rules ::write_rounding_files ();
stratified_charges ::write_strata_files ();
DBDictionary ::write_proprietary_database_files ();
FundData ::write_proprietary_funds_files ();
+ lingo ::write_proprietary_lingo_files ();
product_data ::write_proprietary_policy_files ();
rounding_rules ::write_proprietary_rounding_files ();
stratified_charges ::write_proprietary_strata_files ();
diff --git a/my_prod.cpp b/my_prod.cpp
index fc54750..03993b2 100644
--- a/my_prod.cpp
+++ b/my_prod.cpp
@@ -58,6 +58,7 @@ void product_data::write_proprietary_policy_files()
z.DatabaseFilename = glossed_string("sample.database");
z.FundFilename = glossed_string("sample.funds");
+ z.LingoFilename = glossed_string("sample.lingo");
z.RoundingFilename = glossed_string("sample.rounding");
z.TierFilename = glossed_string("sample.strata");
diff --git a/policy_document.cpp b/policy_document.cpp
index f4a81c2..ef4afe0 100644
--- a/policy_document.cpp
+++ b/policy_document.cpp
@@ -40,6 +40,7 @@ PolicyDocument::PolicyDocument()
{
values_["DatabaseFilename" ] = &product_data_.DatabaseFilename
.datum_;
values_["FundFilename" ] = &product_data_.FundFilename
.datum_;
+ values_["LingoFilename" ] = &product_data_.LingoFilename
.datum_;
values_["CvatCorridorFilename" ] = &product_data_.CvatCorridorFilename
.datum_;
values_["Irc7702NspFilename" ] = &product_data_.Irc7702NspFilename
.datum_;
values_["CurrCOIFilename" ] = &product_data_.CurrCOIFilename
.datum_;
diff --git a/policy_view.xrc b/policy_view.xrc
index 230c5e3..f0aae7c 100644
--- a/policy_view.xrc
+++ b/policy_view.xrc
@@ -64,6 +64,17 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
<object class="wxStaticText">
+ <label>LingoFilename</label>
+ </object>
+ </object>
+ <object class="sizeritem">
+
<flag>wxGROW|wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxTextCtrl"
name="LingoFilename"/>
+ <minsize>160,-1</minsize>
+ </object>
+ <object class="sizeritem">
+
<flag>wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+ <object class="wxStaticText">
<label>TierFilename</label>
</object>
</object>
diff --git a/product_data.cpp b/product_data.cpp
index 00ac90f..edb594c 100644
--- a/product_data.cpp
+++ b/product_data.cpp
@@ -183,6 +183,7 @@ void product_data::ascribe_members()
{
ascribe("DatabaseFilename" , &product_data::DatabaseFilename
);
ascribe("FundFilename" , &product_data::FundFilename
);
+ ascribe("LingoFilename" , &product_data::LingoFilename
);
ascribe("RoundingFilename" , &product_data::RoundingFilename
);
ascribe("TierFilename" , &product_data::TierFilename
);
ascribe("CvatCorridorFilename" , &product_data::CvatCorridorFilename
);
@@ -616,6 +617,7 @@ sample::sample()
// Names of lmi product files.
item("DatabaseFilename") = glossed_string("sample.database");
item("FundFilename") = glossed_string("sample.funds");
+ item("LingoFilename") = glossed_string("sample.lingo");
item("RoundingFilename") = glossed_string("sample.rounding");
item("TierFilename") = glossed_string("sample.strata");
@@ -780,6 +782,7 @@ sample2::sample2()
// Names of lmi product files.
item("DatabaseFilename") = glossed_string("sample.database");
item("FundFilename") = glossed_string("sample.funds");
+ item("LingoFilename") = glossed_string("sample.lingo");
item("RoundingFilename") = glossed_string("sample.rounding");
item("TierFilename") = glossed_string("sample.strata");
diff --git a/product_data.hpp b/product_data.hpp
index 62b3ab7..52d750f 100644
--- a/product_data.hpp
+++ b/product_data.hpp
@@ -142,6 +142,7 @@ class LMI_SO product_data
// Names of files that contain other product data.
glossed_string DatabaseFilename;
glossed_string FundFilename;
+ glossed_string LingoFilename;
glossed_string RoundingFilename;
glossed_string TierFilename;
diff --git a/product_file_test.cpp b/product_file_test.cpp
index 5077bf6..4f589da 100644
--- a/product_file_test.cpp
+++ b/product_file_test.cpp
@@ -25,6 +25,7 @@
#include "database.hpp"
#include "dbdict.hpp"
#include "fund_data.hpp"
+#include "lingo.hpp"
#include "product_data.hpp"
#include "rounding_rules.hpp"
#include "stratified_charges.hpp"
@@ -57,12 +58,14 @@ class product_file_test
static void assay_speed();
static void read_database_file() ;
static void read_fund_file() ;
+ static void read_lingo_file() ;
static void read_policy_file() ;
static void read_rounding_file() ;
static void read_stratified_file() ;
static std::string database_filename_ ;
static std::string fund_filename_ ;
+ static std::string lingo_filename_ ;
static std::string policy_filename_ ;
static std::string rounding_filename_ ;
static std::string stratified_filename_ ;
@@ -70,6 +73,7 @@ class product_file_test
std::string product_file_test::database_filename_ ;
std::string product_file_test::fund_filename_ ;
+std::string product_file_test::lingo_filename_ ;
std::string product_file_test::policy_filename_ ;
std::string product_file_test::rounding_filename_ ;
std::string product_file_test::stratified_filename_ ;
@@ -80,6 +84,7 @@ void product_file_test::get_filenames()
product_data p(policy_filename_);
database_filename_ = AddDataDir(p.datum("DatabaseFilename"));
fund_filename_ = AddDataDir(p.datum("FundFilename" ));
+ lingo_filename_ = AddDataDir(p.datum("LingoFilename" ));
rounding_filename_ = AddDataDir(p.datum("RoundingFilename"));
stratified_filename_ = AddDataDir(p.datum("TierFilename" ));
}
@@ -92,6 +97,7 @@ void product_file_test::test_copying()
product_data q(p);
BOOST_TEST(database_filename_ ==
AddDataDir(q.datum("DatabaseFilename")));
BOOST_TEST(fund_filename_ == AddDataDir(q.datum("FundFilename"
)));
+ BOOST_TEST(lingo_filename_ == AddDataDir(q.datum("LingoFilename"
)));
BOOST_TEST(rounding_filename_ ==
AddDataDir(q.datum("RoundingFilename")));
BOOST_TEST(stratified_filename_ == AddDataDir(q.datum("TierFilename"
)));
@@ -147,6 +153,11 @@ void product_file_test::read_fund_file()
FundData z(fund_filename_);
}
+void product_file_test::read_lingo_file()
+{
+ lingo z(lingo_filename_);
+}
+
void product_file_test::read_policy_file()
{
product_data z(policy_filename_);
@@ -168,6 +179,7 @@ void product_file_test::assay_speed()
<< " Speed tests..."
<< "\n Read 'database' : " << TimeAnAliquot(read_database_file )
<< "\n Read 'fund' : " << TimeAnAliquot(read_fund_file )
+ << "\n Read 'lingo' : " << TimeAnAliquot(read_lingo_file )
<< "\n Read 'policy' : " << TimeAnAliquot(read_policy_file )
<< "\n Read 'rounding' : " << TimeAnAliquot(read_rounding_file )
<< "\n Read 'stratified' : " << TimeAnAliquot(read_stratified_file)
diff --git a/skeleton.cpp b/skeleton.cpp
index 4686fb0..0360891 100644
--- a/skeleton.cpp
+++ b/skeleton.cpp
@@ -338,7 +338,8 @@ void Skeleton::InitDocManager()
,CLASSINFO(DatabaseView)
);
- // Apparently there's no way to edit a '.funds' file.
+ // There is intentionally no GUI editor for '.lingo' files.
+ // There's no GUI editor for '.funds' files either.
new(wx) wxDocTemplate
(doc_manager_
diff --git a/workhorse.make b/workhorse.make
index 9b372f5..46986ff 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -1096,6 +1096,7 @@ shared_data_files = \
sample.dat \
sample*.database \
sample*.funds \
+ sample*.lingo \
sample.ndx \
sample*.policy \
sample*.rounding \
@@ -1206,7 +1207,7 @@ extra_fardel_checksummed_files = \
fardel_checksummed_files = \
$(extra_fardel_checksummed_files) \
- *.dat *.database *.funds *.ndx *.policy *.rounding *.strata *.xst \
+ *.dat *.database *.funds *.lingo *.ndx *.policy *.rounding *.strata *.xst \
expiry \
lmi_md5sum$(EXEEXT) \