Navigation

Changeset 16029

Timestamp:

02/07/08 15:09:11 (2 months ago)

Author:

watkins

Message:

Merged widgetws branch back into the trunk

Files:

r15901	r16029
13	13	import java.awt.BasicStroke;
14	14	import java.awt.Font;
	15	import java.io.File;
	16	import java.io.FileInputStream;
15	17	import java.lang.reflect.Constructor;
16	18	import java.util.List;
	19
	20	import net.sourceforge.iharder.Base64;
17	21
18	22	import org.intermine.objectstore.ObjectStore;
…	…
289	293	* @return the HTML as a String
290	294	*/
291		public String getHtml() {
292		StringBuffer sb = new StringBuffer("<img src=\"loadTmpImg.do?fileName=" + fileName
293		+ "\" width=\"" + ((GraphWidgetConfig) config).getWIDTH() + "\" height=\""
294		+ ((GraphWidgetConfig) config).getHEIGHT()
295		+ "\" usemap=\"#chart" + fileName + "\">");
	295	public String getHtml() throws Exception{
	296	File file = new File(System.getProperty("java.io.tmpdir"), fileName);
	297	FileInputStream is = new FileInputStream(file);
	298	// Create the byte array to hold the data
	299	byte[] bytes = new byte[(int) file.length()];
	300	String h;
	301	is.read(bytes);
	302	h = Base64.encodeBytes(bytes);
	303	StringBuffer sb = new StringBuffer("<img src=\"data:image/png;base64," + h + "\" width=\""
	304	+ ((GraphWidgetConfig) config).getWIDTH()
	305	+ "\" height=\""
	306	+ ((GraphWidgetConfig) config).getHEIGHT()
	307	+ "\" usemap=\"#chart" + fileName + "\">");
296	308	sb.append(imageMap);
297	309	return sb.toString();

r15743	r16029
100	100	<action path="/exportQuery" type="org.intermine.web.struts.ExportQueryAction">
101	101	</action>
102		~~<action path="/loadTmpImg" type="org.intermine.web.struts.TempImageLoader">~~
103		~~</action>~~
104	102	<action path="/tips" forward="tips.page">
105	103	</action>

r15760	r16029
98	98	<url-pattern>/service/template/results</url-pattern>
99	99	</servlet-mapping>
	100
	101	<servlet>
	102	<servlet-name>ws-widgets</servlet-name>
	103	<servlet-class>org.intermine.webservice.widget.WidgetsServlet</servlet-class>
	104	<init-param>
	105	<param-name>debug</param-name>
	106	<param-value>true</param-value>
	107	</init-param>
	108	</servlet>
	109
	110	<servlet-mapping>
	111	<servlet-name>ws-widgets</servlet-name>
	112	<url-pattern>/service/widgets</url-pattern>
	113	</servlet-mapping>
100	114
101	115	<!-- ================================================================================= -->