X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.g3d.vtk%2Fsrc%2Forg%2Fsimantics%2Fg3d%2Fvtk%2Fcommon%2FSelectionHighlighter.java;h=95ba7aee2ef852e827a1070aa3c9dda48c15405f;hb=9c5be9fa9ff5fece5710b9f21bcafca58388899d;hp=2d5f8fbe7cf1c20e9718d15c1c1cb57b171f42cd;hpb=b79406dcc167890ad62d43f0aa1baf1ce25b5e47;p=simantics%2F3d.git

diff --git a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/SelectionHighlighter.java b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/SelectionHighlighter.java
index 2d5f8fbe..95ba7aee 100644
--- a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/SelectionHighlighter.java
+++ b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/SelectionHighlighter.java
@@ -1,199 +1,199 @@
-/*******************************************************************************
- * Copyright (c) 2012, 2013 Association for Decentralized Information Management in
- * Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.g3d.vtk.common;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.simantics.g3d.scenegraph.IG3DNode;
-import org.simantics.g3d.scenegraph.NodeHighlighter;
-import org.simantics.g3d.scenegraph.NodeHighlighter.HighlightEventType;
-import org.simantics.g3d.scenegraph.NodeHighlighter.HighlightObjectType;
-import org.simantics.g3d.scenegraph.base.INode;
-import org.simantics.g3d.tools.AdaptationUtils;
-import org.simantics.utils.threads.AWTThread;
-import org.simantics.utils.threads.ThreadUtils;
-
-import vtk.vtkActor;
-import vtk.vtkAlgorithm;
-import vtk.vtkAlgorithmOutput;
-import vtk.vtkFeatureEdges;
-import vtk.vtkMapper;
-import vtk.vtkPanel;
-import vtk.vtkProp;
-import vtk.vtkProperty;
-
-public class SelectionHighlighter implements ISelectionChangedListener{
-
-	
-	
-	vtkPanel panel;
-	VTKNodeMap nodeMap;
-	
-	List<IG3DNode> selectedNodes = new ArrayList<IG3DNode>();
-	List<vtkActor> selectedActors = new ArrayList<vtkActor>();
-	
-	HighlightObjectType type = HighlightObjectType.Node;
-	
-	public SelectionHighlighter(vtkPanel panel, VTKNodeMap nodeMap) {
-		this.panel = panel;
-		this.nodeMap = nodeMap;
-	}
-	
-	@Override
-	public void selectionChanged(SelectionChangedEvent event) {
-		final ISelection s = event.getSelection();
-		
-		if (Thread.currentThread().equals(AWTThread.getThreadAccess().getThread()))
-			highlight(s);
-		else {
-			ThreadUtils.asyncExec(AWTThread.getThreadAccess(), new Runnable() {
-				@Override
-				public void run() {
-					highlight(s);
-					//System.out.println(this.getClass().getName() + " highlight ");
-					panel.Render();
-					//panel.repaint();
-				}
-			});
-		}
-			
-	}
-	
-	protected void hilight(IG3DNode node, HighlightEventType type) {
-		if (node instanceof NodeHighlighter) {
-			((NodeHighlighter)node).highlight(type);
-			return;
-		}
-		if (type == HighlightEventType.Selection) {
-			setSelectedColor(node);	
-		} else if (type == HighlightEventType.ClearSelection) {
-			setDefaultColor(node);
-		}
-	}
-	
-	protected void hilight(vtkActor actor, HighlightEventType type) {
-		if (type == HighlightEventType.Selection) {
-			setColor(actor,false,new double[]{1,0,0});
-			setColor(actor,true,new double[]{1,0,1});
-		} else if (type == HighlightEventType.ClearSelection) {
-			setColor(actor,false,new double[]{1,1,0});
-			setColor(actor,true,new double[]{0,0,0});
-		}
-	}
-	
-	protected void highlight(ISelection s) {
-		highlight(s, HighlightEventType.Selection, HighlightEventType.ClearSelection);
-	}
-	
-	protected void highlight(ISelection s, HighlightEventType apply, HighlightEventType clear) {
-	
-		boolean changed = false;
-		if (type == HighlightObjectType.Node) {
-			Collection<IG3DNode> currentSelectedNodes = AdaptationUtils.adaptToCollection(s,IG3DNode.class);//getSelectedNodes(currentSelectedActors);
-			if (currentSelectedNodes.size() == 0) {
-				Collection<vtkProp> currentSelectedActors = AdaptationUtils.adaptToCollection(s, vtkProp.class);
-				currentSelectedNodes = getSelectedNodes(currentSelectedActors);
-			}
-			for (IG3DNode node : selectedNodes) {
-				if (!currentSelectedNodes.contains(node)) {
-					hilight(node, clear);
-					changed = true;
-				}
-			}
-			for (IG3DNode node : currentSelectedNodes) {
-				if (!selectedNodes.contains(node)) {
-					hilight(node, apply);
-					changed = true;
-				}
-			}
-			selectedNodes.clear();
-			selectedNodes.addAll(currentSelectedNodes);
-			//selectedNodes = currentSelectedNodes;
-			
-		} else {
-			
-			Collection<vtkActor> currentSelectedActors = AdaptationUtils.adaptToCollection(s, vtkActor.class);
-			
-			for (vtkActor act : selectedActors) {
-				if (!currentSelectedActors.contains(act)) {
-					hilight(act,clear);
-					changed = true;
-				}
-			}
-			for (vtkActor act : currentSelectedActors) {
-				if (!selectedActors.contains(act)) {
-					hilight(act,apply);
-					changed = true;
-				}
-			}
-			selectedActors.clear();
-			selectedActors.addAll(currentSelectedActors);
-		}
-		if (changed) {
-			panel.repaint();
-		}
-	}
-	
-	protected List<IG3DNode> getSelectedNodes(Collection<vtkProp> selectedActors) {
-		List<IG3DNode> currentSelectedNodes = new ArrayList<IG3DNode>();
-		
-		for (vtkProp a : selectedActors) {
-			INode node = nodeMap.getNode((vtkProp)a);
-			if (node == null || !(node instanceof IG3DNode))
-				continue;
-			if (!currentSelectedNodes.contains(node))
-				currentSelectedNodes.add((IG3DNode)node);
-		}
-		return currentSelectedNodes;
-	}
-	
-	protected void setDefaultColor(IG3DNode node) {
-		double color[] = new double[]{1,1,0};
-		setColor(node, false, color);
-	}
-	
-	protected void setSelectedColor(IG3DNode node) {
-		double color[] = new double[]{1,0,0};
-		setColor(node, false, color);
-	}
-	
-	
-	protected void setColor(IG3DNode node, boolean edge, double color[]) {
-		for (vtkProp prop : nodeMap.getRenderObjects(node)) {
-			if (prop instanceof vtkActor) {
-				vtkActor act = (vtkActor)prop;
-				setColor(act, edge, color);
-			}
-		}
-	}
-	
-	protected void setColor(vtkActor act, boolean edge, double color[]) {
-		
-		vtkMapper mapper = act.GetMapper();
-		vtkAlgorithmOutput out = mapper.GetInputConnection(0, 0);
-		vtkAlgorithm producer = out.GetProducer();
-		boolean isEdge = (producer instanceof vtkFeatureEdges);
-		producer.Delete();
-		if (isEdge == edge) {
-			vtkProperty property = act.GetProperty();
-			property.SetColor(color);
-			property.Delete();
-		}
-		out.Delete();
-		mapper.Delete();
-	}
-}
+/*******************************************************************************
+ * Copyright (c) 2012, 2013 Association for Decentralized Information Management in
+ * Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.g3d.vtk.common;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.simantics.g3d.scenegraph.IG3DNode;
+import org.simantics.g3d.scenegraph.NodeHighlighter;
+import org.simantics.g3d.scenegraph.NodeHighlighter.HighlightEventType;
+import org.simantics.g3d.scenegraph.NodeHighlighter.HighlightObjectType;
+import org.simantics.g3d.scenegraph.base.INode;
+import org.simantics.g3d.tools.AdaptationUtils;
+import org.simantics.utils.threads.AWTThread;
+import org.simantics.utils.threads.ThreadUtils;
+
+import vtk.vtkActor;
+import vtk.vtkAlgorithm;
+import vtk.vtkAlgorithmOutput;
+import vtk.vtkFeatureEdges;
+import vtk.vtkMapper;
+import vtk.vtkPanel;
+import vtk.vtkProp;
+import vtk.vtkProperty;
+
+public class SelectionHighlighter<E extends IG3DNode> implements ISelectionChangedListener{
+
+	
+	
+	vtkPanel panel;
+	VTKNodeMap<E> nodeMap;
+	
+	List<IG3DNode> selectedNodes = new ArrayList<IG3DNode>();
+	List<vtkActor> selectedActors = new ArrayList<vtkActor>();
+	
+	HighlightObjectType type = HighlightObjectType.Node;
+	
+	public SelectionHighlighter(vtkPanel panel, VTKNodeMap<E> nodeMap) {
+		this.panel = panel;
+		this.nodeMap = nodeMap;
+	}
+	
+	@Override
+	public void selectionChanged(SelectionChangedEvent event) {
+		final ISelection s = event.getSelection();
+		
+		if (Thread.currentThread().equals(AWTThread.getThreadAccess().getThread()))
+			highlight(s);
+		else {
+			ThreadUtils.asyncExec(AWTThread.getThreadAccess(), new Runnable() {
+				@Override
+				public void run() {
+					highlight(s);
+					//System.out.println(this.getClass().getName() + " highlight ");
+					panel.Render();
+					//panel.repaint();
+				}
+			});
+		}
+			
+	}
+	
+	protected void hilight(E node, HighlightEventType type) {
+		if (node instanceof NodeHighlighter) {
+			((NodeHighlighter)node).highlight(type);
+			return;
+		}
+		if (type == HighlightEventType.Selection) {
+			setSelectedColor(node);	
+		} else if (type == HighlightEventType.ClearSelection) {
+			setDefaultColor(node);
+		}
+	}
+	
+	protected void hilight(vtkActor actor, HighlightEventType type) {
+		if (type == HighlightEventType.Selection) {
+			setColor(actor,false,new double[]{1,0,0});
+			setColor(actor,true,new double[]{1,0,1});
+		} else if (type == HighlightEventType.ClearSelection) {
+			setColor(actor,false,new double[]{1,1,0});
+			setColor(actor,true,new double[]{0,0,0});
+		}
+	}
+	
+	protected void highlight(ISelection s) {
+		highlight(s, HighlightEventType.Selection, HighlightEventType.ClearSelection);
+	}
+	
+	protected void highlight(ISelection s, HighlightEventType apply, HighlightEventType clear) {
+	
+		boolean changed = false;
+		if (type == HighlightObjectType.Node) {
+			Collection<IG3DNode> currentSelectedNodes = AdaptationUtils.adaptToCollection(s,IG3DNode.class);//getSelectedNodes(currentSelectedActors);
+			if (currentSelectedNodes.size() == 0) {
+				Collection<vtkProp> currentSelectedActors = AdaptationUtils.adaptToCollection(s, vtkProp.class);
+				currentSelectedNodes = getSelectedNodes(currentSelectedActors);
+			}
+			for (IG3DNode node : selectedNodes) {
+				if (!currentSelectedNodes.contains(node)) {
+					hilight((E)node, clear);
+					changed = true;
+				}
+			}
+			for (IG3DNode node : currentSelectedNodes) {
+				if (!selectedNodes.contains(node)) {
+					hilight((E)node, apply);
+					changed = true;
+				}
+			}
+			selectedNodes.clear();
+			selectedNodes.addAll(currentSelectedNodes);
+			//selectedNodes = currentSelectedNodes;
+			
+		} else {
+			
+			Collection<vtkActor> currentSelectedActors = AdaptationUtils.adaptToCollection(s, vtkActor.class);
+			
+			for (vtkActor act : selectedActors) {
+				if (!currentSelectedActors.contains(act)) {
+					hilight(act,clear);
+					changed = true;
+				}
+			}
+			for (vtkActor act : currentSelectedActors) {
+				if (!selectedActors.contains(act)) {
+					hilight(act,apply);
+					changed = true;
+				}
+			}
+			selectedActors.clear();
+			selectedActors.addAll(currentSelectedActors);
+		}
+		if (changed) {
+			panel.repaint();
+		}
+	}
+	
+	protected List<IG3DNode> getSelectedNodes(Collection<vtkProp> selectedActors) {
+		List<IG3DNode> currentSelectedNodes = new ArrayList<IG3DNode>();
+		
+		for (vtkProp a : selectedActors) {
+			INode node = nodeMap.getNode((vtkProp)a);
+			if (node == null || !(node instanceof IG3DNode))
+				continue;
+			if (!currentSelectedNodes.contains(node))
+				currentSelectedNodes.add((IG3DNode)node);
+		}
+		return currentSelectedNodes;
+	}
+	
+	protected void setDefaultColor(E node) {
+		double color[] = new double[]{1,1,0};
+		setColor(node, false, color);
+	}
+	
+	protected void setSelectedColor(E node) {
+		double color[] = new double[]{1,0,0};
+		setColor(node, false, color);
+	}
+	
+	
+	protected void setColor(E node, boolean edge, double color[]) {
+		for (vtkProp prop : nodeMap.getRenderObjects(node)) {
+			if (prop instanceof vtkActor) {
+				vtkActor act = (vtkActor)prop;
+				setColor(act, edge, color);
+			}
+		}
+	}
+	
+	protected void setColor(vtkActor act, boolean edge, double color[]) {
+		
+		vtkMapper mapper = act.GetMapper();
+		vtkAlgorithmOutput out = mapper.GetInputConnection(0, 0);
+		vtkAlgorithm producer = out.GetProducer();
+		boolean isEdge = (producer instanceof vtkFeatureEdges);
+		producer.Delete();
+		if (isEdge == edge) {
+			vtkProperty property = act.GetProperty();
+			property.SetColor(color);
+			property.Delete();
+		}
+		out.Delete();
+		mapper.Delete();
+	}
+}