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

Still working to make backward compatible.

Browse Source 
Think there will be one diff, headings will not be rewritten (ddl_flux).

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/multi_punch@7880 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2013-08-02 17:38:40 +00:00
parent 62feec3f96
commit 04141a3098
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SelectedOutput.cpp
View File

@ -38,7 +38,6 @@ SelectedOutput::SelectedOutput(int n, PHRQ_io *io)
this->user_punch = true;
this->charge_balance = false;
this->percent_error = false;
//this->punch = false;
}

1
SelectedOutput.h
View File

@ -103,6 +103,5 @@ public:
bool charge_balance;
bool percent_error;
bool inverse;
//bool punch;
};
#endif // !defined(SELECTEDOUTPUT_H_INCLUDED)

2
print.cpp
View File

@ -3197,7 +3197,7 @@ punch_user_punch(void)
n_user_punch_index = 0;
//if (punch.user_punch == FALSE)
// return (OK);
if (current_user_punch == NULL)
if (current_user_punch == NULL || !current_selected_output->Get_user_punch())
return OK;
struct rate * user_punch = current_user_punch->Get_rate();

16
read.cpp
View File

@ -4677,6 +4677,7 @@ read_selected_output(void)
if (so != SelectedOutput_map.end())
{
SelectedOutput & so_ref = so->second;
temp_selected_output.active = so_ref.active;
temp_selected_output.inverse = so_ref.inverse;
temp_selected_output.sim = so_ref.sim;
temp_selected_output.state = so_ref.state;
@ -4974,10 +4975,12 @@ read_selected_output(void)
opt_save = OPTION_ERROR;
break;
case 39: /* user_punch */
temp_selected_output.Set_new_def(true);
value = get_true_false(next_char, TRUE);
temp_selected_output.Set_user_punch(value!=FALSE);
opt_save = OPTION_ERROR;
if (so != SelectedOutput_map.end())
{
so->second.Set_user_punch(value!=FALSE);
} opt_save = OPTION_ERROR;
break;
case 42: /* charge_balance */
temp_selected_output.Set_new_def(true);
@ -4993,12 +4996,11 @@ read_selected_output(void)
break;
case 44: /* selected_out */
case 45: /* selected_output */
temp_selected_output.Set_new_def(true);
//warning_msg("Use PRINT; -selected_output, not SELECTED_OUTPUT; -selected_output");
value = get_true_false(next_char, TRUE);
temp_selected_output.Set_active(value!=FALSE);
opt_save = OPTION_ERROR;
break;
//value = get_true_false(next_char, TRUE);
//temp_selected_output.Set_active(value!=FALSE);
//opt_save = OPTION_ERROR;
//break;
case 49: /* active */
value = get_true_false(next_char, TRUE);
temp_selected_output.Set_active(value!=FALSE);