Skip to content

Commit 32af317

Browse files
authored
Merge pull request #3391 from konero/invert-waveform
Fill Audio Waveform
2 parents e6e0292 + b704484 commit 32af317

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

toonz/sources/toonz/xshcellviewer.cpp

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1500,16 +1500,13 @@ void CellArea::drawSoundCell(QPainter &p, int row, int col, bool isReference) {
15001500
o->rowToFrameAxis(offset); // pixels since start of clip
15011501

15021502
int trackWidth = trackBounds.length();
1503-
int lastMin, lastMax;
15041503
DoublePair minmax;
15051504
soundLevel->getValueAtPixel(o, soundPixel, minmax);
15061505

15071506
double pmin = minmax.first;
15081507
double pmax = minmax.second;
15091508

15101509
int center = trackBounds.middle();
1511-
lastMin = tcrop((int)pmin, -trackWidth / 2, 0) + center;
1512-
lastMax = tcrop((int)pmax, 0, trackWidth / 2 - 1) + center;
15131510

15141511
bool scrub = m_viewer->isScrubHighlighted(row, col);
15151512

@@ -1522,7 +1519,6 @@ void CellArea::drawSoundCell(QPainter &p, int row, int col, bool isReference) {
15221519
pmin = minmax.first;
15231520
pmax = minmax.second;
15241521

1525-
center = trackBounds.middle();
15261522
min = tcrop((int)pmin, -trackWidth / 2, 0) + center;
15271523
max = tcrop((int)pmax, 0, trackWidth / 2 - 1) + center;
15281524

@@ -1542,14 +1538,9 @@ void CellArea::drawSoundCell(QPainter &p, int row, int col, bool isReference) {
15421538
if (!o->isVerticalTimeline() || i != begin) {
15431539
// "audio track" in the middle of the column
15441540
p.setPen(m_viewer->getSoundColumnTrackColor());
1545-
QLine minLine = o->horizontalLine(i, NumberRange(lastMin, min));
1546-
p.drawLine(minLine);
1547-
QLine maxLine = o->horizontalLine(i, NumberRange(lastMax, max));
1548-
p.drawLine(maxLine);
1541+
QLine midLine = o->horizontalLine(i, NumberRange(min, max));
1542+
p.drawLine(midLine);
15491543
}
1550-
1551-
lastMin = min;
1552-
lastMax = max;
15531544
}
15541545

15551546
// yellow clipped border

0 commit comments

Comments
 (0)