White space clean-up

[simantics/3d.git] / org.simantics.g3d.vtk / src / org / simantics / g3d / vtk / handlers / CameraPositionHandler.java

diff --git a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/handlers/CameraPositionHandler.java b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/handlers/CameraPositionHandler.java
index da31a243ede4b982a6f224dce5188c7b3b441f61..1f88e11845a7e13bdd08deeb4a28d8094c11f06e 100644 (file)
--- a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/handlers/CameraPositionHandler.java
+++ b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/handlers/CameraPositionHandler.java
@@ -1,66 +1,76 @@
-package org.simantics.g3d.vtk.handlers;\r
-\r
-import java.util.HashMap;\r
-import java.util.Map;\r
-\r
-import javax.vecmath.Vector3d;\r
-\r
-import org.eclipse.core.commands.AbstractHandler;\r
-import org.eclipse.core.commands.ExecutionEvent;\r
-import org.eclipse.core.commands.ExecutionException;\r
-import org.eclipse.ui.IWorkbenchPart;\r
-import org.eclipse.ui.handlers.HandlerUtil;\r
-import org.simantics.g3d.vtk.common.InteractiveVtkPanel;\r
-import org.simantics.utils.threads.AWTThread;\r
-import org.simantics.utils.threads.ThreadUtils;\r
-\r
-public class CameraPositionHandler extends AbstractHandler {\r
-\r
-       \r
-       private Map<InteractiveVtkPanel,Vector3d> cameraPos = new HashMap<InteractiveVtkPanel, Vector3d>();\r
-       \r
-       @Override\r
-       public Object execute(ExecutionEvent event) throws ExecutionException {\r
-            \r
-            final IWorkbenchPart ap = HandlerUtil.getActiveEditor(event);\r
-            final InteractiveVtkPanel panel = (InteractiveVtkPanel)ap.getAdapter(InteractiveVtkPanel.class);\r
-            \r
-            String param = event.getParameter("org.simantics.g3d.viewDirection");\r
-            String vals[] = param.split(",");\r
-            final Vector3d direction = new Vector3d(Double.parseDouble(vals[0]),Double.parseDouble(vals[1]),Double.parseDouble(vals[2]));\r
-\r
-            \r
-            ThreadUtils.asyncExec(AWTThread.getThreadAccess(), new Runnable() {\r
-                       \r
-                       @Override\r
-                       public void run() {\r
-\r
-                               Vector3d focal = new Vector3d(panel.GetRenderer().GetActiveCamera().GetFocalPoint());\r
-                               Vector3d pos = new Vector3d(panel.GetRenderer().GetActiveCamera().GetPosition());\r
-                               cameraPos.put(panel, pos);\r
-                               Vector3d dir = new Vector3d(pos);\r
-                               dir.sub(focal);\r
-                               double distance = dir.length();\r
-                               \r
-                               dir.set(direction);\r
-                               dir.scale(distance);\r
-                               dir.add(focal);\r
-                               panel.GetRenderer().GetActiveCamera().SetPosition(dir.x, dir.y, dir.z);\r
-                               if (Math.abs(direction.dot(new Vector3d(0,1,0))) < 0.95)\r
-                                       panel.GetRenderer().GetActiveCamera().SetViewUp(0, 1, 0);\r
-                               else\r
-                                       panel.GetRenderer().GetActiveCamera().SetViewUp(1, 0, 0);\r
-                               \r
-                               panel.GetRenderer().ResetCameraClippingRange();\r
-                               \r
-                               panel.UpdateLight();\r
-                               panel.repaint();\r
-                       }\r
-                });\r
-           \r
-            return null;\r
-            \r
-       }\r
-       \r
-       \r
-}\r
+/*******************************************************************************
+ * 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.handlers;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.vecmath.Vector3d;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.handlers.HandlerUtil;
+import org.simantics.g3d.vtk.common.VtkView;
+import org.simantics.utils.threads.ThreadUtils;
+
+public class CameraPositionHandler extends AbstractHandler {
+
+       
+       private Map<VtkView,Vector3d> cameraPos = new HashMap<VtkView, Vector3d>();
+       
+       @Override
+       public Object execute(ExecutionEvent event) throws ExecutionException {
+
+               final IWorkbenchPart ap = HandlerUtil.getActiveEditor(event);
+               final VtkView panel = (VtkView)ap.getAdapter(VtkView.class);
+
+               String param = event.getParameter("org.simantics.g3d.viewDirection");
+               String vals[] = param.split(",");
+               final Vector3d direction = new Vector3d(Double.parseDouble(vals[0]),Double.parseDouble(vals[1]),Double.parseDouble(vals[2]));
+
+
+               ThreadUtils.asyncExec(panel.getThreadQueue(), new Runnable() {
+
+                       @Override
+                       public void run() {
+
+                               Vector3d focal = new Vector3d(panel.getRenderer().GetActiveCamera().GetFocalPoint());
+                               Vector3d pos = new Vector3d(panel.getRenderer().GetActiveCamera().GetPosition());
+                               cameraPos.put(panel, pos);
+                               Vector3d dir = new Vector3d(pos);
+                               dir.sub(focal);
+                               double distance = dir.length();
+
+                               dir.set(direction);
+                               dir.scale(distance);
+                               dir.add(focal);
+                               panel.getRenderer().GetActiveCamera().SetPosition(dir.x, dir.y, dir.z);
+                               if (Math.abs(direction.dot(new Vector3d(0,1,0))) < 0.95)
+                                       panel.getRenderer().GetActiveCamera().SetViewUp(0, 1, 0);
+                               else
+                                       panel.getRenderer().GetActiveCamera().SetViewUp(1, 0, 0);
+
+                               panel.getRenderer().ResetCameraClippingRange();
+
+                               //panel.UpdateLight();
+                               panel.refresh();
+                       }
+               });
+
+               return null;
+
+       }
+
+       
+}