mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-16 00:28:23 +01:00
fixed bug in GetSelectedOutputString (bad args);
cleared SelectedOutputString for each run git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/branches/ErrorHandling@6156 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
parent
ea645fb801
commit
cea8ab44a8
@ -858,6 +858,8 @@ void IPhreeqc::do_run(const char* sz_routine, std::istream* pis, PFN_PRERUN_CALL
|
|||||||
this->LogLines.clear();
|
this->LogLines.clear();
|
||||||
this->OutputString.clear();
|
this->OutputString.clear();
|
||||||
this->OutputLines.clear();
|
this->OutputLines.clear();
|
||||||
|
this->SelectedOutputString.clear();
|
||||||
|
this->SelectedOutputLines.clear();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* set read callback
|
* set read callback
|
||||||
@ -888,9 +890,6 @@ void IPhreeqc::do_run(const char* sz_routine, std::istream* pis, PFN_PRERUN_CALL
|
|||||||
|
|
||||||
int save_punch_in = this->PhreeqcPtr->punch.in;
|
int save_punch_in = this->PhreeqcPtr->punch.in;
|
||||||
|
|
||||||
//{{
|
|
||||||
//}}
|
|
||||||
|
|
||||||
this->PhreeqcPtr->dup_print(token, TRUE);
|
this->PhreeqcPtr->dup_print(token, TRUE);
|
||||||
if (this->PhreeqcPtr->read_input() == EOF)
|
if (this->PhreeqcPtr->read_input() == EOF)
|
||||||
break;
|
break;
|
||||||
@ -1077,6 +1076,7 @@ void IPhreeqc::do_run(const char* sz_routine, std::istream* pis, PFN_PRERUN_CALL
|
|||||||
if (this->DumpOn)
|
if (this->DumpOn)
|
||||||
{
|
{
|
||||||
this->PhreeqcPtr->dump_entities();
|
this->PhreeqcPtr->dump_entities();
|
||||||
|
this->DumpFileName = this->PhreeqcPtr->dump_info.Get_file_name();
|
||||||
}
|
}
|
||||||
if (this->DumpStringOn)
|
if (this->DumpStringOn)
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user