Skip to content

Commit 360f639

Browse files
Do not show scale degrees or allow different tunings on learn/patterns
1 parent 71b14a5 commit 360f639

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

apps/fretonator-web/src/app/common/fretonator/fretboard/fretboard.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</div>
4343

4444
<div class="controlPanel">
45-
<div class="controlPanel__row">
45+
<div class="controlPanel__row" *ngIf="configuration !== 'learn'">
4646
<div class="controlPanel__section">
4747
<h4 class="controlPanel__title">Highlight scale degrees</h4>
4848
<app-scale-degrees
@@ -79,7 +79,7 @@ <h4 class="controlPanel__title">Fretboard</h4>
7979
></app-fretboard-config>
8080
</div>
8181

82-
<div class="controlPanel__column">
82+
<div class="controlPanel__column" *ngIf="configuration !== 'learn'">
8383
<h4 class="controlPanel__title">Guitar tuning</h4>
8484
<div class="fretboard__tuningGroup">
8585
<button class="fretboard__changeTuning"

apps/fretonator-web/src/app/common/fretonator/fretboard/fretboard.component.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,23 +45,23 @@ const TuningReturner = {
4545
{ name: 'G', note: 'G', frequencyMarker: 'G' },
4646
{ name: 'D', note: 'D', frequencyMarker: 'D' },
4747
{ name: 'A', note: 'A', frequencyMarker: 'A' },
48-
{ name: 'E', note: 'E', frequencyMarker: 'E' },
48+
{ name: 'E', note: 'E', frequencyMarker: 'E' }
4949
],
5050
'dropd': [
5151
{ name: 'e', note: 'E', frequencyMarker: 'e' },
5252
{ name: 'B', note: 'B', frequencyMarker: 'B' },
5353
{ name: 'G', note: 'G', frequencyMarker: 'G' },
5454
{ name: 'D', note: 'D', frequencyMarker: 'D' },
5555
{ name: 'A', note: 'A', frequencyMarker: 'A' },
56-
{ name: 'D', note: 'D', frequencyMarker: 'D_' },
56+
{ name: 'D', note: 'D', frequencyMarker: 'D_' }
5757
],
5858
'dadgad': [
5959
{ name: 'd', note: 'D', frequencyMarker: 'd' },
6060
{ name: 'A', note: 'A', frequencyMarker: 'A' },
6161
{ name: 'G', note: 'G', frequencyMarker: 'G' },
6262
{ name: 'D', note: 'D', frequencyMarker: 'D' },
6363
{ name: 'A', note: 'A', frequencyMarker: 'A' },
64-
{ name: 'D', note: 'D', frequencyMarker: 'D_' },
64+
{ name: 'D', note: 'D', frequencyMarker: 'D_' }
6565
]
6666
};
6767

@@ -90,6 +90,7 @@ export class FretboardComponent implements OnChanges, OnInit {
9090
@Input() stringNamesAreCaseSensitive = false;
9191
@Input() loadExpanded = false;
9292
@Input() configuration;
93+
@Input() standardTuningOnly;
9394
orientation;
9495
fretMode;
9596
frets;
@@ -106,7 +107,10 @@ export class FretboardComponent implements OnChanges, OnInit {
106107
this.loadPropFromStorage(StorageKeys.fretMode, 'fretMode', FretModes.twelve);
107108
this.loadPropFromStorage(StorageKeys.orientation, 'orientation', Orientations.right);
108109
this.loadPropFromStorage(StorageKeys.noteNameDisplay, 'noteNameDisplay', NoteDisplays.noteNames);
109-
this.loadPropFromStorage(StorageKeys.tuning, 'tuning', Tunings.standard);
110+
111+
if (this.configuration !== 'learn') {
112+
this.loadPropFromStorage(StorageKeys.tuning, 'tuning', Tunings.standard);
113+
}
110114

111115
this.toggleHighlight(ScaleDegrees.tonic);
112116
this.configureStrings();

0 commit comments

Comments
 (0)