Skip to content

Commit 1809cea

Browse files
mikekuceramikekucera
committed
Using experimental view model (for testing).
1 parent a49bd78 commit 1809cea

17 files changed

+78
-701
lines changed

‎Cy3D/pom.xml

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33

4-
<name>Cy3D</name>
4+
<name>Cy3DTest</name>
55

66
<groupId>org.cytoscape</groupId>
7-
<artifactId>cy3d</artifactId>
8-
<version>1.0.2</version>
7+
<artifactId>cy3dtest</artifactId>
8+
<version>1.0.4-SNAPSHOT</version>
99

1010
<modelVersion>4.0.0</modelVersion>
1111
<packaging>bundle</packaging>
1212

1313
<properties>
1414
<bundle.symbolicName>org.baderlab.cy3d-impl</bundle.symbolicName>
1515
<bundle.namespace>org.baderlab.cy3d.internal</bundle.namespace>
16-
<cytoscape.api>3.4.0</cytoscape.api>
16+
<cytoscape.api>3.7.1-SNAPSHOT</cytoscape.api>
1717
<timestamp>${maven.build.timestamp}</timestamp>
1818
<jogl.version>2.2.4</jogl.version>
1919
</properties>
@@ -64,39 +64,16 @@
6464
<plugin>
6565
<groupId>org.apache.maven.plugins</groupId>
6666
<artifactId>maven-compiler-plugin</artifactId>
67-
<version>2.3.2</version>
68-
<executions>
69-
<execution>
70-
<id>default-testCompile</id>
71-
<phase>test-compile</phase>
72-
<goals>
73-
<goal>testCompile</goal>
74-
</goals>
75-
</execution>
76-
<execution>
77-
<id>default-compile</id>
78-
<phase>compile</phase>
79-
<goals>
80-
<goal>compile</goal>
81-
</goals>
82-
</execution>
83-
</executions>
67+
<version>3.0</version>
8468
<configuration>
85-
<source>1.7</source>
86-
<target>1.7</target>
87-
<optimize>true</optimize>
88-
<showWarnings>true</showWarnings>
89-
<showDeprecation>true</showDeprecation>
90-
<compilerArguments>
91-
<Xmaxwarns>10000</Xmaxwarns>
92-
<Xmaxerrs>10000</Xmaxerrs>
93-
</compilerArguments>
69+
<source>1.8</source>
70+
<target>1.8</target>
9471
</configuration>
9572
</plugin>
9673
<plugin>
9774
<groupId>org.apache.felix</groupId>
9875
<artifactId>maven-bundle-plugin</artifactId>
99-
<version>2.3.7</version>
76+
<version>2.4.0</version>
10077
<extensions>true</extensions>
10178
<configuration>
10279
<instructions>

‎Cy3D/src/main/java/org/baderlab/cy3d/internal/Cy3DNetworkViewFactory.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎Cy3D/src/main/java/org/baderlab/cy3d/internal/Cy3DNetworkViewRenderer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
*/
1414
public class Cy3DNetworkViewRenderer implements NetworkViewRenderer {
1515

16-
public static final String ID = "org.baderlab.cy3d";
17-
public static final String DISPLAY_NAME = "Cy3D";
16+
public static final String ID = "org.baderlab.cy3dtest";
17+
public static final String DISPLAY_NAME = "Cy3DTest";
1818

1919
private final CyNetworkViewFactory networkViewFactory;
2020
private final RenderingEngineFactory<CyNetwork> mainFactory;

‎Cy3D/src/main/java/org/baderlab/cy3d/internal/Cy3DRenderingEngine.java

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616
import javax.swing.JComponent;
1717
import javax.swing.RootPaneContainer;
1818

19-
import org.baderlab.cy3d.internal.cytoscape.view.Cy3DNetworkView;
2019
import org.baderlab.cy3d.internal.eventbus.EventBusProvider;
2120
import org.baderlab.cy3d.internal.graphics.GraphicsConfiguration;
2221
import org.baderlab.cy3d.internal.graphics.RenderEventListener;
2322
import org.baderlab.cy3d.internal.task.TaskFactoryListener;
2423
import org.cytoscape.model.CyNetwork;
24+
import org.cytoscape.view.model.CyNetworkView;
25+
import org.cytoscape.view.model.CyNetworkViewListener;
2526
import org.cytoscape.view.model.View;
2627
import org.cytoscape.view.model.VisualLexicon;
2728
import org.cytoscape.view.model.VisualProperty;
@@ -37,7 +38,7 @@
3738
*/
3839
class Cy3DRenderingEngine implements RenderingEngine<CyNetwork> {
3940

40-
private final Cy3DNetworkView networkView;
41+
private final CyNetworkView networkView;
4142
private final VisualLexicon visualLexicon;
4243

4344
private GLJPanel panel;
@@ -47,7 +48,7 @@ class Cy3DRenderingEngine implements RenderingEngine<CyNetwork> {
4748
public Cy3DRenderingEngine(
4849
JComponent component,
4950
JComponent inputComponent,
50-
Cy3DNetworkView viewModel,
51+
CyNetworkView viewModel,
5152
VisualLexicon visualLexicon,
5253
EventBusProvider eventBusProvider,
5354
GraphicsConfiguration configuration,
@@ -86,7 +87,19 @@ private void setUpCanvas(JComponent container, JComponent inputComponent,
8687

8788
panel.addGLEventListener(renderEventListener);
8889

89-
networkView.addContainer(panel); // When networkView.updateView() is called it will repaint all containers it owns
90+
networkView.addNetworkViewListener(new CyNetworkViewListener() {
91+
@Override
92+
public void handleUpdateView() {
93+
panel.repaint();
94+
}
95+
@Override
96+
public void handleFitSelected() {
97+
}
98+
@Override
99+
public void handleFitContent() {
100+
}
101+
});
102+
// networkView.addContainer(pa nel); // When networkView.updateView() is called it will repaint all containers it owns
90103

91104
if (container instanceof RootPaneContainer) {
92105
RootPaneContainer rootPaneContainer = (RootPaneContainer) container;

‎Cy3D/src/main/java/org/baderlab/cy3d/internal/Cy3DRenderingEngineFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
import javax.swing.JComponent;
66

7-
import org.baderlab.cy3d.internal.cytoscape.view.Cy3DNetworkView;
87
import org.baderlab.cy3d.internal.eventbus.EventBusProvider;
98
import org.baderlab.cy3d.internal.graphics.GraphicsConfiguration;
109
import org.baderlab.cy3d.internal.graphics.GraphicsConfigurationFactory;
1110
import org.baderlab.cy3d.internal.task.TaskFactoryListener;
1211
import org.cytoscape.model.CyNetwork;
12+
import org.cytoscape.view.model.CyNetworkView;
1313
import org.cytoscape.view.model.View;
1414
import org.cytoscape.view.model.VisualLexicon;
1515
import org.cytoscape.view.presentation.RenderingEngine;
@@ -58,7 +58,7 @@ public Cy3DRenderingEngineFactory(
5858
@Override
5959
public RenderingEngine<CyNetwork> createRenderingEngine(Object container, View<CyNetwork> viewModel) {
6060
// Verify the type of the view up front.
61-
Cy3DNetworkView cy3dViewModel = (Cy3DNetworkView) viewModel;
61+
CyNetworkView cy3dViewModel = (CyNetworkView) viewModel;
6262
JComponent component = (JComponent) container;
6363

6464
GraphicsConfiguration configuration = graphicsConfigFactory.createGraphicsConfiguration();

‎Cy3D/src/main/java/org/baderlab/cy3d/internal/CyActivator.java

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.cytoscape.view.layout.CyLayoutAlgorithm;
3131
import org.cytoscape.view.layout.CyLayoutAlgorithmManager;
3232
import org.cytoscape.view.model.CyNetworkViewFactory;
33+
import org.cytoscape.view.model.CyNetworkViewFactoryFactory;
3334
import org.cytoscape.view.model.VisualLexicon;
3435
import org.cytoscape.view.presentation.RenderingEngineManager;
3536
import org.cytoscape.view.vizmap.VisualMappingManager;
@@ -58,10 +59,10 @@ public void start(BundleContext bc) {
5859

5960
// Register service to collect references to relevant task factories for the right-click context menu
6061
TaskFactoryListener taskFactoryListener = new TaskFactoryListener();
61-
registerServiceListener(bc, taskFactoryListener, "addNodeViewTaskFactory", "removeNodeViewTaskFactory", NodeViewTaskFactory.class);
62-
registerServiceListener(bc, taskFactoryListener, "addEdgeViewTaskFactory", "removeEdgeViewTaskFactory", EdgeViewTaskFactory.class);
63-
registerServiceListener(bc, taskFactoryListener, "addNetworkViewTaskFactory", "removeNetworkViewTaskFactory", NetworkViewTaskFactory.class);
64-
registerServiceListener(bc, taskFactoryListener, "addNetworkViewLocationTaskFactory", "removeNetworkViewLocationTaskFactory", NetworkViewLocationTaskFactory.class);
62+
registerServiceListener(bc, taskFactoryListener::addNodeViewTaskFactory, taskFactoryListener::removeNodeViewTaskFactory, NodeViewTaskFactory.class);
63+
registerServiceListener(bc, taskFactoryListener::addEdgeViewTaskFactory, taskFactoryListener::removeEdgeViewTaskFactory, EdgeViewTaskFactory.class);
64+
registerServiceListener(bc, taskFactoryListener::addNetworkViewTaskFactory, taskFactoryListener::removeNetworkViewTaskFactory, NetworkViewTaskFactory.class);
65+
registerServiceListener(bc, taskFactoryListener::addNetworkViewLocationTaskFactory, taskFactoryListener::removeNetworkViewLocationTaskFactory, NetworkViewLocationTaskFactory.class);
6566

6667
// Cy3D Visual Lexicon
6768
VisualLexicon cy3dVisualLexicon = new Cy3DVisualLexicon();
@@ -72,10 +73,15 @@ public void start(BundleContext bc) {
7273

7374
// Cy3D NetworkView factory
7475
EventBusProvider eventBusProvider = new EventBusProvider();
75-
Cy3DNetworkViewFactory cy3dNetworkViewFactory = new Cy3DNetworkViewFactory(cy3dVisualLexicon, visualMappingManagerService, eventBusProvider);
76+
77+
CyNetworkViewFactoryFactory netViewFactoryFactory = getService(bc, CyNetworkViewFactoryFactory.class);
78+
CyNetworkViewFactory netViewFactory = netViewFactoryFactory.createNetworkViewFactory(cy3dVisualLexicon, Cy3DNetworkViewRenderer.ID);
79+
80+
System.out.println("Cy3D: netViewFactory: " + netViewFactory);
81+
7682
Properties cy3dNetworkViewFactoryProps = new Properties();
7783
cy3dNetworkViewFactoryProps.setProperty("serviceType", "factory");
78-
registerService(bc, cy3dNetworkViewFactory, CyNetworkViewFactory.class, cy3dNetworkViewFactoryProps);
84+
registerService(bc, netViewFactory, CyNetworkViewFactory.class, cy3dNetworkViewFactoryProps);
7985

8086

8187
// Main RenderingEngine factory
@@ -90,7 +96,7 @@ public void start(BundleContext bc) {
9096

9197

9298
// NetworkViewRenderer, this is the main entry point that Cytoscape will call into
93-
Cy3DNetworkViewRenderer networkViewRenderer = new Cy3DNetworkViewRenderer(cy3dNetworkViewFactory, cy3dMainRenderingEngineFactory, cy3dBirdsEyeRenderingEngineFactory);
99+
Cy3DNetworkViewRenderer networkViewRenderer = new Cy3DNetworkViewRenderer(netViewFactory, cy3dMainRenderingEngineFactory, cy3dBirdsEyeRenderingEngineFactory);
94100
registerService(bc, networkViewRenderer, NetworkViewRenderer.class, new Properties());
95101

96102
// Still need to register the rendering engine factory directly

‎Cy3D/src/main/java/org/baderlab/cy3d/internal/cytoscape/view/Cy3DEdgeView.java

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)