Skip to content
Snippets Groups Projects
Commit c540c3f1 authored by Christopher Schankula's avatar Christopher Schankula :earth_africa:
Browse files

merge

parent 5d5ad732
No related branches found
No related tags found
No related merge requests found
...@@ -19,6 +19,7 @@ function histogram(x,y){ ...@@ -19,6 +19,7 @@ function histogram(x,y){
size: 18, size: 18,
color: '#7f7f7f' color: '#7f7f7f'
} }
, autosize: true
}, },
yaxis:{title: 'Individual count', yaxis:{title: 'Individual count',
titlefont: { titlefont: {
......
...@@ -5,13 +5,18 @@ ...@@ -5,13 +5,18 @@
<% <%
TrawlExpert te = (TrawlExpert)request.getServletContext().getAttribute("trawl"); TrawlExpert te = (TrawlExpert)request.getServletContext().getAttribute("trawl");
BasicSearchResult result = te.rangeSearch(2, 1960, 2016); JSONParser parser = new JSONParser();
JSONObject req = (JSONObject) parser.parse(request.getReader().readLine());
Integer taxonId = (int) (long) req.get("taxId");
Integer yearLo = (int) (long) req.get("yearF");
Integer yearHi = (int) (long) req.get("yearT");
BasicSearchResult result = te.rangeSearch(taxonId, yearLo, yearHi);
BST<Integer, Integer> histogram = result.histogram(); BST<Integer, Integer> histogram = result.histogram();
Iterable<Integer> results = histogram.keys(); Iterable<Integer> results = histogram.keys();
JSONParser parser = new JSONParser();
JSONObject js = new JSONObject(); JSONObject js = new JSONObject();
JSONArray x = new JSONArray(); JSONArray x = new JSONArray();
......
...@@ -199,7 +199,7 @@ function callOutput(){ ...@@ -199,7 +199,7 @@ function callOutput(){
var params= JSON.stringify({taxId: Number(taxGroup), yearF: Number(yearFrom), yearT: Number(yearTo)}); var params= JSON.stringify({taxId: Number(taxGroup), yearF: Number(yearFrom), yearT: Number(yearTo)});
//Switch Output Display //Switch Output Display
if(outType === "Histogram"){ if(outType === "histogram"){
reqHistogram(params); reqHistogram(params);
} }
else{ else{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment