Menu
▾
▴
[CIShell-SVN] SF.net SVN: cishell:[866] trunk/clients/gui
|
From: <mwl...@us...> - 2009-04-24 22:00:54
|
Revision: 866
http://cishell.svn.sourceforge.net/cishell/?rev=866&view=rev
Author: mwlinnem
Date: 2009-04-24 22:00:50 +0000 (Fri, 24 Apr 2009)
Log Message:
-----------
3 Things: Fixed CIShell menu to only include things really in CIShell, not things in NWB. Added a bunch of new icons from SciPolicy into CIShell as well. Made CIShell use a default icon instead of crashing and burning when it can't find an icon it wants.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/extra-files/configuration/default_menu.xml
trunk/clients/gui/org.cishell.reference.gui.datamanager/build.properties
trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java
Added Paths:
-----------
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/database.jpg
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/matrix.png
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/plot.png
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/raster_image.jpg
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/vector_image.jpg
trunk/clients/gui/org.cishell.reference.gui.datamanager/unknown.png
Modified: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/extra-files/configuration/default_menu.xml
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/extra-files/configuration/default_menu.xml 2009-03-06 23:41:41 UTC (rev 865)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/extra-files/configuration/default_menu.xml 2009-04-24 22:00:50 UTC (rev 866)
@@ -2,126 +2,23 @@
<!-- <?xml version="1.0" encoding="ISO-8859-1" ?> -->
<menu_layout>
<top_menu name="File">
- <menu name="Load..." pid= "org.cishell.reference.gui.persistence.load.FileLoad "/>
- <menu name="Load CSV Files" pid= "edu.iu.nwb.preprocessing.csv.CsvAlgorithm"/>
- <menu name="Directory Hierarchy Reader" pid= "edu.iu.nwb.preprocessing.prefuse.beta.directoryhierarchyreader.DirectoryHierarchyReaderAlgorithm"/>
- <menu name = "Datasets" type="group">
- <menu name="Parallel Coordinates (demo) STF Dataset" pid="org.mediavirus.parvis.sampledata/pcvis_data.txt"/>
- </menu>
+ <menu name="Load..." pid= "org.cishell.reference.gui.persistence.load.FileLoad "/>
<menu type="break"/>
<menu name="Save..." pid= "org.cishell.reference.gui.persistence.save.Save"/>
<menu type="break"/>
<menu name="View..." pid= "org.cishell.reference.gui.persistence.view.FileView"/>
<menu name="View With..." pid= "org.cishell.reference.gui.persistence.viewwith.FileViewWith"/>
<menu type="break"/>
- <menu name = "Test" type="group">
- <menu name="Scheduler Tester" pid= "org.cishell.tests.ProgressTrackableAlgorithm.AlgorithmTest"/>
- </menu>
<menu type="break"/>
<menu name="Exit" type="preserved"/>
</top_menu>
- <top_menu name="Preprocessing">
- <menu name="Random Node Deletion" pid="edu.iu.iv.errortolerance.ErrorToleranceAlgorithm"/>
- <menu name="High Degree Node Deletion" pid="edu.iu.iv.attacktolerance.AttackToleranceAlgorithm"/>
- <menu name="Pathfinder Network Scaling" pid="edu.iu.nwb.analysis.pathfindergraphnetworkscaling.PathfinderGraphAlgorithm"/>
- <menu name="Multipartite Joining" pid="edu.iu.nwb.analysis.multipartitejoining.JoiningAlgorithm"/>
- <menu type="break"/>
- <menu name="Snowball Sampling (n nodes)" pid="edu.iu.nwb.analysis.sampling.snowball.SnowballAlgorithm"/>
- <menu name="Node Sampling" pid="edu.iu.nwb.analysis.sampling.node.NodeAlgorithm"/>
- <menu name="Edge Sampling" pid="edu.iu.nwb.analysis.sampling.edge.EdgeAlgorithm"/>
- </top_menu>
- <top_menu name="Modeling">
- <menu name="Random Graph" pid="edu.iu.nwb.modeling.erdosrandomgraph"/>
- <menu name="Watts-Strogatz Small World" pid="edu.iu.nwb.modeling.smallworld"/>
- <menu name="Barabási-Albert Scale-Free" pid="edu.iu.nwb.modeling.barabasialbert"/>
- <menu type="break"/>
- <menu name="Can" pid="edu.iu.iv.modeling.p2p.can.CanAlgorithm"/>
- <menu name="Chord" pid="edu.iu.iv.modeling.p2p.chord.ChordAlgorithm"/>
- <menu name="Hypergrid" pid="edu.id.iv.modeling.p2p.hypergrid.Hypergrid"/>
- <menu name="PRU" pid="edu.iu.iv.modeling.p2p.pru.PruAlgorithm"/>
- <menu type="break"/>
- <menu name="TARL" pid="edu.iu.iv.modeling.tarl.TarlAlgorithm"/>
- </top_menu>
- <top_menu name="Analysis">
- <menu name = "Unweighted && Undirected" type="group">
- <menu name="Node Degree" pid="edu.iu.nwb.analysis.totaldegreesequence"/>
- <menu name="Degree Distribution" pid="edu.iu.nwb.analysis.totaldegreedistribution"/>
- <menu type="break"/>
- <menu name="k-Nearest Neighbor" pid="edu.iu.nwb.analysis.undirectedknn"/>
- <menu name="Watts Strogatz Clustering Coefficient" pid="edu.iu.nwb.analysis.clustering"/>
- <menu name="Watts Strogatz Clustering Coefficient Over k" pid="edu.iu.nwb.analysis.clustering_vs_k"/>
- <menu type="break"/>
- <menu name="Diameter" pid="edu.iu.nwb.analysis.diameter"/>
- <menu name="Average Shortest Path" pid="edu.iu.nwb.analysis.averageshortestpath"/>
- <menu name="Shortest Path Distribution" pid="edu.iu.nwb.analysis.shortestpathdistr"/>
- <menu name="Node Betweenness Centrality" pid="edu.iu.nwb.analysis.sitebetweenness"/>
- <menu type="break"/>
- <menu name="Connected Components" pid="edu.iu.nwb.analysis.connectedcomponents"/>
- <menu name="Weak Component Clustering" pid="edu.iu.nwb.analysis.weakcomponentclustering.ClusteringAlgorithm"/>
- </menu>
-
- <menu name = "Unweighted && Directed" type="group">
- <menu name="Node Indegree" pid="edu.iu.nwb.analysis.indegreesequence"/>
- <menu name="Node Outdegree" pid="edu.iu.nwb.analysis.outdegreesequence"/>
- <menu name="Indegree Distribution" pid="edu.iu.nwb.analysis.indegreedistribution"/>
- <menu name="Outdegree Distribution" pid="edu.iu.nwb.analysis.outdegreedistribution"/>
- <menu type="break"/>
- <menu name="k-Nearest Neighbor" pid="edu.iu.nwb.analysis.directedknn"/>
- <menu name="Single Node In-Out Degree Correlations" pid="edu.iu.nwb.analysis.onepointcorrelations"/>
- <menu type="break"/>
- <menu name="Page Rank" pid="edu.iu.nwb.analysis.pagerank"/>
- </menu>
-
- <menu name = "Weighted and Undirected" type="group">
- </menu>
- <menu name = "Weighted and Directed" type="group">
- </menu>
- </top_menu>
-
- <top_menu name="Search">
- <menu name="Can" pid="edu.iu.iv.search.p2p.can.CanSearchAlgorithm"/>
- <menu name="Chord" pid="edu.iu.iv.search.p2p.chord.ChordSearchAlgorithm"/>
- <menu name="k Random-Walk" pid="edu.iu.iv.search.p2p.randomwalk.RandomWalkAlgorithm"/>
- <menu name="Random Breadth First" pid="edu.iu.iv.search.p2p.bfs.BreadthFirstSearchAlgorithm"/>
- </top_menu>
-
- <top_menu name="Clustering">
- <menu name="Weak Component Clustering" pid="edu.iu.nwb.analysis.weakcomponentclustering.ClusteringAlgorithm"/>
- </top_menu>
-
- <top_menu name="Visualization">
- <menu name="Circular" pid="edu.iu.nwb.visualization.jungnetworklayout.JUNGCircleLayout"/>
- <menu name="Specified" pid="edu.iu.nwb.visualization.prefuse.beta.specified.Specified"/>
- <menu type="break"/>
- <menu name="Radial Tree/Graph" pid="edu.iu.nwb.visualization.radialgraph.RadialGraph"/>
- <menu name="Radial Tree/Graph with Annotation" pid="edu.iu.nwb.visualization.prefuse.beta.radialgraph.RadialGraph"/>
- <menu name="Tree Map" pid="edu.iu.nwb.visualization.prefuse.beta.treemap.TreeMap"/>
- <menu name="Tree View" pid="edu.iu.nwb.visualization.prefuse.beta.treeview.TreeView"/>
- <menu type="break"/>
- <menu name="Force Directed" pid="edu.iu.nwb.visualization.prefuse.beta.graphview.GraphView"/>
- <menu name="Kamada-Kawai" pid="edu.iu.nwb.visualization.jungnetworklayout.JUNGKamadaKawaiLayout"/>
- <menu name="Fruchterman-Reingold" pid="edu.iu.nwb.visualization.jungnetworklayout.JUNGFruchtermanReingoldLayout"/>
- <menu name="Fruchterman-Reingold with Annotation" pid="edu.iu.nwb.visualization.prefuse.beta.fruchtermanreingold.FruchtermanReingold"/>
- <menu name="Spring" pid="edu.iu.nwb.visualization.jungnetworklayout.JUNGSpringLayout"/>
- <menu name="Small World" pid="edu.iu.nwb.visualization.prefuse.alpha.smallworld.app.SmallWorld"/>
- <menu type="break"/>
- <menu name="Parallel Coordinates (demo)" pid="org.mediavirus.parvis.ParallelCoordinatesAlgorithm"/>
- </top_menu>
-
<top_menu name="Tools">
- <menu name="GnuPlot" pid="edu.iu.nwb.visualization.gnuplot"/>
<menu name="Scheduler" pid=""/>
</top_menu>
<top_menu name="Help">
- <menu name="Dataset Details" pid=""/>
- <menu name="Algorithm Details" pid=""/>
- <menu name="Tutorials" pid=""/>
- <menu type="break"/>
<menu name="Update" pid=""/>
<menu name="Manage Configuration" pid=""/>
- <menu type="break"/>
- <menu name="About Network Workbench Tool" pid=""/>
</top_menu>
</menu_layout>
Added: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/database.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/database.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/matrix.png
===================================================================
(Binary files differ)
Property changes on: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/matrix.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/plot.png
===================================================================
(Binary files differ)
Property changes on: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/plot.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/raster_image.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/raster_image.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/vector_image.jpg
===================================================================
(Binary files differ)
Property changes on: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/vector_image.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/clients/gui/org.cishell.reference.gui.datamanager/build.properties
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.datamanager/build.properties 2009-03-06 23:41:41 UTC (rev 865)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/build.properties 2009-04-24 22:00:50 UTC (rev 866)
@@ -1,4 +1,6 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
\ No newline at end of file
+ .,\
+ unknown.png
+
Modified: trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java 2009-03-06 23:41:41 UTC (rev 865)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java 2009-04-24 22:00:50 UTC (rev 866)
@@ -15,6 +15,7 @@
import org.cishell.framework.data.Data;
import org.cishell.framework.data.DataProperty;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -62,16 +63,16 @@
children = new ArrayList();
this.brandPluginID = brandPluginID;
- matrixIcon = createImage("matrix.png", this.brandPluginID);
- treeIcon = createImage("tree.png", this.brandPluginID);
- networkIcon = createImage("network.png", this.brandPluginID);
- unknownIcon = createImage("unknown.png", this.brandPluginID);
- textIcon = createImage("text.png", this.brandPluginID);
- plotIcon = createImage("plot.png", this.brandPluginID);
- tableIcon = createImage("table.png", this.brandPluginID);
- databaseIcon = createImage("database.jpg", this.brandPluginID);
- rasterImageIcon = createImage("raster_image.jpg", this.brandPluginID);
- vectorImageIcon = createImage("vector_image.jpg", this.brandPluginID);
+ matrixIcon = getImage("matrix.png", this.brandPluginID);
+ treeIcon = getImage("tree.png", this.brandPluginID);
+ networkIcon = getImage("network.png", this.brandPluginID);
+ unknownIcon = getImage("unknown.png", this.brandPluginID);
+ textIcon = getImage("text.png", this.brandPluginID);
+ plotIcon = getImage("plot.png", this.brandPluginID);
+ tableIcon = getImage("table.png", this.brandPluginID);
+ databaseIcon = getImage("database.jpg", this.brandPluginID);
+ rasterImageIcon = getImage("raster_image.jpg", this.brandPluginID);
+ vectorImageIcon = getImage("vector_image.jpg", this.brandPluginID);
typeToImageMapping = new HashMap();
registerImage(DataProperty.OTHER_TYPE, unknownIcon);
@@ -157,15 +158,43 @@
typeToImageMapping.put(type, image);
}
- public static Image createImage(String name, String brandPluginID){
- if(Platform.isRunning()){
- return AbstractUIPlugin.
- imageDescriptorFromPlugin(brandPluginID,
- File.separator + "icons" + File.separator + name).
- createImage();
+
+
+ public static Image getImage(String name, String brandPluginID){
+ if(Platform.isRunning()) {
+ String imageLocation = File.separator + "icons" + File.separator + name;
+ ImageDescriptor imageDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin(
+ brandPluginID,
+ imageLocation);
+ if (imageDescriptor != null) {
+ return imageDescriptor.createImage();
+ } else {
+ System.err.println("Could not find the icon " +
+ "'" + imageLocation + "'" +
+ "in" +
+ "'" + brandPluginID + "'." +
+ "Using the default image instead.");
+ return getDefaultImage();
+ }
+
}
else {
- return null;
+ System.err.println("Could not obtain the image " +
+ "'" + name + "'" +
+ "in" +
+ "'" + brandPluginID + "'" +
+ ", since the platform was not running (?)." +
+ "Using the default image instead.");
+ return getDefaultImage();
}
}
+
+ private static final String DEFAULT_IMAGE_LOCATION = File.separator + "unknown.png";
+
+ private static Image getDefaultImage() {
+ String thisPluginID = "org.cishell.reference.gui.datamanager"; //TODO: don't hardcode this
+ ImageDescriptor imageDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin(
+ thisPluginID, DEFAULT_IMAGE_LOCATION);
+ return imageDescriptor.createImage();
+ }
}
Added: trunk/clients/gui/org.cishell.reference.gui.datamanager/unknown.png
===================================================================
(Binary files differ)
Property changes on: trunk/clients/gui/org.cishell.reference.gui.datamanager/unknown.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
