Merge branch 'develop' of github.com:cytoscape/cytoscape-impl into de…

…velop

ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/debug/SettingsPanel.java

@@ -9,15 +9,20 @@
 
 import javax.swing.GroupLayout;
 import javax.swing.GroupLayout.Alignment;
+import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JSpinner;
 import javax.swing.SpinnerNumberModel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
+import org.cytoscape.application.CyApplicationManager;
+import org.cytoscape.ding.impl.DRenderingEngine;
+import org.cytoscape.ding.impl.DingRenderer;
 import org.cytoscape.event.CyEventHelper;
 import org.cytoscape.event.DebounceTimer;
 import org.cytoscape.property.CyProperty;
@@ -40,6 +45,8 @@ public class SettingsPanel extends BasicCollapsiblePanel  {
 	private PropEditor prop4;
 	private PropEditor prop5;
 	private PropEditor prop6;
+	private PropEditor prop7;
+	private JButton cacheStatsButton;
 
 
 	@SuppressWarnings("unchecked")
@@ -51,13 +58,17 @@ public SettingsPanel(CyServiceRegistrar registrar) {
 	}
 
 	private void createContents() {
-		prop1 = new NumberPropEditor("render.coarseDetailThreshold");
-		prop2 = new NumberPropEditor("render.nodeBorderThreshold");
-		prop3 = new NumberPropEditor("render.nodeLabelThreshold");
-		prop4 = new NumberPropEditor("render.edgeArrowThreshold");
-		prop5 = new NumberPropEditor("render.edgeLabelThreshold");
-		prop6 = new BooleanPropEditor("render.edgeBufferPan");
+		prop1 = new NumberPropEditor("render.coarseDetailThreshold", "coarseDetailThreshold");
+		prop2 = new NumberPropEditor("render.nodeBorderThreshold", "nodeBorderThreshold");
+		prop3 = new NumberPropEditor("render.nodeLabelThreshold", "nodeLabelThreshold");
+		prop4 = new NumberPropEditor("render.edgeArrowThreshold", "edgeArrowThreshold");
+		prop5 = new NumberPropEditor("render.edgeLabelThreshold", "edgeLabelThreshold");
+		prop6 = new BooleanPropEditor("render.edgeBufferPan", "edgeBufferPan");
+		prop7 = new BooleanPropEditor("render.labelCache", "labelCache");
+		cacheStatsButton = new JButton("show stats");
+		cacheStatsButton.addActionListener(e-> showCacheStats());
 
+		LookAndFeelUtil.makeSmall(cacheStatsButton);
 
 		JPanel panel = new JPanel();
 		panel.setOpaque(false);
@@ -74,6 +85,7 @@ private void createContents() {
 				.addComponent(prop4.getLabel())
 				.addComponent(prop5.getLabel())
 				.addComponent(prop6.getLabel())
+				.addComponent(prop7.getLabel())
 			)
 			.addGroup(layout.createParallelGroup()
 				.addComponent(prop1.getEditor())
@@ -82,6 +94,10 @@ private void createContents() {
 				.addComponent(prop4.getEditor())
 				.addComponent(prop5.getEditor())
 				.addComponent(prop6.getEditor())
+				.addComponent(prop7.getEditor())
+			)
+			.addGroup(layout.createParallelGroup()
+				.addComponent(cacheStatsButton)
 			)
 		);
 
@@ -110,6 +126,11 @@ private void createContents() {
 				.addComponent(prop6.getLabel())
 				.addComponent(prop6.getEditor(), PREFERRED_SIZE, PREFERRED_SIZE, PREFERRED_SIZE)
 			)
+			.addGroup(layout.createParallelGroup(Alignment.BASELINE)
+				.addComponent(prop7.getLabel())
+				.addComponent(prop7.getEditor(), PREFERRED_SIZE, PREFERRED_SIZE, PREFERRED_SIZE)
+				.addComponent(cacheStatsButton)
+			)
 		);
 
 		JPanel content = getContentPane();
@@ -124,6 +145,23 @@ public void update() {
 		prop4.update();
 		prop5.update();
 		prop6.update();
+		prop7.update();
+	}
+
+
+	private void showCacheStats() {
+		var renderer = registrar.getService(DingRenderer.class);
+		var appManager = registrar.getService(CyApplicationManager.class);
+
+		var netView = appManager.getCurrentNetworkView();
+		if(netView == null)
+			return;
+
+		DRenderingEngine re = renderer.getRenderingEngine(netView);
+		var labelCache = re.getLabelCache();
+		String stats = labelCache.getStats();
+
+		JOptionPane.showMessageDialog(this, stats);
 	}
 
 
@@ -150,9 +188,9 @@ private class NumberPropEditor implements PropEditor, ChangeListener {
 		private final JLabel label;
 		private final JSpinner spinner;
 
-		public NumberPropEditor(String propName) {
+		public NumberPropEditor(String propName, String labelText) {
 			this.propName = propName;
-			label = new JLabel(propName);
+			label = new JLabel(labelText);
 			int value = getPropValue();
 			model = new SpinnerNumberModel(value, 0, 1000000, 100);
 			spinner = new JSpinner(model);
@@ -197,9 +235,9 @@ private class BooleanPropEditor implements PropEditor, ActionListener {
 		private final JLabel label;
 		private final JCheckBox checkBox;
 
-		public BooleanPropEditor(String propName) {
+		public BooleanPropEditor(String propName, String labelText) {
 			this.propName = propName;
-			label = new JLabel(propName);
+			label = new JLabel(labelText);
 			checkBox = new JCheckBox();
 			boolean value = getPropValue();
 			checkBox.setSelected(value);

ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DNodeDetails.java

@@ -200,12 +200,6 @@ public Paint getBorderPaint(View<CyNode> nodeView) {
 		return getTransparentColor(paint, trans);
 	}
 
-	@Override
-	public int getLabelCount(View<CyNode> nodeView) {
-		String label = getLabelText(nodeView);
-		return (label == null || label.isEmpty()) ? 0 : 1;
-	}
-
 	@Override
 	public String getLabelText(View<CyNode> nodeView) {
 		return nodeView.getVisualProperty(NODE_LABEL);

ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DRenderingEngine.java

@@ -30,6 +30,7 @@
 import org.cytoscape.ding.DVisualLexicon;
 import org.cytoscape.ding.PrintLOD;
 import org.cytoscape.ding.debug.DebugProgressMonitorFactory;
+import org.cytoscape.ding.debug.DingDebugMediator;
 import org.cytoscape.ding.icon.VisualPropertyIconFactory;
 import org.cytoscape.ding.impl.canvas.CompositeGraphicsCanvas;
 import org.cytoscape.ding.impl.canvas.MainRenderComponent;
@@ -42,6 +43,8 @@
 import org.cytoscape.graph.render.stateful.EdgeDetails;
 import org.cytoscape.graph.render.stateful.GraphLOD;
 import org.cytoscape.graph.render.stateful.GraphLOD.RenderEdges;
+import org.cytoscape.graph.render.stateful.LabelInfoCache;
+import org.cytoscape.graph.render.stateful.LabelInfoProvider;
 import org.cytoscape.graph.render.stateful.NodeDetails;
 import org.cytoscape.graph.render.stateful.RenderDetailFlags;
 import org.cytoscape.model.CyEdge;
@@ -142,6 +145,8 @@ public enum UpdateType {
 	private final Timer checkDirtyTimer;
 	private final DebounceTimer eventFireTimer;
 
+	private final LabelInfoCache labelInfoCache;
+
 	private final BendStore bendStore;
 	private InputHandlerGlassPane inputHandler = null;
 	private DebugProgressMonitorFactory debugProgressMonitorFactory;
@@ -188,6 +193,8 @@ public DRenderingEngine(
 
 		viewModelSnapshot = viewModel.createSnapshot();
 
+		labelInfoCache = new LabelInfoCache(1000, DingDebugMediator.showDebugPanel(registrar)); // MKTODO should maxSize be hardcoded?
+
 		eventFireTimer = new DebounceTimer(240);
 
 		// Check if the view model has changed approximately 30 times per second
@@ -229,6 +236,9 @@ public ExecutorService getSingleThreadExecutorService() {
 		return singleThreadExecutor;
 	}
 
+	public LabelInfoProvider getLabelCache() {
+		return labelInfoCache;
+	}
 
 	public Rectangle getComponentBounds() {
 		return renderComponent.getBounds();

ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/DingGraphLOD.java

@@ -48,7 +48,9 @@ public class DingGraphLOD implements GraphLOD, PropertyUpdatedListener {
 	protected int nodeLabelThreshold;
 	protected int edgeArrowThreshold;
 	protected int edgeLabelThreshold;
+
 	protected boolean edgeBufferPan;
+	protected boolean labelCache;
 
 	private final Properties props;
 	private final CyProperty<Properties> cyProp;
@@ -70,6 +72,7 @@ private void init() {
 		edgeArrowThreshold = parseInt(props.getProperty("render.edgeArrowThreshold"), 600);
 		edgeLabelThreshold = parseInt(props.getProperty("render.edgeLabelThreshold"), 200);
 		edgeBufferPan = Boolean.valueOf(props.getProperty("render.edgeBufferPan"));
+		labelCache = Boolean.valueOf(props.getProperty("render.labelCache"));
 	}
 
 	private static int parseInt(String intString, int defaultValue) {
@@ -132,6 +135,10 @@ public double getNestedNetworkImageScaleFactor() {
 			public boolean edgeBufferPan() {
 				return DingGraphLOD.this.edgeBufferPan();
 			}
+			@Override
+			public boolean labelCache() {
+				return DingGraphLOD.this.labelCache();
+			}
 		};
 	}
 
@@ -416,6 +423,11 @@ public boolean edgeBufferPan() {
 		return edgeBufferPan;
 	}
 
+	@Override
+	public boolean labelCache() {
+		return labelCache;
+	}
+
 	@Override
 	public double getNestedNetworkImageScaleFactor() {
 		final String scaleFactor = props.getProperty("nestedNetwork.imageScaleFactor", "1.0");

ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/InputHandlerGlassPane.java

@@ -1573,8 +1573,10 @@ public void mouseReleased(MouseEvent e) {
 			mousePressedPoint = null;
 			undoPanEdit = null;
 
-			panner.endPan();
-			panner = null;
+			if(panner != null) { // why does this happen?
+				panner.endPan();
+				panner = null;
+			}
 		}
 
 		private Cursor createPanCursor() {

ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/NetworkPicker.java

@@ -28,7 +28,8 @@
 import org.cytoscape.graph.render.immed.GraphGraphics;
 import org.cytoscape.graph.render.stateful.EdgeDetails;
 import org.cytoscape.graph.render.stateful.GraphRenderer;
-import org.cytoscape.graph.render.stateful.MeasuredLineCreator;
+import org.cytoscape.graph.render.stateful.LabelInfo;
+import org.cytoscape.graph.render.stateful.LabelInfoProvider;
 import org.cytoscape.graph.render.stateful.NodeDetails;
 import org.cytoscape.graph.render.stateful.RenderDetailFlags;
 import org.cytoscape.model.CyEdge;
@@ -128,7 +129,7 @@ public DLabelSelection getNodeLabelAt(Point2D pt) {
 	 * @param pt   point where the mouse was clicked.
 	 * @return a DLabelSelection object if there is a node label under the specified point. null if no labels are found at this point.
 	 */
-	private DLabelSelection selectLabel(CyNetworkViewSnapshot snapshot, Point2D pt ) {
+	private DLabelSelection selectLabel(CyNetworkViewSnapshot snapshot, Point2D pt) {
 		double[] locn = {pt.getX(), pt.getY()};
 		re.getTransform().xformImageToNodeCoords(locn);
 		double xP = locn[0];
@@ -150,6 +151,9 @@ private DLabelSelection selectLabel(CyNetworkViewSnapshot snapshot, Point2D pt )
 
 		SpacialIndex2DEnumerator<Long> under = snapshot.getSpacialIndex2D().queryOverlap(xMin, yMin, xMax, yMax);
 
+		LabelInfoProvider labelProvider = re.getGraphLOD().labelCache() ? re.getLabelCache() : LabelInfoProvider.INSTANCE;
+		FontRenderContext frc = new FontRenderContext(null,true,true); // MKTODO
+
 		float[] extentsBuff = new float[4];
 
 		while (under.hasNext()) {
@@ -159,13 +163,13 @@ private DLabelSelection selectLabel(CyNetworkViewSnapshot snapshot, Point2D pt )
 			// compute the actual size of label text rectangle
 			String labelText = nodeDetails.getLabelText(nodeView);
 
-			Font   font = nodeDetails.getLabelFont(nodeView);
+			Font font = nodeDetails.getLabelFont(nodeView);
 			double labelWidth = nodeDetails.getLabelWidth(nodeView);
 
-			MeasuredLineCreator mlCreator = new MeasuredLineCreator(labelText, font,  new FontRenderContext(null,true,true), 1.0, true, labelWidth);
+			LabelInfo mlCreator = labelProvider.getLabelInfo(labelText, font, labelWidth, frc);
 
 			double h = mlCreator.getTotalHeight();  // actual label text box height
-			double w =  mlCreator.getMaxLineWidth();  // actual label text box width. 
+			double w = mlCreator.getMaxLineWidth();  // actual label text box width. 
 
 			// compute the actual position of the label text box.
 			double x = nodeDetails.getXPosition(nodeView); 

ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/canvas/EdgeCanvas.java

@@ -4,6 +4,7 @@
 import org.cytoscape.ding.impl.work.ProgressMonitor;
 import org.cytoscape.graph.render.immed.GraphGraphics;
 import org.cytoscape.graph.render.stateful.GraphRenderer;
+import org.cytoscape.graph.render.stateful.LabelInfoProvider;
 import org.cytoscape.graph.render.stateful.RenderDetailFlags;
 
 public class EdgeCanvas<GP extends GraphicsProvider> extends DingCanvas<GP> {
@@ -27,9 +28,10 @@ public void paint(ProgressMonitor pm, RenderDetailFlags flags) {
 		var netViewSnapshot = re.getViewModelSnapshot();
 		var edgeDetails = re.getEdgeDetails();
 		var nodeDetails = re.getNodeDetails();
+		var labelProvider = flags.has(RenderDetailFlags.OPT_LABEL_CACHE) ? re.getLabelCache() : LabelInfoProvider.INSTANCE;
 
-		graphGraphics.update();
-		GraphRenderer.renderEdges(pm, graphGraphics, netViewSnapshot, flags, nodeDetails, edgeDetails);
+		graphGraphics.update(flags);
+		GraphRenderer.renderEdges(pm, graphGraphics, netViewSnapshot, flags, nodeDetails, edgeDetails, labelProvider);
 	}
 
 }

ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/canvas/EdgeThumbnailCanvas.java

@@ -5,6 +5,7 @@
 import org.cytoscape.ding.impl.work.ProgressMonitor;
 import org.cytoscape.graph.render.immed.GraphGraphics;
 import org.cytoscape.graph.render.stateful.GraphRenderer;
+import org.cytoscape.graph.render.stateful.LabelInfoProvider;
 import org.cytoscape.graph.render.stateful.RenderDetailFlags;
 import org.cytoscape.view.model.CyNetworkViewSnapshot;
 
@@ -25,11 +26,11 @@ public String getCanvasDebugName() {
 	@Override
 	public void paint(ProgressMonitor pm, RenderDetailFlags flags) {
 		var graphics = new GraphGraphics(graphicsProvider);
-
 		var edgeDetails = new DEdgeDetails(null);
 		var nodeDetails = new DNodeDetails(null, null);
+		var labelInfoCache = LabelInfoProvider.INSTANCE;
 
-		GraphRenderer.renderEdges(pm, graphics, snapshot, flags, nodeDetails, edgeDetails);
+		GraphRenderer.renderEdges(pm, graphics, snapshot, flags, nodeDetails, edgeDetails, labelInfoCache);
 	}
 
 }

ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/canvas/NodeCanvas.java

@@ -6,6 +6,7 @@
 import org.cytoscape.ding.impl.work.ProgressMonitor;
 import org.cytoscape.graph.render.immed.GraphGraphics;
 import org.cytoscape.graph.render.stateful.GraphRenderer;
+import org.cytoscape.graph.render.stateful.LabelInfoProvider;
 import org.cytoscape.graph.render.stateful.RenderDetailFlags;
 import org.cytoscape.view.model.CyNetworkView;
 import org.cytoscape.view.vizmap.VisualMappingManager;
@@ -67,8 +68,9 @@ public void paint(ProgressMonitor pm, RenderDetailFlags flags) {
 		var snapshot = re.getViewModelSnapshot();
 		var edgeDetails = re.getEdgeDetails();
 		var nodeDetails = re.getNodeDetails();
+		var labelProvider = flags.has(RenderDetailFlags.OPT_LABEL_CACHE) ? re.getLabelCache() : LabelInfoProvider.INSTANCE;
 
-		graphGraphics.update();
-		GraphRenderer.renderNodes(pm, graphGraphics, snapshot, flags, nodeDetails, edgeDetails, dependencies);
+		graphGraphics.update(flags);
+		GraphRenderer.renderNodes(pm, graphGraphics, snapshot, flags, nodeDetails, edgeDetails, dependencies, labelProvider);
 	}
 }

ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/canvas/NodeThumbnailCanvas.java

@@ -5,6 +5,7 @@
 import org.cytoscape.ding.impl.work.ProgressMonitor;
 import org.cytoscape.graph.render.immed.GraphGraphics;
 import org.cytoscape.graph.render.stateful.GraphRenderer;
+import org.cytoscape.graph.render.stateful.LabelInfoProvider;
 import org.cytoscape.graph.render.stateful.RenderDetailFlags;
 import org.cytoscape.view.model.CyNetworkViewSnapshot;
 
@@ -25,11 +26,11 @@ public String getCanvasDebugName() {
 	@Override
 	public void paint(ProgressMonitor pm, RenderDetailFlags flags) {
 		var graphics = new GraphGraphics(graphicsProvider);
-
 		var edgeDetails = new DEdgeDetails(null);
 		var nodeDetails = new DNodeDetails(null, null);
+		var labelInfoCache = LabelInfoProvider.INSTANCE;
 
-		GraphRenderer.renderNodes(pm, graphics, snapshot, flags, nodeDetails, edgeDetails, null);
+		GraphRenderer.renderNodes(pm, graphics, snapshot, flags, nodeDetails, edgeDetails, null, labelInfoCache);
 	}
 
 }