highest/lowest notes in stats

sksum · Aug 25, 2020 · fb033bc · fb033bc
1 parent b01d78a
commit fb033bc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/js/logo.js b/js/logo.js
@@ -1802,7 +1802,7 @@ class Logo {
                         if (logo.collectingStats){
                             console.debug("stats collection completed")
                             logo.projectStats = getStatsFromNotation(logo);
-                            logo.statsWindow.jsonObject.innerHTML = JSON.stringify(projectStats); 
+                            logo.statsWindow.jsonObject.innerHTML = JSON.stringify(projectStats,undefined,4); 
                         } else {
                             console.debug("saving lilypond output:");
                             save.afterSaveLilypond();

diff --git a/js/rubrics.js b/js/rubrics.js
@@ -743,6 +743,9 @@ let getStatsFromNotation = (logo) => {
         end : []
     };
     projectStats["pitches"] = [];
+    projectStats["numberOfNotes"] = 0;
+
+    let noteId = 0;
 
     for (tur in notation.notationStaging){
         for (it in notation.notationStaging[tur]) {
@@ -751,9 +754,18 @@ let getStatsFromNotation = (logo) => {
             if (typeof item == "object" && item[0].length){
                 for (note of item[0]) {
                     projectStats["pitchNames"].add(note[0]);
+                    let freq = logo.synth._getFrequency(note);
                     projectStats["pitches"].push(
-                        logo.synth._getFrequency(note)
+                        freq
                     );
+                    if (projectStats["lowestNote"] == undefined || freq < projectStats["lowestNote"][2]) {
+                        projectStats["lowestNote"] = [note,noteId,freq];
+                    }
+                    if (projectStats["highestNote"] == undefined || freq > projectStats["highestNote"][2]) {
+                        projectStats["highestNote"] = [note,noteId,freq];
+                    }
+                    projectStats["numberOfNotes"]++;
+                    noteId++;
                 }
             }
 

diff --git a/js/widgets/statistics.js b/js/widgets/statistics.js
@@ -70,6 +70,7 @@ function StatsWindow() {
             imageData = myRadarChart.toBase64Image();
             img = new Image();
             img.src = imageData;
+            img.width =  200;
             this.widgetWindow.getWidgetBody().appendChild(img)
             blocks.hideBlocks();
             logo.showBlocksAfterRun = false;
@@ -78,7 +79,8 @@ function StatsWindow() {
         options = getChartOptions(__callback);
         myRadarChart = new Chart(ctx).Radar(data, options);
 
-        this.jsonObject = document.createElement('p');
+        this.jsonObject = document.createElement('pre');
+        this.jsonObject.style.float = 'left';
         this.widgetWindow.getWidgetBody().appendChild(this.jsonObject)
 
     };