diff options
Diffstat (limited to 'frontend/src/app/_pages')
4 files changed, 24 insertions, 15 deletions
diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html index 6bd921fd..3176f58c 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.html +++ b/frontend/src/app/_pages/experiment/experiment.component.html @@ -67,8 +67,8 @@ <button mat-raised-button *ngIf="comparing" (click)="toggleCompare()"><mat-icon>not_interested</mat-icon> Prekini upoređivanje</button> </div> <div class="side-by-side"> - <app-folder #folderModel [type]="FolderType.Model" [forExperiment]="experiment" [startingTab]="TabType.NewFile" [tabsToShow]="[TabType.MyModels]" (okPressed)="goToPage(3); trainModel();" (selectedFileChanged)="setModel($event);"></app-folder> - <app-folder #folderModelCompare [type]="FolderType.Model" [forExperiment]="experiment" [startingTab]="TabType.MyModels" [tabsToShow]="[TabType.MyModels]" (okPressed)="goToPage(3); trainModelCmp();" (selectedFileChanged)="setModelCmp($event);" style="width: 50%;" + <app-folder #folderModel [type]="FolderType.Model" [forExperiment]="experiment" [startingTab]="TabType.NewFile" [tabsToShow]="[TabType.MyModels]" (okPressed)="trainModel();" (selectedFileChanged)="setModel($event);"></app-folder> + <app-folder #folderModelCompare [type]="FolderType.Model" [forExperiment]="experiment" [startingTab]="TabType.MyModels" [tabsToShow]="[TabType.MyModels]" (okPressed)=" trainModelCmp();" (selectedFileChanged)="setModelCmp($event);" style="width: 50%;" *ngIf="comparing"></app-folder> </div> </div> diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts index 20a3afb0..e4d444b2 100644 --- a/frontend/src/app/_pages/experiment/experiment.component.ts +++ b/frontend/src/app/_pages/experiment/experiment.component.ts @@ -75,7 +75,10 @@ export class ExperimentComponent implements AfterViewInit { Shared.openDialog('Greška', 'Morate odabrati konfiguraciju neuronske mreže'); } else { this.modelsService.trainModel(this.modelToTrain._id, this.experiment._id).subscribe(() => { console.log("pocelo treniranje") }); - this.step4 = true; + this.step3 = true; + setTimeout(() => { + this.goToPage(3); + }); } } @@ -84,7 +87,10 @@ export class ExperimentComponent implements AfterViewInit { Shared.openDialog('Greška', 'Morate odabrati konfiguraciju neuronske mreže'); } else { this.modelsService.trainModel(this.modelToTrainCmp._id, this.experiment._id).subscribe(() => { console.log("pocelo treniranje") }); - this.step4 = true; + this.step3 = true; + setTimeout(() => { + this.goToPage(3); + }); } } @@ -268,10 +274,11 @@ export class ExperimentComponent implements AfterViewInit { } setDataset(dataset: FolderFile | null) { - if (dataset == null) { + if (dataset == null ||dataset==undefined) { this.columnTable.loaded = false; this.dataset = undefined; this.experiment.datasetId = ''; + this.step1=false; return; } const d = <Dataset>dataset; @@ -291,12 +298,12 @@ export class ExperimentComponent implements AfterViewInit { setModel(model: FolderFile) { const m = <Model>model; this.modelToTrain = m; - this.step3 = true; + //this.step3 = true; } setModelCmp(model: FolderFile) { const m = <Model>model; this.modelToTrainCmp = m; - this.step3 = true; + //this.step3 = true; } } diff --git a/frontend/src/app/_pages/page-model/page-model.component.html b/frontend/src/app/_pages/page-model/page-model.component.html index e494542f..0ac8aaae 100644 --- a/frontend/src/app/_pages/page-model/page-model.component.html +++ b/frontend/src/app/_pages/page-model/page-model.component.html @@ -1,4 +1,6 @@ <div class="force-centered" style="color: var(--offwhite);"> - <app-form-model [disableAll]="true"></app-form-model> + <div> + {{JSON.stringify(model)}} + </div> <button mat-raised-button class="m-3 p-2" (click)="import()">Uvezi</button> </div>
\ No newline at end of file diff --git a/frontend/src/app/_pages/page-model/page-model.component.ts b/frontend/src/app/_pages/page-model/page-model.component.ts index f988ef0d..0ccd0f9a 100644 --- a/frontend/src/app/_pages/page-model/page-model.component.ts +++ b/frontend/src/app/_pages/page-model/page-model.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import Shared from 'src/app/Shared'; +import Experiment from 'src/app/_data/Experiment'; import Model from 'src/app/_data/Model'; import { FormModelComponent } from 'src/app/_elements/form-model/form-model.component'; import { ModelsService } from 'src/app/_services/models.service'; @@ -12,16 +13,14 @@ import { ModelsService } from 'src/app/_services/models.service'; }) export class PageModelComponent implements OnInit { - @ViewChild(FormModelComponent) formModel!: FormModelComponent; - constructor(private route: ActivatedRoute, private router: Router, private modelsService: ModelsService) { } - + model!:Model; ngOnInit(): void { this.route.queryParams.subscribe(params => { let id = this.route.snapshot.paramMap.get("id"); if (id) { this.modelsService.getModelById(id).subscribe((model) => { - this.formModel.newModel = model; + this.model = model; }); } else { this.router.navigate(['']); @@ -30,12 +29,13 @@ export class PageModelComponent implements OnInit { } import() { - this.formModel.newModel._id = ""; - this.formModel.newModel.isPublic = false; - this.modelsService.stealModel(this.formModel.newModel).subscribe((response) => { + this.model._id = ""; + this.model.isPublic = false; + this.modelsService.stealModel(this.model).subscribe((response) => { Shared.openDialog("Obaveštenje", "Uspešno ste dodali javnu konfiguraciju neuronske mreže u vašu kolekciju."); }, (error: any) => { Shared.openDialog("Obaveštenje", "Konfiguracija neuronske mreže sa ovim imenom postoji u vašoj kolekciji."); }); } + JSON=JSON; } |