Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev

# Conflicts:
#	frontend/src/app/_elements/model-load/model-load.component.html
#	frontend/src/app/_elements/model-load/model-load.component.ts

1 files changed, 6 insertions, 1 deletions

diff --git a/frontend/src/app/experiment/experiment.component.ts b/frontend/src/app/experiment/experiment.component.ts
index ada0484e..6af5d686 100644
--- a/frontend/src/app/experiment/experiment.component.ts
+++ b/frontend/src/app/experiment/experiment.component.ts
@@ -29,10 +29,15 @@ export class ExperimentComponent implements OnInit {
   }
 
   updateDataset(dataset: Dataset) {
-    console.log(dataset);
+    //console.log(dataset);
     this.selectedDataset = dataset;
   }
 
+  updateModel(model: Model) {
+    //console.log(model);
+    this.selectedModel = model;
+  }
+
   getInputById(id: string): HTMLInputElement {
     return document.getElementById(id) as HTMLInputElement;
   }