comparison layer/Colour3DPlotLayer.cpp @ 1078:ee01a4062747 spectrogram-minor-refactor

Move drawVisibleText to PaintAssistant

 #include "base/LogRange.h"
 #include "base/RangeMapper.h"
 
 #include "ColourMapper.h"
 #include "LayerGeometryProvider.h"
+#include "PaintAssistant.h"
 
 #include "view/ViewManager.h"
 
 #include <QPainter>
 #include <QImage>

         m.translate(cw - 6, ch + 10);
         m.rotate(-90);
 
         paint.setWorldMatrix(m);
 
-        v->drawVisibleText(paint, 2, 0, minstr, LayerGeometryProvider::OutlinedText);
+        PaintAssistant::drawVisibleText(v, paint, 2, 0, minstr, PaintAssistant::OutlinedText);
 
         m.translate(ch - msw - 2, 0);
         paint.setWorldMatrix(m);
 
-        v->drawVisibleText(paint, 0, 0, maxstr, LayerGeometryProvider::OutlinedText);
+        PaintAssistant::drawVisibleText(v, paint, 0, 0, maxstr, PaintAssistant::OutlinedText);
 
         paint.restore();
     }
 
     paint.setPen(v->getForeground());

 		if (sx >= 0 && sx < m_cache->width() &&
 		    sy >= 0 && sy < m_cache->height()) {
 		    double value = m_model->getValueAt(sx, sy);
 		    snprintf(labelbuf, buflen, "%06f", value);
 		    QString text(labelbuf);
-		    v->drawVisibleText
-                        (paint,
+                    PaintAssistant::drawVisibleText
+                        (v,
+                         paint,
                          rx0 + 2,
                          ry0 - h / sh - 1 + 2 + paint.fontMetrics().ascent(),
                          text,
-                         LayerGeometryProvider::OutlinedText);
+                         PaintAssistant::OutlinedText);
 		}
 	    }
 	}
     }
 }