diff layer/Colour3DPlotLayer.cpp @ 1077:5144d7185fb5 spectrogram-minor-refactor

Move LayerGeometryProvider from view to layer
author Chris Cannam
date Thu, 30 Jun 2016 10:59:11 +0100
parents 38a53c7b81f6
children ee01a4062747
line wrap: on
line diff
--- a/layer/Colour3DPlotLayer.cpp	Thu Jun 30 10:36:52 2016 +0100
+++ b/layer/Colour3DPlotLayer.cpp	Thu Jun 30 10:59:11 2016 +0100
@@ -15,11 +15,14 @@
 
 #include "Colour3DPlotLayer.h"
 
-#include "view/View.h"
 #include "base/Profiler.h"
 #include "base/LogRange.h"
 #include "base/RangeMapper.h"
+
 #include "ColourMapper.h"
+#include "LayerGeometryProvider.h"
+
+#include "view/ViewManager.h"
 
 #include <QPainter>
 #include <QImage>
@@ -864,12 +867,12 @@
 
         paint.setWorldMatrix(m);
 
-        v->drawVisibleText(paint, 2, 0, minstr, View::OutlinedText);
+        v->drawVisibleText(paint, 2, 0, minstr, LayerGeometryProvider::OutlinedText);
 
         m.translate(ch - msw - 2, 0);
         paint.setWorldMatrix(m);
 
-        v->drawVisibleText(paint, 0, 0, maxstr, View::OutlinedText);
+        v->drawVisibleText(paint, 0, 0, maxstr, LayerGeometryProvider::OutlinedText);
 
         paint.restore();
     }
@@ -1442,7 +1445,7 @@
                          rx0 + 2,
                          ry0 - h / sh - 1 + 2 + paint.fontMetrics().ascent(),
                          text,
-                         View::OutlinedText);
+                         LayerGeometryProvider::OutlinedText);
 		}
 	    }
 	}