w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-11-03 13:30:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Used floating point for colour interpolation in palettes since QColor

Browse Source 
is float internally anyway.

Avoided invalid colour values in palette colour interpolation.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3989 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2014-04-07 18:13:16 +00:00
parent 478217e8e3
commit 0fc00598a6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
WFPalette.cpp
View File

@ -2,6 +2,7 @@
#include <stdexcept>
#include <memory>
#include <algorithm>
#include <QMetaType>
#include <QObject>
@ -22,6 +23,7 @@
#include <QFileDialog>
#include <QFile>
#include <QTextStream>
#include <QDebug>
#include "qt_helpers.hpp"
@ -290,11 +292,11 @@ QVector<QColor> WFPalette::interpolate () const
--prior;
}
int increment {i - interval * prior};
int r {colours[prior].red () + int((increment * (colours[next].red () - colours[prior].red ()))/interval)};
int g {colours[prior].green () + int((increment * (colours[next].green () - colours[prior].green ()))/interval)};
int b {colours[prior].blue () + int((increment * (colours[next].blue () - colours[prior].blue ()))/interval)};
result.append (QColor {r, g, b});
auto increment = i - interval * prior;
qreal r {std::max (0., colours[prior].redF () + (increment * (colours[next].redF () - colours[prior].redF ()))/interval)};
qreal g {std::max (0., colours[prior].greenF () + (increment * (colours[next].greenF () - colours[prior].greenF ()))/interval)};
qreal b {std::max (0., colours[prior].blueF () + (increment * (colours[next].blueF () - colours[prior].blueF ()))/interval)};
result.append (QColor::fromRgbF (r, g, b));
}
return result;