;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [ PiecesComponent ]
- })
- .compileComponents();
-
- fixture = TestBed.createComponent(PiecesComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/app/pieces/pieces.component.ts b/src/app/pieces/pieces.component.ts
deleted file mode 100644
index 4db901a..0000000
--- a/src/app/pieces/pieces.component.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
-import { Subscription } from 'rxjs';
-import { PianoService } from '../piano/piano.service';
-import { PieceQuestionGenerator } from './pieces';
-
-@Component({
- selector: 'app-pieces',
- templateUrl: './pieces.component.html',
- styleUrls: ['./pieces.component.scss'],
-})
-export class PiecesComponent implements OnInit, OnDestroy {
- public pieceQuestionGenerator = new PieceQuestionGenerator();
-
- private chordSubscription: Subscription;
-
- constructor(
- private ref: ChangeDetectorRef,
- private pianoService: PianoService
- ) {
- this.chordSubscription = this.pianoService.chordsSource.subscribe(
- chords => {
- if (this.pieceQuestionGenerator.checkAnswer(chords)) {
- this.pieceQuestionGenerator.nextQuestion();
- }
- this.ref.detectChanges();
- }
- );
- }
-
- ngOnInit() {}
-
- ngOnDestroy() {
- // prevent memory leak when component destroyed
- this.chordSubscription.unsubscribe();
- }
-}
diff --git a/src/app/pieces/pieces.ts b/src/app/pieces/pieces.ts
deleted file mode 100644
index e7b659e..0000000
--- a/src/app/pieces/pieces.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { numToString } from '../data';
-import { chordpatterns } from '../data';
-
-const FQBK_handbook_1 = [
- 'Bb 7',
- 'Eb 7',
- 'Bb 7',
- 'F m7',
- 'Bb 7',
- //
- 'Eb 7',
- 'Eb 7',
- 'Bb 7',
- 'D dim',
- 'G 7',
- //
- 'C m7',
- 'F 7',
- 'D m7',
- 'G 7',
- 'C m7',
- 'F 7',
-];
-
-const allTheThingsYouAre = [
- 'F m7',
- 'Bb m7',
- 'Eb 7',
- 'Ab maj7',
- //
- 'Db maj7',
- 'G 7',
- 'C maj7',
- 'C maj7',
- //
- 'C m7',
- 'F m7',
- 'Bb 7',
- 'Eb maj7',
- //
-];
-
-export class PieceQuestionGenerator {
- public chords = allTheThingsYouAre;
- private currentQuestionIndex = 0;
- public question = '';
-
- constructor() {
- this.nextQuestion();
- }
-
- public nextQuestion() {
- this.question = this.chords[this.currentQuestionIndex];
- this.currentQuestionIndex += 1;
- if (this.currentQuestionIndex >= this.chords.length) {
- this.currentQuestionIndex = 0;
- }
- return this.question;
- }
-
- public checkAnswer(chords: string[]) {
- return chords.includes(this.question);
- }
-}
diff --git a/src/app/progressions/progressions.component.html b/src/app/progressions/progressions.component.html
deleted file mode 100644
index 4286029..0000000
--- a/src/app/progressions/progressions.component.html
+++ /dev/null
@@ -1,2 +0,0 @@
-Play {{ question }} scale
-{{ progressionQuestionGenerator.progression }}
diff --git a/src/app/progressions/progressions.component.scss b/src/app/progressions/progressions.component.scss
deleted file mode 100644
index e69de29..0000000
diff --git a/src/app/progressions/progressions.component.spec.ts b/src/app/progressions/progressions.component.spec.ts
deleted file mode 100644
index 79018c0..0000000
--- a/src/app/progressions/progressions.component.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { ProgressionsComponent } from './progressions.component';
-
-describe('ProgressionsComponent', () => {
- let component: ProgressionsComponent;
- let fixture: ComponentFixture;
-
- beforeEach(waitForAsync(() => {
- TestBed.configureTestingModule({
- declarations: [ProgressionsComponent],
- }).compileComponents();
- }));
-
- beforeEach(() => {
- fixture = TestBed.createComponent(ProgressionsComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src/app/progressions/progressions.component.ts b/src/app/progressions/progressions.component.ts
deleted file mode 100644
index 886759d..0000000
--- a/src/app/progressions/progressions.component.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { ProgressionQuestionGenerator } from './progressions';
-import { ChangeDetectorRef } from '@angular/core';
-import { PianoService } from '../piano/piano.service';
-import { Subscription } from 'rxjs';
-
-@Component({
- selector: 'app-progressions',
- templateUrl: './progressions.component.html',
- styleUrls: ['./progressions.component.scss'],
-})
-export class ProgressionsComponent implements OnInit {
- public progressionQuestionGenerator = new ProgressionQuestionGenerator();
-
- noteSubscription: Subscription;
- public question = '';
- public progress = '';
-
- constructor(
- private ref: ChangeDetectorRef,
- private pianoService: PianoService
- ) {
- this.noteSubscription = this.pianoService.noteSource.subscribe(note => {
- if (this.progressionQuestionGenerator.nextNote(note)) {
- this.question = this.progressionQuestionGenerator.nextQuestion();
- }
- this.progress = this.progressionQuestionGenerator.getProgressString();
- this.ref.detectChanges();
- });
- this.question = this.progressionQuestionGenerator.nextQuestion();
- this.progress = this.progressionQuestionGenerator.getProgressString();
- }
-
- ngOnInit() {}
-
- ngOnDestroy() {
- // prevent memory leak when component destroyed
- this.noteSubscription.unsubscribe();
- }
-}
diff --git a/src/app/progressions/progressions.ts b/src/app/progressions/progressions.ts
deleted file mode 100644
index a91719b..0000000
--- a/src/app/progressions/progressions.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-import {
- numToString,
- scalepatterns,
- generateScales,
- noteNames,
- chordpatterns,
- generateChords,
-} from '../data';
-
-function chordIntersection(c1, c2) {
- return c1.filter(value => -1 !== c2.indexOf(value));
-}
-
-export class ProgressionQuestionGenerator {
- private enableSharps = false;
- private enableNaturals = true;
- private enableScaleModes = { Ionian: true };
- private enableChords = {
- '': true,
- 7: true,
- maj7: false,
- m: true,
- m7: true,
- mmaj7: false,
- dim: false,
- dim7: false,
- };
-
- private enabledScaleNames = [];
- private scale: string = '';
- public progression = [];
- private scales = generateScales();
- private chords = generateChords();
-
- private sequence = [];
- public question = '';
-
- public generateScaleNames() {
- this.enabledScaleNames = [];
- for (let root = 21; root < 33; root++) {
- let note = numToString(root, false);
- if (
- (note.length == 1 || this.enableSharps) &&
- (note.length == 2 || this.enableNaturals)
- ) {
- for (let pat of Object.keys(scalepatterns).filter(
- pat => this.enableScaleModes[pat]
- )) {
- this.enabledScaleNames.push(note + ' ' + pat);
- }
- }
- }
- this.generateChords();
- }
-
- public generateChords() {
- this.scale =
- this.enabledScaleNames[
- Math.floor(Math.random() * this.enabledScaleNames.length)
- ];
- let enabledChordNames = [];
- for (let note of this.scales[this.scale].slice(0, -1)) {
- for (let pat of Object.keys(chordpatterns).filter(
- pat => this.enableChords[pat]
- )) {
- enabledChordNames.push(note + ' ' + pat);
- }
- }
- console.log(enabledChordNames);
- console.log('AA', this.chords);
- let rootChords = enabledChordNames.filter(
- chord => chord.split(' ')[0] == this.scale.split(' ')[0]
- );
- this.progression.push(
- rootChords[Math.floor(Math.random() * rootChords.length)]
- );
- let notLooping = true;
- while (notLooping) {
- while (this.progression.length < 4) {
- let potenantialNextChords = [];
- for (let cn of enabledChordNames) {
- let c1 = this.chords[this.progression[this.progression.length - 1]];
- let c2 = this.chords[cn];
- let intersection = chordIntersection(c1, c2);
- console.log(c1, c2, intersection);
- if (
- this.progression.filter(
- chord => chord.split(' ')[0] == cn.split(' ')[0]
- ).length == 0
- ) {
- for (let i = 0; i < intersection.length; i++) {
- potenantialNextChords.push(cn);
- }
- }
- }
- console.log('AAA', this.progression, potenantialNextChords);
- this.progression.push(
- potenantialNextChords[
- Math.floor(Math.random() * potenantialNextChords.length)
- ]
- );
- }
- console.log(
- 'aaa',
- this.chords[this.progression[this.progression.length - 1]],
- this.chords[this.progression[0]]
- );
- if (
- chordIntersection(
- this.chords[this.progression[this.progression.length - 1]],
- this.chords[this.progression[0]]
- ).length > 1
- ) {
- notLooping = false;
- } else {
- this.progression = [this.progression[0]];
- }
- }
-
- console.log(this.progression);
- // this.nextQuestion();
- }
-
- constructor() {
- this.generateScaleNames();
- }
-
- public nextQuestion() {
- this.question =
- this.enabledScaleNames[
- Math.floor(Math.random() * this.enabledScaleNames.length)
- ];
- return this.question;
- }
-
- public nextNote(note: string) {
- this.sequence.push(note.slice(0, -1));
- let i;
- for (i = 0; i < this.sequence.length; i++) {
- if (this.scales[this.question][i] != this.sequence[i]) {
- this.sequence = [];
- }
- }
- if (i == this.scales[this.question].length) {
- this.sequence = [];
- return true;
- }
- console.log(this.sequence);
- }
-
- public getProgressString() {
- let outstr = '';
- for (let i = 0; i < this.scales[this.question].length; i++) {
- if (i < this.sequence.length) {
- outstr += this.sequence[i] + ' ';
- } else {
- outstr += '● ';
- }
- }
- return outstr.slice(0, -1);
- }
-}
diff --git a/src/app/questions/question.ts b/src/app/questions/question.ts
deleted file mode 100644
index 640963a..0000000
--- a/src/app/questions/question.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-class Question {
- note: string;
- constructor(note: string) {
- this.note = note;
- }
-}
diff --git a/src/app/scales/scales.component.html b/src/app/scales/scales.component.html
index 017025e..b5e3f25 100644
--- a/src/app/scales/scales.component.html
+++ b/src/app/scales/scales.component.html
@@ -1,5 +1,24 @@
-Play {{ question }} scale
-{{ progress }}
+Play {{ scaleQuestionGenerator.question }} scale
+No scales enabled!
+{{ scaleQuestionGenerator.progress }}
+
+Sharps
+
+Naturals
+
+
+Enabled scale types
+
+
+ {{ scaleNames[item.key] }}
+
+