diff options
author | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-05-04 20:29:40 +0200 |
---|---|---|
committer | Ognjen Cirkovic <ciraboxkg@gmail.com> | 2022-05-04 20:29:40 +0200 |
commit | 2c852c832bf310feeb6045380a533bb4f832ccfd (patch) | |
tree | 6fa81c0c45a4e0e2550e10371050c07b32a74dd0 /frontend/src/app/_elements/graph | |
parent | 45c519d53fee1124c2882c7b353cd930fd311f9e (diff) | |
parent | 3ac7a37690765d6c116463dc8a6ef08b18afea50 (diff) |
Mergovana grana sa granom redesign. Sredjeni konflikti.
Diffstat (limited to 'frontend/src/app/_elements/graph')
-rw-r--r-- | frontend/src/app/_elements/graph/graph.component.css | 7 | ||||
-rw-r--r-- | frontend/src/app/_elements/graph/graph.component.html | 2 | ||||
-rw-r--r-- | frontend/src/app/_elements/graph/graph.component.ts | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/frontend/src/app/_elements/graph/graph.component.css b/frontend/src/app/_elements/graph/graph.component.css index 361e7249..456a8df1 100644 --- a/frontend/src/app/_elements/graph/graph.component.css +++ b/frontend/src/app/_elements/graph/graph.component.css @@ -1,6 +1,5 @@ .node-text { position: absolute; - color: transparent; width: 100px; height: 40px; text-align: center; @@ -12,6 +11,10 @@ transform: translate(-50%, -50%); } -.node-text:hover { +.node-text:not(.inputs) { + color: transparent; +} + +.node-text:not(.inputs):hover { color: var(--offwhite); }
\ No newline at end of file diff --git a/frontend/src/app/_elements/graph/graph.component.html b/frontend/src/app/_elements/graph/graph.component.html index 19e5c14a..3c01bc5e 100644 --- a/frontend/src/app/_elements/graph/graph.component.html +++ b/frontend/src/app/_elements/graph/graph.component.html @@ -1,6 +1,6 @@ <div #graphWrapper class="w-100 position-relative" style="height: 14rem;"> <ng-container *ngFor="let layer of layers; let i = index"> - <div class="node-text" *ngFor="let node of layer; let j = index" [style.left.%]="node.x * 99.4" [style.top.%]="node.y * 100"> + <div [ngClass]="{'inputs': i==0}" class="node-text" *ngFor="let node of layer; let j = index" [style.left.%]="node.x * 99.4" [style.top.%]="node.y * 100"> {{ i == 0 ? (inputColumns ? inputColumns[j] : 'nepoznato') : (i > 0 && i < layers.length - 1 ? model!.layers[i-1].activationFunction : (i==layers.length - 1 ? 'out' : '')) }} </div> </ng-container> diff --git a/frontend/src/app/_elements/graph/graph.component.ts b/frontend/src/app/_elements/graph/graph.component.ts index 31814c2c..c7f8d964 100644 --- a/frontend/src/app/_elements/graph/graph.component.ts +++ b/frontend/src/app/_elements/graph/graph.component.ts @@ -28,7 +28,7 @@ export class GraphComponent implements AfterViewInit { @Input() outputNodeColor: string = '#dfd7d7'; private ctx!: CanvasRenderingContext2D; - @Input() inputColumns?: string[] = []; + @Input() inputColumns?: string[] = ['Nije odabran eksperiment']; constructor() { } @@ -43,6 +43,7 @@ export class GraphComponent implements AfterViewInit { window.addEventListener('resize', () => { this.resize() }); this.update(); this.resize(); + console.log(this.layers); } layers: Node[][] = []; |