diff --git a/packages/uhk-web/src/app/components/svg/keyboard/svg-keyboard.component.html b/packages/uhk-web/src/app/components/svg/keyboard/svg-keyboard.component.html index 5a622a91..db9d1c0b 100644 --- a/packages/uhk-web/src/app/components/svg/keyboard/svg-keyboard.component.html +++ b/packages/uhk-web/src/app/components/svg/keyboard/svg-keyboard.component.html @@ -1,5 +1,9 @@ - - + + (capture)="onCapture(i, $event.index, $event.captured)" /> + + { + return obj.path[0].$; +}; diff --git a/packages/uhk-web/src/app/components/svg/separator/index.ts b/packages/uhk-web/src/app/components/svg/separator/index.ts new file mode 100644 index 00000000..cb01d4c4 --- /dev/null +++ b/packages/uhk-web/src/app/components/svg/separator/index.ts @@ -0,0 +1,2 @@ +export * from './svg-separator.model'; +export * from './convert-xml-to-svg-separator'; diff --git a/packages/uhk-web/src/app/components/svg/separator/svg-separator.model.ts b/packages/uhk-web/src/app/components/svg/separator/svg-separator.model.ts new file mode 100644 index 00000000..f2c85930 --- /dev/null +++ b/packages/uhk-web/src/app/components/svg/separator/svg-separator.model.ts @@ -0,0 +1,4 @@ +export interface SvgSeparator { + style: string; + d: string; +} diff --git a/packages/uhk-web/src/app/services/svg-module-provider.service.ts b/packages/uhk-web/src/app/services/svg-module-provider.service.ts index 13638079..14f0fd94 100644 --- a/packages/uhk-web/src/app/services/svg-module-provider.service.ts +++ b/packages/uhk-web/src/app/services/svg-module-provider.service.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import { SvgModule } from '../components/svg/module'; import { KeyboardLayout } from '../keyboard/keyboard-layout.enum'; +import { convertXmlToSvgSeparator, SvgSeparator } from '../components/svg/separator'; @Injectable() export class SvgModuleProviderService { @@ -9,11 +10,20 @@ export class SvgModuleProviderService { private ansiLeft: SvgModule; private isoLeft: SvgModule; private right: SvgModule; + private separator: SvgSeparator; getSvgModules(layout = KeyboardLayout.ANSI): SvgModule[] { return [this.getRightModule(), this.getLeftModule(layout)]; } + getSvgSeparator(): SvgSeparator { + if (!this.separator) { + this.separator = convertXmlToSvgSeparator(require('xml-loader!../../devices/uhk60-right/separator.xml').svg); + } + + return this.separator; + } + private getLeftModule(layout = KeyboardLayout.ANSI): SvgModule { if (layout === KeyboardLayout.ISO) { if (!this.isoLeft) { diff --git a/packages/uhk-web/src/devices/uhk60-right/separator.xml b/packages/uhk-web/src/devices/uhk60-right/separator.xml index 68e6f615..9244b7bb 100644 --- a/packages/uhk-web/src/devices/uhk60-right/separator.xml +++ b/packages/uhk-web/src/devices/uhk60-right/separator.xml @@ -3,5 +3,5 @@ + d="M 16.455118,651.55037 16.455118,737.88305 C 16.455118,737.88305 16.419979,743.14568 11.278346,743.14568 L -10.998425,743.14568 C -10.998425,743.14568 -16.174,743.39316 -16.174,748.40667 L -16.174,804.39801 C -16.174,807.0217 -14.110808,809.66218 -10.998425,809.66218 L -4.719685,809.66218 C -4.719685,809.66218 0.315,809.66109 0.315,814.92517 L 0.315,870.91651 C 0.315,870.91651 0.31884203,876.17868 5.3503937,876.17868 L 28.187008,876.17868 C 28.187008,876.17868 33.311,876.17121 33.311,881.44014 L 33.311,937.43147 C 33.311,937.43147 33.306776,942.69568 28.187008,942.69568 L 4.719685,942.69568 C 4.719685,942.69568 -0.01,942.67983 -0.01,947.95864 L -0.01,1050.5905" />