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

D2DNSHARP and UI updates

Browse source
This commit is contained in:
Michael James 2016-09-07 19:13:30 -05:00
parent 76e808c848
commit 223d41331b
5 changed files with 39 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

10
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNsharpObservedSoundingDialogContents.java
View file

@ -30,11 +30,11 @@ import gov.noaa.nws.ncep.ui.nsharp.NsharpConstants;
import gov.noaa.nws.ncep.ui.nsharp.NsharpStationInfo;
import com.raytheon.uf.viz.d2d.nsharp.display.map.D2DNsharpMapResource;
import java.sql.Timestamp;
import java.text.DateFormatSymbols;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
import org.eclipse.swt.SWT;
@ -99,10 +99,10 @@ public class D2DNsharpObservedSoundingDialogContents {
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
ldDia.startWaitCursor();
for (Object timeLine : timeLines.getTimeLines()) {
Timestamp synoptictime = (Timestamp) timeLine;
Date synoptictime = (Date) timeLine;
if (synoptictime != null) {
// need to format synoptictime to GMT time string.
// Timestamp.toString produce a local time Not GMT time
// Date.toString produce a local time Not GMT time
cal.setTimeInMillis(synoptictime.getTime());
String dayOfWeek = defaultDays[cal
.get(Calendar.DAY_OF_WEEK)];
@ -148,14 +148,14 @@ public class D2DNsharpObservedSoundingDialogContents {
// Note: A same station may have many reports
for (int i = 0; i < stnInfoAry.length; i++) {
NcSoundingStnInfo stnInfo = stnInfoAry[i];
Timestamp synoptictime = null;
Date synoptictime = null;
stnInfoStr = stnInfo.getStnId();
if (stnInfoStr == null || stnInfoStr.length() < 1)
stnInfoStr = "*";
lat = stnInfo.getStationLatitude();
lon = stnInfo.getStationLongitude();
// elv = stnInfo.getStationElevation();
synoptictime = (Timestamp) stnInfo.getSynopTime();
synoptictime = (Date) stnInfo.getSynopTime();
// convert to Nsharp's own station info struct
NsharpStationInfo stn = new NsharpStationInfo();

2
cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/map/D2DNsharpMapResourceData.java
View file

@ -19,8 +19,6 @@
*/
package com.raytheon.uf.viz.d2d.nsharp.display.map;
import gov.noaa.nws.ncep.ui.nsharp.display.map.NsharpMapResource;
import gov.noaa.nws.ncep.ui.nsharp.display.map.NsharpMapResourceData;
import gov.noaa.nws.ncep.viz.common.ui.Markers.MarkerState;
import gov.noaa.nws.ncep.viz.common.ui.Markers.MarkerTextSize;
import gov.noaa.nws.ncep.viz.common.ui.Markers.MarkerType;

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

@ -621,7 +621,25 @@
</reference>
</visibleWhen>
</command>
<!--
<command
commandId="com.raytheon.viz.radar.rsc.map.dialog"
icon="icons/nsharp.png"
id="com.raytheon.viz.radar.rsc.map.dialog"
label="NEXRAD"
mode="FORCE_TEXT"
style="push"
tooltip="NEXRAD">
<visibleWhen>
<reference
definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
</reference>
</visibleWhen>
</command>
-->
<!--
com.raytheon.viz.radar.rsc.map.RadarMapResource
<command
commandId="gov.noaa.nws.ncep.ui.nsharp.palette"
icon="icons/nsharp.png"
@ -810,12 +828,26 @@
value="10">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="15">
</parameter>
</command>
<command commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="20">
</parameter>
</command>
<command
commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"
value="25">
</parameter>
</command>
<command commandId="com.raytheon.viz.ui.actions.setframes">
<parameter
name="frameCount"

2
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/perspectives/D2D5Pane.java
View file

@ -81,7 +81,7 @@ public class D2D5Pane implements IPerspectiveFactory {
// Get the editor area.
String editorArea = layout.getEditorArea();
layout.setFixed(false);
//layout.addPlaceholder("com.raytheon.uf.viz.d2d.nsharp.display.D2DNSharpPaletteWindow", IPageLayout.RIGHT,0.85f, editorArea);
layout.addPlaceholder("com.raytheon.uf.viz.d2d.nsharp.display.D2DNSharpPaletteWindow", IPageLayout.RIGHT,0.85f, editorArea);
//layout.addPlaceholder("edu.ucar.unidata.viz.radar.radarBrowser", IPageLayout.RIGHT,0.65f, editorArea);
layout.addPlaceholder("gov.noaa.gsd.viz.ensemble.tool.viewer", IPageLayout.RIGHT,0.6f, editorArea);