uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move label setter logic from module to key component

Browse Source
This commit is contained in:
József Farkas
2016-05-02 20:03:09 +02:00
parent 70ea0318ac
commit d283093716
2 changed files with 79 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/components/svg-keyboard-key.component.ts
View File

@@ -1,4 +1,10 @@
import { Component, OnInit, Input } from 'angular2/core';
import { Component, OnInit, Input, OnChanges, SimpleChange } from 'angular2/core';
import {KeyAction} from '../../config-serializer/config-items/KeyAction';
import {KeystrokeAction} from '../../config-serializer/config-items/KeystrokeAction';
import {KeystrokeModifiersAction, KeyModifiers} from '../../config-serializer/config-items/KeystrokeModifiersAction';
import {SwitchLayerAction, LayerName} from '../../config-serializer/config-items/SwitchLayerAction';
import {Mapper} from '../utils/mapper';
@Component({
selector: 'g[svg-keyboard-key]',
@@ -32,18 +38,81 @@ import { Component, OnInit, Input } from 'angular2/core';
</svg:text>
`
})
export class SvgKeyboardKeyComponent implements OnInit {
export class SvgKeyboardKeyComponent implements OnInit, OnChanges {
@Input() id: string;
@Input() rx: string;
@Input() ry: string;
@Input() height: string;
@Input() width: string;
@Input() labels: string[];
@Input() keyAction: KeyAction;
constructor() {
this.labels = [];
private labels: any[];
constructor() { }
ngOnInit() {
this.setLabels();
}
ngOnInit() { }
ngOnChanges(changes: { [propertyName: string]: SimpleChange }) {
/* tslint:disable:no-string-literal */
if (changes['keyAction']) {
this.setLabels();
}
/* tslint:enable:no-string-literal */
}
private setLabels(): void {
if (!this.keyAction) {
return;
}
let newLabels: string[] = [];
if (this.keyAction instanceof KeystrokeModifiersAction) {
let keyAction: KeystrokeModifiersAction = <KeystrokeModifiersAction> this.keyAction;
if (keyAction.isOnlyOneModifierActive()) {
switch (keyAction.modifierMask) {
case KeyModifiers.leftCtrl:
case KeyModifiers.rightCtrl:
newLabels.push('Ctrl');
break;
case KeyModifiers.leftShift:
case KeyModifiers.rightShift:
newLabels.push('Shift');
break;
case KeyModifiers.leftAlt:
case KeyModifiers.rightAlt:
newLabels.push('Alt');
break;
case KeyModifiers.leftGui:
case KeyModifiers.rightGui:
newLabels.push('Super');
break;
default:
newLabels.push('Undefined');
break;
}
}
} else if (this.keyAction instanceof KeystrokeAction) {
let keyAction: KeystrokeAction = <KeystrokeAction> this.keyAction;
newLabels = Mapper.scanCodeToText((keyAction as KeystrokeAction).scancode);
} else if (this.keyAction instanceof SwitchLayerAction) {
let keyAction: SwitchLayerAction = <SwitchLayerAction> this.keyAction;
switch (keyAction.layer) {
case LayerName.mod:
newLabels.push('Mod');
break;
case LayerName.fn:
newLabels.push('Fn');
break;
case LayerName.mouse:
newLabels.push('Mouse');
break;
default:
break;
}
}
this.labels = newLabels;
}
}

78
src/components/svg-module.component.ts
View File

@@ -1,12 +1,8 @@
import { Component, OnInit, OnChanges, Input, SimpleChange} from 'angular2/core';
import { Component, OnInit, Input } from 'angular2/core';
import {SvgKeyboardKey} from './svg-keyboard-key.model';
import {SvgKeyboardKeyComponent} from './svg-keyboard-key.component';
import {KeyAction} from '../../config-serializer/config-items/KeyAction';
import {KeystrokeAction} from '../../config-serializer/config-items/KeystrokeAction';
import {KeystrokeModifiersAction, KeyModifiers} from '../../config-serializer/config-items/KeystrokeModifiersAction';
import {SwitchLayerAction, LayerName} from '../../config-serializer/config-items/SwitchLayerAction';
import {Mapper} from '../utils/mapper';
@Component({
selector: 'g[svg-module]',
@@ -18,86 +14,20 @@ import {Mapper} from '../utils/mapper';
[rx]="key.rx" [ry]="key.ry"
[width]="key.width" [height]="key.height"
[attr.transform]="'translate(' + key.x + ' ' + key.y + ')'"
[labels]="labels[i]"
[keyAction]="keyActions[i]"
/>
`,
directives: [SvgKeyboardKeyComponent]
})
export class SvgModuleComponent implements OnInit, OnChanges {
export class SvgModuleComponent implements OnInit {
@Input() coverages: any[];
@Input() keyboardKeys: SvgKeyboardKey[];
@Input() keyActions: KeyAction[];
private labels: string[][];
constructor() {
this.keyboardKeys = [];
this.labels = [];
}
ngOnInit() {
this.setLabels();
}
ngOnChanges(changes: { [propertyName: string]: SimpleChange }) {
/* tslint:disable:no-string-literal */
if (changes['keyActions']) {
this.setLabels();
}
/* tslint:enable:no-string-literal */
}
private setLabels(): void {
if (!this.keyActions) {
return;
}
let newLabels: string[][] = [];
this.keyActions.forEach((keyAction: KeyAction) => {
if (keyAction instanceof KeystrokeModifiersAction) {
if (keyAction.isOnlyOneModifierActive()) {
switch (keyAction.modifierMask) {
case KeyModifiers.leftCtrl:
case KeyModifiers.rightCtrl:
newLabels.push(['Ctrl']);
break;
case KeyModifiers.leftShift:
case KeyModifiers.rightShift:
newLabels.push(['Shift']);
break;
case KeyModifiers.leftAlt:
case KeyModifiers.rightAlt:
newLabels.push(['Alt']);
break;
case KeyModifiers.leftGui:
case KeyModifiers.rightGui:
newLabels.push(['Super']);
break;
default:
newLabels.push(['Undefined']);
break;
}
}
} else if (keyAction instanceof KeystrokeAction) {
newLabels.push(Mapper.scanCodeToText((keyAction as KeystrokeAction).scancode));
} else if (keyAction instanceof SwitchLayerAction) {
switch (keyAction.layer) {
case LayerName.mod:
newLabels.push(['Mod']);
break;
case LayerName.fn:
newLabels.push(['Fn']);
break;
case LayerName.mouse:
newLabels.push(['Mouse']);
break;
default:
break;
}
} else {
newLabels.push([]);
}
});
this.labels = newLabels;
}
ngOnInit() { }
}