Mercurial > hg > multitrack-audio-matcher
diff annotationCalculatorSrc/testApp.h @ 49:8df911733fdc
Added new histogram functions - absolute error graphs like Match paper
author | Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk> |
---|---|
date | Tue, 22 May 2012 22:53:44 +0100 |
parents | 5359e2c0b0fb |
children | 5274e3b5479d |
line wrap: on
line diff
--- a/annotationCalculatorSrc/testApp.h Wed May 09 21:55:16 2012 +0100 +++ b/annotationCalculatorSrc/testApp.h Tue May 22 22:53:44 2012 +0100 @@ -6,7 +6,9 @@ #include "MatchMultitrackAnnotationReader.h" #include "Histogram.h" -#define NUMBER_OF_SCREENS 4 +#include "EwertAnnotationReader.h" + +#define NUMBER_OF_SCREENS 9 class testApp : public ofBaseApp{ public: @@ -35,6 +37,7 @@ void setFilePaths(int fileToLoad); void readInFiles(); void processResults(); + void printPercentageTotals(); void drawAlignmentVectors(); @@ -56,6 +59,9 @@ Histogram matchBackwardsAbsTotalHistogram; Histogram matchForwardAbsTotalHistogram; + Histogram ewertHistogram; + Histogram ewertAbsTotalHistogram; + int screenToDraw; int histogramWidth, histogramBinNumber; @@ -69,4 +75,7 @@ void drawSquare(); void setCoordinatesToSquare(); + EwertAnnotationReader ewertReader; + void readEwertAnnotations(); + std::string ewertAlignmentPath; };