From: <mg...@us...> - 2007-01-04 19:10:32
|
Revision: 267 http://svn.sourceforge.net/obo/?rev=267&view=rev Author: mgibson Date: 2007-01-04 11:10:26 -0800 (Thu, 04 Jan 2007) Log Message: ----------- got phenote working with the latest shrimp dag viewer - still a bunch of issues to work out but its coming along - not ready yet for curators to check out i think Modified Paths: -------------- phenote/trunk/build.xml phenote/trunk/jars/layouts.jar phenote/trunk/jars/shrimp.jar phenote/trunk/phenote phenote/trunk/src/java/phenote/gui/ShrimpDag.java Modified: phenote/trunk/build.xml =================================================================== --- phenote/trunk/build.xml 2006-12-22 18:24:19 UTC (rev 266) +++ phenote/trunk/build.xml 2007-01-04 19:10:26 UTC (rev 267) @@ -74,7 +74,7 @@ <!-- runs off classfiles not jar, todo: run-jar --> <target name="run" depends="compile"> - <java classname="phenote.main.Phenote" fork="yes" jvmargs="-Xmx120M"> + <java classname="phenote.main.Phenote" fork="yes" jvmargs="-Xmx400M"> <!-- arg value="-c configfilehereventually"/ --> <classpath> <pathelement path="${classfiles}"/> Modified: phenote/trunk/jars/layouts.jar =================================================================== (Binary files differ) Modified: phenote/trunk/jars/shrimp.jar =================================================================== (Binary files differ) Modified: phenote/trunk/phenote =================================================================== --- phenote/trunk/phenote 2006-12-22 18:24:19 UTC (rev 266) +++ phenote/trunk/phenote 2007-01-04 19:10:26 UTC (rev 267) @@ -1,3 +1,13 @@ #!/bin/sh -java -Xmx300M -classpath classfiles:jars/oboedit.jar:jars/org.geneontology.jar:jars/BrowserLauncher2-10rc4.jar:jars/junit-4.0.jar:jars/tomcat-servlet.jar:jars/xbean.jar:jars/jsr173_1.0_api.jar:jars/phenoxmlbeans.jar:jars/phenoteconfigbeans.jar:jars/log4j-1.2.13.jar:jars/te-common.jar phenote.main.Phenote $@ +PHENOTE_CLASSPATH=classfiles +for file in jars/*.jar; do + if [ $file != jars/phenote.jar ]; then + #echo "Adding ${file} to CLASSPATH" + PHENOTE_CLASSPATH=${PHENOTE_CLASSPATH}:${file}; + fi; +done + +java -Xmx300M -classpath ${PHENOTE_CLASSPATH} phenote.main.Phenote $@ + +##java -Xmx300M -classpath classfiles:jars/oboedit.jar:jars/org.geneontology.jar:jars/BrowserLauncher2-10rc4.jar:jars/junit-4.0.jar:jars/tomcat-servlet.jar:jars/xbean.jar:jars/jsr173_1.0_api.jar:jars/phenoxmlbeans.jar:jars/phenoteconfigbeans.jar:jars/log4j-1.2.13.jar:jars/te-common.jar phenote.main.Phenote $@ Modified: phenote/trunk/src/java/phenote/gui/ShrimpDag.java =================================================================== --- phenote/trunk/src/java/phenote/gui/ShrimpDag.java 2006-12-22 18:24:19 UTC (rev 266) +++ phenote/trunk/src/java/phenote/gui/ShrimpDag.java 2007-01-04 19:10:26 UTC (rev 267) @@ -1,7 +1,9 @@ package phenote.gui; -//import javax.swing.JFrame; +import java.awt.Component; +import javax.swing.JFrame; + import org.geneontology.oboedit.datamodel.OBOSession; //import ca.uvic.csr.shrimp.gui.QueryView.QueryView; @@ -27,9 +29,9 @@ } private ShrimpDag() { - //window = new JFrame("Shrimp ontology viewer"); - //window.pack(); - //window.setVisible(true); + //window = new JFrame("Shrimp ontology viewer"); + //window.pack(); + //window.setVisible(true); init(); } @@ -46,13 +48,24 @@ private void init() { //initShrimp(); SelectionManager.inst().addTermSelectionListener(new ShrimpSelectionListener()); + //initOntologies(); } public void display() { //queryView = new QueryView(); false - show query view? boolean showQueryPanel = true; - oboViewer = - new OBOViewer("Shrimp ontology viewer",getOboSession(),showQueryPanel); + oboViewer = new OBOViewer(showQueryPanel); + //new OBOViewer("Shrimp ontology viewer",getOboSession(),showQueryPanel); + oboViewer.loadOBOSession(getOboSession()); // change this! + + JFrame frame = new JFrame("Shrimp DAG view"); + //frame.setDefaultCloseOperation(java.awt.WindowListener.DISPOSE_ON_CLOSE); + frame.getContentPane().add(oboViewer.getView()); + frame.pack(); + frame.setSize(600, 600); + frame.setLocation(400, 200); + frame.setVisible(true); + } private OBOSession getOboSession() { @@ -76,10 +89,11 @@ if (e.isMouseOverEvent()) return false; String term = e.getOboClass().getName(); boolean animate = true; - getQueryView().query(term, animate); + //getQueryView().query(term, animate); + oboViewer.query(getOboSession(),e.getOboClass(),animate); return true; } } -} \ No newline at end of file +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |