Author: laylaoesper
Date: 2010-07-19 13:31:37 -0700 (Mon, 19 Jul 2010)
New Revision: 20966
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CloudParameters.java
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CreateCloudAction.java
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummary.jar
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummaryParameters.java
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummaryPlugin.java
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/UpdateCloudAction.java
Log:
Fix the issue with SemanticSummaryParameters not being up to date when saving a
session. Also, renamed networkChanged method to networkHasChanged.
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CloudParameters.java
===================================================================
---
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CloudParameters.java
2010-07-19 17:05:12 UTC (rev 20965)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CloudParameters.java
2010-07-19 20:31:37 UTC (rev 20966)
@@ -89,7 +89,7 @@
private static final String NODEDELIMITER = "CloudParamNodeDelimiter";
//Default Values for User Input
- private Double defaultNetWeight = 1.0;
+ private Double defaultNetWeight = 0.5;
private String defaultAttName = "nodeID";
private Integer defaultMaxWords = 250;
private Double defaultClusterCutoff = 1.0;
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CreateCloudAction.java
===================================================================
---
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CreateCloudAction.java
2010-07-19 17:05:12 UTC (rev 20965)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/CreateCloudAction.java
2010-07-19 20:31:37 UTC (rev 20966)
@@ -100,7 +100,7 @@
params =
SemanticSummaryManager.getInstance().getParameters(networkID);
//Update if necessary
- if (params.networkChanged(network));
+ if (params.networkHasChanged(network));
params.updateParameters(network);
}
else
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/SemanticSummaryParameters.java
===================================================================
---
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummaryParameters.java
2010-07-19 17:05:12 UTC (rev 20965)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummaryParameters.java
2010-07-19 20:31:37 UTC (rev 20966)
@@ -271,7 +271,7 @@
* is different than the parameters.
* @return boolean - whether or not this network has changed.
*/
- public boolean networkChanged(CyNetwork network)
+ public boolean networkHasChanged(CyNetwork network)
{
List<CyNode> nodes = network.nodesList();
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummaryPlugin.java
===================================================================
---
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummaryPlugin.java
2010-07-19 17:05:12 UTC (rev 20965)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/SemanticSummaryPlugin.java
2010-07-19 20:31:37 UTC (rev 20966)
@@ -142,6 +142,11 @@
SemanticSummaryParameters params =
networks.get(networkID);
String networkName = params.getNetworkName();
+ //Update the network if it has changed
+ CyNetwork network = Cytoscape.getNetwork(networkID);
+ if (params.networkHasChanged(network));
+ params.updateParameters(network);
+
//property file
File session_prop_file = new File(tmpDir, netNameSep +
networkName + netNameSep + ".props");
Modified:
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/UpdateCloudAction.java
===================================================================
---
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/UpdateCloudAction.java
2010-07-19 17:05:12 UTC (rev 20965)
+++
csplugins/trunk/soc/layla/SemanticSummary/src/cytoscape/csplugins/semanticsummary/UpdateCloudAction.java
2010-07-19 20:31:37 UTC (rev 20966)
@@ -84,7 +84,7 @@
CyNetworkView view = Cytoscape.getCurrentNetworkView();
//Update network if necessary
- if (networkParams.networkChanged(network));
+ if (networkParams.networkHasChanged(network));
networkParams.updateParameters(network);
//Get set of selected and compare to saved
--
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.
