diff --git a/beat/web/plotters/static/plotters/app/directives/plotterparameterItemView.js b/beat/web/plotters/static/plotters/app/directives/plotterparameterItemView.js index 4e0144aa44792111d0615d7b5fb3c2732039b073..c943b2120b4697eec64b38bb0b8dcd85818af36b 100644 --- a/beat/web/plotters/static/plotters/app/directives/plotterparameterItemView.js +++ b/beat/web/plotters/static/plotters/app/directives/plotterparameterItemView.js @@ -39,9 +39,6 @@ app.directive("plotinfo", function(){ }, link: function(scope, elem, attrs) { - console.log("--"); - console.log(scope.plotterparameter); - console.log("--"); var data_to_plot = scope.plotters.selected.sample_data; $('td#td_' + scope.plotterparameter.name).ready(function(){ beat.experiments.utils.displayPlot( @@ -65,6 +62,46 @@ app.directive("plotinfo", function(){ }; }); +//Directive used to plot a graph with dynamic params +app.directive("plotinfodynamicparams", function(){ + + return { + restrict: 'E', + scope: true, + replace: true, + //templateUrl: "/reports/partials/reportTable/", + templateUrl: function(scope, elem, attrs) + { + var prefix = elem['urlprefix']; + var the_url = prefix + "/plotters/partials/plotinfo/"; + return the_url; + }, + link: function(scope, elem, attrs) + { + var data_to_plot = scope.plotters.selected.sample_data; + $('td#td_' + scope.plotterparameter.name).ready(function(){ + beat.experiments.utils.displayPlot( + scope.url_prefix, + $('td#td_figure_plot')[0], + { + output: scope.plotterparameter, + plotter: scope.plotters.selected.name, + parameter: scope.plotterparameter, + merged: true, + sample_data: scope.plotters.selected.sample_data, + dynamic_params: JSON.stringify(scope.plotterparams_update), + }, + [scope.plotters.selected], // available plotters + true, // replace contents of tag above? + function(){$(this).find('i.fa-spin').hide();}); + }); + + }, + controller: ['$scope', function ($scope) { + }], + }; +}); + //Directive used to generate the selector for plotting graph app.directive("selectplotter", function($compile) { @@ -477,37 +514,18 @@ app.directive("testplotterparameters", function($compile) { element.bind("click", function() { - console.log("TODO:rewrite another plotter view"); - }); + //update the plot + var plotter_graph_element = document.getElementById('space-for-plotterparameter-plot'); + generate_graph(plotter_graph_element); - //scope.$on("addParametersElement", function(event) - //{ - // console.log("broadcasted"); - // //add the plot - // var plotter_graph_element = document.getElementById('space-for-plotterparameter-plot'); - // generate_graph(plotter_graph_element); - - // //add the parameters - // var parameter_elements = document.getElementById('space-for-plotterparameter-items'); - // append_plotterparameters(parameter_elements) - - // //functions to operate on graph and parameters - - // function generate_graph(head_id) - // { - // var html_div_code = "<plotinfo urlprefix=" + scope.url_prefix +"></plotinfo>" - // $(head_id ).empty(); - // angular.element(head_id).append($compile(html_div_code)(scope)); - // } - - // function append_plotterparameters(head_id) - // { - // var html_div_code = "<plotparams urlprefix=" + scope.url_prefix +"></plotparams>" - // $(head_id ).empty(); - // angular.element(head_id).append($compile(html_div_code)(scope)); - // } - - //}); + //functions to operate on graph and parameters + function generate_graph(head_id) + { + var html_div_code = "<plotinfodynamicparams urlprefix=" + scope.url_prefix +"></plotinfodynamicparams>" + $(head_id ).empty(); + angular.element(head_id).append($compile(html_div_code)(scope)); + } + }); }; });