annotate layer/Colour3DPlotRenderer.cpp @ 1090:c8c747783110 spectrogram-minor-refactor

Cut over to using the renderer (though it's very incomplete) and fix some cache problems and pointer lifetime misunderstandings
author Chris Cannam
date Tue, 05 Jul 2016 17:48:26 +0100
parents db976e9f385a
children 8a815776151c
rev   line source
Chris@1071 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
Chris@1071 2
Chris@1071 3 /*
Chris@1071 4 Sonic Visualiser
Chris@1071 5 An audio file viewer and annotation editor.
Chris@1071 6 Centre for Digital Music, Queen Mary, University of London.
Chris@1071 7 This file copyright 2006-2016 Chris Cannam and QMUL.
Chris@1071 8
Chris@1071 9 This program is free software; you can redistribute it and/or
Chris@1071 10 modify it under the terms of the GNU General Public License as
Chris@1071 11 published by the Free Software Foundation; either version 2 of the
Chris@1071 12 License, or (at your option) any later version. See the file
Chris@1071 13 COPYING included with this distribution for more information.
Chris@1071 14 */
Chris@1071 15
Chris@1071 16 #include "Colour3DPlotRenderer.h"
Chris@1074 17 #include "RenderTimer.h"
Chris@1071 18
Chris@1075 19 #include "data/model/DenseThreeDimensionalModel.h"
Chris@1075 20 #include "data/model/Dense3DModelPeakCache.h"
Chris@1075 21 #include "data/model/FFTModel.h"
Chris@1075 22
Chris@1077 23 #include "LayerGeometryProvider.h"
Chris@1082 24 #include "VerticalBinLayer.h"
Chris@1075 25
Chris@1079 26 #include <vector>
Chris@1079 27
Chris@1079 28 using namespace std;
Chris@1079 29
Chris@1073 30 Colour3DPlotRenderer::RenderResult
Chris@1090 31 Colour3DPlotRenderer::render(LayerGeometryProvider *v, QPainter &paint, QRect rect)
Chris@1076 32 {
Chris@1090 33 return render(v, paint, rect, false);
Chris@1076 34 }
Chris@1076 35
Chris@1076 36 Colour3DPlotRenderer::RenderResult
Chris@1090 37 Colour3DPlotRenderer::renderTimeConstrained(LayerGeometryProvider *v,
Chris@1090 38 QPainter &paint, QRect rect)
Chris@1076 39 {
Chris@1090 40 return render(v, paint, rect, true);
Chris@1076 41 }
Chris@1076 42
Chris@1076 43 Colour3DPlotRenderer::RenderResult
Chris@1090 44 Colour3DPlotRenderer::render(LayerGeometryProvider *v,
Chris@1090 45 QPainter &paint, QRect rect, bool timeConstrained)
Chris@1073 46 {
Chris@1079 47 sv_frame_t startFrame = v->getStartFrame();
Chris@1079 48
Chris@1079 49 int x0 = v->getXForViewX(rect.x());
Chris@1079 50 int x1 = v->getXForViewX(rect.x() + rect.width());
Chris@1079 51 if (x0 < 0) x0 = 0;
Chris@1079 52 if (x1 > v->getPaintWidth()) x1 = v->getPaintWidth();
Chris@1079 53
Chris@1079 54 m_cache.resize(v->getPaintSize());
Chris@1079 55 m_cache.setZoomLevel(v->getZoomLevel());
Chris@1079 56
Chris@1090 57 cerr << "cache start " << m_cache.getStartFrame()
Chris@1090 58 << " view start " << startFrame
Chris@1090 59 << " valid left " << m_cache.getValidLeft()
Chris@1090 60 << " valid right " << m_cache.getValidRight()
Chris@1090 61 << " x0 " << x0
Chris@1090 62 << " x1 " << x1
Chris@1090 63 << endl;
Chris@1090 64
Chris@1090 65
Chris@1079 66 if (m_cache.isValid()) { // some part of the cache is valid
Chris@1079 67
Chris@1079 68 if (v->getXForFrame(m_cache.getStartFrame()) ==
Chris@1079 69 v->getXForFrame(startFrame) &&
Chris@1079 70 m_cache.getValidLeft() <= x0 &&
Chris@1079 71 m_cache.getValidRight() >= x1) {
Chris@1090 72
Chris@1090 73 cerr << "cache hit" << endl;
Chris@1090 74
Chris@1079 75 // cache is valid for the complete requested area
Chris@1079 76 paint.drawImage(rect, m_cache.getImage(), rect);
Chris@1079 77 return { rect, {} };
Chris@1079 78
Chris@1079 79 } else {
Chris@1090 80 cerr << "cache partial hit" << endl;
Chris@1090 81
Chris@1079 82 // cache doesn't begin at the right frame or doesn't
Chris@1079 83 // contain the complete view, but might be scrollable or
Chris@1079 84 // partially usable
Chris@1090 85 m_cache.scrollTo(v, startFrame);
Chris@1079 86
Chris@1079 87 // if we are not time-constrained, then we want to paint
Chris@1081 88 // the whole area in one go; we don't return a partial
Chris@1081 89 // paint. To avoid providing the more complex logic to
Chris@1081 90 // handle painting discontiguous areas, if the only valid
Chris@1079 91 // part of cache is in the middle, just make the whole
Chris@1079 92 // thing invalid and start again.
Chris@1079 93 if (!timeConstrained) {
Chris@1079 94 if (m_cache.getValidLeft() > x0 &&
Chris@1079 95 m_cache.getValidRight() < x1) {
Chris@1079 96 m_cache.invalidate();
Chris@1079 97 }
Chris@1079 98 }
Chris@1079 99 }
Chris@1090 100 } else {
Chris@1090 101 // cache completely invalid
Chris@1090 102 m_cache.setStartFrame(startFrame);
Chris@1075 103 }
Chris@1075 104
Chris@1079 105 bool rightToLeft = false;
Chris@1079 106
Chris@1079 107 if (!m_cache.isValid() && timeConstrained) {
Chris@1081 108 // When rendering the whole area, in a context where we might
Chris@1081 109 // not be able to complete the work, start from somewhere near
Chris@1081 110 // the middle so that the region of interest appears first
Chris@1079 111
Chris@1079 112 //!!! (perhaps we should avoid doing this if past repaints
Chris@1079 113 //!!! have been fast enough to do the whole in one shot)
Chris@1079 114 if (x0 == 0 && x1 == v->getPaintWidth()) {
Chris@1079 115 x0 = int(x1 * 0.3);
Chris@1079 116 }
Chris@1079 117 }
Chris@1079 118
Chris@1079 119 if (m_cache.isValid()) {
Chris@1090 120 cerr << "cache somewhat valid" << endl;
Chris@1090 121
Chris@1079 122 // When rendering only a part of the cache, we need to make
Chris@1079 123 // sure that the part we're rendering is adjacent to (or
Chris@1079 124 // overlapping) a valid area of cache, if we have one. The
Chris@1079 125 // alternative is to ditch the valid area of cache and render
Chris@1079 126 // only the requested area, but that's risky because this can
Chris@1079 127 // happen when just waving the pointer over a small part of
Chris@1079 128 // the view -- if we lose the partly-built cache every time
Chris@1079 129 // the user does that, we'll never finish building it.
Chris@1079 130 int left = x0;
Chris@1079 131 int width = x1 - x0;
Chris@1079 132 bool isLeftOfValidArea = false;
Chris@1079 133 m_cache.adjustToTouchValidArea(left, width, isLeftOfValidArea);
Chris@1079 134 x0 = left;
Chris@1079 135 x1 = x0 + width;
Chris@1079 136
Chris@1079 137 // That call also told us whether we should be painting
Chris@1079 138 // sub-regions of our target region in right-to-left order in
Chris@1079 139 // order to ensure contiguity
Chris@1079 140 rightToLeft = isLeftOfValidArea;
Chris@1079 141 }
Chris@1075 142
Chris@1090 143 renderToCache(v, x0, x1 - x0, rightToLeft, timeConstrained);
Chris@1079 144
Chris@1079 145 QRect pr = rect & m_cache.getValidArea();
Chris@1079 146 paint.drawImage(pr.x(), pr.y(), m_cache.getImage(),
Chris@1079 147 pr.x(), pr.y(), pr.width(), pr.height());
Chris@1079 148
Chris@1079 149 if (!timeConstrained && (pr != rect)) {
Chris@1079 150 //!!! on a first cut, there is a risk that this will happen
Chris@1079 151 //!!! when we are at start/end of model -- trap, report, and
Chris@1079 152 //!!! then fix
Chris@1079 153 throw std::logic_error("internal error: failed to render entire requested rect even when not time-constrained");
Chris@1079 154 }
Chris@1079 155
Chris@1079 156 return { pr, {} };
Chris@1079 157
Chris@1073 158 //!!! todo: timing/incomplete paint
Chris@1073 159
Chris@1073 160 //!!! todo: peak frequency style
Chris@1073 161
Chris@1073 162 //!!! todo: transparent style from Colour3DPlot
Chris@1074 163
Chris@1074 164 //!!! todo: bin boundary alignment when in BinResolution
Chris@1074 165
Chris@1079 166 //!!! todo: view magnitudes / normalise visible area
Chris@1079 167
Chris@1079 168 //!!! todo: alter documentation for view mag stuff (cached paints
Chris@1079 169 //!!! do not update MagnitudeRange)
Chris@1079 170
Chris@1079 171 //!!! todo, here or in caller: illuminateLocalFeatures
Chris@1079 172
Chris@1079 173 //!!! fft model scaling?
Chris@1079 174
Chris@1079 175 //!!! should we own the Dense3DModelPeakCache here? or should it persist
Chris@1073 176 }
Chris@1073 177
Chris@1080 178 void
Chris@1090 179 Colour3DPlotRenderer::renderToCache(LayerGeometryProvider *v,
Chris@1090 180 int x0, int repaintWidth,
Chris@1080 181 bool rightToLeft, bool timeConstrained)
Chris@1079 182 {
Chris@1079 183 // Draw to the draw buffer, and then scale-copy from there.
Chris@1079 184
Chris@1079 185 DenseThreeDimensionalModel *model = m_sources.source;
Chris@1079 186 if (!model || !model->isOK() || !model->isReady()) {
Chris@1079 187 throw std::logic_error("no source model provided, or model not ready");
Chris@1079 188 }
Chris@1079 189
Chris@1079 190 // The draw buffer contains a fragment at either our pixel
Chris@1079 191 // resolution (if there is more than one time-bin per pixel) or
Chris@1079 192 // time-bin resolution (if a time-bin spans more than one pixel).
Chris@1079 193 // We need to ensure that it starts and ends at points where a
Chris@1079 194 // time-bin boundary occurs at an exact pixel boundary, and with a
Chris@1079 195 // certain amount of overlap across existing pixels so that we can
Chris@1079 196 // scale and draw from it without smoothing errors at the edges.
Chris@1079 197
Chris@1079 198 // If (getFrameForX(x) / increment) * increment ==
Chris@1079 199 // getFrameForX(x), then x is a time-bin boundary. We want two
Chris@1079 200 // such boundaries at either side of the draw buffer -- one which
Chris@1079 201 // we draw up to, and one which we subsequently crop at.
Chris@1079 202
Chris@1079 203 bool bufferIsBinResolution = false;
Chris@1079 204 int binResolution = model->getResolution();
Chris@1079 205 int zoomLevel = v->getZoomLevel();
Chris@1079 206 if (binResolution > zoomLevel) bufferIsBinResolution = true;
Chris@1079 207
Chris@1079 208 sv_frame_t leftBoundaryFrame = -1, leftCropFrame = -1;
Chris@1079 209 sv_frame_t rightBoundaryFrame = -1, rightCropFrame = -1;
Chris@1079 210
Chris@1079 211 int drawWidth;
Chris@1079 212
Chris@1079 213 if (bufferIsBinResolution) {
Chris@1079 214 for (int x = x0; ; --x) {
Chris@1079 215 sv_frame_t f = v->getFrameForX(x);
Chris@1079 216 if ((f / binResolution) * binResolution == f) {
Chris@1079 217 if (leftCropFrame == -1) leftCropFrame = f;
Chris@1079 218 else if (x < x0 - 2) {
Chris@1079 219 leftBoundaryFrame = f;
Chris@1079 220 break;
Chris@1079 221 }
Chris@1079 222 }
Chris@1079 223 }
Chris@1079 224 for (int x = x0 + repaintWidth; ; ++x) {
Chris@1079 225 sv_frame_t f = v->getFrameForX(x);
Chris@1079 226 if ((f / binResolution) * binResolution == f) {
Chris@1079 227 if (rightCropFrame == -1) rightCropFrame = f;
Chris@1079 228 else if (x > x0 + repaintWidth + 2) {
Chris@1079 229 rightBoundaryFrame = f;
Chris@1079 230 break;
Chris@1079 231 }
Chris@1079 232 }
Chris@1079 233 }
Chris@1079 234 drawWidth = int((rightBoundaryFrame - leftBoundaryFrame) / binResolution);
Chris@1079 235 } else {
Chris@1079 236 drawWidth = repaintWidth;
Chris@1079 237 }
Chris@1079 238
Chris@1079 239 // We always paint the full height. Smaller heights can be used
Chris@1079 240 // when painting direct from cache (outside this function), but we
Chris@1079 241 // want to ensure the cache is coherent without having to worry
Chris@1079 242 // about vertical matching of required and valid areas as well as
Chris@1079 243 // horizontal. That's why this function didn't take any y/height
Chris@1079 244 // parameters.
Chris@1079 245 int h = v->getPaintHeight();
Chris@1079 246
Chris@1079 247 clearDrawBuffer(drawWidth, h);
Chris@1079 248
Chris@1079 249 vector<int> binforx(drawWidth);
Chris@1079 250 vector<double> binfory(h);
Chris@1079 251
Chris@1079 252 bool usePeaksCache = false;
Chris@1079 253 int binsPerPeak = 1;
Chris@1079 254
Chris@1079 255 if (bufferIsBinResolution) {
Chris@1080 256
Chris@1079 257 for (int x = 0; x < drawWidth; ++x) {
Chris@1079 258 binforx[x] = int(leftBoundaryFrame / binResolution) + x;
Chris@1079 259 }
Chris@1080 260
Chris@1080 261 // calculating boundaries later will be too fiddly for partial
Chris@1080 262 // paints, and painting should be fast anyway when this is the
Chris@1080 263 // case because it means we're well zoomed in
Chris@1080 264 timeConstrained = false;
Chris@1080 265
Chris@1079 266 } else {
Chris@1079 267 for (int x = 0; x < drawWidth; ++x) {
Chris@1090 268 sv_frame_t f0 = v->getFrameForX(x0 + x);
Chris@1079 269 double s0 = double(f0 - model->getStartFrame()) / binResolution;
Chris@1079 270 binforx[x] = int(s0 + 0.0001);
Chris@1079 271 }
Chris@1079 272
Chris@1079 273 if (m_sources.peaks) { // peaks cache exists
Chris@1079 274
Chris@1079 275 binsPerPeak = m_sources.peaks->getColumnsPerPeak();
Chris@1079 276 usePeaksCache = (binResolution * binsPerPeak) < zoomLevel;
Chris@1079 277
Chris@1079 278 if (m_params.colourScale.getScale() ==
Chris@1079 279 ColourScale::PhaseColourScale) {
Chris@1079 280 usePeaksCache = false;
Chris@1079 281 }
Chris@1079 282 }
Chris@1079 283 }
Chris@1082 284
Chris@1080 285 for (int y = 0; y < h; ++y) {
Chris@1090 286 binfory[y] = m_sources.verticalBinLayer->getBinForY(v, h - y - 1);
Chris@1080 287 }
Chris@1079 288
Chris@1083 289 int attainedWidth = renderDrawBuffer(repaintWidth,
Chris@1080 290 h,
Chris@1080 291 binforx,
Chris@1080 292 binfory,
Chris@1080 293 usePeaksCache,
Chris@1080 294 rightToLeft,
Chris@1080 295 timeConstrained);
Chris@1083 296
Chris@1083 297 //!!! now scale-copy to cache
Chris@1084 298
Chris@1084 299 if (attainedWidth == 0) return;
Chris@1084 300
Chris@1084 301 int paintedLeft = x0;
Chris@1084 302 if (rightToLeft) {
Chris@1084 303 paintedLeft += (repaintWidth - attainedWidth);
Chris@1084 304 }
Chris@1084 305
Chris@1084 306 if (bufferIsBinResolution) {
Chris@1084 307
Chris@1084 308 int scaledLeft = v->getXForFrame(leftBoundaryFrame);
Chris@1084 309 int scaledRight = v->getXForFrame(rightBoundaryFrame);
Chris@1084 310
Chris@1084 311 QImage scaled = m_drawBuffer.scaled
Chris@1084 312 (scaledRight - scaledLeft, h,
Chris@1084 313 Qt::IgnoreAspectRatio, (m_params.interpolate ?
Chris@1084 314 Qt::SmoothTransformation :
Chris@1084 315 Qt::FastTransformation));
Chris@1084 316
Chris@1084 317 int scaledLeftCrop = v->getXForFrame(leftCropFrame);
Chris@1084 318 int scaledRightCrop = v->getXForFrame(rightCropFrame);
Chris@1084 319
Chris@1084 320 int targetLeft = scaledLeftCrop;
Chris@1084 321 if (targetLeft < 0) {
Chris@1084 322 targetLeft = 0;
Chris@1084 323 }
Chris@1084 324
Chris@1084 325 int targetWidth = scaledRightCrop - targetLeft;
Chris@1084 326 if (targetLeft + targetWidth > m_cache.getSize().width()) {
Chris@1084 327 targetWidth = m_cache.getSize().width() - targetLeft;
Chris@1084 328 }
Chris@1084 329
Chris@1084 330 int sourceLeft = targetLeft - scaledLeft;
Chris@1084 331 if (sourceLeft < 0) {
Chris@1084 332 sourceLeft = 0;
Chris@1084 333 }
Chris@1084 334
Chris@1084 335 int sourceWidth = targetWidth;
Chris@1084 336
Chris@1084 337 if (targetWidth > 0) {
Chris@1084 338 m_cache.drawImage(targetLeft, targetWidth,
Chris@1084 339 scaled,
Chris@1084 340 sourceLeft, sourceWidth);
Chris@1084 341 }
Chris@1084 342
Chris@1084 343 } else {
Chris@1084 344
Chris@1084 345 m_cache.drawImage(paintedLeft, attainedWidth,
Chris@1084 346 m_drawBuffer,
Chris@1084 347 paintedLeft - x0, attainedWidth);
Chris@1084 348 }
Chris@1079 349 }
Chris@1083 350
Chris@1083 351 int
Chris@1083 352 Colour3DPlotRenderer::renderDrawBuffer(int w, int h,
Chris@1083 353 const vector<int> &binforx,
Chris@1083 354 const vector<double> &binfory,
Chris@1083 355 bool usePeaksCache,
Chris@1083 356 bool rightToLeft,
Chris@1083 357 bool timeConstrained)
Chris@1083 358 {
Chris@1083 359 // Callers must have checked that the appropriate subset of
Chris@1083 360 // Sources data members are set for the supplied flags (e.g. that
Chris@1083 361 // peaks model exists if usePeaksCache)
Chris@1083 362
Chris@1083 363 RenderTimer timer(timeConstrained ?
Chris@1083 364 RenderTimer::FastRender :
Chris@1083 365 RenderTimer::NoTimeout);
Chris@1083 366
Chris@1083 367 int minbin = int(binfory[0] + 0.0001);
Chris@1083 368 int maxbin = int(binfory[h-1]);
Chris@1083 369 if (minbin < 0) minbin = 0;
Chris@1083 370 if (maxbin < 0) maxbin = minbin+1;
Chris@1083 371
Chris@1083 372 int divisor = 1;
Chris@1083 373 DenseThreeDimensionalModel *sourceModel = m_sources.source;
Chris@1083 374 if (usePeaksCache) {
Chris@1083 375 divisor = m_sources.peaks->getColumnsPerPeak();
Chris@1083 376 sourceModel = m_sources.peaks;
Chris@1083 377 }
Chris@1083 378
Chris@1083 379 int psx = -1;
Chris@1083 380
Chris@1083 381 int start = 0;
Chris@1083 382 int finish = w;
Chris@1083 383 int step = 1;
Chris@1083 384
Chris@1083 385 if (rightToLeft) {
Chris@1083 386 start = w-1;
Chris@1083 387 finish = -1;
Chris@1083 388 step = -1;
Chris@1083 389 }
Chris@1083 390
Chris@1083 391 int columnCount = 0;
Chris@1083 392
Chris@1083 393 vector<float> preparedColumn;
Chris@1083 394
Chris@1083 395 for (int x = start; x != finish; x += step) {
Chris@1083 396
Chris@1083 397 // x is the on-canvas pixel coord; sx (later) will be the
Chris@1083 398 // source column index
Chris@1083 399
Chris@1083 400 ++columnCount;
Chris@1083 401
Chris@1083 402 if (binforx[x] < 0) continue;
Chris@1083 403
Chris@1083 404 int sx0 = binforx[x] / divisor;
Chris@1083 405 int sx1 = sx0;
Chris@1083 406 if (x+1 < w) sx1 = binforx[x+1] / divisor;
Chris@1083 407 if (sx0 < 0) sx0 = sx1 - 1;
Chris@1083 408 if (sx0 < 0) continue;
Chris@1083 409 if (sx1 <= sx0) sx1 = sx0 + 1;
Chris@1083 410
Chris@1083 411 vector<float> pixelPeakColumn;
Chris@1083 412
Chris@1083 413 for (int sx = sx0; sx < sx1; ++sx) {
Chris@1083 414
Chris@1083 415 #ifdef DEBUG_SPECTROGRAM_REPAINT
Chris@1083 416 // cerr << "sx = " << sx << endl;
Chris@1083 417 #endif
Chris@1083 418
Chris@1083 419 if (sx < 0 || sx >= sourceModel->getWidth()) {
Chris@1083 420 continue;
Chris@1083 421 }
Chris@1083 422
Chris@1083 423 if (sx != psx) {
Chris@1083 424
Chris@1083 425 // order:
Chris@1083 426 // get column -> scale -> record extents ->
Chris@1083 427 // normalise -> peak pick -> apply display gain ->
Chris@1083 428 // distribute/interpolate
Chris@1083 429
Chris@1083 430 ColumnOp::Column fullColumn = sourceModel->getColumn(sx);
Chris@1090 431
Chris@1090 432 cerr << "x " << x << ", sx " << sx << ", col height " << fullColumn.size()
Chris@1090 433 << ", minbin " << minbin << ", maxbin " << maxbin << endl;
Chris@1090 434
Chris@1083 435 ColumnOp::Column column =
Chris@1083 436 vector<float>(fullColumn.data() + minbin,
Chris@1083 437 fullColumn.data() + maxbin + 1);
Chris@1083 438
Chris@1083 439 //!!! fft scale if (m_colourScale != PhaseColourScale) {
Chris@1083 440 // column = ColumnOp::fftScale(column, m_fftSize);
Chris@1083 441 // }
Chris@1083 442
Chris@1083 443 //!!! extents recordColumnExtents(column,
Chris@1083 444 // sx,
Chris@1083 445 // overallMag,
Chris@1083 446 // overallMagChanged);
Chris@1083 447
Chris@1083 448 // if (m_colourScale != PhaseColourScale) {
Chris@1083 449 column = ColumnOp::normalize(column, m_params.normalization);
Chris@1083 450 // }
Chris@1083 451
Chris@1083 452 if (m_params.binDisplay == PeakBins) {
Chris@1083 453 column = ColumnOp::peakPick(column);
Chris@1083 454 }
Chris@1083 455
Chris@1083 456 preparedColumn =
Chris@1083 457 ColumnOp::distribute(column, //!!! gain? ColumnOp::applyGain(column, m_gain),
Chris@1083 458 h,
Chris@1083 459 binfory,
Chris@1083 460 minbin,
Chris@1083 461 m_params.interpolate);
Chris@1083 462
Chris@1083 463 psx = sx;
Chris@1083 464 }
Chris@1083 465
Chris@1083 466 if (sx == sx0) {
Chris@1083 467 pixelPeakColumn = preparedColumn;
Chris@1083 468 } else {
Chris@1083 469 for (int i = 0; in_range_for(pixelPeakColumn, i); ++i) {
Chris@1083 470 pixelPeakColumn[i] = std::max(pixelPeakColumn[i],
Chris@1083 471 preparedColumn[i]);
Chris@1083 472 }
Chris@1083 473 }
Chris@1083 474 }
Chris@1083 475
Chris@1083 476 if (!pixelPeakColumn.empty()) {
Chris@1083 477 for (int y = 0; y < h; ++y) {
Chris@1083 478 m_drawBuffer.setPixel
Chris@1083 479 (x,
Chris@1083 480 h-y-1,
Chris@1083 481 m_params.colourScale.getPixel(pixelPeakColumn[y]));
Chris@1083 482 }
Chris@1083 483 }
Chris@1083 484
Chris@1083 485 double fractionComplete = double(columnCount) / double(w);
Chris@1083 486 if (timer.outOfTime(fractionComplete)) {
Chris@1083 487 return columnCount;
Chris@1083 488 }
Chris@1083 489 }
Chris@1083 490
Chris@1083 491 return columnCount;
Chris@1083 492 }
Chris@1083 493
Chris@1079 494 void
Chris@1079 495 Colour3DPlotRenderer::clearDrawBuffer(int w, int h)
Chris@1079 496 {
Chris@1079 497 if (m_drawBuffer.width() < w || m_drawBuffer.height() != h) {
Chris@1079 498
Chris@1079 499 m_drawBuffer = QImage(w, h, QImage::Format_Indexed8);
Chris@1079 500
Chris@1079 501 for (int pixel = 0; pixel < 256; ++pixel) {
Chris@1079 502 //!!! todo: colour rotation (here 0)
Chris@1079 503 m_drawBuffer.setColor
Chris@1079 504 ((unsigned char)pixel,
Chris@1079 505 m_params.colourScale.getColourForPixel(pixel, 0).rgb());
Chris@1079 506 }
Chris@1079 507 }
Chris@1079 508
Chris@1079 509 m_drawBuffer.fill(0);
Chris@1079 510 }
Chris@1079 511
Chris@1079 512