tmp update
This commit is contained in:
@@ -83,10 +83,22 @@ Please see instructions or contact the author for more information.");
|
||||
bool value_only = false;
|
||||
if (format_str != "NULL") value_only = true;
|
||||
|
||||
std::string file_ext;
|
||||
size_t dpos = table_name.find_last_of('.');
|
||||
if (dpos != std::string::npos)
|
||||
{
|
||||
file_ext = table_name.substr(dpos);
|
||||
table_name = table_name.substr(0, dpos);
|
||||
}
|
||||
else file_ext = ".txt";
|
||||
|
||||
gctl::text_descriptor desc;
|
||||
desc.file_name_ = table_name;
|
||||
desc.file_ext_ = file_ext;
|
||||
if (head_str != "NULL") gctl::str2type(head_str, desc.head_num_);
|
||||
if (ant_str != "NULL") gctl::str2type(ant_str, desc.att_sym_);
|
||||
if (del_str != "NULL") gctl::str2type(del_str, desc.delimiter_);
|
||||
if (grid_name == "NULL") grid_name = table_name;
|
||||
|
||||
if (interval_str == "NULL" && size_str == "NULL")
|
||||
{
|
||||
@@ -134,7 +146,7 @@ Please see instructions or contact the author for more information.");
|
||||
}
|
||||
|
||||
gctl::_2d_vector table_data;
|
||||
gctl::read_text2vector2d(table_name, table_data, desc);
|
||||
gctl::read_text2vector2d(desc, table_data);
|
||||
|
||||
// check data
|
||||
for (int i = 0; i < table_data.size(); i++)
|
||||
|
Reference in New Issue
Block a user