Author: clopes
Date: 2012-05-04 13:25:43 -0700 (Fri, 04 May 2012)
New Revision: 29117
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
Log:
Fixes #947 : Remove "VIEW" CyTables
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-05-04 20:12:38 UTC (rev 29116)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DGraphView.java
2012-05-04 20:25:43 UTC (rev 29117)
@@ -96,7 +96,6 @@
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNetworkTableManager;
import org.cytoscape.model.CyNode;
-import org.cytoscape.model.CyTable;
import org.cytoscape.model.CyTableFactory;
import org.cytoscape.model.events.AboutToRemoveEdgesEvent;
import org.cytoscape.model.events.AboutToRemoveEdgesListener;
@@ -460,19 +459,9 @@
this.networkViewLocationTfs = vtfl.networkViewLocationTFs;
this.cyEdgeViewContextMenuFactory =
vtfl.cyEdgeViewContextMenuFactory;
this.cyNodeViewContextMenuFactory =
vtfl.cyNodeViewContexMenuFactory;
-
this.manager = manager;
-
this.cyEventHelper = cyEventHelper;
- final CyTable nodeCAM = dataFactory.createTable("node view",
CyIdentifiable.SUID, Long.class, false, false);
- nodeCAM.createColumn("hidden", Boolean.class, false);
- tableMgr.setTable(model, CyNode.class, "VIEW", nodeCAM);
-
- final CyTable edgeCAM = dataFactory.createTable("edge view",
CyIdentifiable.SUID, Long.class, false, false);
- edgeCAM.createColumn("hidden", Boolean.class, false);
- tableMgr.setTable(model, CyEdge.class, "VIEW", edgeCAM);
-
// creating empty subnetworks
m_drawPersp = cyRoot.getRootNetwork(model).addSubNetwork();
cyEventHelper.silenceEventSource(m_drawPersp);
@@ -1337,7 +1326,6 @@
synchronized (m_lock) {
edge = ((DEdgeView) obj).getEdge();
- model.getRow(edge,"VIEW").set("hidden", true);
if
(!m_drawPersp.removeEdges(Collections.singletonList(edge)))
return false;
@@ -1384,7 +1372,6 @@
nView.m_hiddenXMax = m_extentsBuff[2];
nView.m_hiddenYMax = m_extentsBuff[3];
m_drawPersp.removeNodes(Collections.singletonList(nnode));
- model.getRow(nnode,"VIEW").set("hidden", true);
m_spacial.delete(nodeInx);
m_contentChanged = true;
}
@@ -1447,7 +1434,6 @@
return false;
}
- model.getRow(nnode,"VIEW").set("hidden", false);
if (!m_drawPersp.addNode(nnode))
return false;
@@ -1497,7 +1483,6 @@
newEdge = edge;
- model.getRow(newEdge,"VIEW").set("hidden",
false);
if (!m_drawPersp.addEdge(newEdge))
return false;
--
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.
