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

Squashed 'phreeqcpp/' changes from fdc0bb5..e317dd0

Browse Source 
e317dd0 Guarded case with no points in curves for log axes. Added bad_graph test case.

git-subtree-dir: phreeqcpp
git-subtree-split: e317dd0e41bbfd18abd2255ab5f2cf3933cd4c69
This commit is contained in:
Darth Vader 2024-09-24 22:02:30 +00:00
parent 8f7d206a80
commit c155685f63
1 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Form1.h
View File

@ -969,38 +969,71 @@ namespace zdg_ui2 {
if ((fabs(chart->Get_axis_scale_x()[1] - NA) < 1e-3) && zg1->GraphPane->XAxis->Type == AxisType::Log)
{
double max = -1e99;
for (int i = 0; i < zg1->GraphPane->CurveList->Count; i++)
for (int i = 0; i < zg1->GraphPane->CurveList->Count; i++)
{
if (Curves[i]->Get_x()[Curves[i]->Get_x().size() - 1] > max)
max = Curves[i]->Get_x()[Curves[i]->Get_x().size() - 1];
if (Curves[i]->Get_x().size() > 0)
{
if (Curves[i]->Get_x()[Curves[i]->Get_x().size() - 1] > max)
max = Curves[i]->Get_x()[Curves[i]->Get_x().size() - 1];
}
}
if (max > 0)
{
max += pow(10.0, log10(max / 3));
}
else
{
zg1->GraphPane->XAxis->Scale->Min = 0;
max = zg1->GraphPane->XAxis->Scale->Min + 1.0;
}
max += pow(10.0, log10(max / 3));
zg1->GraphPane->XAxis->Scale->Max = max;
}
if ((fabs(chart->Get_axis_scale_y()[1] - NA) < 1e-3) && zg1->GraphPane->YAxis->Type == AxisType::Log)
{
double max = -1e99;
for (int i = 0; i < zg1->GraphPane->CurveList->Count; i++)
for (int i = 0; i < zg1->GraphPane->CurveList->Count; i++)
{
curve = (LineItem ^) zg1->GraphPane->CurveList[i];
curve = (LineItem^)zg1->GraphPane->CurveList[i];
if (curve->IsY2Axis) continue;
if (Curves[i]->Get_y()[Curves[i]->Get_y().size() - 1] > max)
max = Curves[i]->Get_y()[Curves[i]->Get_y().size() - 1];
if (Curves[i]->Get_y().size() > 0)
{
if (Curves[i]->Get_y()[Curves[i]->Get_y().size() - 1] > max)
max = Curves[i]->Get_y()[Curves[i]->Get_y().size() - 1];
}
}
if (max > 0)
{
max += pow(10.0, log10(max / 3));
}
else
{
zg1->GraphPane->YAxis->Scale->Min = 0;
max = zg1->GraphPane->YAxis->Scale->Min + 1.0;
}
max += pow(10.0, log10(max / 3));
zg1->GraphPane->YAxis->Scale->Max = max;
}
if ((fabs(chart->Get_axis_scale_y2()[1] - NA) < 1e-3) && zg1->GraphPane->Y2Axis->Type == AxisType::Log)
{
double max = -1e99;
for (int i = 0; i < zg1->GraphPane->CurveList->Count; i++)
for (int i = 0; i < zg1->GraphPane->CurveList->Count; i++)
{
curve = (LineItem ^) zg1->GraphPane->CurveList[i];
curve = (LineItem^)zg1->GraphPane->CurveList[i];
if (!curve->IsY2Axis) continue;
if (Curves[i]->Get_y()[Curves[i]->Get_y().size() - 1] > max)
max = Curves[i]->Get_y()[Curves[i]->Get_y().size() - 1];
if (Curves[i]->Get_y().size() > 0)
{
if (Curves[i]->Get_y()[Curves[i]->Get_y().size() - 1] > max)
max = Curves[i]->Get_y()[Curves[i]->Get_y().size() - 1];
}
}
if (max > 0.0)
{
max += pow(10.0, log10(max / 3));
}
else
{
zg1->GraphPane->Y2Axis->Scale->Min = 0;
max = zg1->GraphPane->Y2Axis->Scale->Min + 1.0;
}
max += pow(10.0, log10(max / 3));
zg1->GraphPane->Y2Axis->Scale->Max = max;
}
zg1->AxisChange();