xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OSX ui merge

Browse source
This commit is contained in:
Michael James 2017-04-25 10:31:06 -06:00
parent 5e76443442
commit 9f3c8ae622
31 changed files with 138 additions and 334 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/com.raytheon.uf.viz.alertview/plugin.xml
View file

@ -15,7 +15,7 @@
<extension <extension
point="org.eclipse.ui.menus"> point="org.eclipse.ui.menus">
<menuContribution <menuContribution
locationURI="menu:CAVE?after=browsers"> locationURI="menu:d2dFile?after=afterNewGroup">
<command <command
commandId="com.raytheon.uf.viz.alertview.openAlertView" commandId="com.raytheon.uf.viz.alertview.openAlertView"
label="Open AlertView" label="Open AlertView"

2
cave/com.raytheon.uf.viz.archive/plugin.xml
View file

@ -23,7 +23,7 @@
<extension <extension
point="org.eclipse.ui.menus"> point="org.eclipse.ui.menus">
<menuContribution <menuContribution
locationURI="menu:CAVE?after=group1"> locationURI="menu:d2dFile?after=group1">
<menu <menu
label="Archive" label="Archive"
id="archive"> id="archive">

2
cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml
View file

@ -18,7 +18,7 @@
restorable="false" restorable="false"
class="com.raytheon.uf.viz.d2d.nsharp.display.D2DNSharpPaletteWindow" class="com.raytheon.uf.viz.d2d.nsharp.display.D2DNSharpPaletteWindow"
id="com.raytheon.uf.viz.d2d.nsharp.display.D2DNSharpPaletteWindow" id="com.raytheon.uf.viz.d2d.nsharp.display.D2DNSharpPaletteWindow"
name="NSHARP(D2D)"/> name="NSHARP"/>
</extension> </extension>
<extension point="org.eclipse.ui.perspectiveExtensions"> <extension point="org.eclipse.ui.perspectiveExtensions">

10
cave/com.raytheon.uf.viz.d2d.ui.popupskewt/plugin.xml
View file

@ -20,16 +20,6 @@
--> -->
<?eclipse version="3.3"?> <?eclipse version="3.3"?>
<plugin> <plugin>
<extension
point="com.raytheon.uf.viz.localization.perspective.localizationpath">
<path
application="D2D"
localizationType="CAVE_STATIC"
name="Cloud Height"
value="cloudheight"
recursive="true">
</path>
</extension>
<extension <extension
point="com.raytheon.viz.ui.displayCustomizer"> point="com.raytheon.viz.ui.displayCustomizer">
<displayCustomizer <displayCustomizer

134
cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
View file

@ -63,7 +63,7 @@
<extension <extension
point="org.eclipse.ui.menus"> point="org.eclipse.ui.menus">
<menuContribution <menuContribution
locationURI="menu:org.eclipse.ui.main.menu?after=CAVE"> locationURI="menu:org.eclipse.ui.main.menu">
<menu id="d2dFile" label="File" mnemonic="F"> <menu id="d2dFile" label="File" mnemonic="F">
<visibleWhen> <visibleWhen>
<reference <reference
@ -85,29 +85,6 @@
label="New Window" label="New Window"
style="push"> style="push">
</command> </command>
<menu
label="Procedures">
<command
commandId="com.raytheon.viz.ui.newAWIPSProcedure"
label="New..."
style="push">
</command>
<command
commandId="com.raytheon.viz.ui.openAWIPSProcedure"
label="Open..."
style="push">
</command>
<command
commandId="com.raytheon.viz.ui.deleteAWIPSProcedure"
label="Delete..."
style="push">
</command>
<command
commandId="com.raytheon.viz.ui.copyOutAWIPSProcedure"
label="Copy Display to Procedure(s)"
style="push">
</command>
</menu>
<menu <menu
id="import" id="import"
label="Import"> label="Import">
@ -154,6 +131,30 @@
value="current"> value="current">
</parameter> </parameter>
</command> </command>
<separator
name="afterNewGroup"
visible="true">
</separator>
<separator
name="group1"
visible="true">
</separator>
<separator
name="group2"
visible="true">
</separator>
<separator
name="group3"
visible="true">
</separator>
<separator
name="group4"
visible="true">
</separator>
<separator
name="group5"
visible="true">
</separator>
</menu> </menu>
<menu <menu
id="view" id="view"
@ -229,26 +230,6 @@
label="Looping" label="Looping"
style="toggle"> style="toggle">
</command> </command>
<separator
name="beforeLayoutGroup"
visible="true">
</separator>
<command
commandId="com.raytheon.uf.viz.d2d.ui.actions.changeD2DLayout"
label="1 Pane Layout">
<parameter
name="sideViews"
value="4">
</parameter>
</command>
<command
commandId="com.raytheon.uf.viz.d2d.ui.actions.changeD2DLayout"
label="5 Pane Layout">
<parameter
name="sideViews"
value="0">
</parameter>
</command>
<separator <separator
name="afterLayoutGroup" name="afterLayoutGroup"
visible="true"> visible="true">
@ -629,24 +610,6 @@
</visibleWhen> </visibleWhen>
</command> </command>
--> -->
<command
commandId="gov.noaa.nws.ncep.viz.actions.resourceManager"
icon="icons/plus.png"
id="gov.noaa.nws.ncep.viz.actions.resourceManager"
label="Ncdata"
mode="FORCE_TEXT"
style="push"
tooltip="NCP Data Manager">
<visibleWhen>
<reference
definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
</reference>
</visibleWhen>
<parameter
name="mode"
value="CREATE_RBD">
</parameter>
</command>
<command <command
commandId="com.raytheon.uf.viz.productbrowser.productBrowser" commandId="com.raytheon.uf.viz.productbrowser.productBrowser"
icon="icons/plus.png" icon="icons/plus.png"
@ -1168,12 +1131,6 @@
schemeId="com.raytheon.viz.ui.cave.scheme" schemeId="com.raytheon.viz.ui.cave.scheme"
sequence="M1+N"> sequence="M1+N">
</key> </key>
<key
contextId="com.raytheon.uf.viz.d2d.ui"
commandId="com.raytheon.viz.ui.clear"
schemeId="com.raytheon.viz.ui.cave.scheme"
sequence="M1+C">
</key>
<key <key
commandId="com.raytheon.viz.ui.tools.looping.frameTool" commandId="com.raytheon.viz.ui.tools.looping.frameTool"
contextId="com.raytheon.viz.ui.loopContext" contextId="com.raytheon.viz.ui.loopContext"
@ -1202,34 +1159,6 @@
value="NEXT"> value="NEXT">
</parameter> </parameter>
</key> </key>
<key
commandId="com.raytheon.viz.ui.tools.looping.frameTool"
contextId="com.raytheon.viz.ui.loopContext"
schemeId="com.raytheon.viz.ui.cave.scheme"
sequence="M1+ARROW_LEFT">
<parameter
id="mode"
value="TIME_AND_SPACE">
</parameter>
<parameter
id="operation"
value="FIRST">
</parameter>
</key>
<key
commandId="com.raytheon.viz.ui.tools.looping.frameTool"
contextId="com.raytheon.viz.ui.loopContext"
schemeId="com.raytheon.viz.ui.cave.scheme"
sequence="M1+ARROW_RIGHT">
<parameter
id="mode"
value="TIME_AND_SPACE">
</parameter>
<parameter
id="operation"
value="LAST">
</parameter>
</key>
<key <key
commandId="com.raytheon.viz.ui.tools.looping.frameTool" commandId="com.raytheon.viz.ui.tools.looping.frameTool"
contextId="com.raytheon.viz.ui.loopContext" contextId="com.raytheon.viz.ui.loopContext"
@ -1513,6 +1442,18 @@
categoryId="com.raytheon.uf.viz.d2d.ui" categoryId="com.raytheon.uf.viz.d2d.ui"
description="Open time options dialog" description="Open time options dialog"
name="Time Options"> name="Time Options">
<state id="org.eclipse.ui.commands.toggleState">
<class class="org.eclipse.ui.handlers.RegistryToggleState">
<parameter
name="persisted"
value="false">
</parameter>
<parameter
name="default"
value="false">
</parameter>
</class>
</state>
</command> </command>
<command <command
id="com.raytheon.viz.ui.actions.notImplemented" id="com.raytheon.viz.ui.actions.notImplemented"
@ -1691,6 +1632,7 @@
<contextId <contextId
id="com.raytheon.uf.viz.d2d.ui"> id="com.raytheon.uf.viz.d2d.ui">
</contextId> </contextId>
<contextId id="com.raytheon.viz.ui.loop.space"/>
</classContext> </classContext>
</extension> </extension>
<extension <extension

11
cave/com.raytheon.uf.viz.damagepath/plugin.xml
View file

@ -29,15 +29,4 @@
</contextualMenu> </contextualMenu>
</extension> </extension>
<extension
point="com.raytheon.uf.viz.localization.perspective.localizationpath">
<path
application="D2D"
extensionFilter=".xml"
localizationType="COMMON_STATIC"
name="Damage Path"
recursive="false"
value="damagepath">
</path>
</extension>
</plugin> </plugin>

2
cave/com.raytheon.uf.viz.gl.triangulated/.classpath
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>

8
cave/com.raytheon.uf.viz.gl.triangulated/META-INF/MANIFEST.MF
View file

@ -4,11 +4,13 @@ Bundle-Name: OpenGL Triangulated Image Rendering
Bundle-SymbolicName: com.raytheon.uf.viz.gl.triangulated;singleton:=true Bundle-SymbolicName: com.raytheon.uf.viz.gl.triangulated;singleton:=true
Bundle-Version: 1.15.0.qualifier Bundle-Version: 1.15.0.qualifier
Bundle-Vendor: RAYTHEON Bundle-Vendor: RAYTHEON
Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: com.raytheon.uf.viz.drawables.triangulated;bundle-version="1.15.0", Require-Bundle: com.raytheon.uf.viz.drawables.triangulated;bundle-version="1.15.0",
com.raytheon.uf.viz.core;bundle-version="1.15.1", com.raytheon.uf.viz.core;bundle-version="1.15.1",
com.raytheon.uf.common.colormap;bundle-version="1.15.0", com.raytheon.uf.common.colormap;bundle-version="1.15.0",
com.raytheon.viz.core.gl;bundle-version="1.15.1", com.raytheon.viz.core.gl;bundle-version="1.15.1",
javax.measure;bundle-version="1.0.0" javax.measure;bundle-version="1.0.0",
Import-Package: com.vividsolutions.jts.algorithm, com.jogamp.jogl
Import-Package: com.jogamp.opengl,
com.vividsolutions.jts.algorithm,
com.vividsolutions.jts.geom com.vividsolutions.jts.geom

71
cave/com.raytheon.uf.viz.gl.triangulated/src/com/raytheon/uf/viz/gl/triangulated/GLTriangulatedImage.java
View file

@ -26,7 +26,7 @@ import java.nio.FloatBuffer;
import java.nio.IntBuffer; import java.nio.IntBuffer;
import javax.measure.unit.Unit; import javax.measure.unit.Unit;
import javax.media.opengl.GL; import com.jogamp.opengl.GL2;
import com.raytheon.uf.common.colormap.image.ColorMapData; import com.raytheon.uf.common.colormap.image.ColorMapData;
import com.raytheon.uf.common.colormap.prefs.ColorMapParameters; import com.raytheon.uf.common.colormap.prefs.ColorMapParameters;
@ -40,7 +40,6 @@ import com.raytheon.viz.core.gl.IGLTarget;
import com.raytheon.viz.core.gl.dataformat.AbstractGLColorMapDataFormat; import com.raytheon.viz.core.gl.dataformat.AbstractGLColorMapDataFormat;
import com.raytheon.viz.core.gl.dataformat.GLBufferColorMapData; import com.raytheon.viz.core.gl.dataformat.GLBufferColorMapData;
import com.raytheon.viz.core.gl.dataformat.GLColorMapDataFormatFactory; import com.raytheon.viz.core.gl.dataformat.GLColorMapDataFormatFactory;
import com.raytheon.viz.core.gl.ext.imaging.AbstractGLImagingExtension;
import com.raytheon.viz.core.gl.ext.imaging.GLDataMappingFactory; import com.raytheon.viz.core.gl.ext.imaging.GLDataMappingFactory;
import com.raytheon.viz.core.gl.ext.imaging.GLDataMappingFactory.GLDataMapping; import com.raytheon.viz.core.gl.ext.imaging.GLDataMappingFactory.GLDataMapping;
import com.raytheon.viz.core.gl.glsl.GLSLFactory; import com.raytheon.viz.core.gl.glsl.GLSLFactory;
@ -84,7 +83,7 @@ import com.vividsolutions.jts.geom.Triangle;
* ------------- -------- --------- --------------------------------- * ------------- -------- --------- ---------------------------------
* Aug 24, 2015 4709 bsteffen Initial creation * Aug 24, 2015 4709 bsteffen Initial creation
* Dec 04, 2015 5146 bsteffen Rewind attrib buffer before use. * Dec 04, 2015 5146 bsteffen Rewind attrib buffer before use.
* May 19, 2016 5146 bsteffen Add debug code for drawing triangles. * Sep 13, 2016 mjames@ucar jogamp refactor for osx
* *
* </pre> * </pre>
* *
@ -92,8 +91,6 @@ import com.vividsolutions.jts.geom.Triangle;
*/ */
public class GLTriangulatedImage implements ITriangulatedImage { public class GLTriangulatedImage implements ITriangulatedImage {
private static final boolean SHOW_MESH_LINES = AbstractGLImagingExtension.SHOW_MESH_LINES;
protected final ITriangleLocationCallback locations; protected final ITriangleLocationCallback locations;
protected final IColorMapDataRetrievalCallback dataCallback; protected final IColorMapDataRetrievalCallback dataCallback;
@ -200,35 +197,35 @@ public class GLTriangulatedImage implements ITriangulatedImage {
if (this.indexBuffer == null) { if (this.indexBuffer == null) {
stage(); stage();
} }
GL gl = target.getGl(); GL2 gl = target.getGl();
target.pushGLState(); target.pushGLState();
try { try {
gl.glPolygonMode(GL.GL_BACK, GL.GL_FILL); gl.glPolygonMode(GL2.GL_BACK, GL2.GL_FILL);
gl.glPolygonMode(GL.GL_FRONT, GL.GL_FILL); gl.glPolygonMode(GL2.GL_FRONT, GL2.GL_FILL);
gl.glEnable(GL.GL_BLEND); gl.glEnable(GL2.GL_BLEND);
gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA); gl.glBlendFunc(GL2.GL_SRC_ALPHA, GL2.GL_ONE_MINUS_SRC_ALPHA);
GLTextureObject cmapTexture = target GLTextureObject cmapTexture = target
.getColorMapTexture(colorMapParameters); .getColorMapTexture(colorMapParameters);
gl.glActiveTexture(GL.GL_TEXTURE1); gl.glActiveTexture(GL2.GL_TEXTURE1);
cmapTexture.bind(gl, GL.GL_TEXTURE_1D); cmapTexture.bind(gl, GL2.GL_TEXTURE_1D);
if (colorMapParameters.isInterpolate()) { if (colorMapParameters.isInterpolate()) {
gl.glTexParameteri(GL.GL_TEXTURE_1D, GL.GL_TEXTURE_MIN_FILTER, gl.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_MIN_FILTER,
GL.GL_LINEAR); GL2.GL_LINEAR);
gl.glTexParameteri(GL.GL_TEXTURE_1D, GL.GL_TEXTURE_MAG_FILTER, gl.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_MAG_FILTER,
GL.GL_LINEAR); GL2.GL_LINEAR);
} else { } else {
gl.glTexParameteri(GL.GL_TEXTURE_1D, GL.GL_TEXTURE_MIN_FILTER, gl.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_MIN_FILTER,
GL.GL_NEAREST); GL2.GL_NEAREST);
gl.glTexParameteri(GL.GL_TEXTURE_1D, GL.GL_TEXTURE_MAG_FILTER, gl.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_MAG_FILTER,
GL.GL_NEAREST); GL2.GL_NEAREST);
} }
setupDataMapping(gl, GL.GL_TEXTURE3, GL.GL_TEXTURE4); setupDataMapping(gl, GL2.GL_TEXTURE3, GL2.GL_TEXTURE4);
GLShaderProgram program = GLSLFactory.getInstance() GLShaderProgram program = GLSLFactory.getInstance()
.getShaderProgram(gl, "copyValueVertexShader", .getShaderProgram(gl, "copyValueVertexShader",
@ -248,9 +245,9 @@ public class GLTriangulatedImage implements ITriangulatedImage {
GLSLStructFactory.createColorModifiers(program, "modifiers", GLSLStructFactory.createColorModifiers(program, "modifiers",
paintProps.getAlpha(), brightness, contrast); paintProps.getAlpha(), brightness, contrast);
gl.glEnableClientState(GL.GL_VERTEX_ARRAY); gl.glEnableClientState(GL2.GL_VERTEX_ARRAY);
vertexBuffer.rewind(); vertexBuffer.rewind();
gl.glVertexPointer(2, GL.GL_FLOAT, 0, vertexBuffer); gl.glVertexPointer(2, GL2.GL_FLOAT, 0, vertexBuffer);
Buffer attribBufferData = attribBuffer.getData(); Buffer attribBufferData = attribBuffer.getData();
attribBufferData.rewind(); attribBufferData.rewind();
@ -258,37 +255,23 @@ public class GLTriangulatedImage implements ITriangulatedImage {
attribBuffer.getTextureType(), attribBufferData); attribBuffer.getTextureType(), attribBufferData);
indexBuffer.rewind(); indexBuffer.rewind();
gl.glDrawElements(GL.GL_TRIANGLES, indexBuffer.capacity(), gl.glDrawElements(GL2.GL_TRIANGLES, indexBuffer.capacity(),
GL.GL_UNSIGNED_INT, indexBuffer); GL2.GL_UNSIGNED_INT, indexBuffer);
program.endShader(); program.endShader();
if (SHOW_MESH_LINES) { gl.glDisableClientState(GL2.GL_VERTEX_ARRAY);
/*
* This block can be enabled to see the triangles rendered as
* lines on top of the image for debugging.
*/
indexBuffer.rewind();
gl.glDisable(GL.GL_BLEND);
gl.glPolygonMode(GL.GL_FRONT_AND_BACK, GL.GL_LINE);
gl.glDrawElements(GL.GL_TRIANGLES, indexBuffer.capacity(),
GL.GL_UNSIGNED_INT, indexBuffer);
gl.glPolygonMode(GL.GL_FRONT_AND_BACK, GL.GL_FILL);
gl.glEnable(GL.GL_BLEND);
}
gl.glDisableClientState(GL.GL_VERTEX_ARRAY); gl.glActiveTexture(GL2.GL_TEXTURE1);
gl.glBindTexture(GL2.GL_TEXTURE_1D, 0);
gl.glActiveTexture(GL.GL_TEXTURE1); gl.glDisable(GL2.GL_BLEND);
gl.glBindTexture(GL.GL_TEXTURE_1D, 0);
gl.glDisable(GL.GL_BLEND);
} finally { } finally {
target.popGLState(); target.popGLState();
} }
} }
protected void setupDataMapping(GL gl, protected void setupDataMapping(GL2 gl,
int dataMappedTexBinding, int colorMappedTexBinding) int dataMappedTexBinding, int colorMappedTexBinding)
throws VizException { throws VizException {
if (dataMapping == null && colorMapParameters.getColorMap() != null) { if (dataMapping == null && colorMapParameters.getColorMap() != null) {

9
cave/com.raytheon.uf.viz.kml.export/plugin.xml
View file

@ -42,4 +42,13 @@
class="com.raytheon.uf.viz.kml.export.graphics.ext.KmlCanvasRenderingExtension"> class="com.raytheon.uf.viz.kml.export.graphics.ext.KmlCanvasRenderingExtension">
</graphicsExtension> </graphicsExtension>
</extension> </extension>
<extension
point="org.eclipse.ui.bindings">
<key
commandId="com.raytheon.uf.viz.kml.export.exportKML"
contextId="com.raytheon.uf.viz.d2d.ui"
schemeId="com.raytheon.viz.ui.cave.scheme"
sequence="M1+K">
</key>
</extension>
</plugin> </plugin>

7
cave/com.raytheon.uf.viz.monitor.ffmp/plugin.xml
View file

@ -108,13 +108,6 @@
recursive="true" recursive="true"
value="ffmp"> value="ffmp">
</path> </path>
<path
application="D2D"
localizationType="common_static"
name="Monitoring"
recursive="true"
value="monitoring">
</path>
<path <path
application="D2D" application="D2D"
localizationType="cave_static" localizationType="cave_static"

10
cave/com.raytheon.uf.viz.monitor.fog/plugin.xml
View file

@ -78,14 +78,4 @@
commandId="com.raytheon.uf.viz.monitor.fog.ui.actions.fogThresholdAlertVisConfig"> commandId="com.raytheon.uf.viz.monitor.fog.ui.actions.fogThresholdAlertVisConfig">
</handler> </handler>
</extension> </extension>
<extension
point="com.raytheon.uf.viz.localization.perspective.localizationpath">
<path
application="D2D"
localizationType="common_static"
name="Fog"
recursive="true"
value="fog">
</path>
</extension>
</plugin> </plugin>

10
cave/com.raytheon.uf.viz.monitor.safeseas/plugin.xml
View file

@ -62,14 +62,4 @@
commandId="com.raytheon.uf.viz.monitor.safeseas.ui.actions.safeseasThresholdAlertVisConfig"> commandId="com.raytheon.uf.viz.monitor.safeseas.ui.actions.safeseasThresholdAlertVisConfig">
</handler> </handler>
</extension> </extension>
<extension
point="com.raytheon.uf.viz.localization.perspective.localizationpath">
<path
application="D2D"
localizationType="common_static"
name="SafeSeas"
recursive="true"
value="safeseas">
</path>
</extension>
</plugin> </plugin>

17
cave/com.raytheon.uf.viz.monitor.scan/plugin.xml
View file

@ -44,21 +44,4 @@
renderingOrderId="CONTOUR"> renderingOrderId="CONTOUR">
</resource> </resource>
</extension> </extension>
<extension
point="com.raytheon.uf.viz.localization.perspective.localizationpath">
<path
application="D2D"
localizationType="cave_static"
name="SCAN"
recursive="true"
value="scan">
</path>
<path
application="D2D"
localizationType="common_static"
name="SCAN COMMON"
recursive="true"
value="scan">
</path>
</extension>
</plugin> </plugin>

10
cave/com.raytheon.uf.viz.monitor.snow/plugin.xml
View file

@ -62,14 +62,4 @@
commandId="com.raytheon.uf.viz.monitor.snow.ui.actions.snowThresholdAlertVisConfig"> commandId="com.raytheon.uf.viz.monitor.snow.ui.actions.snowThresholdAlertVisConfig">
</handler> </handler>
</extension> </extension>
<extension
point="com.raytheon.uf.viz.localization.perspective.localizationpath">
<path
application="D2D"
localizationType="common_static"
name="Snow"
recursive="true"
value="snow">
</path>
</extension>
</plugin> </plugin>

2
cave/com.raytheon.uf.viz.radar.gl/.classpath
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>

3
cave/com.raytheon.uf.viz.radar.gl/META-INF/MANIFEST.MF
View file

@ -8,5 +8,6 @@ Require-Bundle: com.raytheon.viz.radar;bundle-version="1.14",
com.raytheon.viz.core.gl;bundle-version="1.14", com.raytheon.viz.core.gl;bundle-version="1.14",
com.raytheon.uf.viz.core;bundle-version="1.14", com.raytheon.uf.viz.core;bundle-version="1.14",
com.raytheon.uf.common.geospatial;bundle-version="1.14" com.raytheon.uf.common.geospatial;bundle-version="1.14"
Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Import-Package: com.jogamp.opengl

4
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/RadarRadialMesh.java
View file

@ -22,7 +22,7 @@ package com.raytheon.uf.viz.radar.gl;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import javax.media.opengl.GL; import com.jogamp.opengl.GL2;
import org.geotools.coverage.grid.GeneralGridGeometry; import org.geotools.coverage.grid.GeneralGridGeometry;
import org.geotools.coverage.grid.GridGeometry2D; import org.geotools.coverage.grid.GridGeometry2D;
@ -117,7 +117,7 @@ public class RadarRadialMesh extends AbstractGLMesh {
public RadarRadialMesh(RadialMeshData data, public RadarRadialMesh(RadialMeshData data,
GeneralGridGeometry targetGeometry, CacheKey cacheKey) GeneralGridGeometry targetGeometry, CacheKey cacheKey)
throws VizException { throws VizException {
super(GL.GL_TRIANGLE_STRIP); super(GL2.GL_TRIANGLE_STRIP);
this.data = data; this.data = data;
this.cacheKey = cacheKey; this.cacheKey = cacheKey;
ProjectedCRS crs = CRSCache.getInstance().constructStereographic( ProjectedCRS crs = CRSCache.getInstance().constructStereographic(

11
cave/com.raytheon.uf.viz.spellchecker/plugin.xml
View file

@ -20,4 +20,15 @@
--> -->
<?eclipse version="3.8"?> <?eclipse version="3.8"?>
<plugin> <plugin>
<extension
point="com.raytheon.uf.viz.localization.perspective.localizationpath">
<path
application="TextWS"
extensionFilter=".txt"
localizationType="CAVE_STATIC"
name="Spell Checker"
recursive="false"
value="spellchecker">
</path>
</extension>
</plugin> </plugin>

2
cave/com.raytheon.uf.viz.stats/plugin.xml
View file

@ -5,7 +5,7 @@
point="org.eclipse.ui.menus"> point="org.eclipse.ui.menus">
<menuContribution <menuContribution
allPopups="false" allPopups="false"
locationURI="menu:CAVE?after=group1"> locationURI="menu:d2dFile?after=group1">
<command <command
commandId="com.raytheon.uf.viz.stats.statsui" commandId="com.raytheon.uf.viz.stats.statsui"
id="stats" id="stats"

2
cave/com.raytheon.uf.viz.truecolor.gl/.classpath
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>

6
cave/com.raytheon.uf.viz.truecolor.gl/META-INF/MANIFEST.MF
View file

@ -8,9 +8,9 @@ Require-Bundle: org.eclipse.core.runtime,
com.raytheon.uf.viz.core;bundle-version="1.12.1174", com.raytheon.uf.viz.core;bundle-version="1.12.1174",
com.raytheon.uf.viz.truecolor;bundle-version="1.0.0", com.raytheon.uf.viz.truecolor;bundle-version="1.0.0",
com.raytheon.viz.core.gl;bundle-version="1.12.1174", com.raytheon.viz.core.gl;bundle-version="1.12.1174",
javax.media.opengl;bundle-version="1.1.0",
com.raytheon.uf.common.util;bundle-version="1.12.1174", com.raytheon.uf.common.util;bundle-version="1.12.1174",
com.raytheon.uf.common.colormap;bundle-version="1.12.1174" com.raytheon.uf.common.colormap;bundle-version="1.12.1174",
Bundle-RequiredExecutionEnvironment: JavaSE-1.7 com.jogamp.jogl;bundle-version="2.3.2"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Bundle-ClassPath: com.raytheon.uf.viz.truecolor.gl.jar Bundle-ClassPath: com.raytheon.uf.viz.truecolor.gl.jar

32
cave/com.raytheon.uf.viz.truecolor.gl/src/com/raytheon/uf/viz/truecolor/gl/extension/GLTrueColorImagingExtension.java
View file

@ -22,7 +22,7 @@ package com.raytheon.uf.viz.truecolor.gl.extension;
import java.util.IdentityHashMap; import java.util.IdentityHashMap;
import java.util.Map; import java.util.Map;
import javax.media.opengl.GL; import com.jogamp.opengl.GL2;
import com.raytheon.uf.common.colormap.prefs.ColorMapParameters; import com.raytheon.uf.common.colormap.prefs.ColorMapParameters;
import com.raytheon.uf.viz.core.DrawableImage; import com.raytheon.uf.viz.core.DrawableImage;
@ -54,7 +54,7 @@ import com.raytheon.viz.core.gl.images.AbstractGLImage;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Aug 6, 2012 mschenke Initial creation * Aug 6, 2012 mschenke Initial creation
* Nov 4, 2013 2492 mschenke Reworked to use GLSL Data mapping * Nov 4, 2013 2492 mschenke Reworked to use GLSL Data mapping
* Jan 27, 2016 DR 17997 jgerth Support for gamma control * Jun 2, 2016 mjames@ucar Refactored for jogamp 2 for OS X
* *
* </pre> * </pre>
* *
@ -69,8 +69,6 @@ public class GLTrueColorImagingExtension extends AbstractGLSLImagingExtension
private Channel renderingChannel; private Channel renderingChannel;
private double renderingGamma = 1.0;
private Map<ColorMapParameters, Object> parameters = new IdentityHashMap<ColorMapParameters, Object>(); private Map<ColorMapParameters, Object> parameters = new IdentityHashMap<ColorMapParameters, Object>();
/* /*
@ -125,7 +123,6 @@ public class GLTrueColorImagingExtension extends AbstractGLSLImagingExtension
boolean allPainted = true; boolean allPainted = true;
for (Channel channel : Channel.values()) { for (Channel channel : Channel.values()) {
renderingChannel = channel; renderingChannel = channel;
renderingGamma = trueColorImage.getGamma(channel);
DrawableImage[] imagesToDraw = trueColorImage DrawableImage[] imagesToDraw = trueColorImage
.getImages(channel); .getImages(channel);
if (imagesToDraw != null && imagesToDraw.length > 0) { if (imagesToDraw != null && imagesToDraw.length > 0) {
@ -151,7 +148,6 @@ public class GLTrueColorImagingExtension extends AbstractGLSLImagingExtension
throw e; throw e;
} }
renderingChannel = null; renderingChannel = null;
renderingGamma = 1.0;
writeToImage = null; writeToImage = null;
trueColorImage.setImageParameters(parameters.keySet()); trueColorImage.setImageParameters(parameters.keySet());
trueColorImage.bind(target.getGl()); trueColorImage.bind(target.getGl());
@ -163,13 +159,13 @@ public class GLTrueColorImagingExtension extends AbstractGLSLImagingExtension
return null; return null;
} }
} else if (image instanceof AbstractGLColormappedImage) { } else if (image instanceof AbstractGLColormappedImage) {
GL gl = target.getGl(); GL2 gl = target.getGl();
GLColormappedImageExtension.setupDataMapping(gl, GLColormappedImageExtension.setupDataMapping(gl,
(AbstractGLColormappedImage) image, GL.GL_TEXTURE2, (AbstractGLColormappedImage) image, GL2.GL_TEXTURE2,
GL.GL_TEXTURE3); GL2.GL_TEXTURE3);
// bind on GL_TEXTURE1 as 0 is channel image // bind on GL_TEXTURE1 as 0 is channel image
writeToImage.bind(gl, GL.GL_TEXTURE1); writeToImage.bind(gl, GL2.GL_TEXTURE1);
return image; return image;
} }
return null; return null;
@ -193,17 +189,17 @@ public class GLTrueColorImagingExtension extends AbstractGLSLImagingExtension
((GLTrueColorImage) image).getWrappedImage(), ((GLTrueColorImage) image).getWrappedImage(),
(PixelCoverage) data)); (PixelCoverage) data));
} else if (writeToImage != null) { } else if (writeToImage != null) {
GL gl = target.getGl(); GL2 gl = target.getGl();
// Unbind the writeToImage from GL_TEXTURE1 // Unbind the writeToImage from GL_TEXTURE1
gl.glActiveTexture(GL.GL_TEXTURE1); gl.glActiveTexture(GL2.GL_TEXTURE1);
gl.glBindTexture(writeToImage.getTextureStorageType(), 0); gl.glBindTexture(writeToImage.getTextureStorageType(), 0);
// Unbind the data mapped textures // Unbind the data mapped textures
gl.glActiveTexture(GL.GL_TEXTURE2); gl.glActiveTexture(GL2.GL_TEXTURE2);
gl.glBindTexture(GL.GL_TEXTURE_1D, 0); gl.glBindTexture(GL2.GL_TEXTURE_1D, 0);
gl.glActiveTexture(GL.GL_TEXTURE3); gl.glActiveTexture(GL2.GL_TEXTURE3);
gl.glBindTexture(GL.GL_TEXTURE_1D, 0); gl.glBindTexture(GL2.GL_TEXTURE_1D, 0);
} }
} }
@ -250,8 +246,6 @@ public class GLTrueColorImagingExtension extends AbstractGLSLImagingExtension
GLSLStructFactory.createColorMapping(program, "colorMapping", -1, GLSLStructFactory.createColorMapping(program, "colorMapping", -1,
-1, colorMapParameters); -1, colorMapParameters);
program.setUniform("gamma", renderingGamma);
// Set the composite image data // Set the composite image data
program.setUniform("trueColorTexture", 1); program.setUniform("trueColorTexture", 1);
program.setUniform("width", (float) writeToImage.getWidth()); program.setUniform("width", (float) writeToImage.getWidth());
@ -270,7 +264,7 @@ public class GLTrueColorImagingExtension extends AbstractGLSLImagingExtension
* (javax.media.opengl.GL) * (javax.media.opengl.GL)
*/ */
@Override @Override
protected void enableBlending(GL gl) { protected void enableBlending(GL2 gl) {
// Do not enable blending for this extension as it messes with alpha // Do not enable blending for this extension as it messes with alpha
// values between passes // values between passes
} }

2
cave/com.raytheon.uf.viz.useradmin/plugin.xml
View file

@ -5,7 +5,7 @@
point="org.eclipse.ui.menus"> point="org.eclipse.ui.menus">
<menuContribution <menuContribution
allPopups="false" allPopups="false"
locationURI="menu:CAVE?after=group1"> locationURI="menu:d2dFile?after=group1">
<command <command
commandId="com.raytheon.uf.viz.useradmin.useradminui" commandId="com.raytheon.uf.viz.useradmin.useradminui"
label="AWIPS User Administration..." label="AWIPS User Administration..."

3
cave/com.raytheon.uf.viz.volumebrowser.dataplugin/META-INF/MANIFEST.MF
View file

@ -28,5 +28,6 @@ Require-Bundle: com.raytheon.uf.viz.core;bundle-version="1.15.1",
com.raytheon.uf.viz.datacube;bundle-version="1.14.0", com.raytheon.uf.viz.datacube;bundle-version="1.14.0",
com.raytheon.uf.viz.core.grid;bundle-version="1.15.0", com.raytheon.uf.viz.core.grid;bundle-version="1.15.0",
com.raytheon.viz.core;bundle-version="1.15.0", com.raytheon.viz.core;bundle-version="1.15.0",
com.raytheon.uf.common.dataplugin.grid.derivparam;bundle-version="1.16.0" com.raytheon.uf.common.dataplugin.grid.derivparam;bundle-version="1.16.0",
com.raytheon.uf.viz.d2d.ui;bundle-version="1.14.0"
Export-Package: com.raytheon.uf.viz.volumebrowser.dataplugin.point Export-Package: com.raytheon.uf.viz.volumebrowser.dataplugin.point

2
cave/com.raytheon.viz.bcd/plugin.xml
View file

@ -40,7 +40,7 @@
locationURI="menu:import"> locationURI="menu:import">
<command <command
commandId="com.raytheon.viz.bcd.openBCD" commandId="com.raytheon.viz.bcd.openBCD"
label="BCD File" label="BCD File..."
style="push"> style="push">
</command> </command>
</menuContribution> </menuContribution>

67
cave/com.raytheon.viz.gfe/plugin.xml
View file

@ -1924,7 +1924,7 @@
<path <path
application="GFE" application="GFE"
extensionFilter=".py" extensionFilter=".py"
localizationAdapter="com.raytheon.viz.gfe.localization.adapters.ConfigAdapter" localizationAdapter="com.raytheon.viz.gfe.config.ConfigAdapter"
localizationType="CAVE_STATIC" localizationType="CAVE_STATIC"
name="Config Files" name="Config Files"
value="gfe/userPython/gfeConfig"> value="gfe/userPython/gfeConfig">
@ -1956,7 +1956,7 @@
<path <path
application="GFE" application="GFE"
extensionFilter=".py" extensionFilter=".py"
localizationAdapter="com.raytheon.viz.gfe.localization.adapters.ProceduresAdapter" localizationAdapter="com.raytheon.viz.gfe.procedures.ProceduresAdapter"
localizationType="CAVE_STATIC" localizationType="CAVE_STATIC"
name="Procedures" name="Procedures"
value="gfe/userPython/procedures"> value="gfe/userPython/procedures">
@ -1964,7 +1964,7 @@
<path <path
application="GFE" application="GFE"
extensionFilter=".py" extensionFilter=".py"
localizationAdapter="com.raytheon.viz.gfe.localization.adapters.SmartToolAdapter" localizationAdapter="com.raytheon.viz.gfe.smarttool.SmartToolAdapter"
localizationType="CAVE_STATIC" localizationType="CAVE_STATIC"
name="Smart Tools" name="Smart Tools"
value="gfe/userPython/smartTools"> value="gfe/userPython/smartTools">
@ -1972,7 +1972,7 @@
<path <path
application="GFE" application="GFE"
extensionFilter=".py" extensionFilter=".py"
localizationAdapter="com.raytheon.viz.gfe.localization.adapters.TextProductAdapter" localizationAdapter="com.raytheon.viz.gfe.textproduct.TextProductAdapter"
localizationType="CAVE_STATIC" localizationType="CAVE_STATIC"
name="Text Products" name="Text Products"
recursive="false" recursive="false"
@ -1989,7 +1989,7 @@
<path <path
application="GFE" application="GFE"
extensionFilter=".py" extensionFilter=".py"
localizationAdapter="com.raytheon.viz.gfe.localization.adapters.TextUtilityAdapter" localizationAdapter="com.raytheon.viz.gfe.textproduct.TextUtilityAdapter"
localizationType="CAVE_STATIC" localizationType="CAVE_STATIC"
name="Text Utilities" name="Text Utilities"
recursive="false" recursive="false"
@ -1998,7 +1998,7 @@
<path <path
application="GFE" application="GFE"
extensionFilter=".py" extensionFilter=".py"
localizationAdapter="com.raytheon.viz.gfe.localization.adapters.UtilityAdapter" localizationAdapter="com.raytheon.viz.gfe.smarttool.UtilityAdapter"
localizationType="CAVE_STATIC" localizationType="CAVE_STATIC"
name="Utilities" name="Utilities"
value="gfe/userPython/utilities"> value="gfe/userPython/utilities">
@ -2017,61 +2017,6 @@
recursive="true" recursive="true"
value="gfe/weGroups"> value="gfe/weGroups">
</path> </path>
<path
application="GFE Server"
extensionFilter=".py,.properties"
localizationAdapter="com.raytheon.viz.gfe.localization.adapters.ServerConfigAdapter"
localizationType="COMMON_STATIC"
name="Server Config Files"
recursive="false"
value="gfe/config">
</path>
<path
application="GFE Server"
extensionFilter=".py"
localizationAdapter="com.raytheon.viz.gfe.localization.adapters.SmartInitAdapter"
localizationType="COMMON_STATIC"
name="Smart Inits"
recursive="false"
value="gfe/smartinit">
</path>
<path
application="GFE Server"
extensionFilter=".xml"
localizationAdapter="com.raytheon.viz.gfe.localization.adapters.ParameterInfoAdapter"
localizationType="COMMON_STATIC"
name="Parameter Info Files"
value="grid/parameterInfo">
</path>
<path
application="GFE Server"
extensionFilter="gfeParamName.xml"
localizationType="COMMON_STATIC"
name="Param Names"
value="parameter/alias">
</path>
<path
application="GFE Server"
extensionFilter="gfeParamInfo.xml"
localizationType="COMMON_STATIC"
name="Param Info Mapping"
value="grid/dataset/alias">
</path>
<path
application="GFE Server"
extensionFilter="gfeLevelMappingFile.xml"
localizationType="COMMON_STATIC"
name="Level Mapping"
value="grid">
</path>
<path
application="GFE Server"
extensionFilter="VTECPartners.py"
localizationAdapter="com.raytheon.viz.gfe.localization.adapters.ServerConfigAdapter"
localizationType="COMMON_STATIC"
name="VTEC Partners"
value="vtec">
</path>
</extension> </extension>
<extension <extension

4
cave/com.raytheon.viz.lpi/plugin.xml
View file

@ -39,8 +39,8 @@
point="org.eclipse.ui.menus"> point="org.eclipse.ui.menus">
<menuContribution <menuContribution
locationURI="menu:import"> locationURI="menu:import">
<command <command
commandId="com.raytheon.viz.lpi.openLPI" commandId="com.raytheon.viz.lpi.openLPI"
label="LPI File" label="LPI File"
style="push"> style="push">
</command> </command>

16
cave/com.raytheon.viz.mpe.ui/plugin.xml
View file

@ -1819,22 +1819,6 @@
</contextId> </contextId>
</classContext> </classContext>
</extension> </extension>
<extension
point="com.raytheon.uf.viz.localization.perspective.localizationpath">
<path
application="MPE"
localizationType="COMMON_STATIC"
name="MPE Proc"
value="mpeProc">
</path>
<path
application="MPE"
localizationType="COMMON_STATIC"
name="MPE Lookup"
value="mpeLookup"
recursive="true">
</path>
</extension>
<extension point="org.eclipse.ui.services"> <extension point="org.eclipse.ui.services">
<sourceProvider <sourceProvider
provider="com.raytheon.viz.mpe.ui.TransmitBestEstimateQPEProvider"> provider="com.raytheon.viz.mpe.ui.TransmitBestEstimateQPEProvider">

4
cave/com.raytheon.viz.product.awips/developer.product
View file

@ -14,7 +14,7 @@
</configIni> </configIni>
<launcherArgs> <launcherArgs>
<programArgs>-data @user.home/caveData -user @user.home/caveData -clean -consoleLog -component thinclient -alertviz <programArgs>-data @user.home/Library/caveData -user @user.home/Library/caveData -clean -consoleLog -component thinclient -alertviz
</programArgs> </programArgs>
<vmArgs>-Xmx4536M <vmArgs>-Xmx4536M
-XX:+UseG1GC -XX:+UseG1GC
@ -24,7 +24,7 @@
-Dqpid.dest_syntax=BURL -Dqpid.dest_syntax=BURL
-Dlogback.configurationFile=logback-viz-core-developer.xml -Dlogback.configurationFile=logback-viz-core-developer.xml
-Dlogback.statusListenerClass=com.raytheon.uf.common.logback.UFLogbackInternalStatusListener -Dlogback.statusListenerClass=com.raytheon.uf.common.logback.UFLogbackInternalStatusListener
-Dthrift.stream.maxsize=200 -Dthrift.stream.maxsize=800
-Dviz.memory.warn.threshold=99 -Dviz.memory.warn.threshold=99
-Dorg.eclipse.swt.internal.gtk.cairoGraphics=false -Dorg.eclipse.swt.internal.gtk.cairoGraphics=false
-Dhttps.certificate.check=false -Dhttps.certificate.check=false

7
cave/com.raytheon.viz.satellite/plugin.xml
View file

@ -71,4 +71,11 @@
sortID="4"> sortID="4">
</contextualMenu> </contextualMenu>
</extension> </extension>
<extension
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
locationURI="menu:models?after=top">
</menuContribution>
</extension>
</plugin> </plugin>