[Traverso-commit] traverso/src/sheetcanvas AudioClipView.cpp

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    09/02/06 20:34:02

Modified files:
        src/sheetcanvas: AudioClipView.cpp 

Log message:
        * fixed position of 0 and -6 dB lines for mono clips

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.13&r2=1.14

Patches:
Index: AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/AudioClipView.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- AudioClipView.cpp   2 Feb 2009 20:22:42 -0000       1.13
+++ AudioClipView.cpp   6 Feb 2009 20:34:02 -0000       1.14
@@ -440,26 +440,27 @@
                                p->setMatrix(matrix().translate(0, ytrans), 
true);
 
                                int scale = 1;
-                               if (!m_mergedView) {
+                               if (m_mergedView) {
                                        scale = channels;
                                }
 
                                
p->setPen(themer()->get_color("AudioClip:db-grid"));
                                p->setFont( 
themer()->get_font("AudioClip:fontscale:dblines") );
+
                                QFontMetrics fm(p->font());
                                int toffset = fm.width(" -6 dB ");
 
-                               p->drawLine(toffset, -0.9 * height/scale, 
xstart+pixelcount, -0.9 * height/scale);
-                               p->drawText(0.0, -0.9 * height/scale - 1 + 
fm.ascent()/2, "  0 dB");
+                               p->drawLine(toffset, -0.45 * scale * height, 
xstart+pixelcount, -0.45 * scale * height);
+                               p->drawText(0.0, -0.45 * scale * height - 1 + 
fm.ascent()/2, "  0 dB");
 
-                               p->drawLine(toffset, 0.9 * height/scale + 1, 
xstart+pixelcount, 0.9 * height/scale + 1);
-                               p->drawText(0.0, 0.9 * height/scale + 
fm.ascent()/2, "  0 dB");
+                               p->drawLine(toffset, 0.45 * scale * height + 1, 
xstart+pixelcount, 0.45 * scale * height + 1);
+                               p->drawText(0.0, 0.45 * scale * height + 
fm.ascent()/2, "  0 dB");
 
-                               p->drawLine(toffset, -0.45 * height/scale, 
xstart+pixelcount, -0.45 * height/scale);
-                               p->drawText(0.0, -0.45 * height/scale - 1 + 
fm.ascent()/2, " -6 dB");
+                               p->drawLine(toffset, -0.225 * scale * height, 
xstart+pixelcount, -0.225 * scale * height);
+                               p->drawText(0.0, -0.225 * scale * height - 1 + 
fm.ascent()/2, " -6 dB");
 
-                               p->drawLine(toffset, 0.45 * height/scale + 1, 
xstart+pixelcount, 0.45 * height/scale + 1);
-                               p->drawText(0.0, 0.45 * height/scale + 
fm.ascent()/2, " -6 dB");
+                               p->drawLine(toffset, 0.225 * scale * height + 
1, xstart+pixelcount, 0.225 * scale * height + 1);
+                               p->drawText(0.0, 0.225 * scale * height + 
fm.ascent()/2, " -6 dB");
                        }
 
                // Macroview, paint waveform with painterpath
@@ -542,7 +543,7 @@
                                        p->setMatrix(matrix().translate(0, 
ytrans), true);
 
                                        int scale = 1;
-                                       if (!m_mergedView) {
+                                       if (m_mergedView) {
                                                scale = channels;
                                        }
 
@@ -552,17 +553,17 @@
                                        QFontMetrics fm(p->font());
                                        int toffset = fm.width(" -6 dB ");
 
-                                       p->drawLine(toffset, -0.9 * 
height/scale, xstart+pixelcount, -0.9 * height/scale);
-                                       p->drawText(0.0, -0.9 * height/scale - 
1 + fm.ascent()/2, "  0 dB");
+                                       p->drawLine(toffset, -0.45 * scale * 
height, xstart+pixelcount, -0.45 * scale * height);
+                                       p->drawText(0.0, -0.45 * scale * height 
- 1 + fm.ascent()/2, "  0 dB");
 
-                                       p->drawLine(toffset, 0.9 * height/scale 
+ 1, xstart+pixelcount, 0.9 * height/scale + 1);
-                                       p->drawText(0.0, 0.9 * height/scale + 
fm.ascent()/2, "  0 dB");
+                                       p->drawLine(toffset, 0.45 * scale * 
height + 1, xstart+pixelcount, 0.45 * scale * height + 1);
+                                       p->drawText(0.0, 0.45 * scale * height 
+ fm.ascent()/2, "  0 dB");
 
-                                       p->drawLine(toffset, -0.45 * 
height/scale, xstart+pixelcount, -0.45 * height/scale);
-                                       p->drawText(0.0, -0.45 * height/scale - 
1 + fm.ascent()/2, " -6 dB");
+                                       p->drawLine(toffset, -0.225 * scale * 
height, xstart+pixelcount, -0.225 * scale * height);
+                                       p->drawText(0.0, -0.225 * scale * 
height - 1 + fm.ascent()/2, " -6 dB");
 
-                                       p->drawLine(toffset, 0.45 * 
height/scale + 1, xstart+pixelcount, 0.45 * height/scale + 1);
-                                       p->drawText(0.0, 0.45 * height/scale + 
fm.ascent()/2, " -6 dB");
+                                       p->drawLine(toffset, 0.225 * scale * 
height + 1, xstart+pixelcount, 0.225 * scale * height + 1);
+                                       p->drawText(0.0, 0.225 * scale * height 
+ fm.ascent()/2, " -6 dB");
                                }
                        } else {
                                scaleFactor =  (float) height * 0.95 * 
m_clip->get_gain() / Peak::MAX_DB_VALUE * curveDefaultValue;
@@ -601,7 +602,7 @@
                                        p->setMatrix(matrix().translate(0, 
ytrans), true);
 
                                        int scale = 1;
-                                       if (!m_mergedView) {
+                                       if (m_mergedView) {
                                                scale = channels;
                                        }
 
@@ -610,11 +611,11 @@
                                        QFontMetrics fm(p->font());
                                        int toffset = fm.width(" -6 dB ");
 
-                                       p->drawLine(toffset, -1.9 * 
height/scale, xstart+pixelcount, -1.9 * height/scale);
-                                       p->drawText(0.0, -1.9 * height/scale - 
1 + fm.ascent()/2, "  0 dB");
+                                       p->drawLine(toffset, -0.95 * scale * 
height, xstart+pixelcount, -0.95 * scale *  height);
+                                       p->drawText(0.0, -0.95 * scale * height 
- 1 + fm.ascent()/2, "  0 dB");
 
-                                       p->drawLine(toffset, -0.95 * 
height/scale, xstart+pixelcount, -0.95 * height/scale);
-                                       p->drawText(0.0, -0.95 * height/scale - 
1 + fm.ascent()/2, " -6 dB");
+                                       p->drawLine(toffset, -0.475 * scale * 
height, xstart+pixelcount, -0.475 * scale * height);
+                                       p->drawText(0.0, -0.475 * scale * 
height - 1 + fm.ascent()/2, " -6 dB");
                                }
 
                        }