AxioDL/amuse
2
0
Fork 0
mirror of https://github.com/AxioDL/amuse.git synced 2025-12-09 05:27:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Common: Replace amuse::clamp with std::clamp

Browse Source 
We can use the standardized facility for this now with C++17
This commit is contained in:
Lioncash
2019-08-26 05:02:26 -04:00
parent 88c017926b
commit eaf62288a2
20 changed files with 106 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Editor/CurveEditor.cpp
View File

@@ -138,7 +138,7 @@ void CurveView::mouseMoveEvent(QMouseEvent* ev) {
if (idx < 0 || idx > 127) {
return;
}
const int val = 127 - amuse::clamp(0, int(std::round(ev->localPos().y() / (height() - 16.0) * 127.0)), 127);
const int val = 127 - std::clamp(0, int(std::round(ev->localPos().y() / (height() - 16.0) * 127.0)), 127);
CurveEditUndoCommand::RedoData newData;
auto& curve = static_cast<amuse::Curve&>(table);
@@ -196,7 +196,7 @@ void CurveControls::exprCommit() {
m_errLabel->setText(val.toString());
return;
} else if (val.isNumber()) {
newData[i] = uint8_t(amuse::clamp(0, int(std::round(val.toNumber() * 127.0)), 127));
newData[i] = uint8_t(std::clamp(0, int(std::round(val.toNumber() * 127.0)), 127));
} else {
notANumber = true;
newData[i] = 0;