Author: challngr
Date: Wed Jul 9 18:48:22 2014
New Revision: 1609266
URL: http://svn.apache.org/r1609266
Log:
UIMA-3900 Center titles. Put viz into the nav menu.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/JobFragment.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c0-menu.jsp
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/JobFragment.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/JobFragment.java?rev=1609266&r1=1609265&r2=1609266&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/JobFragment.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/JobFragment.java
Wed Jul 9 18:48:22 2014
@@ -50,7 +50,7 @@ class JobFragment
{
if ( type == DuccType.Undefined ) {
fillColor = "0,0,0";
- textColor = "256,256,256";
+ textColor = "255,255,255";
} else {
int color_index = (user + " ").hashCode(); // we add " " because
orginal viz did and this keeps the colors consistent.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java?rev=1609266&r1=1609265&r2=1609266&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/Markup.java
Wed Jul 9 18:48:22 2014
@@ -81,11 +81,29 @@ public class Markup
out.append("\" y=\"");
out.append((y*YSCALE) );
out.append("\" font-family=\"helvetica\" font-size=\"10\"
font-weight=\"bold\"" );
+ out.append(" text-anchor=\"middle\"");
out.append(" fill=\"black\">" );
out.append(label);
out.append("</text>");
}
+ void centeredText(float x, float y, String label, String color, int
fontsize)
+ {
+ out.append("<text x=\"");
+ out.append(Float.toString(x * XSCALE));
+ out.append("\" y=\"");
+ out.append(Float.toString(y * YSCALE));
+ out.append("\" font-family=\"helvetica\" font-size=\"");
+ out.append(Integer.toString(fontsize));
+ out.append("\" fill=\"");
+ out.append(color);
+ out.append("\"");
+ out.append(" text-anchor=\"middle\"");
+ out.append(">");
+ out.append(label);
+ out.append("</text>");
+ }
+
void text(float x, float y, String label, String color, int fontsize)
{
out.append("<text x=\"");
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java?rev=1609266&r1=1609265&r2=1609266&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java
Wed Jul 9 18:48:22 2014
@@ -245,6 +245,7 @@ public class NodeViz
visualization =
"<html>" +
"<div id=\"viz-header\" style=\"text-align:center\">" +
+
"Sort By " +
"<i onclick=\"ducc_viz_node_sorter('size')\"
id=\"ducc-viz-sort-size\" style=\"color:red\">Size </i>" +
"<i onclick=\"ducc_viz_node_sorter('name')\"
id=\"ducc-viz-sort-name\"\">Name</i>" +
@@ -267,7 +268,7 @@ public class NodeViz
"</div>" +
"<br>" +
//"<div id=\"nodelist\" style=\"background-color:e5e5e5\">" +
- "<div id=\"nodelist\" style=\"background-color:eeeeee\">" +
+ "<div id=\"nodelist\"
style=\"background-color:eeeeee;padding:3\">" +
page +
"</div>" +
"<script>" +
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java?rev=1609266&r1=1609265&r2=1609266&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java
Wed Jul 9 18:48:22 2014
@@ -157,7 +157,7 @@ class VisualizedHost
// here draw the node name just above the node box, including the hover
m.tooltipStart(name + " (" + mem + "GB)");
- m.nodeLabel(0f, TITLE_ADJUSTMENT - .3f, name);
+ m.nodeLabel((size/2), TITLE_ADJUSTMENT - .3f, name);
m.tooltipEnd();
Collections.sort(fragments, sorter);
@@ -209,15 +209,9 @@ class VisualizedHost
break;
}
- // if ( j.type == DuccType.Undefined ) {
- // m.rect(0, top, size, height, "", "black", .1f, "");
- // } else {
- // m.rect(0, top, size, height, fill, "black", .1f, "");
- // }
-
// draw the work duccid in the fragment
m.rect(.1f, top, size-.1f, 1.2f, j.fillColor, j.fillColor, .1f,
"");
- m.text(.1f, top + 1.2f, j.id + " " + j.user, j.textColor, 10);
+ m.centeredText((size/2), top + 1.2f, j.id + " " + j.user,
j.textColor, 10);
// close off the markup elements
m.hyperlinkEnd();
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c0-menu.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/%24banner/c0-menu.jsp?rev=1609266&r1=1609265&r2=1609266&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c0-menu.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/$banner/c0-menu.jsp
Wed Jul 9 18:48:22 2014
@@ -32,6 +32,7 @@ under the License.
<li><a href="doc/duccbook.html" target="_duccbook">DuccBook</a></li>
<li><a href="system.machines.html">Machines</a></li>
</ul>
+<li><a href="viz.html">Viz</a></li>
<%@ include file="../site.jsp" %>
</ul>
</div>
\ No newline at end of file
