diff options
Diffstat (limited to 'frontend/src/app/_elements')
4 files changed, 23 insertions, 7 deletions
diff --git a/frontend/src/app/_elements/column-table/column-table.component.ts b/frontend/src/app/_elements/column-table/column-table.component.ts index e41cd51d..44a15f22 100644 --- a/frontend/src/app/_elements/column-table/column-table.component.ts +++ b/frontend/src/app/_elements/column-table/column-table.component.ts @@ -24,6 +24,7 @@ export class ColumnTableComponent implements AfterViewInit { @Input() experiment!: Experiment; @Output() okPressed: EventEmitter<string> = new EventEmitter(); @Output() columnTableChanged = new EventEmitter(); + @Output() experimentChanged = new EventEmitter(); Object = Object; Encoding = Encoding; @@ -175,7 +176,7 @@ export class ColumnTableComponent implements AfterViewInit { } openEncodingDialog() { const dialogRef = this.dialog.open(EncodingDialogComponent, { - width: '300px' + width: '400px' }); dialogRef.afterClosed().subscribe(selectedEncoding => { if (selectedEncoding != undefined) @@ -231,14 +232,19 @@ export class ColumnTableComponent implements AfterViewInit { }); dialogRef.afterClosed().subscribe(experiment => { if (experiment) { - this.experiment = experiment; + Object.assign(this.experiment, experiment); + this.experiment._columnsSelected = true; + this.experimentChanged.emit(); + console.log(this.experiment); } }); } openUpdateExperimentDialog() { this.experimentService.updateExperiment(this.experiment).subscribe((response) => { - this.experiment = response; + Object.assign(this.experiment, response); + this.experiment._columnsSelected = true; + this.experimentChanged.emit(); Shared.openDialog("Izmena eksperimenta", "Uspešno ste izmenili podatke o eksperimentu."); }); } diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts index fabb524c..e60f041e 100644 --- a/frontend/src/app/_elements/folder/folder.component.ts +++ b/frontend/src/app/_elements/folder/folder.component.ts @@ -360,6 +360,12 @@ export class FolderComponent implements AfterViewInit { } this.searchTermsChanged(); } + + updateExperiment() { + if (this.formModel) { + this.formModel.updateGraph(); + } + } } export enum Privacy { diff --git a/frontend/src/app/_elements/form-model/form-model.component.html b/frontend/src/app/_elements/form-model/form-model.component.html index 361e2545..d13cb3aa 100644 --- a/frontend/src/app/_elements/form-model/form-model.component.html +++ b/frontend/src/app/_elements/form-model/form-model.component.html @@ -109,7 +109,7 @@ <div class="col-sm-9"> <!-- {{forExperiment._columnsSelected}} --> - <app-graph [model]="newModel" *ngIf="forExperiment._columnsSelected" [inputColumns]="forExperiment.inputColumns"></app-graph> + <app-graph [model]="newModel" *ngIf="forExperiment._columnsSelected" [inputColumns]="getInputColumns()"></app-graph> <app-graph [model]="newModel" *ngIf="!forExperiment._columnsSelected" [inputColumns]="['Nisu odabrane ulazne kolone']"></app-graph> </div> </div> @@ -124,9 +124,9 @@ <button class="btn-clear btn-icon bubble" (click)="removeLayer()"> <mat-icon>remove</mat-icon> </button> - + <div>{{newModel.hiddenLayers}}</div> - + <button class="btn-clear btn-icon bubble" (click)="addLayer()"> <mat-icon>add</mat-icon> </button> diff --git a/frontend/src/app/_elements/form-model/form-model.component.ts b/frontend/src/app/_elements/form-model/form-model.component.ts index 82fa0e95..a98ceaec 100644 --- a/frontend/src/app/_elements/form-model/form-model.component.ts +++ b/frontend/src/app/_elements/form-model/form-model.component.ts @@ -149,5 +149,9 @@ export class FormModelComponent implements AfterViewInit { this.lossFunction = LossFunctionMultiClassification; this.newModel.lossFunction=LossFunction.SparseCategoricalCrossEntropy; } - } + +} +getInputColumns() { + return this.forExperiment.inputColumns.filter(x => x != this.forExperiment.outputColumn); +} } |