Removed Transformation View and updated documentation

Removed the TransformationView from the Geometry and Mesh pages. Updated
the geometry editor documentation with the newest functionality.
Signed-off-by: Robert Smith <smithrw@ornl.gov>

docs/geometryEditor/src/content.tex

@@ -37,7 +37,10 @@ and click OK.
 
 You can change the perspective of the camera by clicking and dragging inside the
 Geometry Editor. You can see this initially by the way the three axes and the
-reference plane move as you rotate the camera about the origin. If you hold shift while dragging, you will instead move the central point the camera is focused on. If you hold ctrl, you can drag the mouse up or down to zoom in or out, respectively. Scrolling the mouse wheel offers another way to zoom the camera.
+reference plane move as you rotate the camera about the origin. If you hold
+shift while dragging, you will instead move the central point the camera is
+focused on. If you hold ctrl, you can drag the mouse up or down to zoom in or
+out, respectively. Scrolling the mouse wheel offers another way to zoom the camera.
 
 \subsubsection{Primitive Shapes}
 
@@ -52,45 +55,64 @@ view. Simply select an object from the menu to add it to the scene.
 \includegraphics[width=12cm]{images/GeometryAddCube.jpg}
 \end{center}
 
-Clicking on the shape's name in the Shapes View will cause that shape to turn
-red in the editor.
+Clicking on the shape's name in the Shapes View will cause that shape and any
+children to appear in the Properties view. 
 
 \begin{center}
-\includegraphics[width=12cm]{images/GeometrySelectCube.jpg}
+\includegraphics[width=12cm]{images/GeometryPropertiesView.jpg}
 \end{center}
 
-Selections in the Shapes View also activate the Transformation View in the lower
-left corner. Editing the values in this view will change the selected shape
-accordingly.
+Editing the values in this view will change the selected shape
+accordingly. 
 
 \begin{center}
 \includegraphics[width=12cm]{images/GeometryCubeSize.jpg}
 \end{center}
 
-\textbf{Size} - Controls the overall size of the shape. Setting size to X is
-equivalent to setting the shape's three scales to X times their current value.
+\textbf{Mesh Properties} - These controls will allow the user to set any custom
+properties of the mesh. A cube has ``sideLength'', which will control the size
+of the cube.
 
 \begin{center}
 \includegraphics[width=12cm]{images/GeometryCubeTranslate.jpg}
 \end{center}
 
-\textbf{Translate} - Controls the position of the shape. Setting one of the
-translations will move the shape that many units along the given axis.
+\textbf{Center} - These controls allow the shape to be moved about hte three
+dimensional space by setting the X, Y, and Z coordinates of its center.
+
+\textbf{Triangle Mesh Data} - This table list the coordinates for all vertices
+in each triangle used to define the shape.
 
 \begin{center}
-\includegraphics[width=12cm]{images/GeometryCubeRotate.jpg}
+\includegraphics[width=12cm]{images/GeometryCubeColor.jpg}
 \end{center}
 
-\textbf{Rotation} - Controls the orientation of the shape. Setting one of the
-rotations will rotate the shape the given number of degrees about that axis.
+\textbf{Color} - These controls allow for setting the shape's color.
 
 \begin{center}
 \includegraphics[width=12cm]{images/GeometryCubeScale.jpg}
 \end{center}
 
-\textbf{Scale} - Controls the size of the shape in three directions. Setting one
-of the scales will stretch or compress the shape in that direction by a factor
-of the scale's new setting.
+\textbf{Scale} - Controls the magnification of the shape. For more complex
+shapes such as tubes or imported files, it is a simpler way to set the
+geometry's size.
+
+\begin{center}
+\includegraphics[width=12cm]{images/GeometryCubeWireframe.jpg}
+\end{center}
+
+\textbf{Opacity} - This menu allows for a shape to be displayed as a wireframe
+or to be rendered transparent and removed from the scene.
+
+\begin{center}
+\includegraphics[width=12cm]{images/GeometryCubeDisplayDeactivated.jpg}
+\end{center}
+
+The check boxes by each display option allow that effect to be toggled, allowing
+you to quickly change a shape back and forth from its default display to your
+custom settings. Notice how the cube remained the same size, as it was edited to
+be larger, while the tube was kept the same size but had only been set to draw
+larger in the display menu.
 
 \subsubsection{Complex Shapes}
 
@@ -113,16 +135,31 @@ add the shape as a child of the union. To add additional shapes, select the
 child shape and add another as normal.
 
 Selecting the union will select all of its child shapes, and changes to the
-transformation view will affect the entire complex shape. Individual shapes can
-still be selected for editing on their own.
+Properties View will affect the entire complex shape. Individual shapes can
+still be selected for editing on their own, but you must deactivate all parent
+shape's display options if they conflict with the childrens.
 
-You can add a complex shape as a child to a complex shape in the same way as a
-primitive shape, allowing for nested unions
+\begin{center}
+\includegraphics[width=12cm]{images/GeometrySlotMachineMonochrome.jpg}
+\end{center}
+
+For example, this slot machine is a union of shapes. While the union is set to a
+purple color, all child shapes are also set to purple. 
+
+\begin{center}
+\includegraphics[width=12cm]{images/GeometrySlotMachineMonochrome.jpg}
+\end{center}
+
+By deactivating the union's color display, the child shapes will each be able to
+display their own color.
 
 \begin{center}
-\includegraphics[width=12cm]{images/GeometryStackedUnions.jpg}
+\includegraphics[width=12cm]{images/GeometrySlotMachineColor.jpg}
 \end{center}
 
+You can add a complex shape as a child to a complex shape in the same way as a
+primitive shape, allowing for nested unions
+
 \subsubsection{Copying}
 
 Once you have a shape created, you can automatically create copies of that
@@ -168,6 +205,11 @@ and clicking the Delete button, highlighted below.
 \includegraphics[width=12cm]{images/GeometryDeleteButton.jpg}
 \end{center}
 
+\subsubsection{Importing}
+
+The Import File button next to Add Primitive will add import the contents of an
+.obj or .stl file. These will appear as a union containing other shapes inside. 
+
 \subsubsection{Saving}
 
 You may save the contents of the Geometry Editor. This can be done as normal for

org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF

@@ -39,6 +39,7 @@ Import-Package:
  org.eclipse.eavp.viz.modeling.properties,
  org.eclipse.eavp.viz.service,
  org.eclipse.eavp.viz.service.csv,
+ org.eclipse.eavp.viz.service.geometry.properties,
  org.eclipse.eavp.viz.service.geometry.widgets,
  org.eclipse.eavp.viz.service.internal,
  org.eclipse.eavp.viz.service.mesh.datastructures,

org.eclipse.ice.client.widgets/plugin.xml

@@ -56,14 +56,6 @@
                name="Shapes"
                restorable="true">
          </view>
-         <view
-               allowMultiple="false"
-               class="org.eclipse.eavp.viz.service.geometry.widgets.TransformationView"
-               fastViewWidthRatio="0.75f"
-               id="org.eclipse.eavp.viz.service.geometry.widgets.TransformationView"
-               name="Transformation View"
-               restorable="true">
-         </view>
          <!-- ICE Resource View -->
          <view
                allowMultiple="false"
@@ -155,14 +147,6 @@
                relative="org.eclipse.ice.client.common.ItemViewer"
                visible="true">
          </view>
-         <view
-               closeable="false"
-               id="org.eclipse.eavp.viz.service.geometry.widgets.TransformationView"
-               minimized="false"
-               ratio="0.25f"
-               relationship="left"
-               relative="org.eclipse.ui.console.ConsoleView">
-         </view>
          <newWizardShortcut
                id="org.eclipse.ice.client.common.CreateItemWizard">
          </newWizardShortcut>
@@ -451,4 +435,11 @@
           class="org.eclipse.ice.client.widgets.providers.Default.DefaultMasterDetailsPageProvider">
     </Implementation>
  </extension>
+	<extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
+		<propertyContributor 
+			contributorId="org.eclipse.eavp.viz.service.geometry.widgets.ShapeTreeView"
+			tabDescriptorProvider="org.eclipse.eavp.viz.service.geometry.properties.ShapeTabDescriptorProvider">
+			<propertyCategory category="GeometrySelection"/>
+		</propertyContributor>
+	</extension>
 </plugin>

org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEGeometryPage.java

@@ -16,7 +16,6 @@ import org.eclipse.eavp.viz.service.IVizCanvas;
 import org.eclipse.eavp.viz.service.IVizService;
 import org.eclipse.eavp.viz.service.IVizServiceFactory;
 import org.eclipse.eavp.viz.service.geometry.widgets.ShapeTreeView;
-import org.eclipse.eavp.viz.service.geometry.widgets.TransformationView;
 import org.eclipse.ice.datastructures.ICEObject.IUpdateable;
 import org.eclipse.ice.datastructures.ICEObject.IUpdateableListener;
 import org.eclipse.ice.datastructures.form.GeometryComponent;
@@ -34,8 +33,8 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
 /**
  * <p>
  * This class is ICEFormPage that displays the GeometryEditor powered by JavaFX.
- * It automatically opens the ShapeTreeView and TransformationView to allow the
- * user to add and edit geometry.
+ * It automatically opens the ShapeTreeView to allow the user to add and edit
+ * geometry.
  * </p>
  * 
  * @author Jay Jay Billings
@@ -184,8 +183,6 @@ public class ICEGeometryPage extends ICEFormPage
 
 			getSite().getWorkbenchWindow().getActivePage()
 					.showView(ShapeTreeView.ID);
-			getSite().getWorkbenchWindow().getActivePage()
-					.showView(TransformationView.ID);
 
 		} catch (PartInitException e) {
 			logger.error(getClass().getName() + " Exception!", e);

org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEMeshPage.java

@@ -18,7 +18,6 @@ import java.util.List;
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.eavp.viz.service.IVizService;
 import org.eclipse.eavp.viz.service.IVizServiceFactory;
-import org.eclipse.eavp.viz.service.geometry.widgets.TransformationView;
 import org.eclipse.eavp.viz.service.mesh.datastructures.IMeshVizCanvas;
 import org.eclipse.ice.client.common.ActionTree;
 import org.eclipse.ice.datastructures.ICEObject.ICEObject;
@@ -208,8 +207,6 @@ public class ICEMeshPage extends ICEFormPage
 
 			getSite().getWorkbenchWindow().getActivePage()
 					.showView(MeshElementTreeView.ID);
-			getSite().getWorkbenchWindow().getActivePage()
-					.showView(TransformationView.ID);
 
 		} catch (PartInitException e) {
 			logger.error(getClass().getName() + " Exception!", e);