Skip to content

Commit 4a51f39

Browse files
WeiqunZhangWeiqunZhang
committed
use std::abs
1 parent 9546677 commit 4a51f39

File tree

2 files changed

+34
-30
lines changed

2 files changed

+34
-30
lines changed

‎PltApp.cpp‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242

4343
#include <cctype>
4444
#include <sstream>
45+
#include <cmath>
46+
#include <cstdlib>
4547
using std::cout;
4648
using std::cerr;
4749
using std::endl;
@@ -3618,8 +3620,8 @@ void PltApp::DoRubberBanding(Widget, XtPointer client_data, XtPointer call_data)
36183620
case MotionNotify:
36193621

36203622
if(rectDrawn) { // undraw the old rectangle(s)
3621-
rWidth = abs(oldX-anchorX);
3622-
rHeight = abs(oldY-anchorY);
3623+
rWidth = std::abs(oldX-anchorX);
3624+
rHeight = std::abs(oldY-anchorY);
36233625
rStartX = (anchorX < oldX) ? anchorX : oldX;
36243626
rStartY = (anchorY < oldY) ? anchorY : oldY;
36253627
XDrawRectangle(display, amrPicturePtrArray[V]->PictureWindow(),
@@ -3630,30 +3632,30 @@ void PltApp::DoRubberBanding(Widget, XtPointer client_data, XtPointer call_data)
36303632
case Amrvis::ZPLANE:
36313633
XDrawRectangle(display, amrPicturePtrArray[Amrvis::YPLANE]->PictureWindow(),
36323634
rbgc, rStartX, startcutY[Amrvis::YPLANE], rWidth,
3633-
abs(finishcutY[Amrvis::YPLANE]-startcutY[Amrvis::YPLANE]));
3635+
std::abs(finishcutY[Amrvis::YPLANE]-startcutY[Amrvis::YPLANE]));
36343636
rStartPlane = (anchorY < oldY) ? oldY : anchorY;
36353637
XDrawRectangle(display, amrPicturePtrArray[Amrvis::XPLANE]->PictureWindow(),
36363638
rbgc, imageHeight-rStartPlane, startcutY[Amrvis::XPLANE],
36373639
rHeight,
3638-
abs(finishcutY[Amrvis::XPLANE]-startcutY[Amrvis::XPLANE]));
3640+
std::abs(finishcutY[Amrvis::XPLANE]-startcutY[Amrvis::XPLANE]));
36393641
break;
36403642
case Amrvis::YPLANE:
36413643
XDrawRectangle(display, amrPicturePtrArray[Amrvis::ZPLANE]->PictureWindow(),
36423644
rbgc, rStartX, startcutY[Amrvis::ZPLANE], rWidth,
3643-
abs(finishcutY[Amrvis::ZPLANE]-startcutY[Amrvis::ZPLANE]));
3645+
std::abs(finishcutY[Amrvis::ZPLANE]-startcutY[Amrvis::ZPLANE]));
36443646
XDrawRectangle(display, amrPicturePtrArray[Amrvis::XPLANE]->PictureWindow(),
36453647
rbgc, startcutX[Amrvis::XPLANE], rStartY,
3646-
abs(finishcutX[Amrvis::XPLANE]-startcutX[Amrvis::XPLANE]),
3648+
std::abs(finishcutX[Amrvis::XPLANE]-startcutX[Amrvis::XPLANE]),
36473649
rHeight);
36483650
break;
36493651
default: // Amrvis::XPLANE
36503652
rStartPlane = (anchorX < oldX) ? oldX : anchorX;
36513653
XDrawRectangle(display, amrPicturePtrArray[Amrvis::ZPLANE]->PictureWindow(),
36523654
rbgc, startcutX[Amrvis::ZPLANE], imageWidth-rStartPlane,
3653-
abs(finishcutX[Amrvis::ZPLANE]-startcutX[Amrvis::ZPLANE]), rWidth);
3655+
std::abs(finishcutX[Amrvis::ZPLANE]-startcutX[Amrvis::ZPLANE]), rWidth);
36543656
XDrawRectangle(display, amrPicturePtrArray[Amrvis::YPLANE]->PictureWindow(),
36553657
rbgc, startcutX[Amrvis::YPLANE], rStartY,
3656-
abs(finishcutX[Amrvis::YPLANE]-startcutX[Amrvis::YPLANE]),
3658+
std::abs(finishcutX[Amrvis::YPLANE]-startcutX[Amrvis::YPLANE]),
36573659
rHeight);
36583660
}
36593661
#endif
@@ -3677,8 +3679,8 @@ void PltApp::DoRubberBanding(Widget, XtPointer client_data, XtPointer call_data)
36773679
}
36783680
newX = max(0, min(imageWidth, newX));
36793681
newY = max(0, min(imageHeight, newY));
3680-
rWidth = abs(newX-anchorX); // draw the new rectangle
3681-
rHeight = abs(newY-anchorY);
3682+
rWidth = std::abs(newX-anchorX); // draw the new rectangle
3683+
rHeight = std::abs(newY-anchorY);
36823684
rStartX = (anchorX < newX) ? anchorX : newX;
36833685
rStartY = (anchorY < newY) ? anchorY : newY;
36843686
XDrawRectangle(display, amrPicturePtrArray[V]->PictureWindow(),
@@ -3703,12 +3705,12 @@ void PltApp::DoRubberBanding(Widget, XtPointer client_data, XtPointer call_data)
37033705
// draw in other planes
37043706
XDrawRectangle(display, amrPicturePtrArray[Amrvis::YPLANE]->PictureWindow(),
37053707
rbgc, rStartX, startcutY[Amrvis::YPLANE], rWidth,
3706-
abs(finishcutY[Amrvis::YPLANE]-startcutY[Amrvis::YPLANE]));
3708+
std::abs(finishcutY[Amrvis::YPLANE]-startcutY[Amrvis::YPLANE]));
37073709
rStartPlane = (anchorY < newY) ? newY : anchorY;
37083710
XDrawRectangle(display, amrPicturePtrArray[Amrvis::XPLANE]->PictureWindow(),
37093711
rbgc, imageHeight-rStartPlane, startcutY[Amrvis::XPLANE],
37103712
rHeight,
3711-
abs(finishcutY[Amrvis::XPLANE]-startcutY[Amrvis::XPLANE]));
3713+
std::abs(finishcutY[Amrvis::XPLANE]-startcutY[Amrvis::XPLANE]));
37123714
break;
37133715
case Amrvis::YPLANE:
37143716
startcutX[Amrvis::ZPLANE] = startcutX[V];
@@ -3717,10 +3719,10 @@ void PltApp::DoRubberBanding(Widget, XtPointer client_data, XtPointer call_data)
37173719
finishcutY[Amrvis::XPLANE] = finishcutY[V];
37183720
XDrawRectangle(display, amrPicturePtrArray[Amrvis::ZPLANE]->PictureWindow(),
37193721
rbgc, rStartX, startcutY[Amrvis::ZPLANE], rWidth,
3720-
abs(finishcutY[Amrvis::ZPLANE]-startcutY[Amrvis::ZPLANE]));
3722+
std::abs(finishcutY[Amrvis::ZPLANE]-startcutY[Amrvis::ZPLANE]));
37213723
XDrawRectangle(display, amrPicturePtrArray[Amrvis::XPLANE]->PictureWindow(),
37223724
rbgc, startcutX[Amrvis::XPLANE], rStartY,
3723-
abs(finishcutX[Amrvis::XPLANE]-startcutX[Amrvis::XPLANE]), rHeight);
3725+
std::abs(finishcutX[Amrvis::XPLANE]-startcutX[Amrvis::XPLANE]), rHeight);
37243726
break;
37253727
default: // Amrvis::XPLANE
37263728
startcutY[Amrvis::YPLANE] = startcutY[V];
@@ -3730,10 +3732,10 @@ void PltApp::DoRubberBanding(Widget, XtPointer client_data, XtPointer call_data)
37303732
rStartPlane = (anchorX < newX) ? newX : anchorX;
37313733
XDrawRectangle(display, amrPicturePtrArray[Amrvis::ZPLANE]->PictureWindow(),
37323734
rbgc, startcutX[Amrvis::ZPLANE], imageWidth-rStartPlane,
3733-
abs(finishcutX[Amrvis::ZPLANE]-startcutX[Amrvis::ZPLANE]), rWidth);
3735+
std::abs(finishcutX[Amrvis::ZPLANE]-startcutX[Amrvis::ZPLANE]), rWidth);
37343736
XDrawRectangle(display, amrPicturePtrArray[Amrvis::YPLANE]->PictureWindow(),
37353737
rbgc, startcutX[Amrvis::YPLANE], rStartY,
3736-
abs(finishcutX[Amrvis::YPLANE]-startcutX[Amrvis::YPLANE]), rHeight);
3738+
std::abs(finishcutX[Amrvis::YPLANE]-startcutX[Amrvis::YPLANE]), rHeight);
37373739
}
37383740

37393741
#if defined(BL_VOLUMERENDER) || defined(BL_PARALLELVOLUMERENDER)

‎XYPlotWin.cpp‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
#include <iostream>
4040
#include <iomanip>
4141
#include <limits>
42+
#include <cmath>
43+
#include <cstdlib>
4244
using std::setw;
4345
using std::cout;
4446
using std::cerr;
@@ -667,12 +669,12 @@ void XYPlotWin::SetBoundingBox(double lowXIn, double lowYIn,
667669

668670
// Increase the padding for aesthetics
669671
if(hiX - loX == 0.0) {
670-
pad = std::max(0.5, fabs(hiX * 0.5));
672+
pad = std::max(0.5, std::fabs(hiX * 0.5));
671673
hiX += pad;
672674
loX -= pad;
673675
}
674676
if(hiY - loY == 0.0) {
675-
pad = std::max(0.5, fabs(hiY * 0.5));
677+
pad = std::max(0.5, std::fabs(hiY * 0.5));
676678
hiY += pad;
677679
loY -= pad;
678680
}
@@ -1070,16 +1072,16 @@ void XYPlotWin::drawGridAndAxis() {
10701072

10711073
// Grid display powers are computed by taking the log of the largest
10721074
// numbers and rounding down to the nearest multiple of 3.
1073-
if(fabs(dUsrOrgX) > fabs(dUsrOppX)) {
1074-
dLarger = fabs(dUsrOrgX);
1075+
if(std::fabs(dUsrOrgX) > std::fabs(dUsrOppX)) {
1076+
dLarger = std::fabs(dUsrOrgX);
10751077
} else {
1076-
dLarger = fabs(dUsrOppX);
1078+
dLarger = std::fabs(dUsrOppX);
10771079
}
10781080
expX = ((int) floor(nlog10(dLarger) / 3.0)) * 3;
1079-
if(fabs(dUsrOrgY) > fabs(dUsrOppY)) {
1080-
dLarger = fabs(dUsrOrgY);
1081+
if(std::fabs(dUsrOrgY) > std::fabs(dUsrOppY)) {
1082+
dLarger = std::fabs(dUsrOrgY);
10811083
} else {
1082-
dLarger = fabs(dUsrOppY);
1084+
dLarger = std::fabs(dUsrOppY);
10831085
}
10841086
expY = ((int) floor(nlog10(dLarger) / 3.0)) * 3;
10851087

@@ -2317,8 +2319,8 @@ void XYPlotWin::CBdoRubberBanding(Widget, XtPointer, XtPointer call_data) {
23172319
case MotionNotify:
23182320

23192321
if(rectDrawn) { // undraw the old rectangle(s)
2320-
rWidth = abs(oldX-anchorX);
2321-
rHeight = abs(oldY-anchorY);
2322+
rWidth = std::abs(oldX-anchorX);
2323+
rHeight = std::abs(oldY-anchorY);
23222324
rStartX = (anchorX < oldX) ? anchorX : oldX;
23232325
rStartY = (anchorY < oldY) ? anchorY : oldY;
23242326
XDrawRectangle(disp, pWindow, rbGC, rStartX, rStartY,
@@ -2333,8 +2335,8 @@ void XYPlotWin::CBdoRubberBanding(Widget, XtPointer, XtPointer call_data) {
23332335
XQueryPointer(disp, pWindow, &whichRoot, &whichChild,
23342336
&rootX, &rootY, &newX, &newY, &inputMask);
23352337

2336-
rWidth = abs(newX-anchorX); // draw the new rectangle
2337-
rHeight = abs(newY-anchorY);
2338+
rWidth = std::abs(newX-anchorX); // draw the new rectangle
2339+
rHeight = std::abs(newY-anchorY);
23382340
rStartX = (anchorX < newX) ? anchorX : newX;
23392341
rStartY = (anchorY < newY) ? anchorY : newY;
23402342
XDrawRectangle(disp, pWindow, rbGC, rStartX, rStartY,
@@ -2350,8 +2352,8 @@ void XYPlotWin::CBdoRubberBanding(Widget, XtPointer, XtPointer call_data) {
23502352
avxGrab.ExplicitUngrab(); // giveitawaynow
23512353

23522354
// undraw rectangle
2353-
rWidth = abs(oldX-anchorX);
2354-
rHeight = abs(oldY-anchorY);
2355+
rWidth = std::abs(oldX-anchorX);
2356+
rHeight = std::abs(oldY-anchorY);
23552357
rStartX = (anchorX < oldX) ? anchorX : oldX;
23562358
rStartY = (anchorY < oldY) ? anchorY : oldY;
23572359
XDrawRectangle(disp, pWindow, rbGC, rStartX, rStartY,

0 commit comments

Comments
 (0)