diff --git a/js/activity.js b/js/activity.js index 2f6684c4ca..bbfe7e04d3 100644 --- a/js/activity.js +++ b/js/activity.js @@ -4708,8 +4708,7 @@ function Activity() { toolbar.renderRunStepIcon(_doStepButton); toolbar.renderAdvancedIcons( () => { - if (!logo.statsWindow) logo.statsWindow = new StatsWindow(); - logo.statsWindow.init(); + logo.statsWindow = new StatsWindow(); }, doOpenPlugin, deletePlugin, diff --git a/js/widgets/help.js b/js/widgets/help.js index 130639db72..b783baeb2d 100644 --- a/js/widgets/help.js +++ b/js/widgets/help.js @@ -27,6 +27,7 @@ class HelpWidget { this.widgetWindow = widgetWindow; widgetWindow.clear(); widgetWindow.show(); + widgetWindow.onClose = () => { this.isOpen = false; this.destroy(); diff --git a/js/widgets/statistics.js b/js/widgets/statistics.js index d61f01e79d..83365720a4 100644 --- a/js/widgets/statistics.js +++ b/js/widgets/statistics.js @@ -9,54 +9,36 @@ // License along with this library; if not, write to the Free Software // Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA -// This widget makes displays the status of selected parameters and -// notes as they are being played. +const BUTTONSIZE = 53; +const ICONSIZE = 32; -function StatsWindow() { - const BUTTONSIZE = 53; - const ICONSIZE = 32; - - this.init = function(logo) { - this._logo = logo; +/** + * This widget makes displays the status of selected parameters and notes as they are being played. + */ +class StatsWindow { + constructor() { this.isOpen = true; - let w = window.innerWidth; - this._cellScale = w / 1200; - let iconSize = ICONSIZE * this._cellScale; - - let widgetWindow = window.widgetWindows.windowFor( - this, - "stats", - "stats" - ); - this.widgetWindow = widgetWindow; - widgetWindow.clear(); - widgetWindow.show(); - - let that = this; - - widgetWindow.onclose = function() { - that.isOpen = false; + this.widgetWindow = window.widgetWindows.windowFor(this, "stats", "stats"); + this.widgetWindow.clear(); + this.widgetWindow.show(); + this.widgetWindow.onclose = () => { + this.isOpen = false; blocks.showBlocks(); - this.destroy(); + this.widgetWindow.destroy(); }; this.doAnalytics(); - widgetWindow.sendToCenter(); + this.widgetWindow.sendToCenter(); }; - /* - * Renders and carries out analysis - * of the MB project + /** + * Renders and carries out analysis of the MB project. */ - this.doAnalytics = function() { + doAnalytics() { toolbar.closeAuxToolbar(_showHideAuxMenu); blocks.activeBlock = null; - myChart = docById("myChart"); - - // if (_isCanvasBlank(myChart) === false) { - // return; - // } + let myChart = docById("myChart"); let ctx = myChart.getContext("2d"); loading = true; @@ -64,30 +46,30 @@ function StatsWindow() { let myRadarChart = null; let scores = analyzeProject(blocks); - runAnalytics(logo) + runAnalytics(logo); let data = scoreToChartData(scores); - __callback = () => { - imageData = myRadarChart.toBase64Image(); - img = new Image(); + const __callback = () => { + let imageData = myRadarChart.toBase64Image(); + let img = new Image(); img.src = imageData; - img.width = 200; - this.widgetWindow.getWidgetBody().appendChild(img) + img.width = 200; + this.widgetWindow.getWidgetBody().appendChild(img); blocks.hideBlocks(); logo.showBlocksAfterRun = false; document.body.style.cursor = "default"; }; - options = getChartOptions(__callback); + let options = getChartOptions(__callback); myRadarChart = new Chart(ctx).Radar(data, options); - - this.jsonObject = document.createElement('ul'); - this.jsonObject.style.float = 'left'; - this.widgetWindow.getWidgetBody().appendChild(this.jsonObject) + this.jsonObject = document.createElement("ul"); + this.jsonObject.style.float = "left"; + this.widgetWindow.getWidgetBody().appendChild(this.jsonObject); }; - this.displayInfo = (stats) => { - let lowHertz = stats["lowestNote"][2] + 0.5; - let highHertz = stats["highestNote"][2] + 0.5; - this.jsonObject.innerHTML = + + displayInfo(stats) { + let lowHertz = stats["lowestNote"][2] + 0.5; + let highHertz = stats["highestNote"][2] + 0.5; + this.jsonObject.innerHTML = '
  • duples: ' + stats["duples"] + '
  • ' + '
  • triplets: ' + stats["triplets"] + '
  • ' + '
  • quintuplets: ' + stats["quintuplets"] + '
  • ' + @@ -98,5 +80,4 @@ function StatsWindow() { '
  • rests used: ' + stats["rests"] + '
  • ' + '
  • ornaments used: ' + stats["ornaments"] + '
  • ' } - }