}
QImage RGBParadeGenerator::calculateRGBParade(const QSize ¶deSize, const QImage &image,
- const RGBParadeGenerator::PaintMode paintMode, const bool &drawAxis,
- const bool &drawGradientRef, const uint &accelFactor)
+ const RGBParadeGenerator::PaintMode paintMode, bool drawAxis,
+ bool drawGradientRef, uint accelFactor)
{
Q_ASSERT(accelFactor >= 1);
} else {
QImage parade(paradeSize, QImage::Format_ARGB32);
- parade.fill(qRgba(0,0,0,0));
+ parade.fill(Qt::transparent);
QRgb *col;
QPainter davinci(¶de);
const float wPrediv = (float)(partW-1)/(iw-1);
StructRGB paradeVals[partW][256];
- for (uint i = 0; i < partW; i++) {
+ for (uint i = 0; i < partW; ++i) {
for (uint j = 0; j < 256; j++) {
paradeVals[i][j].r = 0;
paradeVals[i][j].g = 0;
}
const uchar *bits = image.bits();
- const uint stepsize = 4*accelFactor;
+ const uint stepsize = image.depth() / 8 *accelFactor;
for (uint i = 0, x = 0; i < byteCount; i += stepsize) {
-
col = (QRgb *)bits;
r = qRed(*col);
g = qGreen(*col);
const uint offset2 = 2*partW + 2*offset;
switch(paintMode) {
case PaintMode_RGB:
- for (uint i = 0; i < partW; i++) {
+ for (uint i = 0; i < partW; ++i) {
for (uint j = 0; j < 256; j++) {
unscaled.setPixel(i, j, qRgba(255,10,10, CHOP255(gain*paradeVals[i][j].r)));
unscaled.setPixel(i+offset1, j, qRgba(10,255,10, CHOP255(gain*paradeVals[i][j].g)));
}
break;
default:
- for (uint i = 0; i < partW; i++) {
+ for (uint i = 0; i < partW; ++i) {
for (uint j = 0; j < 256; j++) {
unscaled.setPixel(i, j, qRgba(255,255,255, CHOP255(gain*paradeVals[i][j].r)));
unscaled.setPixel(i+offset1, j, qRgba(255,255,255, CHOP255(gain*paradeVals[i][j].g)));
if (drawAxis) {
QRgb opx;
- for (uint i = 0; i <= 10; i++) {
+ for (uint i = 0; i <= 10; ++i) {
dy = (float)i/10 * (partH-1);
for (uint x = 0; x < ww-distRight; x++) {
opx = parade.pixel(x, dy);