Commit e383f4d2 authored by Robert Smith's avatar Robert Smith
Browse files

Merge branch 'next' into UnifiedVizRefactor_NoReactor

Conflicts:
	org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
	org.eclipse.ice.client.widgets.reactoreditor.lwr/META-INF/MANIFEST.MF
	org.eclipse.ice.client.widgets.reactoreditor.lwr/src/org/eclipse/ice/client/widgets/reactoreditor/lwr/PlantAnalysisView.java
	org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
	org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEMeshPage.java
	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/GeometryTester.java
	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEShapeTester.java
	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MeshComponentTester.java
	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/GeometryComponent.java
	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/geometry/ICEGeometry.java...
parents 132780b2 5b3deaa7
......@@ -12,6 +12,7 @@
package org.eclipse.ice.client.widgets.geometry.test;
import org.eclipse.ice.viz.service.jme3.application.MasterApplication;
import org.eclipse.ice.viz.service.jme3.application.ViewAppState;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
......
......@@ -21,6 +21,7 @@ import org.eclipse.ice.reactor.plant.Pipe;
import org.eclipse.ice.reactor.plant.PlantComposite;
import org.eclipse.ice.reactor.plant.Reactor;
import org.eclipse.ice.viz.service.jme3.application.MasterApplication;
import org.eclipse.ice.viz.service.jme3.application.ViewAppState;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
......
......@@ -61,8 +61,7 @@ public class PipeController extends AbstractPlantController {
* The queue responsible for tasks that need to be performed on
* the jME rendering thread.
*/
public PipeController(Pipe model, PipeView view,
IRenderQueue renderQueue) {
public PipeController(Pipe model, PipeView view, IRenderQueue renderQueue) {
super(model, view, renderQueue);
// Set the model. If it is null, create a new, default model.
......@@ -92,8 +91,8 @@ public class PipeController extends AbstractPlantController {
view.updateMesh((float) model.getRadius(), (float) model.getLength(),
model.getNumElements());
view.setLocation(PlantMath.getVector(model.getPosition()));
view.setRotation(getQuaternionFromOrientation(PlantMath.getVector(model
.getOrientation())));
view.setRotation(getQuaternionFromOrientation(
PlantMath.getVector(model.getOrientation())));
view.refreshMesh();
return;
......@@ -128,8 +127,8 @@ public class PipeController extends AbstractPlantController {
List<Quaternion> rotations = new ArrayList<Quaternion>();
offsets.add(PlantMath.getVector(model.getPosition()));
rotations.add(getQuaternionFromOrientation(PlantMath.getVector(model
.getOrientation())));
rotations.add(getQuaternionFromOrientation(
PlantMath.getVector(model.getOrientation())));
return getWorldBounds(view.getBottomVertices(primary), offsets,
rotations);
......@@ -163,8 +162,8 @@ public class PipeController extends AbstractPlantController {
List<Quaternion> rotations = new ArrayList<Quaternion>();
offsets.add(PlantMath.getVector(model.getPosition()));
rotations.add(getQuaternionFromOrientation(PlantMath.getVector(model
.getOrientation())));
rotations.add(getQuaternionFromOrientation(
PlantMath.getVector(model.getOrientation())));
return getWorldBounds(view.getTopVertices(primary), offsets, rotations);
}
......@@ -251,8 +250,8 @@ public class PipeController extends AbstractPlantController {
List<Vector3f> offsets = new ArrayList<Vector3f>();
List<Quaternion> rotations = new ArrayList<Quaternion>();
offsets.add(PlantMath.getVector(model.getPosition()));
rotations.add(getQuaternionFromOrientation(PlantMath.getVector(model
.getOrientation())));
rotations.add(getQuaternionFromOrientation(
PlantMath.getVector(model.getOrientation())));
// Get the BoundingBox for the end vertices in world coordinates.
return getWorldBounds(allEndVertices, offsets, rotations);
......@@ -329,8 +328,8 @@ public class PipeController extends AbstractPlantController {
float length = (float) model.getLength();
int axialSamples = model.getNumElements();
final Vector3f location = PlantMath.getVector(model.getPosition());
final Quaternion rotation = getQuaternionFromOrientation(PlantMath
.getVector(model.getOrientation()));
final Quaternion rotation = getQuaternionFromOrientation(
PlantMath.getVector(model.getOrientation()));
// Update the mesh. This method only affects the underlying mesh.
view.updateMesh(radius, length, axialSamples);
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ice.client.widgets.reactoreditor.grid.test</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
eclipse.preferences.version=1
pluginProject.extensions=false
resolve.requirebundle=false
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<title>About</title>
</head>
<body lang="EN-US">
<h2>About This Content</h2>
<p>July 1, 2014</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
apply to your use of any object code in the Content. Check the Redistributor's license that was
provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
indicated below, the terms and conditions of the EPL still apply to any source code in the Content
and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
</body>
</html>
\ No newline at end of file
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
<?xml version="1.0" encoding="UTF-8"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>ICE</groupId>
<artifactId>org.eclipse.ice.build</artifactId>
<version>2.1.8</version>
<relativePath>../${pom-filename}</relativePath>
</parent>
<groupId>ICE</groupId>
<artifactId>org.eclipse.ice.client.widgets.reactoreditor.grid.test</artifactId>
<packaging>eclipse-plugin</packaging>
<properties>
<sonar.skip>true</sonar.skip>
</properties>
</project>
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: GridTester
Bundle-SymbolicName: org.eclipse.ice.client.widgets.reactoreditor.grid.test;singleton:=true
Bundle-Version: 2.1.8
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Import-Package: org.eclipse.ice.client.widgets.reactoreditor.grid,
org.eclipse.ui,
org.osgi.framework;version="1.3.0"
Require-Bundle: org.junit,
org.eclipse.gef;bundle-version="3.9.0",
org.eclipse.jface;bundle-version="3.8.102"
Bundle-Vendor: Oak Ridge National Laboratory
Manifest-Version: 1.0
Bundle-SymbolicName: org.eclipse.ice.client.widgets.reactoreditor.grid
.test;singleton:=true
Bundle-Name: GridTester
Bundle-Version: 2.1.8
Require-Bundle: org.junit,org.eclipse.gef;bundle-version="3.9.0",org.e
clipse.jface;bundle-version="3.8.102"
Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-Vendor: Oak Ridge National Laboratory
Import-Package: org.eclipse.ice.client.widgets.reactoreditor.grid,org.
eclipse.ui,org.osgi.framework;version="1.3.0"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment