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

updated to allow charts to stay open in phreeqci

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7997 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2013-08-30 04:29:19 +00:00
parent 7c66a50b9b
commit d3ed690461
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChartHandler.cpp
View File

@ -179,6 +179,7 @@ ChartHandler::End_timer()
}
#endif
it->second->Set_end_timer(true);
it->second->Set_phreeqc(NULL);
#if defined(__cplusplus_cli)
int n = System::Threading::Interlocked::Exchange(it->second->usingResource, 0);
assert(n == 6);

36
Form1.h
View File

@ -18,12 +18,10 @@ namespace zdg_ui2 {
// Form1 is only used with MULTICHART
public ref class ChartObj : public System::Object
{
public: Phreeqc* phreeqc_ptr;
public: ChartObject* chartobject_ptr;
public: ChartObj(ChartObject* ptr)
{
this->chartobject_ptr = ptr;
this->phreeqc_ptr = this->chartobject_ptr->Get_phreeqc();
}
};
@ -33,8 +31,10 @@ namespace zdg_ui2 {
public: Form1(ChartObject *ptr)
{
this->chartobject_ptr = ptr;
this->phreeqc_ptr = chartobject_ptr->Get_phreeqc();
this->phreeqc_ptr->Get_chart_handler().Increment_active_charts();
if (Phreeqc* ptr = this->chartobject_ptr->Get_phreeqc())
{
ptr->Get_chart_handler().Increment_active_charts();
}
InitializeComponent();
col_use = 0;
symbol_use = 0;
@ -71,9 +71,12 @@ namespace zdg_ui2 {
{
chart->Set_done(true);
System::Threading::Interlocked::Exchange(this->chartobject_ptr->usingResource, 0);
if (Phreeqc* ptr = chart->Get_phreeqc())
{
ptr->Get_chart_handler().Decrement_active_charts();
chart->Set_phreeqc(NULL);
}
}
this->phreeqc_ptr->Get_chart_handler().Decrement_active_charts();
this->phreeqc_ptr = NULL;
this->chartobject_ptr = NULL;
}
@ -98,7 +101,10 @@ namespace zdg_ui2 {
if (LogX && chart->Get_axis_scale_x()[4] == 10.0 &&
Curves[i]->Get_x()[i2] <= 0)
{
this->phreeqc_ptr->warning_msg("Obtained x_value <= 0, removing point...");
if (Phreeqc* ptr = chart->Get_phreeqc())
{
ptr->warning_msg("Obtained x_value <= 0, removing point...");
}
//axis_scale_x[4] = NA; /* if reverting to linear... */
//LogX = false;
return true;
@ -109,14 +115,20 @@ namespace zdg_ui2 {
{
if (Curves[i]->Get_y_axis() == 2 && LogY2)
{
this->phreeqc_ptr->warning_msg("Obtained sy_value <= 0, removing point......");
if (Phreeqc* ptr = chart->Get_phreeqc())
{
ptr->warning_msg("Obtained sy_value <= 0, removing point......");
}
//axis_scale_y2[4] = NA;
//LogY2 = false;
return true;
}
else if (LogY)
{
this->phreeqc_ptr->warning_msg("Obtained y_value <= 0, removing point......");
if (Phreeqc* ptr = chart->Get_phreeqc())
{
ptr->warning_msg("Obtained y_value <= 0, removing point......");
}
//axis_scale_y[4] = NA;
//LogY = false;
return true;
@ -541,7 +553,10 @@ namespace zdg_ui2 {
{
if (this->chartobject_ptr != NULL)
{
this->phreeqc_ptr->error_msg(estring.c_str(), CONTINUE);
if (Phreeqc* ptr = this->chartobject_ptr->Get_phreeqc())
{
ptr->error_msg(estring.c_str(), CONTINUE);
}
}
else
{
@ -1071,7 +1086,6 @@ namespace zdg_ui2 {
public: ZedGraph::ZedGraphControl ^zg1;
private: System::Windows::Forms::Timer ^timer1;
private: System::ComponentModel::Container ^components;
private: Phreeqc * phreeqc_ptr;
ChartObject * chartobject_ptr;
public:

2
structures.cpp
View File

@ -28,11 +28,13 @@ clean_up(void)
#if defined MULTICHART
chart_handler.End_timer();
output_flush();
#if 0
// Wait for charts to end
while (0 != this->chart_handler.Get_active_charts())
{
System::Threading::Thread::Sleep(60);
}
#endif
#endif
description_x = (char *) free_check_null(description_x);