Commit a7c31bcf authored by Pierre-Yves Gibello's avatar Pierre-Yves Gibello
Browse files

Misspelled dendogram now properly called dendrogram

parent 0732d59c
......@@ -83,17 +83,17 @@ public class TreeNode {
}
public String toString() {
return toDendogramJson();
return toDendrogramJson();
}
/**
* Generates JSON data for D3.js dendogram
* @return JSON formatted for D3.js dendogram
* Generates JSON data for D3.js dendrogram
* @return JSON formatted for D3.js dendrogram
*/
public String toDendogramJson() {
return toDendogramJson(0);
public String toDendrogramJson() {
return toDendrogramJson(0);
}
private String toDendogramJson(int tab) {
private String toDendrogramJson(int tab) {
DecimalFormat df = new DecimalFormat("0.00", new DecimalFormatSymbols(Locale.US));
StringBuilder json = new StringBuilder();
if(children == null) {
......@@ -102,7 +102,7 @@ public class TreeNode {
tab(json, tab).append("{ \"name\": \"").append(this.getName()).append("\", \"parent\": \"").append(this.parent == null ? "" : this.parent.getName()).append("\", \"value\": \"").append(df.format(this.computeValue())).append("\", \"children\": [\n");
boolean first = true;
for (TreeNode node : children) {
tab(json, tab).append(first ? "" : ", ").append(node.toDendogramJson(tab + 1));
tab(json, tab).append(first ? "" : ", ").append(node.toDendrogramJson(tab + 1));
first = false;
}
json.append("\n");
......
......@@ -34,7 +34,7 @@ String project = request.getParameter("project");
if(request.getParameter("skipForm") == null) {
List<String> projects = DatasetFactory.listProjects(23, "data missing");
if(projects != null) {
out.println("<form method=\"post\" action=\"dendogram.jsp\">");
out.println("<form method=\"post\" action=\"dendrogram.jsp\">");
out.println("<select name=\"project\" onchange=\"this.form.submit()\">");
......@@ -64,7 +64,7 @@ var treeData = [
<%
if(project != null) {
DatasetFactory f = new DatasetFactory(project);
out.println(f.getMRLTree().toDendogramJson());
out.println(f.getMRLTree().toDendrogramJson());
}
%>
];
......
......@@ -90,7 +90,7 @@ if(project == null) project = projects.stream().findFirst().orElse(null);
<div class="tab">
<button class="tablinks" onclick="openTab(event, 'Radar')">Radar view</button>
<button class="tablinks" onclick="openTab(event, 'Dendogram')">Tree view</button>
<button class="tablinks" onclick="openTab(event, 'Dendrogram')">Tree view</button>
<button class="tablinks" onclick="openTab(event, 'Score')">Score</button>
</div>
......@@ -103,11 +103,11 @@ if(project == null) project = projects.stream().findFirst().orElse(null);
</object>
</div>
<div id="Dendogram" class="tabcontent">
<div id="Dendrogram" class="tabcontent">
<% if(project != null) { %>
<object type="text/html" data="dendogram.jsp?skipForm=true&project=<%=project%>" width="1600px" height="1200px">
<object type="text/html" data="dendrogram.jsp?skipForm=true&project=<%=project%>" width="1600px" height="1200px">
<% } else { %>
<object type="text/html" data="dendogram.jsp?skipForm=true>" width="1600px" height="1200px">
<object type="text/html" data="dendrogram.jsp?skipForm=true>" width="1600px" height="1200px">
<% } %>
</object>
</div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment