comparison layer/NoteLayer.cpp @ 197:6b023411087b

* Work on harmonising colour and scale ranges between types of layer
* Add normalize options to colour 3d plot layer

 
 #include "data/model/Model.h"
 #include "base/RealTime.h"
 #include "base/Profiler.h"
 #include "base/Pitch.h"
+#include "base/LogRange.h"
 #include "view/View.h"
 
 #include "data/model/NoteModel.h"
 
 #include "widgets/ItemEditDialog.h"

 
             std::cerr << "NoteLayer[" << this << "]::getScaleExtents: min = " << min << ", max = " << max << ", log = " << log << std::endl;
 
         } else if (log) {
 
-            min = (min < 0.0) ? -log10(-min) : (min == 0.0) ? 0.0 : log10(min);
-            max = (max < 0.0) ? -log10(-max) : (max == 0.0) ? 0.0 : log10(max);
+            LogRange::mapRange(min, max);
 
             std::cerr << "NoteLayer[" << this << "]::getScaleExtents: min = " << min << ", max = " << max << ", log = " << log << std::endl;
 
         }
 

             min = Pitch::getFrequencyForPitch(lrintf(min));
             max = Pitch::getFrequencyForPitch(lrintf(max + 1));
         }
 
         if (m_verticalScale == LogScale || m_verticalScale == MIDIRangeScale) {
-            min = (min < 0.0) ? -log10(-min) : (min == 0.0) ? 0.0 : log10(min);
-            max = (max < 0.0) ? -log10(-max) : (max == 0.0) ? 0.0 : log10(max);
+            LogRange::mapRange(min, max);
             log = true;
         }
     }
 
     if (max == min) max = min + 1.0;

                                           lrintf((val - lrintf(val)) * 100));
 //        std::cerr << "shouldConvertMIDIToHz true, val now = " << val << std::endl;
     }
 
     if (logarithmic) {
-        val = (val < 0.0) ? -log10(-val) : (val == 0.0) ? 0.0 : log10(val);
+        val = LogRange::map(val);
 //        std::cerr << "logarithmic true, val now = " << val << std::endl;
     }
 
     int y = int(h - ((val - min) * h) / (max - min)) - 1;
 //    std::cerr << "y = " << y << std::endl;

     getScaleExtents(v, min, max, logarithmic);
 
     float val = min + (float(h - y) * float(max - min)) / h;
 
     if (logarithmic) {
-        val = pow(10, val);
+        val = powf(10.f, val);
     }
 
     if (shouldConvertMIDIToHz()) {
         val = Pitch::getPitchForFrequency(val);
     }