Author: kono
Date: 2010-02-04 14:46:56 -0800 (Thu, 04 Feb 2010)
New Revision: 19191
Modified:
cytoscape/branches/cytoscape_27_experimental_features/src/cytoscape/view/NetworkPanel.java
cytoscape/branches/cytoscape_27_experimental_features/src/cytoscape/view/NetworkTreeTableModel.java
Log:
Basic listeners to update icons had been added.
Modified:
cytoscape/branches/cytoscape_27_experimental_features/src/cytoscape/view/NetworkPanel.java
===================================================================
---
cytoscape/branches/cytoscape_27_experimental_features/src/cytoscape/view/NetworkPanel.java
2010-02-04 22:33:05 UTC (rev 19190)
+++
cytoscape/branches/cytoscape_27_experimental_features/src/cytoscape/view/NetworkPanel.java
2010-02-04 22:46:56 UTC (rev 19191)
@@ -57,14 +57,12 @@
import javax.swing.Icon;
import javax.swing.ImageIcon;
import javax.swing.InputMap;
-import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
-import javax.swing.JTable;
import javax.swing.JToggleButton;
import javax.swing.JTree;
import javax.swing.KeyStroke;
@@ -76,7 +74,6 @@
import javax.swing.event.SwingPropertyChangeSupport;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
-import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumn;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.TreeNode;
@@ -217,9 +214,7 @@
navigatorPanel.setPreferredSize(new Dimension(180, 180));
final JScrollPane scroll = new JScrollPane(treeTable);
-
- // Icon feature is turned off for now.
- //networkTreePanel.add(commandPanel);
+ networkTreePanel.add(commandPanel);
networkTreePanel.add(scroll);
split = new BiModalJSplitPane(cytoscapeDesktop,
JSplitPane.VERTICAL_SPLIT,
BiModalJSplitPane.MODE_SHOW_SPLIT, networkTreePanel, navigatorPanel);
@@ -302,10 +297,10 @@
for(CyNetwork net: networkSet) {
final CyNetworkView view =
Cytoscape.getNetworkView(net.getIdentifier());
- if(view != null && view !=
Cytoscape.getNullNetworkView() && treeTableModel.getValueAt(
getNetworkNode(net.getIdentifier()), 3) == null) {
+ if(view != null && view !=
Cytoscape.getNullNetworkView() &&
+ treeTableModel.getValueAt(
getNetworkNode(net.getIdentifier()), treeTableModel.getColumnCount()-1) ==
null) {
final Icon networkIcon = new
ImageIcon(((DGraphView)view).createImage(NETWORK_ICON_SIZE, NETWORK_ICON_SIZE,
1.0));
-
- treeTableModel.setValueAt(networkIcon,
getNetworkNode(net.getIdentifier()), 3);
+ treeTableModel.setValueAt(networkIcon,
getNetworkNode(net.getIdentifier()), treeTableModel.getColumnCount()-1);
}
}
}
@@ -515,11 +510,16 @@
}
/**
- * DOCUMENT ME!
+ * Property change event handler.
*
- * @param e DOCUMENT ME!
+ * @param e property change event. Data stored in this object varies.
+ *
*/
public void propertyChange(PropertyChangeEvent e) {
+
+ System.out.println("!!!!!!! Event " + e.getPropertyName());
+
+
if (Cytoscape.NETWORK_CREATED.equals(e.getPropertyName())) {
addNetwork((String) e.getNewValue(), (String)
e.getOldValue());
} else if
(Cytoscape.NETWORK_DESTROYED.equals(e.getPropertyName())) {
@@ -530,13 +530,22 @@
} else if
(Cytoscape.NETWORK_TITLE_MODIFIED.equals(e.getPropertyName())) {
CyNetworkTitleChange cyNetworkTitleChange =
(CyNetworkTitleChange) e.getNewValue();
String newID =
cyNetworkTitleChange.getNetworkIdentifier();
- //String newTitle =
cyNetworkTitleChange.getNetworkTitle();
CyNetwork _network = Cytoscape.getNetwork(newID);
+
// Network "0" is the default and does not appear in
the netowrk panel
if (_network != null &&
!_network.getIdentifier().equals("0"))
updateTitle(_network);
} else
if(Cytoscape.CYTOSCAPE_INITIALIZED.equals(e.getPropertyName())) {
updateVSMenu();
+ } else
if(CytoscapeDesktop.NETWORK_VIEW_DESTROYED.equals(e.getPropertyName())) {
+ System.out.println("#########View Deleted " +
e.getNewValue());
+ final String networkID =
((CyNetworkView)e.getNewValue()).getNetwork().getIdentifier();
+ treeTableModel.setValueAt(null,
getNetworkNode(networkID), treeTableModel.getColumnCount()-1);
+ } else
if(CytoscapeDesktop.NETWORK_VIEW_CREATED.equals(e.getPropertyName())) {
+ System.out.println("#########View Created " +
e.getNewValue());
+ final String networkID =
((CyNetworkView)e.getNewValue()).getNetwork().getIdentifier();
+ final Icon networkIcon = new
ImageIcon(((DGraphView)e.getNewValue()).createImage(NETWORK_ICON_SIZE,
NETWORK_ICON_SIZE, 1.0));
+ treeTableModel.setValueAt(networkIcon,
getNetworkNode(networkID), treeTableModel.getColumnCount()-1);
}
}
@@ -610,8 +619,20 @@
}
}
+ /**
+ * Listening to Visual Mapping Manager state.
+ * Mainly for checking current visual style.
+ *
+ *
+ */
public void stateChanged(ChangeEvent e) {
updateVSMenu();
+ // Update icon
+ final CyNetworkView curNetworkView =
Cytoscape.getCurrentNetworkView();
+ if(curNetworkView != null && curNetworkView !=
Cytoscape.getNullNetworkView()) {
+ final Icon networkIcon = new
ImageIcon(((DGraphView)curNetworkView).createImage(NETWORK_ICON_SIZE,
NETWORK_ICON_SIZE, 1.0));
+ treeTableModel.setValueAt(networkIcon,
getNetworkNode(curNetworkView.getNetwork().getIdentifier()),
treeTableModel.getColumnCount()-1);
+ }
}
Modified:
cytoscape/branches/cytoscape_27_experimental_features/src/cytoscape/view/NetworkTreeTableModel.java
===================================================================
---
cytoscape/branches/cytoscape_27_experimental_features/src/cytoscape/view/NetworkTreeTableModel.java
2010-02-04 22:33:05 UTC (rev 19190)
+++
cytoscape/branches/cytoscape_27_experimental_features/src/cytoscape/view/NetworkTreeTableModel.java
2010-02-04 22:46:56 UTC (rev 19191)
@@ -109,9 +109,11 @@
public void setValueAt(Object aValue, Object node, int column) {
if (columnNames.get(column).equals(ColumnTypes.NETWORK)) {
((DefaultMutableTreeNode) node).setUserObject(aValue);
- } else if
(columnNames.get(column).equals(ColumnTypes.NETWORK_ICONS)
- && aValue instanceof Icon) {
- networkIcons.put(((NetworkTreeNode)
node).getNetworkID(),
+ } else if
(columnNames.get(column).equals(ColumnTypes.NETWORK_ICONS)) {
+ if(aValue == null)
+ networkIcons.put(((NetworkTreeNode)
node).getNetworkID(), null);
+ else
+ networkIcons.put(((NetworkTreeNode)
node).getNetworkID(),
(Icon) aValue);
}
}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
