Author: laylaoesper
Date: 2010-06-15 10:29:49 -0700 (Tue, 15 Jun 2010)
New Revision: 20543
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CloudWordInfo.java
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/DeleteCloudAction.java
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummary.jar
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummaryInputPanel.java
Log:
Various bug fixes for SemanticSummary.
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CloudWordInfo.java
===================================================================
---
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CloudWordInfo.java
2010-06-15 17:24:15 UTC (rev 20542)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CloudWordInfo.java
2010-06-15 17:29:49 UTC (rev 20543)
@@ -22,6 +22,7 @@
package cytoscape.csplugins.semanticsummary;
+import java.awt.Color;
import java.awt.Font;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
@@ -122,6 +123,31 @@
view.redrawGraph(false, true);
}
}
+
+ public void mouseEntered(MouseEvent me)
+ {
+ JLabel clickedLabel = (JLabel)me.getComponent();
+ String word = clickedLabel.getText();
+
+ if
(!Cytoscape.getCurrentNetworkView().equals(Cytoscape.getNullNetworkView()))
+ {
+ clickedLabel.setForeground(Color.BLUE);
+ clickedLabel.repaint();
+ }
+
+ }
+
+ public void mouseExited(MouseEvent me)
+ {
+ JLabel clickedLabel = (JLabel)me.getComponent();
+ String word = clickedLabel.getText();
+
+ if
(!Cytoscape.getCurrentNetworkView().equals(Cytoscape.getNullNetworkView()))
+ {
+ clickedLabel.setForeground(Color.BLACK);
+ clickedLabel.repaint();
+ }
+ }
});
return label;
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/DeleteCloudAction.java
===================================================================
---
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/DeleteCloudAction.java
2010-06-15 17:24:15 UTC (rev 20542)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/DeleteCloudAction.java
2010-06-15 17:29:49 UTC (rev 20543)
@@ -76,13 +76,17 @@
SemanticSummaryManager.getInstance().setupCurrentNetwork();
//Clear Selected Nodes
- CyNetwork network = Cytoscape.getCurrentNetwork();
- network.unselectAllNodes();
- network.unselectAllEdges();
+ //CyNetwork network = Cytoscape.getCurrentNetwork();
+ //network.unselectAllNodes();
+ //network.unselectAllEdges();
//Redraw the graph with selected nodes
- CyNetworkView view = Cytoscape.getCurrentNetworkView();
- view.redrawGraph(false, true);
+ //CyNetworkView view =
Cytoscape.getCurrentNetworkView();
+ //view.redrawGraph(false, true);
+
+ SemanticSummaryPluginAction init = new
SemanticSummaryPluginAction();
+ init.loadCloudPanel();
+ init.loadInputPanel();
}
}
}
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummary.jar
===================================================================
(Binary files differ)
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummaryInputPanel.java
===================================================================
---
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummaryInputPanel.java
2010-06-15 17:24:15 UTC (rev 20542)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummaryInputPanel.java
2010-06-15 17:29:49 UTC (rev 20543)
@@ -23,28 +23,20 @@
package cytoscape.csplugins.semanticsummary;
import java.awt.BorderLayout;
-import java.awt.Color;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.GridLayout;
import java.awt.Insets;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
import java.util.Vector;
import javax.swing.BoxLayout;
-import javax.swing.ComboBoxModel;
import javax.swing.DefaultComboBoxModel;
import javax.swing.DefaultListModel;
import javax.swing.JButton;
@@ -53,17 +45,14 @@
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JPanel;
-import javax.swing.JRadioButton;
import javax.swing.JScrollPane;
import javax.swing.ListSelectionModel;
import javax.swing.ScrollPaneConstants;
-import javax.swing.table.DefaultTableModel;
import cytoscape.Cytoscape;
import cytoscape.data.CyAttributes;
import cytoscape.util.swing.WidestStringComboBoxModel;
import cytoscape.util.swing.WidestStringComboBoxPopupMenuListener;
-import cytoscape.view.CytoscapeDesktop;
/**
* The SemanticSummaryInputPanel class defines the panel that appears for
@@ -81,7 +70,6 @@
DecimalFormat decFormat; //used in formatted text fields
- //TODO
//Text Fields
private JFormattedTextField maxWordsTextField;
@@ -150,14 +138,14 @@
public JPanel createCloudListPanel()
{
JPanel panel = new JPanel();
- //panel.setLayout(new BorderLayout());
- panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
+ //panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
+ panel.setLayout(new BorderLayout());
//Name of the network
JPanel networkPanel = new JPanel();
- networkPanel.setLayout(new BorderLayout());
+ networkPanel.setLayout(new FlowLayout());
networkLabel = new JLabel();
- networkPanel.add(networkLabel, BorderLayout.CENTER);
+ networkPanel.add(networkLabel);
//List of Clouds
listValues = new DefaultListModel();
@@ -173,12 +161,11 @@
ListSelectionModel listSelectionModel =
cloudList.getSelectionModel();
handler = new CloudListSelectionHandler();
listSelectionModel.addListSelectionListener(handler);
-
JScrollPane listScrollPane = new JScrollPane(cloudList);
//Add to panel
- panel.add(networkPanel);
- panel.add(listScrollPane);
+ panel.add(networkPanel, BorderLayout.NORTH);
+ panel.add(listScrollPane, BorderLayout.CENTER);
return panel;
}
--
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.
