Andrea Condoluci 9 rokov pred
rodič
commit
744157fc1b
4 zmenil súbory, kde vykonal 46 pridanie a 43 odobranie
  1. 24 16
      Gruntfile.js
  2. 18 19
      src/Common/DataObjects/pitch.ts
  3. 4 8
      src/Util/fft.ts
  4. 0 0
      test/Util/fft.ts

+ 24 - 16
Gruntfile.js

@@ -1,14 +1,21 @@
 module.exports = function (grunt) {
     'use strict';
-    /*var BANNER = '**\n' +
-        ' * Open Sheet Music Display library <%= pkg.version %> built on <%= grunt.template.today("yyyy-mm-dd") %>.\n' +
+    var banner = '/**\n' +
+        ' * Open Sheet Music Display <%= pkg.version %> built on <%= grunt.template.today("yyyy-mm-dd") %>.\n' +
         ' * Copyright (c) 2016 PhonicScore\n' +
         ' *\n' +
         ' * https://github.com/opensheetmusicdisplay/opensheetmusicdisplay\n' +
-        ' *\n';
-    */
+        ' */\n';
+    // Additional manual typings:
+    var typings = [
+      'typings/browser.d.ts',
+      'typings/vexflow.d.ts',
+      'typings/fft.d.ts'
+    ];
+    // Grunt configuration following:
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
+        banner: banner,
         // Build output directories
         outputDir: {
             build: 'build',
@@ -17,21 +24,21 @@ module.exports = function (grunt) {
         // Browserify
         browserify: {
             dist: {
-                src: [
-                    'typings/browser.d.ts',
-                    'typings/vexflow.d.ts',
-                    'src/**/*.ts'
-                ],
-                dest: '<%= outputDir.build %>/osmd.js'
+                src: typings.concat(['src/**/*.ts']),
+                dest: '<%= outputDir.build %>/osmd.js',
+                options: {
+                    banner: "<%= banner %>"
+                }
             },
             debug: {
-                src: [
-                    'typings/browser.d.ts', 'typings/vexflow.d.ts',
-                    //'src/**/*.ts', 'test/**/*.ts'
-                    'src/Common/**/*.ts', 'test/Common/**/*.ts'
-                ],
+                src: typings.concat([
+                    'src/Common/**/*.ts', 'test/Common/**/*.ts',
+                    'src/Util/**/*.ts', 'test/Util/**/*.ts'
+                    // Should be: 'src/**/*.ts', 'test/**/*.ts'
+                ]),
                 dest: '<%= outputDir.build %>/osmd-debug.js',
                 options: {
+                    banner: "<%= banner %>",
                     browserifyOptions: {
                         debug: true
                     }
@@ -131,7 +138,8 @@ module.exports = function (grunt) {
                 src: [
                     '<%= outputDir.build %>',
                     '<%= outputDir.dist %>',
-                    '.tscache'
+                    '.tscache',
+                    'src/**/*.js', 'test/**/*.js'
                 ]
             }
         }

+ 18 - 19
src/Common/DataObjects/pitch.ts

@@ -1,5 +1,22 @@
-export class Pitch {
+export enum NoteEnum {
+    C = 0,
+    D = 2,
+    E = 4,
+    F = 5,
+    G = 7,
+    A = 9,
+    B = 11
+}
 
+export enum AccidentalEnum {
+    DOUBLEFLAT = -2,
+    FLAT = -1,
+    NONE = 0,
+    SHARP = 1,
+    DOUBLESHARP = 2
+}
+
+export class Pitch {
     constructor(fundamentalNote: NoteEnum, octave: number, accidental: AccidentalEnum) {
         this.fundamentalNote = fundamentalNote;
         this.octave = octave;
@@ -237,21 +254,3 @@ export class Pitch {
         }
     }
 }
-
-export enum NoteEnum {
-    C = 0,
-    D = 2,
-    E = 4,
-    F = 5,
-    G = 7,
-    A = 9,
-    B = 11
-}
-
-export enum AccidentalEnum {
-    DOUBLEFLAT = -2,
-    FLAT = -1,
-    NONE = 0,
-    SHARP = 1,
-    DOUBLESHARP = 2
-}

+ 4 - 8
src/Util/fft.ts

@@ -1,12 +1,8 @@
-module FFT {
+import FFT = require("fft");
 
-  // typing for the FFT npm package
-  export declare class complex {
-    constructor(n: number, inverse: boolean);
-    public simple(output: Float64Array, input: Float64Array, type: string): void;
-  }
+module fft {
 
-  export function toRealImag(timeData: Float64Array): { amplitude: Float64Array; phase: Float64Array; } {
+  export function toRealImag(timeData: Float64Array): { imag: Float64Array; real: Float64Array; } {
     let n: number = timeData.length;
     let fft: any = new FFT.complex(2 * n, false);
     let output: Float64Array = new Float64Array(2 * n);
@@ -26,7 +22,7 @@ module FFT {
       real[i] = output[2 * i];
       imag[i] = output[2 * i + 1];
     }
-    return { real: real, imag: imag };
+    return {imag: imag, real: real};
   }
 
   export function toAmplPhas(timeData: Float64Array): { amplitude: Float64Array; phase: Float64Array; } {

+ 0 - 0
test/Util/fft.ts