max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 16:44:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Worked on logic for Tony. If headings are defined, don't remove Basic code. If no definitions in USER_GRAPH, remove Basic code.

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@5372 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2011-05-09 16:55:57 +00:00
parent 5af51e0c96
commit 2d59bd8c29
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChartObject.cpp
View File

@ -265,7 +265,8 @@ ChartObject::Read(CParser & parser)
std::string token;
int opt_save;
bool useLastLine(false);
bool new_command_lines(true);
bool new_command_lines(false);
bool no_def(true);
if (this->FirstCallToUSER_GRAPH)
{
}
@ -408,10 +409,10 @@ ChartObject::Read(CParser & parser)
/* End of modifications */
case CParser::OPT_DEFAULT: // Read Basic commands
{
if (new_command_lines)
if (!new_command_lines)
{
this->rate_command_list.clear();
new_command_lines = false;
new_command_lines = true;
}
this->rate_new_def = true;
/* read command */
@ -436,10 +437,12 @@ ChartObject::Read(CParser & parser)
}
if (opt == CParser::OPT_EOF || opt == CParser::OPT_KEYWORD)
break;
no_def = false;
}
// install new plotxy commands
this->Set_rate_struct();
// disable this user_graph if USER_GRAPH block is empty
if (new_command_lines || no_def) this->Set_rate_struct();
return true;
}
bool