diff options
author | joye <joye> | 2014-05-19 20:09:33 (GMT) |
---|---|---|
committer | joye <joye> | 2014-05-19 20:09:33 (GMT) |
commit | 39fc2cabfd3ac1dcc9bef7f8035a551f7c7a9676 (patch) | |
tree | 45ce21f467a0bb48457ebca79cf74b4d65aaf975 /src/bltGrElemLine.C | |
parent | 47444bb0df327d9638736ff6b148aad786cdbf8a (diff) | |
download | blt-39fc2cabfd3ac1dcc9bef7f8035a551f7c7a9676.zip blt-39fc2cabfd3ac1dcc9bef7f8035a551f7c7a9676.tar.gz blt-39fc2cabfd3ac1dcc9bef7f8035a551f7c7a9676.tar.bz2 |
*** empty log message ***
Diffstat (limited to 'src/bltGrElemLine.C')
-rw-r--r-- | src/bltGrElemLine.C | 56 |
1 files changed, 21 insertions, 35 deletions
diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C index fa209b8..b0ddb47 100644 --- a/src/bltGrElemLine.C +++ b/src/bltGrElemLine.C @@ -420,17 +420,13 @@ void LineElement::extents(Region2d *extsPtr) // Correct the data limits for error bars if (ops->xError && ops->xError->nValues > 0) { - int i; - np = MIN(ops->xError->nValues, np); - for (i = 0; i < np; i++) { - double x; - - x = ops->coords.x->values[i] + ops->xError->values[i]; - if (x > extsPtr->right) { + for (int ii=0; ii<np; ii++) { + double x = ops->coords.x->values[ii] + ops->xError->values[ii]; + if (x > extsPtr->right) extsPtr->right = x; - } - x = ops->coords.x->values[i] - ops->xError->values[i]; + + x = ops->coords.x->values[ii] - ops->xError->values[ii]; AxisOptions* axisxops = (AxisOptions*)ops->xAxis->ops(); if (axisxops->logScale) { // Mirror negative values, instead of ignoring them @@ -451,9 +447,7 @@ void LineElement::extents(Region2d *extsPtr) } if (ops->xLow && ops->xLow->nValues > 0) { double left; - - if ((ops->xLow->min <= 0.0) && - (axisxops->logScale)) + if ((ops->xLow->min <= 0.0) && (axisxops->logScale)) left = FindElemValuesMinimum(ops->xLow, DBL_MIN); else left = ops->xLow->min; @@ -464,41 +458,33 @@ void LineElement::extents(Region2d *extsPtr) } if (ops->yError && ops->yError->nValues > 0) { - int i; - np = MIN(ops->yError->nValues, np); - for (i = 0; i < np; i++) { - double y; - - y = ops->coords.y->values[i] + ops->yError->values[i]; - if (y > extsPtr->bottom) { + for (int ii=0; ii<np; ii++) { + double y = ops->coords.y->values[ii] + ops->yError->values[ii]; + if (y > extsPtr->bottom) extsPtr->bottom = y; - } - y = ops->coords.y->values[i] - ops->yError->values[i]; + + y = ops->coords.y->values[ii] - ops->yError->values[ii]; AxisOptions* axisyops = (AxisOptions*)ops->yAxis->ops(); if (axisyops->logScale) { - if (y < 0.0) { - y = -y; /* Mirror negative values, instead of - * ignoring them. */ - } - if ((y > DBL_MIN) && (y < extsPtr->left)) { + // Mirror negative values, instead of ignoring them + if (y < 0.0) + y = -y; + if ((y > DBL_MIN) && (y < extsPtr->left)) extsPtr->top = y; - } - } else if (y < extsPtr->top) { - extsPtr->top = y; } + else if (y < extsPtr->top) + extsPtr->top = y; } } else { - if (ops->yHigh && - (ops->yHigh->nValues > 0) && - (ops->yHigh->max > extsPtr->bottom)) { + if (ops->yHigh && (ops->yHigh->nValues > 0) && + (ops->yHigh->max > extsPtr->bottom)) extsPtr->bottom = ops->yHigh->max; - } + if (ops->yLow && ops->yLow->nValues > 0) { double top; - if ((ops->yLow->min <= 0.0) && - (axisyops->logScale)) + if ((ops->yLow->min <= 0.0) && (axisyops->logScale)) top = FindElemValuesMinimum(ops->yLow, DBL_MIN); else top = ops->yLow->min; |