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

Merge branch 'ss_builds' (12.10.1-1) into development

Browse source 
Former-commit-id: 0e046d847a [formerly bba4eb12d0] [formerly 0e046d847a [formerly bba4eb12d0] [formerly af106f1d29 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]
Former-commit-id: af106f1d29
Former-commit-id: f224e3e8ad [formerly 53e29f59e4]
Former-commit-id: e9582cb789
This commit is contained in:
Steve Harris 2012-09-04 12:10:36 -05:00
commit f8e7459dfb
144 changed files with 64663 additions and 62851 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/build/static/common/cave/etc/bundles/UpperAirProfiler.xml
View file

@ -26,6 +26,9 @@
<resource>
<loadProperties loadWithoutData="true">
<capabilities>
<capability xsi:type="colorMapCapability">
<colorMapParameters colorMapName="Profiler/Wind Speed"/>
</capability>
<capability xsi:type="imagingCapability" interpolationState="false" brightness="1.0" contrast="1.0" alpha="1.0"/>
</capabilities>
</loadProperties>

9
cave/build/static/common/cave/etc/gfe/itool/runProcedure.py
View file

@ -40,11 +40,6 @@ import Exceptions
from java.lang.System import getProperty
from com.raytheon.uf.common.dataplugin.gfe.reference import ReferenceID
from com.raytheon.viz.gfe.core import DataManager
from com.raytheon.uf.common.localization import PathManagerFactory
from com.raytheon.uf.viz.core.localization import LocalizationManager
from com.raytheon.uf.common.localization import LocalizationContext_LocalizationLevel as LocalizationLevel
from com.raytheon.uf.common.localization import LocalizationContext_LocalizationType as LocalizationType
from com.raytheon.uf.common.dataplugin.gfe.python import GfePyIncludeUtil
CLASS_NAME = 'Procedure'
@ -157,8 +152,8 @@ def usage():
print " -n procedureName "
print " -u userName"
print " -c configFile"
print " [-h host]"
print " [-p port]"
print " [-server serverURL -- example ec:9581/services]"
print " [-site siteID]"
print " [-a editAreaName]"
print " [-s startTime -e endTime] OR"
print " [-t timeRange]"

3
cave/build/static/common/cave/etc/gfe/runIFPText.py
View file

@ -38,9 +38,6 @@ import FormatterRunner
import loadConfig
from com.raytheon.viz.gfe.core import DataManager
from com.raytheon.uf.common.localization import PathManagerFactory
from com.raytheon.uf.common.localization import LocalizationContext_LocalizationLevel as LocalizationLevel
from com.raytheon.uf.common.localization import LocalizationContext_LocalizationType as LocalizationType
LOGGER = None

75
cave/build/static/common/cave/etc/gfe/userPython/smartTools/ModelBlend.py
View file

@ -311,15 +311,13 @@ class Tool (SmartScript.SmartScript):
def __init__(self, dbss):
self._dbss=dbss
SmartScript.SmartScript.__init__(self, dbss)
self.setToolType("numeric")
def preProcessGrid(self,WEname,ToolTimeRange):
def preProcessGrid(self,WEname):
#
# Setup the arrays of information for the dialog
# box that sets the weights
#
# The mutable database is labelled "Forecast" no matter
# The mutable database is labeled "Forecast" no matter
# what you do, and put in the first slot on the dialog.
# The "Official" database is hardcoded into the next slot,
# then others are added
@ -327,8 +325,7 @@ class Tool (SmartScript.SmartScript):
self.labels = []
self.dbIds = []
self.selectTR = ToolTimeRange # not sure this is quite the same as old code.
# can user change selected time range?
db=self.mutableID()
id=db.modelIdentifier()
self._addModel('Forecast:', id)
@ -465,8 +462,6 @@ class Tool (SmartScript.SmartScript):
if button=="Cancel":
return
self._empty = self.getTopo() * 0.0
#
# Get the results from the dialog
#
@ -496,7 +491,7 @@ class Tool (SmartScript.SmartScript):
if not someweights:
self.statusBarMsg("ModelBlend has no weights","R")
return
if (abs(fcstweight)>0.5)and(otherweights==0):
if abs(fcstweight) > 0.5 and otherweights==0:
self.statusBarMsg("ModelBlend Weights add to no change","R")
return
if totweight==0:
@ -507,18 +502,24 @@ class Tool (SmartScript.SmartScript):
# fcst=mutable model database name
# selectTR=the selected timerange
#
fcst=self.mutableID().modelIdentifier()
#selectTR=self._dbss.dataManager().parmOp().selectionTimeRange()
selectTR = self.selectTR
fcst = self.mutableID().modelIdentifier()
selectTR = self._dbss.getParmOp().getSelectionTimeRange()
#
# get list of parms that are selected and mutable
#
allParms=self.selectedParms()
parms=[]
# Making a derivation from AWIPS1's version of this script.
# Instead of calling direct to Java's ParmManager to get the Parm
# objects, we'll use SmartScript's selectedParms() to retrieve native
# Python objects which should save us Java heap space which wouldn't
# be freed otherwise until the user terminates the SmartTool
#
# allParms = self._dbss.getParmManager().getSelectedParms()
allParms = self.selectedParms()
parms = []
for parm in allParms:
parmName, parmLevel, parmDbID = parm
model=parmDbID.modelIdentifier()
if model==fcst:
# model = parm.getParmID().getDbId().getModelId()
model = parm[2].modelIdentifier()
if model == fcst:
parms.append(parm)
#
@ -527,16 +528,25 @@ class Tool (SmartScript.SmartScript):
# WEname - short parm name string
# parmlevel - parm level string
#
for WEName, parmLevel, parmDbID in parms:
parm = self.getParm(parmDbID, WEName, parmLevel)
parmInfo = parm.getGridInfo()
rateParm=parmInfo.isRateParm()
wxType=parmInfo.getGridType().toString()
for WEname, parmlevel, dbId in parms:
# Another AWIPS1 derivation: Use of different selectedParms()
# call forces us to retrieve Parm to retrieve some of these
# pieces of information
#
# rateParm = parm.getGridInfo().isRateParm()
# wxType = parm.getGridInfo().getGridType().toString()
# WEname = parm.getGridInfo().getParmID().getParmName()
# parmlevel = parm.getGridInfo().getParmID().getParmLevel()
parm = self.getParm(dbId, WEname, parmlevel)
rateParm = parm.getGridInfo().isRateParm()
wxType = parm.getGridInfo().getGridType().toString()
del parm
#
# Get list of grids for this parm within the selcted time range
# and loop over each of those grids
#
gridinfos=self.getGridInfo(fcst,WEName,parmLevel,selectTR)
gridinfos=self.getGridInfo(fcst,WEname,parmlevel,selectTR)
for gridinfo in gridinfos:
GridTimeRange=gridinfo.gridTime()
#
@ -551,7 +561,7 @@ class Tool (SmartScript.SmartScript):
gsum=self._empty.copy()
totweight=0
fcstweight=0
oldgrid=self.getGrids(self.dbIds[0],WEName,"SFC",GridTimeRange,noDataError=0,cache=0)
oldgrid=self.getGrids(self.dbIds[0],WEname,"SFC",GridTimeRange,noDataError=0,cache=0)
if oldgrid==None:
self.statusBarMsg("ModelBlend tool could not get Fcst data for " + WEName,"A")
for num, label in enumerate(self.labels):
@ -564,13 +574,13 @@ class Tool (SmartScript.SmartScript):
idx = label.find("(")
idx1 = label.find(")",idx)
if idx == -1 or idx1 == -1:
WEnameSource = WEName
WEnameSource = WEname
else:
ot = label[idx+1:idx1]
if ot == self.myOfficeType():
WEnameSource = WEName
WEnameSource = WEname
else:
WEnameSource = WEName + ot
WEnameSource = WEname + ot
grid=self.getGrids(self.dbIds[num],WEnameSource,"SFC",GridTimeRange,mode=modeType,noDataError=0,cache=0)
if grid != None:
gsum+=(grid*weight)
@ -591,7 +601,7 @@ class Tool (SmartScript.SmartScript):
else:
newgrid=gsum/totweight
finalgrid=self.inEditArea(newgrid,oldgrid,EdgeType,EdgeWidth)
self.createGrid(fcst,WEName,wxType,finalgrid,GridTimeRange)
self.createGrid(fcst,WEname,wxType,finalgrid,GridTimeRange)
else:
self.statusBarMsg("ModelBlend weights ended up Zero - so cancelled","A")
#
@ -603,7 +613,7 @@ class Tool (SmartScript.SmartScript):
# add up the weights again, because we cannot count
# weights for grids that cannot be read.
#
oldgrid=self.getGrids(dbIds[0],WEName,"SFC",GridTimeRange,noDataError=0,cache=0)
oldgrid=self.getGrids(dbIds[0],WEname,"SFC",GridTimeRange,noDataError=0,cache=0)
if oldgrid==None:
self.statusBarMsg("ModelBlend tool could not get Fcst data for " + WEName,"A")
(mag,direc)=oldgrid
@ -616,7 +626,7 @@ class Tool (SmartScript.SmartScript):
fcstweight=0
for num, weight in enumerate(weights):
if weight!=0:
grid=self.getGrids(self.dbIds[num],WEName,"SFC",GridTimeRange,noDataError=0,cache=0)
grid=self.getGrids(self.dbIds[num],WEname,"SFC",GridTimeRange,noDataError=0,cache=0)
if grid != None:
(mag,direc)=grid
(u,v)=self.MagDirToUV(mag,direc)
@ -642,7 +652,7 @@ class Tool (SmartScript.SmartScript):
ufinal=self.inEditArea(unew,uold,EdgeType,EdgeWidth)
vfinal=self.inEditArea(vnew,vold,EdgeType,EdgeWidth)
result=self.UVToMagDir(ufinal,vfinal)
self.createGrid(fcst,WEName,wxType,result,GridTimeRange)
self.createGrid(fcst,WEname,wxType,result,GridTimeRange)
#self.callSmartTool("DoNothing",WEname,None,GridTimeRange)
else:
self.statusBarMsg("ModelBlend weights ended up Zero - so cancelled","A")
@ -680,8 +690,7 @@ class Tool (SmartScript.SmartScript):
# Make edgegrid 0-1 across edit area
#
if (EdgeType=="Flat"):
edgegrid=editArea.getGrid().__numpy__
edgegrid=edgegrid[0]
edgegrid=editArea.getGrid().__numpy__[0]
elif (EdgeType=="Edge"):
edgegrid=self.taperGrid(editArea,EdgeWidth)
else:

48
cave/build/static/common/cave/etc/gfe/utility/PngWriter.py
View file

@ -17,11 +17,24 @@
# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
# further licensing information.
##
#
# SOFTWARE HISTORY
#
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# 08/20/2012 #1077 randerso Fixed backgroundColor setting
# 08/20/2012 #1082 randerso fixed 1 image per grid
# 08/29/2012 #1081 dgilling Update usage statement.
#
#
#
import string, LogStream, getopt, sys, os, time
import time, TimeRange, AbsTime
import GFEPainter
import loadConfig
from operator import attrgetter
from java.util import ArrayList
from com.raytheon.uf.common.time import DataTime
from com.raytheon.uf.viz.core import RGBColors
from com.raytheon.viz.gfe.core.parm import ParmDisplayAttributes_VisMode as VisMode
@ -244,7 +257,10 @@ class PngWriter:
maskBasedOnHistory = self.getConfig('Png_historyMask', 0, int)
wholeDomain = self.getConfig('Png_wholeDomain', 0, int)
viz = GFEPainter.GFEPainter(width, height, leftExpand, rightExpand, topExpand, bottomExpand, mask, wholeDomain)
#TODO handle transparent background
bgColor, trans = self.getBG()
viz = GFEPainter.GFEPainter(width, height, leftExpand, rightExpand, topExpand, bottomExpand, mask, wholeDomain, bgColor)
if not omitColorbar:
viz.enableColorbar()
@ -253,8 +269,17 @@ class PngWriter:
# allow user to specify precise interval for creation of images
# rather than the automatically generated set
try:
paintInterval = self.getConfig('Png_interval', 6, int)
paintInterval = self.getConfig('Png_interval', None, int)
if paintInterval is None:
parmList = ArrayList();
for p in prms:
parmList.add(p)
jtimes = self.dm.getParmManager().calcStepTimes(parmList,
self.dm.getParmManager().getSystemTimeRange())
times = []
for i in xrange(jtimes.size()):
times.append(AbsTime.AbsTime(jtimes.get(i)))
else:
paintIntervalOffset = self.getConfig('Png_intervalOffset', 0, int)
if paintInterval < 0:
paintInterval = 1
@ -274,9 +299,7 @@ class PngWriter:
if t >= firstTime:
times.append(t)
t = t + paintInterval
except KeyError:
times = Graphics.calcStepTimes(prms,
self.dm.parmMgr().systemTimeRange())
if len(times) == 0:
LogStream.logEvent("No grids to generate")
@ -306,9 +329,6 @@ class PngWriter:
lang = self.getConfig('Png_legendLanguage', '');
viz.setupLegend(localTime, snapshotTime, snapshotFmt, descName, durFmt, startFmt, endFmt, overrideColors, lang)
#TODO handle transparent background
bgColor, trans = self.getBG()
xOffset = self.getConfig("MapLabelXOffset", None, int)
yOffset = self.getConfig("MapLabelYOffset", None, int)
for map in maps:
@ -351,7 +371,7 @@ class PngWriter:
# paint once to get map retrieval started
if len(times) > 0:
viz.paint(times[0], backgroundColor=bgColor)
viz.paint(times[0])
for t in times:
paintTime = t
@ -381,7 +401,7 @@ class PngWriter:
RGBColors.getColorName(p.getDisplayAttributes().getBaseColor()), p.getDisplayAttributes().getVisMode().toString() == 'Image')
visualInfo.append(info)
viz.paint(paintTime, backgroundColor=bgColor)
viz.paint(paintTime)
fname = self.getFileName(dir, t) + '.' + fexten
viz.outputFiles(fname, showLogo, logoString)
self.writeInfo(dir, paintTime, visualInfo)
@ -412,7 +432,7 @@ class PngWriter:
def usage():
msg = """
usage: ifpIMAGE [-c config] [-u username] [-h host] [-p port] -o directory
usage: ifpIMAGE [-c config] [-u username] [-server serverURL] [-site siteID] -o directory
[-b baseTime] [-s startTime] [-e endTime] [-t usrTimeRng]
config : Name of GFE style config file to use.
@ -420,8 +440,8 @@ def usage():
username : The name of the user (for config file lookup).
baseTime : Output filenames are relative to baseTime. Basetime
format is yyyymmdd_hhmm.
host : The host the ifpServer is running on.
port : The rpc port number the ifpServer is using.
serverURL: The URL of the Thrift service, example: ec:9581/services
siteID : The site ID to localize as.
startTime: starting time for images in format yyyymmdd_hhmm
endTime : ending time for images in format yyyymmdd_hhmm\n\n
usrTimeRng: used to specify a user selected time range (e.g., "Day_3")

3
cave/build/static/common/cave/etc/plotModels/bufrmos/CIGV.svg
View file

@ -56,7 +56,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
]]>
</style>
<symbol overflow="visible" id="plotData" class="info">
<symbol overflow="visible" id="plotData" class="info">
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="ceiling_bestCat" class="text" plotMode="table" plotParam="ceiling_bestCat" plotLookupTable="bufrmos/mos_eta_gfs_CIG.txt" style="text-anchor: middle;" x="0px" y="0px">M</text>
<text id="vis_bestCat" class="text" plotMode="table" plotParam="vis_bestCat" plotLookupTable="bufrmos/mos_eta_gfs_VIS.txt" style="text-anchor: middle;" x="0px" y="10px">M</text>
</symbol>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

3
cave/build/static/common/cave/etc/plotModels/bufrmos/freezing.svg
View file

@ -57,7 +57,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="precipFreezing" class="text" plotMode="text" plotParam="precipFreezing" plotFormat="%3.0f" style="text-anchor: middle;" x="0px" y="0px">M</text>
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="precipFreezing" class="text" plotMode="text" plotParam="precipFreezing" plotFormat="%3.0f" style="text-anchor: middle;" x="0px" y="0px">M</text>
</symbol>
</defs>
<use id="wind" x="40" y="40" width="80" height="80" visibility="visible" xlink:href="#plotData"/>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

1
cave/build/static/common/cave/etc/plotModels/bufrmos/gfsex_maxmin.svg
View file

@ -57,6 +57,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="maxTempDay" class="text" plotMode="text" plotParam="maxTempDay" plotUnit="°F" plotFormat="%3.0f" style="text-anchor: middle;" x="0px" y="-10px">M</text>
<text id="minTempNight" class="text" plotMode="text" plotParam="minTempNight" plotUnit="°F" plotFormat="%3.0f" style="text-anchor: middle;" x="0px" y="-10px">M</text>
</symbol>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

1
cave/build/static/common/cave/etc/plotModels/bufrmos/gfsex_stdDesign.svg
View file

@ -57,6 +57,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="stdTemperature" class="text" plotMode="text" plotParam="stdTemperature" plotUnit="°F" plotFormat="%3.0f" style="text-anchor: end;" x="-10px" y="-10px">M</text>
<text id="stdDewpoint" class="text" plotMode="text" plotParam="stdDewpoint" plotUnit="°F" plotFormat="%3.0f" style="text-anchor: end;" x="-10px" y="10px">M</text>
<text id="presentWxText" plotMode="recursive_translation" class="weather" plotLookupTable="wx_symbol_trans.txt" plotParam="presWeather" style="text-anchor: end" x="-10" y="0">0</text>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

1
cave/build/static/common/cave/etc/plotModels/bufrmos/gfslamp_CIGV.svg
View file

@ -57,6 +57,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="ceiling_bestCat" class="text" plotMode="table" plotParam="ceiling_bestCat" plotLookupTable="bufrmos/gfslamp_CIG_codes.txt" style="text-anchor: middle;" x="0px" y="0px">M</text>
<text id="vis_bestCat" class="text" plotMode="table" plotParam="vis_bestCat" plotLookupTable="bufrmos/gfslamp_VIS_codes.txt" style="text-anchor: middle;" x="0px" y="10px">M</text>
</symbol>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

1
cave/build/static/common/cave/etc/plotModels/bufrmos/gfslamp_stdDesign.svg
View file

@ -57,6 +57,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="temperature" class="text" plotMode="text" plotParam="temperature" plotUnit="°F" plotFormat="%3.0f" style="text-anchor: end;" x="-10px" y="-10px">M</text>
<text id="dewpoint" class="text" plotMode="text" plotParam="dewpoint" plotUnit="°F" plotFormat="%3.0f" style="text-anchor: end;" x="-10px" y="10px">M</text>
<text id="clouds_bestCat" plotMode="recursive_translation" class="weather" plotParam="clouds_bestCat" plotLookupTable="bufrmos/mos_clouds_gfs_s2s.txt" style="text-anchor: middle" x="0" y="0">M</text>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

1
cave/build/static/common/cave/etc/plotModels/bufrmos/maxmin.svg
View file

@ -57,6 +57,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="maxTemp24Hour" class="text" plotMode="text" plotParam="maxTemp24Hour" plotUnit="°F" plotFormat="%3.0f" style="text-anchor: middle;" x="0px" y="-10px">M</text>
<text id="minTemp24Hour" class="text" plotMode="text" plotParam="minTemp24Hour" plotUnit="°F" plotFormat="%3.0f" style="text-anchor: middle;" x="0px" y="-10px">M</text>
</symbol>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

1
cave/build/static/common/cave/etc/plotModels/bufrmos/pop12hr.svg
View file

@ -57,6 +57,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="POP12hr" class="text" plotMode="text" plotParam="POP12hr" plotFormat="%3.0f" style="text-anchor: start;" x="10px" y="-10px">M</text>
</symbol>
</defs>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

1
cave/build/static/common/cave/etc/plotModels/bufrmos/pop24hr.svg
View file

@ -57,6 +57,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="POP24hr" class="text" plotMode="text" plotParam="POP24hr" plotFormat="%3.0f" style="text-anchor: start;" x="10px" y="-10px">M</text>
</symbol>
</defs>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

1
cave/build/static/common/cave/etc/plotModels/bufrmos/pqpf12hr.svg
View file

@ -57,6 +57,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="PQPF_12hr" class="text" plotMode="text" plotParam="PQPF_12hr" plotFormat="%3.0f" style="text-anchor: start;" x="10px" y="-10px">M</text>
</symbol>
</defs>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

3
cave/build/static/common/cave/etc/plotModels/bufrmos/pqpf6hr.svg
View file

@ -57,7 +57,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="PQPF_6hr" class="text" plotMode="text" plotParam="PQPF_6hr" plotFormat="%3.0f" style="text-anchor: end;" x="-10px" y="-10px">M</text>
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="PQPF_6hr" class="text" plotMode="text" plotParam="PQPF_6hr" plotFormat="%3.0f" style="text-anchor: end;" x="-10px" y="-10px">M</text>
</symbol>
</defs>
<use id="wind" x="40" y="40" width="80" height="80" visibility="visible" xlink:href="#plotData"/>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

3
cave/build/static/common/cave/etc/plotModels/bufrmos/precipMix.svg
View file

@ -57,7 +57,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="precipMix" class="text" plotMode="text" plotParam="precipMix" plotFormat="%3.0f" style="text-anchor: start;" x="10px" y="10px">M</text>
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="precipMix" class="text" plotMode="text" plotParam="precipMix" plotFormat="%3.0f" style="text-anchor: start;" x="10px" y="10px">M</text>
</symbol>
</defs>
<use id="wind" x="40" y="40" width="80" height="80" visibility="visible" xlink:href="#plotData"/>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

3
cave/build/static/common/cave/etc/plotModels/bufrmos/precipRain.svg
View file

@ -57,7 +57,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="precipRain" class="text" plotMode="text" plotParam="precipRain" plotFormat="%3.0f" style="text-anchor: middle;" x="0px" y="-10px">M</text>
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="precipRain" class="text" plotMode="text" plotParam="precipRain" plotFormat="%3.0f" style="text-anchor: middle;" x="0px" y="-10px">M</text>
</symbol>
</defs>
<use id="wind" x="40" y="40" width="80" height="80" visibility="visible" xlink:href="#plotData"/>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

3
cave/build/static/common/cave/etc/plotModels/bufrmos/precipSnow.svg
View file

@ -57,7 +57,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="precipSnow" class="text" plotMode="text" plotParam="precipSnow" plotFormat="%3.0f" style="text-anchor: middle;" x="0px" y="10px">M</text>
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="precipSnow" class="text" plotMode="text" plotParam="precipSnow" plotFormat="%3.0f" style="text-anchor: middle;" x="0px" y="10px">M</text>
</symbol>
</defs>
<use id="wind" x="40" y="40" width="80" height="80" visibility="visible" xlink:href="#plotData"/>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

1
cave/build/static/common/cave/etc/plotModels/bufrmos/qpf12hr.svg
View file

@ -57,6 +57,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="QPF12hr_bestCat" class="text" plotMode="table" plotParam="QPF12hr_bestCat" plotLookupTable="bufrmos/mos_gfs_gfsex_eta_QPF12hr.txt" style="text-anchor: start;" x="10px" y="0px">M</text>
</symbol>
</defs>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

1
cave/build/static/common/cave/etc/plotModels/bufrmos/qpf6hr.svg
View file

@ -57,6 +57,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="QPF6hr_bestCat" class="text" plotMode="table" plotParam="QPF6hr_bestCat" plotLookupTable="bufrmos/mos_gfs_ngm_eta_QPF6hr.txt" style="text-anchor: start;" x="10px" y="10px">M</text>
</symbol>
</defs>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

3
cave/build/static/common/cave/etc/plotModels/bufrmos/severe12hr.svg
View file

@ -57,7 +57,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="severe12hr" class="text" plotMode="text" plotParam="severe12hr" plotFormat="%3.0f" style="text-anchor: end;" x="-10px" y="10px">M</text>
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="severe12hr" class="text" plotMode="text" plotParam="severe12hr" plotFormat="%3.0f" style="text-anchor: end;" x="-10px" y="10px">M</text>
</symbol>
</defs>
<use id="wind" x="40" y="40" width="80" height="80" visibility="visible" xlink:href="#plotData"/>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

3
cave/build/static/common/cave/etc/plotModels/bufrmos/severe6hr.svg
View file

@ -57,7 +57,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="severe6hr" class="text" plotMode="text" plotParam="severe6hr" plotFormat="%3.0f" style="text-anchor: middle;" x="0px" y="10px">M</text>
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="severe6hr" class="text" plotMode="text" plotParam="severe6hr" plotFormat="%3.0f" style="text-anchor: middle;" x="0px" y="10px">M</text>
</symbol>
</defs>
<use id="wind" x="40" y="40" width="80" height="80" visibility="visible" xlink:href="#plotData"/>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

1
cave/build/static/common/cave/etc/plotModels/bufrmos/snowfall24.svg
View file

@ -57,6 +57,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="snow24hr_bestCat" class="text" plotMode="table" plotParam="snow24hr_bestCat" plotLookupTable="bufrmos/mos_gfs_eta_snowamt24.txt" style="text-anchor: start;" x="10px" y="10px">M</text>
</symbol>
</defs>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

5
cave/build/static/common/cave/etc/plotModels/bufrmos/stdDesign.svg
View file

@ -57,10 +57,13 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="presentWxText" plotMode="recursive_translation" class="weather" plotLookupTable="wx_symbol_trans.txt" plotParam="presWeather" style="text-anchor: end" x="-10" y="0">0</text>
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="stdTemperature" class="text" plotMode="text" plotParam="stdTemperature" plotUnit="°F" plotFormat="%3.0f" style="text-anchor: end;" x="-10px" y="-10px">M</text>
<text id="stdDewpoint" class="text" plotMode="text" plotParam="stdDewpoint" plotUnit="°F" plotFormat="%3.0f" style="text-anchor: end;" x="-10px" y="10px">M</text>
<text id="presentWxText" plotMode="recursive_translation" class="weather" plotLookupTable="wx_symbol_trans.txt" plotParam="presWeather" style="text-anchor: end" x="-10" y="0">0</text>
<text id="stdSkyCover" plotMode="recursive_translation" class="weather" plotParam="stdSkyCover" plotLookupTable="bufrmos/mos_clouds_gfs_s2s.txt" style="text-anchor: middle" x="0" y="0">M</text>
<g id="windVaneText" plotMode="barb" plotParam="stdWindSpeed,stdWindDir" plotUnit="kts" x="0" y="0" transform="rotate(0,0,0)">
<text id="windVaneText" class="arrow" x="0" y="0">0</text>
<text id="windArrowText" class="barb" x="0" y="0">arrow</text>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

3
cave/build/static/common/cave/etc/plotModels/bufrmos/tstorm12hr.svg
View file

@ -57,7 +57,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="tstorm12hr" class="text" plotMode="text" plotParam="tstorm12hr" plotFormat="%3.0f" style="text-anchor: start;" x="10px" y="10px">M</text>
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="tstorm12hr" class="text" plotMode="text" plotParam="tstorm12hr" plotFormat="%3.0f" style="text-anchor: start;" x="10px" y="10px">M</text>
</symbol>
</defs>
<use id="wind" x="40" y="40" width="80" height="80" visibility="visible" xlink:href="#plotData"/>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

3
cave/build/static/common/cave/etc/plotModels/bufrmos/tstorm6hr.svg
View file

@ -57,7 +57,8 @@ xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
</style>
<symbol overflow="visible" id="plotData" class="info">
<text id="tstorm6hr" class="text" plotMode="text" plotParam="tstorm6hr" plotFormat="%3.0f" style="text-anchor: middle;" x="0px" y="0px">M</text>
<text id="mosStaId" plotMode="sample" class="text" plotParam="stationId" x="0" y="0">0</text>
<text id="tstorm6hr" class="text" plotMode="text" plotParam="tstorm6hr" plotFormat="%3.0f" style="text-anchor: middle;" x="0px" y="0px">M</text>
</symbol>
</defs>
<use id="wind" x="40" y="40" width="80" height="80" visibility="visible" xlink:href="#plotData"/>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

5
cave/build/static/common/cave/etc/pyViz/GFEPainter.py
View file

@ -45,6 +45,7 @@ from java.util import HashSet
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# 04/01/09 njensen Initial Creation.
# 08/20/2012 #1077 randerso Fixed backgroundColor setting
#
#
#
@ -53,7 +54,7 @@ import VizPainter
class GFEPainter(VizPainter.VizPainter):
def __init__(self, imageWidth=None, imageHeight=None, expandLeft=25.0, expandRight=25.0, expandTop=25.0, expandBottom=25.0, mask=None, wholeDomain=0):
def __init__(self, imageWidth=None, imageHeight=None, expandLeft=25.0, expandRight=25.0, expandTop=25.0, expandBottom=25.0, mask=None, wholeDomain=0, bgColor=None):
self.dataMgr = DataManager.getInstance(None)
self.refId = None
envelope = None
@ -72,7 +73,7 @@ class GFEPainter(VizPainter.VizPainter):
display.setDataManager(self.dataMgr)
desc = display.getDescriptor()
self.dataMgr.getSpatialDisplayManager().setDescriptor(desc)
VizPainter.VizPainter.__init__(self, display)
VizPainter.VizPainter.__init__(self, display, backgroundColor=bgColor)
gfeSystem = GFESystemResource(self.dataMgr)
self.addVizResource(gfeSystem)

34
cave/build/static/common/cave/etc/pyViz/VizPainter.py
View file

@ -1,19 +1,19 @@
##
# This software was developed and / or modified by Raytheon Company,
# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
#
# U.S. EXPORT CONTROLLED TECHNICAL DATA
# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
#
# U.S. EXPORT CONTROLLED TECHNICAL DATA
# This software product contains export-restricted data whose
# export/transfer/disclosure is restricted by U.S. law. Dissemination
# to non-U.S. persons whether in the United States or abroad requires
# an export license or other authorization.
#
# Contractor Name: Raytheon Company
# Contractor Address: 6825 Pine Street, Suite 340
# Mail Stop B8
# Omaha, NE 68106
# 402.291.0100
#
# Contractor Name: Raytheon Company
# Contractor Address: 6825 Pine Street, Suite 340
# Mail Stop B8
# Omaha, NE 68106
# 402.291.0100
#
# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
# further licensing information.
##
@ -31,6 +31,7 @@ from com.raytheon.viz.core.gl import GLTargetProxy
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# 04/01/09 njensen Initial Creation.
# 08/20/2012 #1077 randerso Fixed backgroundColor setting
#
#
#
@ -40,13 +41,18 @@ SUPPORTED_FORMATS = ('.png', '.jpg', '.gif')
class VizPainter():
def __init__(self, renderableDisplay, imageWidth=None, imageHeight=None):
def __init__(self, renderableDisplay, imageWidth=None, imageHeight=None, backgroundColor=None):
self.display = renderableDisplay
width = float(self.display.getWorldWidth())
height = float(self.display.getWorldHeight())
extent = GraphicsFactory.getGraphicsAdapter().constructExtent(0.0, width, 0.0, height)
self.display.setExtent(extent)
if backgroundColor is not None and type(backgroundColor) is str:
from com.raytheon.uf.viz.core import RGBColors
backgroundColor = RGBColors.getRGBColor(backgroundColor)
self.display.setBackgroundColor(backgroundColor)
if imageWidth is None:
imageWidth = width
if imageHeight is None:
@ -79,7 +85,7 @@ class VizPainter():
vizResource.init(self.target)
desc.getResourceList().add(vizResource)
def paint(self, time, canvas=None, backgroundColor=None):
def paint(self, time, canvas=None):
if type(time) is str:
from com.raytheon.uf.common.time import DataTime
time = DataTime(time)
@ -94,16 +100,10 @@ class VizPainter():
framesInfo = self.display.getDescriptor().getFramesInfo()
props = PaintProperties(alpha, zoom, view, canvas, False, framesInfo)
if backgroundColor is not None and type(backgroundColor) is str:
from com.raytheon.uf.viz.core import RGBColors
backgroundColor = RGBColors.getRGBColor(backgroundColor)
# requires multiple passes to paint everything
paint = True
while paint:
self.target.beginFrame(self.display.getView(), True)
if backgroundColor is not None:
self.target.setBackgroundColor(backgroundColor)
self.display.paint(self.target, props)
self.target.endFrame()
paint = self.target.isNeedsRefresh()

BIN
cave/build/static/linux/cave/caveEnvironment/lib/libg2g.so
View file

Binary file not shown.

21
cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/ConfigurationManager.java
View file

@ -199,13 +199,20 @@ public class ConfigurationManager {
Configuration custom = getCustomConfiguration();
if (custom != null) {
/*
* merge custom over base then overlay the current config on
* that result. preserve locking from the base configuration.
*/
Configuration baseCustom = baseConfiguration.mergeUnder(custom,
true);
currentConfig = baseCustom.overlayWith(currentConfig, true);
if (baseConfiguration == null) {
statusHandler.error("The base configuration "
+ DEFAULT_BASE_CONFIG.getLocalizationFileName()
+ " was not loaded. Check your configuration.");
} else {
/*
* merge custom over base then overlay the current config on
* that result. preserve locking from the base
* configuration.
*/
Configuration baseCustom = baseConfiguration.mergeUnder(
custom, true);
currentConfig = baseCustom.overlayWith(currentConfig, true);
}
}
configurationMap.put(current, currentConfig);
} else if (DEFAULT_BASE_CONFIG.equals(current) == false) {

2
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/CAVELocalizationAdapter.java
View file

@ -68,7 +68,7 @@ import com.raytheon.uf.common.util.FileUtil;
public class CAVELocalizationAdapter implements ILocalizationAdapter {
private static transient IUFStatusHandler statusHandler = UFStatus
.getHandler(CAVELocalizationAdapter.class.getPackage().getName(),
"CAVE", "WORKSTATION");
"WORKSTATION", "CAVE");
private static final LocalizationManager manager = LocalizationManager
.getInstance();

46
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/status/VizStatusHandler.java
View file

@ -78,6 +78,11 @@ public class VizStatusHandler implements IUFStatusHandler {
*/
@Override
public void handle(UFStatus status) {
handle(status, this.category);
}
@Override
public void handle(UFStatus status, String category) {
if (this.source == null) {
if (factory != null) {
this.source = factory.getSource(source, pluginId);
@ -92,38 +97,79 @@ public class VizStatusHandler implements IUFStatusHandler {
handle(new UFStatus(p, msg));
}
@Override
public void handle(Priority priority, String category, String message) {
handle(priority, category, message, (Throwable) null);
}
@Override
public void handle(Priority p, String msg, Throwable t) {
handle(new UFStatus(p, msg, t));
}
@Override
public void handle(Priority p, String category, String msg, Throwable t) {
handle(new UFStatus(p, msg, t), category);
}
@Override
public void debug(String message) {
handle(Priority.DEBUG, message);
}
@Override
public void debug(String category, String message) {
handle(Priority.DEBUG, category, message);
}
@Override
public void info(String message) {
handle(Priority.INFO, message);
}
@Override
public void info(String category, String message) {
handle(Priority.INFO, category, message);
}
@Override
public void warn(String message) {
handle(Priority.WARN, message);
}
@Override
public void warn(String category, String message) {
handle(Priority.WARN, category, message);
}
@Override
public void error(String message) {
handle(Priority.ERROR, message);
}
@Override
public void error(String category, String message) {
handle(Priority.ERROR, category, message);
}
@Override
public void error(String message, Throwable throwable) {
handle(Priority.ERROR, message, throwable);
}
@Override
public void error(String message, String category, Throwable throwable) {
handle(Priority.ERROR, category, message, throwable);
}
@Override
public void fatal(String message, Throwable throwable) {
handle(Priority.FATAL, message, throwable);
}
@Override
public void fatal(String message, String category, Throwable throwable) {
handle(Priority.FATAL, category, message, throwable);
}
}

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

@ -702,7 +702,7 @@
</visibleWhen>
</command>
<command
commandId="com.raytheon.viz.ui.actions.notImplemented"
commandId="com.raytheon.uf.viz.d2d.ui.actions.showPrintDialog"
icon="icons/print.gif"
label="Print">
<visibleWhen>

219
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/PrintDialog.java
View file

@ -26,11 +26,16 @@ import java.awt.image.BufferedImage;
import java.awt.image.ComponentColorModel;
import java.awt.image.IndexColorModel;
import java.awt.image.WritableRaster;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import javax.xml.bind.JAXB;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@ -58,6 +63,14 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Spinner;
import org.eclipse.swt.widgets.Text;
import com.raytheon.uf.common.localization.IPathManager;
import com.raytheon.uf.common.localization.LocalizationContext;
import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
import com.raytheon.uf.common.localization.LocalizationFile;
import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.viz.core.IDisplayPane;
import com.raytheon.uf.viz.core.drawables.ResourcePair;
import com.raytheon.uf.viz.core.rsc.ResourceList;
@ -66,6 +79,7 @@ import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.d2d.core.ID2DRenderableDisplay;
import com.raytheon.uf.viz.d2d.ui.DensityPopulator;
import com.raytheon.uf.viz.d2d.ui.MagnificationPopulator;
import com.raytheon.uf.viz.d2d.ui.dialogs.UserPrintSettings.PRINT_ORIENTATION;
import com.raytheon.viz.ui.EditorUtil;
import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
import com.raytheon.viz.ui.editor.AbstractEditor;
@ -80,6 +94,10 @@ import com.raytheon.viz.ui.editor.AbstractEditor;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Feb 15, 2011 bkowal Initial creation
* ======================================
* AWIPS2 DR Work
* 08/15/2012 1053 jkorman Added capability to save/restore user
* print settings.
*
* </pre>
*
@ -88,6 +106,11 @@ import com.raytheon.viz.ui.editor.AbstractEditor;
*/
public class PrintDialog extends CaveSWTDialog {
private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(PrintDialog.class);
private static final String SETTINGS_FILENAME = "printSettings";
private ArrayList<PrinterData> printerDataStore = null;
private PrinterData printToFileData = null;
@ -104,12 +127,16 @@ public class PrintDialog extends CaveSWTDialog {
private Button browseButton = null;
/* Print In */
private Button colorRadioButton = null;
private Button grayscaleRadioButton = null;
/* Orientation */
private Button landscapeRadioButton = null;
private Button portraitRadioButton = null;
/* Remaining Settings */
private Spinner scaleSpinner = null;
@ -125,8 +152,6 @@ public class PrintDialog extends CaveSWTDialog {
private Button cancelButton = null;
private BufferedImage bi;
private MagnificationInformationStorage magnificationInformationStorage = null;
private DensityInformationStorage densityInformationStorage = null;
@ -197,6 +222,8 @@ public class PrintDialog extends CaveSWTDialog {
this.createPrintInAndOrientationGroups();
this.createRemainingPrintingSettingsSection();
this.createPrintDialogButtons();
// Now read from the saved user config items, if any.
readFromConfig();
}
private void createPrintToGroup() {
@ -267,7 +294,7 @@ public class PrintDialog extends CaveSWTDialog {
button.setText("Browse ...");
button.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent event) {
selectDestinationFile();
selectDestinationFile(destinationFileText.getText());
}
});
button.setEnabled(false);
@ -287,7 +314,8 @@ public class PrintDialog extends CaveSWTDialog {
Button button = new Button(group, SWT.RADIO);
button.setText("Color");
button.setSelection(true);
colorRadioButton = button;
button = new Button(group, SWT.RADIO);
button.setText("Grayscale");
this.grayscaleRadioButton = button;
@ -300,7 +328,8 @@ public class PrintDialog extends CaveSWTDialog {
button = new Button(group, SWT.RADIO);
button.setText("Portrait");
button.setSelection(true);
portraitRadioButton = button;
button = new Button(group, SWT.RADIO);
button.setText("Landscape");
this.landscapeRadioButton = button;
@ -446,7 +475,11 @@ public class PrintDialog extends CaveSWTDialog {
public void widgetSelected(SelectionEvent event) {
okButton.setEnabled(false);
cancelButton.setEnabled(false);
setText("Printing . . .");
print(getPrintPreferences());
setText("Print");
saveToConfig();
close();
}
});
this.okButton = button;
@ -468,8 +501,21 @@ public class PrintDialog extends CaveSWTDialog {
this.cancelButton = button;
}
private void selectDestinationFile() {
private void selectDestinationFile(String fileName) {
FileDialog fileDialog = new FileDialog(this.shell, SWT.SAVE);
if(fileName != null) {
int n = fileName.lastIndexOf(File.separator);
String path = null;
if(n > 0) {
path = fileName.substring(0,n);
fileName = fileName.substring(n+1);
}
fileDialog.setFileName(fileName);
fileDialog.setFilterPath(path);
}
fileDialog.open();
String filterPath = fileDialog.getFilterPath();
@ -628,7 +674,7 @@ public class PrintDialog extends CaveSWTDialog {
private void print(PrinterSettings printerSettings) {
AbstractEditor editor = (AbstractEditor) EditorUtil.getActiveEditor();
bi = editor.screenshot();
BufferedImage bi = editor.screenshot();
Display display = editor.getActiveDisplayPane().getDisplay();
Printer printer = new Printer(printerSettings.selectedPrinter);
Point screenDPI = display.getDPI();
@ -664,7 +710,7 @@ public class PrintDialog extends CaveSWTDialog {
}
if (printerSettings.invert) {
// Only invert gray pixels, not colored pixels, awt doesn not have a
// Only invert gray pixels, not colored pixels, awt doesn't not have a
// good filter for this.
for (int x = 0; x < bi.getWidth(); x += 1) {
for (int y = 0; y < bi.getHeight(); y += 1) {
@ -675,6 +721,7 @@ public class PrintDialog extends CaveSWTDialog {
255 - color.getGreen(), 255 - color.getBlue());
bi.setRGB(x, y, color.getRGB());
}
}
}
}
@ -736,7 +783,7 @@ public class PrintDialog extends CaveSWTDialog {
printer.dispose();
this.restoreMagnificationAndDensity();
this.close();
// this.close();
}
private String getCurrentMagnification() {
@ -831,4 +878,156 @@ public class PrintDialog extends CaveSWTDialog {
return null;
}
/**
* Save the user print settings.
*/
private void saveToConfig() {
UserPrintSettings settings = new UserPrintSettings();
settings.setInvertBlackWhite(invertCheckbox.getSelection());
settings.setPrintGrayScale(grayscaleRadioButton.getSelection());
settings.setOrientation(PRINT_ORIENTATION.getPrintOrientation(landscapeRadioButton.getSelection()));
settings.setCopies(copiesSpinner.getSelection());
settings.setScale(scaleSpinner.getSelection());
settings.setDensity(densityCombo.getSelectionIndex());
settings.setMag(magnificationCombo.getSelectionIndex());
if(printerRadioButton.getSelection()) {
int idx = selectedPrinterCombo.getSelectionIndex();
settings.setPrinterUsed(selectedPrinterCombo.getItem(idx));
settings.setUsePrinterFile(false);
} else {
settings.setPrinterFile(destinationFileText.getText());
settings.setUsePrinterFile(true);
}
LocalizationContext ctx = initUserLocalization();
// Get a list of localization files!
LocalizationFile f = PathManagerFactory.getPathManager().getLocalizationFile(ctx, SETTINGS_FILENAME);
OutputStream strm = null;
try {
strm = f.openOutputStream();
JAXB.marshal(settings, strm);
// Ensure that the file is saved on the server!
f.save();
} catch (Exception e) {
statusHandler.error("Could not save user print settings", e);
} finally {
if(f != null) {
try {
strm.close();
} catch(IOException ioe) {
statusHandler.error("Could not close user print settings", ioe);
}
}
}
}
/**
* Read user print settings if they exist.
*/
private void readFromConfig() {
LocalizationContext ctx = initUserLocalization();
// Get a list of localization files!
LocalizationFile f = PathManagerFactory.getPathManager().getLocalizationFile(ctx, SETTINGS_FILENAME);
// If its not there, no previous settings have been saved. Just exit.
if(f.exists()) {
UserPrintSettings settings = null;
try {
settings = (UserPrintSettings) JAXB.unmarshal(f.openInputStream(),UserPrintSettings.class);
} catch (Exception e) {
statusHandler.error("Could not read user print settings-using defaults", e);
}
if(settings != null) {
invertCheckbox.setSelection(settings.getInvertBlackWhite());
grayscaleRadioButton.setSelection(settings.isPrintGrayScale());
colorRadioButton.setSelection(!grayscaleRadioButton.getSelection());
landscapeRadioButton.setSelection(settings.getOrientation().isPrintLandscape());
portraitRadioButton.setSelection(!landscapeRadioButton.getSelection());
Integer n = settings.getCopies();
if(n != null) {
if(n >= copiesSpinner.getMinimum() && n <= copiesSpinner.getMaximum()) {
copiesSpinner.setSelection(n);
}
}
n = settings.getScale();
if(n != null) {
if(n >= scaleSpinner.getMinimum() && n <= scaleSpinner.getMaximum()) {
scaleSpinner.setSelection(settings.getScale());
}
}
n = settings.getDensity();
if(n != null) {
if((n >= 0) && (n < densityCombo.getItemCount())) {
densityCombo.select(n);
}
}
n = settings.getMag();
if(n != null) {
if((n >= 0) && (n < magnificationCombo.getItemCount())) {
magnificationCombo.select(n);
}
}
String s = settings.getPrinterFile();
if(s != null) {
destinationFileText.setText(s);
destinationFileText.setToolTipText(s);
destinationFileText.setEnabled(true);
browseButton.setEnabled(true);
}
s = settings.getPrinterUsed();
if(s != null) {
int idx = -1;
for(int i = 0;i < selectedPrinterCombo.getItemCount(); i++) {
if(s.equals(selectedPrinterCombo.getItem(i))) {
idx = i;
break;
}
}
if(idx > -1) {
selectedPrinterCombo.select(idx);
}
}
printerRadioButton.setSelection(!settings.isUsePrinterFile());
fileRadioButton.setSelection(settings.isUsePrinterFile());
}
}
}
/**
* initialize the localization for user with the save/load functions
*
* @return the initialized localization
*/
public static LocalizationContext initUserLocalization() {
return initLocalization(LocalizationLevel.USER);
}
/**
* Initialize a LocalizationContext for the given LocalizationLevel.
*
* @return the initialized localization
*/
public static LocalizationContext initLocalization(LocalizationLevel level) {
IPathManager pm = PathManagerFactory.getPathManager();
LocalizationContext localization = pm.getContext(
LocalizationType.COMMON_STATIC, level);
return localization;
}
}

273
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/UserPrintSettings.java Normal file
View file

@ -0,0 +1,273 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.viz.d2d.ui.dialogs;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import com.raytheon.uf.common.serialization.ISerializableObject;
/**
* Allows user printer settings to be persisted to an XML file.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Aug 13, 2012 1053 jkorman Initial creation
*
* </pre>
*
* @author jkorman
* @version 1.0
*/
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
public class UserPrintSettings implements ISerializableObject {
public enum PRINT_ORIENTATION {
PORTRAIT(false),
LANDSCAPE(true);
private final boolean printLandscape;
private PRINT_ORIENTATION(boolean orientation) {
this.printLandscape = orientation;
}
/**
* Is this enum set to landscape?
* @return Is this enum set to landscape?
*/
public boolean isPrintLandscape() {
return printLandscape;
}
/**
* Get the proper enum instance depending on the orientation.
* @param landscape The landscape mode. True return LANDSCAPE.
* @return
*/
public static PRINT_ORIENTATION getPrintOrientation(boolean landscape) {
return (landscape) ? LANDSCAPE : PORTRAIT;
}
}
@XmlElement
private String printerUsed;
@XmlElement
private String printerFile;
@XmlElement
private boolean usePrinterFile = false;
@XmlElement
private PRINT_ORIENTATION orientation = PRINT_ORIENTATION.PORTRAIT;
@XmlElement
private boolean invertBlackWhite = false;
@XmlElement
private boolean printGrayScale = false;
@XmlElement
private Integer copies = 1;
@XmlElement
private Integer density = 0;
@XmlElement
private Integer mag = 0;
@XmlElement
private Integer scale = 100;
/**
* Construct an instance with defaults values.
*/
public UserPrintSettings() {
}
/**
* Get the name of the printer that was used.
* @return The printer name.
*/
public String getPrinterUsed() {
return printerUsed;
}
/**
* Set the name of the printer that was used.
* @param printerUsed The printer name.
*/
public void setPrinterUsed(String printerUsed) {
this.printerUsed = printerUsed;
}
/**
* Get the name of the print file that was used.
* @return The print filename.
*/
public String getPrinterFile() {
return printerFile;
}
/**
* Set the name of the print file that was used.
* @param printerFile The print filename.
*/
public void setPrinterFile(String printerFile) {
this.printerFile = printerFile;
}
/**
* Should print to file be used?
* @return Should print to file be used?
*/
public boolean isUsePrinterFile() {
return usePrinterFile;
}
/**
* Set whether print to file was used.
* @param usePrinterFile Was print to file used?
*/
public void setUsePrinterFile(boolean usePrinterFile) {
this.usePrinterFile = usePrinterFile;
}
/**
* Get the print page orientation.
* @return The print orientation.
*/
public PRINT_ORIENTATION getOrientation() {
return orientation;
}
/**
* Set the print page orientation.
* @param orientation The print orientation.
*/
public void setOrientation(PRINT_ORIENTATION orientation) {
this.orientation = orientation;
}
/**
* Should black and white be inverted?
* @return Should black and white be inverted?
*/
public boolean getInvertBlackWhite() {
return invertBlackWhite;
}
/**
* Set whether black and white should be inverted?
* @param invertBlackWhite Should black and white be inverted.
*/
public void setInvertBlackWhite(boolean invertBlackWhite) {
this.invertBlackWhite = invertBlackWhite;
}
/**
* Should the print be converted to gray scale?
* @return Should the print be converted to gray scale?
*/
public boolean isPrintGrayScale() {
return printGrayScale;
}
/**
* Set whether the print should be converted to grayscale.
* @param printGrayScale Should the print be converted to grayscale.
*/
public void setPrintGrayScale(boolean printGrayScale) {
this.printGrayScale = printGrayScale;
}
/**
* Get the number of copies that should be printed.
* @return The number of print copies.
*/
public Integer getCopies() {
return copies;
}
/**
* Set the number of copies that should be printed.
* @param copies The number of copies that should be printed.
*/
public void setCopies(Integer copies) {
this.copies = copies;
}
/**
* Get the print density that should be used. NOTE : This value is the ordinal value
* returned by the control. The value does not correspond to an actual density value.
* @return the density
*/
public Integer getDensity() {
return density;
}
/**
* @param density the density to set
*/
public void setDensity(Integer density) {
this.density = density;
}
/**
* Get the print magnification that should be used. NOTE : This value is the ordinal value
* returned by the control. The value does not correspond to an actual magnification value.
* @return the density
*/
public Integer getMag() {
return mag;
}
/**
* @param mag the mag to set
*/
public void setMag(Integer mag) {
this.mag = mag;
}
/**
* Get the print scaling that should be used. This is a percent value i.e. 100% = 100.
* @return The print scaling factor.
*/
public Integer getScale() {
return scale;
}
/**
* Set the print scaling that should be used. This is a percent value i.e. 100% = 100.
* @param scale The print scaling factor.
*/
public void setScale(Integer scale) {
this.scale = scale;
}
}

0
cave/com.raytheon.viz.drawing/com.raytheon.viz.drawing.ecl → cave/com.raytheon.uf.viz.points/com.raytheon.uf.viz.points.ecl
View file

33
cave/com.raytheon.uf.viz.profiler/src/com/raytheon/uf/viz/profiler/ProfilerResource.java
View file

@ -27,6 +27,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
import com.raytheon.uf.common.colormap.IColorMap;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.profiler.ProfilerLevel;
import com.raytheon.uf.common.dataplugin.profiler.ProfilerObs;
@ -39,6 +40,7 @@ import com.raytheon.uf.viz.core.DrawableString;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.IGraphicsTarget.TextStyle;
import com.raytheon.uf.viz.core.PixelCoverage;
import com.raytheon.uf.viz.core.drawables.ColorMapLoader;
import com.raytheon.uf.viz.core.drawables.ColorMapParameters;
import com.raytheon.uf.viz.core.drawables.IFont;
import com.raytheon.uf.viz.core.drawables.PaintProperties;
@ -73,6 +75,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* AWIPS2 DR Work
* 08/10/2012 1035 jkorman Changed number of 'staffs' from 12 to 13 and changed time
* display to match AWIPS I.
* 08/13/2012 1046 jkorman Changed to load colorMap file.
* </pre>
*
* @author dhladky
@ -85,7 +88,10 @@ public class ProfilerResource extends
.getHandler(ProfilerResource.class);
private static final int NUM_PROFILE_STAFFS = 13;
/* graph max height in meters*/
private static double MAX_Y = 18000;
/* Graphic target */
private IGraphicsTarget target = null;
@ -105,9 +111,6 @@ public class ProfilerResource extends
private double incYheight = 0;
/* graph max height */
private static double maxY = 18000;
private long earliestTime = Long.MAX_VALUE;
/**
@ -142,27 +145,31 @@ public class ProfilerResource extends
protected void initInternal(IGraphicsTarget target) throws VizException {
this.target = target;
dataTimes = new ArrayList<DataTime>();
incX = (ProfilerUtils.profilerRectangle.width / NUM_PROFILE_STAFFS);
incYheight = ProfilerUtils.profilerRectangle.height / maxY;
incX = (ProfilerUtils.profilerRectangle.width / NUM_PROFILE_STAFFS);
incYheight = ProfilerUtils.profilerRectangle.height / MAX_Y;
this.font = target.initializeFont("Dialog", 11, null);
// Setup the colormap and colormap parameters
ColorMapParameters params = this
.getCapability(ColorMapCapability.class)
ColorMapParameters params = getCapability(ColorMapCapability.class)
.getColorMapParameters();
if (params == null) {
params = new ColorMapParameters();
this.getCapability(ColorMapCapability.class).setColorMapParameters(
params);
}
String cmName = null;
if ((cmName = params.getColorMapName()) != null) {
IColorMap colorMap = ColorMapLoader.loadColorMap(cmName);
params.setColorMap(colorMap);
}
// If we failed to load a colorMap, load a default!
if (params.getColorMap() == null) {
params.setColorMap(ProfilerUtils.getColorMap());
params.setColorMapMin(ProfilerUtils.colorRange[0]);
params.setColorMapMax(ProfilerUtils.colorRange[1]);
}
params.setColorMapMin(ProfilerUtils.colorRange[0]);
params.setColorMapMax(ProfilerUtils.colorRange[1]);
params.setColorBarIntervals(ProfilerUtils.colorLabels);
resourceData.addChangeListener(new IResourceDataChanged() {
@ -574,7 +581,7 @@ public class ProfilerResource extends
for (int i = 0; i < ProfilerUtils.PRESSURES.length; i++) {
double height = WxMath.pressureToHeight(ProfilerUtils.PRESSURES[i]);
if (height <= maxY) {
if (height <= MAX_Y) {
parameters.setText(
ProfilerUtils.decimalFormat.format(new Double(
ProfilerUtils.PRESSURES[i])) + " mb",

2
cave/com.raytheon.uf.viz.radarapps.fsi/src/com/raytheon/uf/viz/radarapps/fsi/FSILauncherLayer.java
View file

@ -628,7 +628,7 @@ public class FSILauncherLayer extends
statusHandler
.handle(Priority.PROBLEM,
"FSI failed to start: "
+ sb.toString(), null);
+ sb.toString());
return;
}
} catch (InterruptedException e) {

2
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AviationDialog.java
View file

@ -629,7 +629,7 @@ public class AviationDialog extends CaveSWTDialog implements IBackupRestart {
}
for (String product : productDisplayList) {
statusHandler.handle(Priority.PROBLEM,
"Error no stations configured for " + product, null);
"Error no stations configured for " + product);
}
} else {
tafMonitorDlg = new TafMonitorDlg(shell, stationList,

6
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/ClimateDataMenuDlg.java
View file

@ -881,11 +881,11 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
identList.add(siteList.get(i));
}
} catch (IOException e) {
statusHandler.handle(Priority.PROBLEM, e.getMessage(), null);
statusHandler.handle(Priority.PROBLEM, e.getMessage());
} catch (ConfigurationException e) {
statusHandler.handle(Priority.PROBLEM, e.toString(), null);
statusHandler.handle(Priority.PROBLEM, e.toString());
} catch (LocalizationOpFailedException e) {
statusHandler.handle(Priority.PROBLEM, e.getMessage(), null);
statusHandler.handle(Priority.PROBLEM, e.getMessage());
}
}

2
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/monitor/LtgDataMgr.java
View file

@ -194,7 +194,7 @@ public class LtgDataMgr {
k++;
}
} catch (FileNotFoundException e) {
statusHandler.handle(Priority.PROBLEM, e.getMessage(), null);
statusHandler.handle(Priority.PROBLEM, e.getMessage());
} catch (Exception e) {
// TODO
e.printStackTrace();

5
cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/AvnConfigFileUtil.java
View file

@ -67,7 +67,7 @@ public class AvnConfigFileUtil {
String site = LocalizationManager.getInstance().getCurrentSite();
statusHandler.handle(Priority.CRITICAL, "Unable to find \""
+ configFile + "\" under the directory for site " + site
+ ".", null);
+ ".");
}
return lFile;
@ -122,8 +122,7 @@ public class AvnConfigFileUtil {
if (file == null) {
statusHandler.handle(Priority.PROBLEM, "Unable to find \""
+ configFile + "\" under the directory for site "
+ LocalizationManager.getInstance().getCurrentSite() + ".",
null);
+ LocalizationManager.getInstance().getCurrentSite() + ".");
}
return file;

22
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
View file

@ -19,6 +19,10 @@
**/
package com.raytheon.viz.gfe;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import jep.Jep;
import jep.JepException;
@ -46,6 +50,8 @@ import com.raytheon.viz.ui.personalities.awips.AbstractCAVEComponent;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jun 25, 2010 mschenke Initial creation
* Aug 20, 2012 #1081 dgilling Don't pass -server and -site args
* to python script.
*
* </pre>
*
@ -127,9 +133,17 @@ public class GfeClient extends AbstractCAVEComponent {
jep.eval("import JavaImporter");
jep.eval("import sys");
jep.eval("sys.argv = []");
boolean skipNextArg = false;
Collection<String> ignoredParams = getIgnoredParameters();
for (int i = gfeClientArgStartIndex; i < args.length; i++) {
jep.eval("sys.argv.append('" + args[i].replaceAll("'", "\\\\'")
+ "')");
if (ignoredParams.contains(args[i])) {
skipNextArg = true;
} else if (skipNextArg) {
skipNextArg = false;
} else {
jep.eval("sys.argv.append('"
+ args[i].replaceAll("'", "\\\\'") + "')");
}
}
jep.runScript(args[gfeClientArgStartIndex]);
// jep.eval("main()");
@ -156,4 +170,8 @@ public class GfeClient extends AbstractCAVEComponent {
return (NON_UI | ALERT_VIZ);
}
private Collection<String> getIgnoredParameters() {
return new HashSet<String>(Arrays.asList("-site", "-server", "-mode",
"-time"));
}
}

5
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/IParmManager.java
View file

@ -19,6 +19,7 @@
**/
package com.raytheon.viz.gfe.core;
import java.util.Date;
import java.util.List;
import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID;
@ -49,6 +50,8 @@ import com.raytheon.viz.gfe.core.parm.vcparm.VCModuleJobPool;
* ------------ ---------- ----------- --------------------------
* 01/28/2008 chammack Initial creation of skeleton.
* 06/25/2012 #766 dgilling Added getVCModulePool().
* 08/20/2012 #1082 randerso Moved calcStepTimes to AbstractParmManager for
* use in PngWriter
*
* </pre>
*
@ -548,4 +551,6 @@ public interface IParmManager extends IParmInventoryChangedListener,
public JobPool getNotificationPool();
public VCModuleJobPool getVCModulePool();
public abstract List<Date> calcStepTimes(List<Parm> parms, TimeRange dspTR);
}

4
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/OrderedGridData.java
View file

@ -378,11 +378,11 @@ public abstract class OrderedGridData extends AbstractGridData {
}
protected float getMinValue() {
return this.getGridSlice().getGridInfo().getMinValue();
return this.getParm().getGridInfo().getMinValue();
}
protected float getMaxValue() {
return this.getGridSlice().getGridInfo().getMaxValue();
return this.getParm().getGridInfo().getMaxValue();
}
}

33
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
View file

@ -32,7 +32,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Set;
import java.util.SortedSet;
import java.util.TimeZone;
import java.util.TreeSet;
import org.eclipse.core.runtime.ListenerList;
@ -63,6 +65,7 @@ import com.raytheon.viz.gfe.GFEServerException;
import com.raytheon.viz.gfe.PythonPreferenceStore;
import com.raytheon.viz.gfe.core.DataManager;
import com.raytheon.viz.gfe.core.IParmManager;
import com.raytheon.viz.gfe.core.griddata.IGridData;
import com.raytheon.viz.gfe.core.internal.NotificationRouter.AbstractGFENotificationObserver;
import com.raytheon.viz.gfe.core.msgs.IAvailableSourcesChangedListener;
import com.raytheon.viz.gfe.core.msgs.IDisplayedParmListChangedListener;
@ -96,6 +99,8 @@ import com.raytheon.viz.gfe.core.parm.vcparm.VCModuleJobPool;
* correspond to a visible mutable parm.
* 06/25/2012 #766 dgilling Move to a shared thread pool for VCModule
* execution.
* 08/20/2012 #1082 randerso Moved calcStepTimes to AbstractParmManager for
* use in PngWriter
*
* </pre>
*
@ -2097,4 +2102,32 @@ public abstract class AbstractParmManager implements IParmManager {
public VCModuleJobPool getVCModulePool() {
return vcModulePool;
}
// Now construct the step times.
// All startTimes are included.
// EndTimes which are contained in another TR are included.
@Override
public List<Date> calcStepTimes(List<Parm> parms, TimeRange dspTR) {
SortedSet<Date> dateSet = new TreeSet<Date>();
for (Parm pi : parms) {
IGridData[] inv = pi.getGridInventory();
for (IGridData grid : inv) {
dateSet.add(grid.getGridTime().getStart());
if (!dateSet.contains(grid.getGridTime().getEnd())) {
for (Parm pk : parms) {
if (pi != pk
&& pi.overlappingGrid(grid.getGridTime()
.getEnd()) != null) {
dateSet.add(grid.getGridTime().getEnd());
break;
}
}
}
}
}
return new ArrayList<Date>(dateSet);
}
}

5
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
View file

@ -447,10 +447,9 @@ public class DbParm extends Parm {
// if only a single unmodified grid exactly matches the time range
if (grids.length == 1 && !this.isLocked(tr)
&& grids[0].getGridSlice().getValidTime().equals(tr)) {
&& grids[0].getGridTime().equals(tr)) {
List<GridDataHistory> newHist = histories.get(tr);
GridDataHistory[] currentHist = grids[0].getGridSlice()
.getHistory();
GridDataHistory[] currentHist = grids[0].getHistory();
// if current history exists and has a matching update time
if (currentHist != null

11
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/Parm.java
View file

@ -865,8 +865,7 @@ public abstract class Parm implements Comparable<Parm> {
if (errMsg != null) {
statusHandler.handle(Priority.SIGNIFICANT,
"ReplaceGriddedData aborted for " + getParmID() + ' '
+ grid.getGridSlice().getValidTime() + ' '
+ errMsg);
+ grid.getGridTime() + ' ' + errMsg);
return false;
}
grid.resetSavePublishHistory();
@ -1466,12 +1465,10 @@ public abstract class Parm implements Comparable<Parm> {
}
// update history
GridDataHistory[] his = grids.get(j).getGridSlice()
.getHistory();
GridDataHistory[] his = grids.get(j).getHistory();
List<GridDataHistory> historyAsList = new ArrayList<GridDataHistory>(
Arrays.asList(his));
historyAsList.addAll(Arrays.asList(grid.getGridSlice()
.getHistory()));
historyAsList.addAll(Arrays.asList(grid.getHistory()));
grids.get(j).updateHistory(
historyAsList.toArray(new GridDataHistory[historyAsList
@ -3597,7 +3594,7 @@ public abstract class Parm implements Comparable<Parm> {
// get some stuff for later use
Point gridSize = this.getGridInfo().getGridLoc().gridSize();
int gridCount = grids.length;
GridParmInfo thisGridInfo = grids[0].getGridSlice().getGridInfo();
GridParmInfo thisGridInfo = grids[0].getParm().getGridInfo();
// Make a new GridSlice into which the result will go
IGridSlice gridSlice = null;

2
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/GridInfoDialog.java
View file

@ -621,7 +621,7 @@ public class GridInfoDialog extends CaveJFACEDialog implements
if (includeGridID) {
info.append("Grid Valid Time: ");
if (gridData != null && gridData.getGridSlice() != null) {
if (gridData != null) {
info.append(this.timeRangeToGMT(gridData.getGridTime()));
} else {
info.append("No Grid");

7
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/edittool/MoveCopyTool.java
View file

@ -163,10 +163,9 @@ public class MoveCopyTool extends AbstractGFEEditTool {
this.getGrid()
.getParm()
.moveCopyArea(
getGrid().getGridSlice().getValidTime()
.getStart(), moveCopyEditInfluence,
new Point(diffX, diffY), copyOp);
.moveCopyArea(getGrid().getGridTime().getStart(),
moveCopyEditInfluence, new Point(diffX, diffY),
copyOp);
}
this.endParmEdit();

15
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/edittool/contour/ContourTool.java
View file

@ -242,8 +242,7 @@ public class ContourTool extends AbstractFreeformTool implements
}
private void computeRemaps() {
GridLocation gloc = currentGrid.getGridSlice().getGridInfo()
.getGridLoc();
GridLocation gloc = currentGrid.getParm().getGridInfo().getGridLoc();
GridLocation lowRes = getLowResGLoc(gloc);
toLowRes = new RemapGrid(gloc, lowRes);
toHiRes = new RemapGrid(lowRes, gloc);
@ -933,8 +932,8 @@ public class ContourTool extends AbstractFreeformTool implements
// Get the grid coordinate
float newContourValue;
Coordinate gridCoord = MapUtil.latLonToGridCoordinate(mapCoord,
PixelOrientation.CENTER, currentGrid.getGridSlice()
.getGridInfo().getGridLoc());
PixelOrientation.CENTER, currentGrid.getParm().getGridInfo()
.getGridLoc());
int x = (int) gridCoord.x;
int y = (int) gridCoord.y;
Grid2DFloat scalarGrid = ((ScalarGridSlice) currentGrid.getGridSlice())
@ -1176,8 +1175,8 @@ public class ContourTool extends AbstractFreeformTool implements
}
// get the size of a grid cell
Coordinate cellSize = currentGrid.getGridSlice().getGridInfo()
.getGridLoc().gridCellSize();
Coordinate cellSize = currentGrid.getParm().getGridInfo().getGridLoc()
.gridCellSize();
LineString line = cline.getLineString();
double distance = line.getCoordinateN(0).distance(
@ -1595,7 +1594,7 @@ public class ContourTool extends AbstractFreeformTool implements
return null;
}
GridParmInfo gridInfo = currentGrid.getGridSlice().getGridInfo();
GridParmInfo gridInfo = currentGrid.getParm().getGridInfo();
dataGrid = getToHiRes().remap(dataGrid, gridInfo.getMinValue(),
gridInfo.getMaxValue(), gridInfo.getMinValue(),
gridInfo.getMinValue());
@ -1622,7 +1621,7 @@ public class ContourTool extends AbstractFreeformTool implements
TransformException {
Grid2DFloat dataGrid = null;
GridParmInfo gridInfo = currentGrid.getGridSlice().getGridInfo();
GridParmInfo gridInfo = currentGrid.getParm().getGridInfo();
Grid2DFloat lowres = getToLowRes().remap(
((ScalarGridSlice) currentGrid.getGridSlice()).getScalarGrid(),
gridInfo.getMinValue(), gridInfo.getMaxValue(),

34
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/gridmanager/GridCanvas.java
View file

@ -107,6 +107,8 @@ import com.raytheon.viz.ui.cmenu.AbstractRightClickAction;
* Apr 7, 2009 randerso Initial creation
* Jun 3, 2011 8919 rferrel Determine grid's VisMode based
* on imageOnEdit
* 08/20/2012 #1082 randerso Moved calcStepTimes to AbstractParmManager for
* use in PngWriter
*
* </pre>
*
@ -992,36 +994,8 @@ public class GridCanvas extends Canvas implements IMessageClient {
// }
}
}
stepTimes = calcStepTimes(parms, new TimeRange());
}
// Now construct the step times.
// All startTimes are included.
// EndTimes which are contained in another TR are included.
private List<Date> calcStepTimes(List<Parm> parms, TimeRange dspTR) {
ArrayList<Date> rval = new ArrayList<Date>();
for (int i = 0; i < parms.size(); i++) {
IGridData[] inv = parms.get(i).getGridInventory();
for (int j = 0; j < inv.length; j++) {
if (!rval.contains(inv[j].getGridTime().getStart())) {
rval.add(inv[j].getGridTime().getStart());
}
if (!rval.contains(inv[j].getGridTime().getEnd())) {
for (int k = 0; k < parms.size(); k++) {
if (parms.get(i) != parms.get(k)
&& parms.get(i).overlappingGrid(
inv[j].getGridTime().getEnd()) != null) {
rval.add(inv[j].getGridTime().getEnd());
break;
}
}
}
}
}
Collections.sort(rval);
return rval;
stepTimes = dataMgr.getParmManager().calcStepTimes(parms,
new TimeRange());
}
/**

42
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ifpimage/ImageLegendResource.java
View file

@ -36,29 +36,34 @@ import com.raytheon.uf.common.time.TimeRange;
import com.raytheon.uf.viz.core.RGBColors;
import com.raytheon.uf.viz.core.drawables.IDescriptor;
import com.raytheon.uf.viz.core.drawables.ResourcePair;
import com.raytheon.uf.viz.core.rsc.ResourceProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
import com.raytheon.viz.core.ColorUtil;
import com.raytheon.viz.gfe.Activator;
import com.raytheon.viz.gfe.core.DataManager;
import com.raytheon.viz.gfe.core.griddata.IGridData;
import com.raytheon.viz.gfe.core.parm.Parm;
import com.raytheon.viz.gfe.core.parm.ParmDisplayAttributes.VisMode;
import com.raytheon.viz.gfe.rsc.GFELegendResource;
import com.raytheon.viz.gfe.rsc.GFEResource;
/**
* Image legend resource used by GFEPainter.py
*
*
* <pre>
*
*
* SOFTWARE HISTORY
*
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jan 24, 2011 mschenke Initial creation
* Jun 25, 2012 15080 ryu Ron's local time fix
* Jul 10, 2012 15186 ryu Set legend font
*
* Aug 20, 2012 #1078 dgilling Fix handling of ImageLegend_color
* setting.
*
* </pre>
*
*
* @author mschenke
* @version 1.0
*/
@ -114,28 +119,29 @@ public class ImageLegendResource extends GFELegendResource {
private LegendData[] makeLegend(Parm[] parms, DataTime curTime) {
// loop through the grids
List<LegendData> legendData = new ArrayList<LegendData>();
Parm activeParm = dataManager.getSpatialDisplayManager()
.getActivatedParm();
for (int i = parms.length - 1; i >= 0; i--) {
Parm parm = parms[i];
String parmName = parm.getParmID().getParmName();
ResourcePair rp = this.parmToRscMap.get(parm);
GFEResource rsc = (GFEResource) rp.getResource();
ResourceProperties props = rp.getProperties();
LegendData data = new LegendData();
data.resource = rp;
// color for the text
RGB color;
if (colorOverrides != null
&& (color = colorOverrides.get(parmName)) != null) {
data.color = color;
if ((props.isVisible())
&& (parm.getDisplayAttributes().getVisMode() == VisMode.IMAGE)) {
data.color = imageLegendColor;
} else if (!props.isVisible()) {
data.color = ColorUtil.GREY;
} else if ((colorOverrides != null)
&& (colorOverrides.get(parmName) != null)) {
// GFEPainter.py populates the colorOverrides map based on the
// "<parmName>_Legend_color" values from the gfe config file
data.color = colorOverrides.get(parmName);
} else {
if (rsc.getParm().equals(activeParm)) {
data.color = this.imageLegendColor;
} else {
data.color = rsc.getCapability(ColorableCapability.class)
.getColor();
}
data.color = rsc.getCapability(ColorableCapability.class)
.getColor();
}
String timeString = "";
@ -341,7 +347,7 @@ public class ImageLegendResource extends GFELegendResource {
/**
* Specifies the color for a legend entry, overrides the default
*
*
* @param parmName
* @param colorName
*/

15
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
View file

@ -49,6 +49,7 @@ import com.raytheon.uf.viz.core.IDisplayPaneContainer;
import com.raytheon.uf.viz.core.IExtent;
import com.raytheon.uf.viz.core.PixelExtent;
import com.raytheon.uf.viz.core.drawables.IRenderableDisplay;
import com.raytheon.uf.viz.core.RGBColors;
import com.raytheon.uf.viz.core.drawables.ResourcePair;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.map.IMapDescriptor;
@ -86,6 +87,7 @@ import com.raytheon.viz.ui.perspectives.VizPerspectiveListener;
* Jun 11, 2009 #1947 rjpeter Moved parm save hook to GridManagerView.
* Apr 27, 2010 mschenke refactor for common perspective switching
* Jul 7, 2011 #9897 ryu close formatters on perspective close/reset
* Aug 20,2012 #1077 randerso Added support for bgColor setting
* </pre>
*
* @author randerso
@ -120,6 +122,13 @@ public class GFEPerspectiveManager extends AbstractCAVEPerspectiveManager {
PythonPreferenceStore prefs = Activator.getDefault()
.getPreferenceStore();
if (prefs.contains("bgColor")) {
String bgColor = prefs.getString("bgColor");
pane.getRenderableDisplay().setBackgroundColor(
RGBColors.getRGBColor(bgColor));
}
String[] maps = prefs.getStringArray("MapBackgrounds_default");
MapManager mapMgr = MapManager.getInstance((IMapDescriptor) pane
@ -238,8 +247,9 @@ public class GFEPerspectiveManager extends AbstractCAVEPerspectiveManager {
SmartToolJob.shutdown();
}
}).start();
if (FormatterlauncherAction.getFormatterLauncher() != null)
if (FormatterlauncherAction.getFormatterLauncher() != null) {
FormatterlauncherAction.getFormatterLauncher().closeFormatters();
}
}
@Override
@ -248,9 +258,10 @@ public class GFEPerspectiveManager extends AbstractCAVEPerspectiveManager {
if (IWorkbenchPage.CHANGE_RESET.equals(VizPerspectiveListener
.getInstance().getPerspectiveChangeId(
GFEPerspective.ID_PERSPECTIVE))) {
if (FormatterlauncherAction.getFormatterLauncher() != null)
if (FormatterlauncherAction.getFormatterLauncher() != null) {
FormatterlauncherAction.getFormatterLauncher()
.closeFormatters();
}
}
}

22
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
View file

@ -77,12 +77,12 @@ import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.common.time.TimeRange;
import com.raytheon.uf.viz.core.DrawableString;
import com.raytheon.uf.viz.core.IDisplayPane;
import com.raytheon.uf.viz.core.IExtent;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.IGraphicsTarget.HorizontalAlignment;
import com.raytheon.uf.viz.core.IGraphicsTarget.LineStyle;
import com.raytheon.uf.viz.core.IGraphicsTarget.TextStyle;
import com.raytheon.uf.viz.core.IGraphicsTarget.VerticalAlignment;
import com.raytheon.uf.viz.core.PixelCoverage;
import com.raytheon.uf.viz.core.RGBColors;
@ -1287,7 +1287,7 @@ public class GFEResource extends
// Convert to a gridpoint and get the contiguous area from grid
final GridLocation gridLocation = grid.getGridSlice().getGridInfo()
final GridLocation gridLocation = grid.getParm().getGridInfo()
.getGridLoc();
Coordinate gridCoord = MapUtil.latLonToGridCoordinate(coord,
PixelOrientation.CENTER, gridLocation);
@ -1399,8 +1399,7 @@ public class GFEResource extends
return;
}
Point gridDim = grid.getGridSlice().getGridInfo().getGridLoc()
.gridSize();
Point gridDim = grid.getParm().getGridInfo().getGridLoc().gridSize();
Rectangle gDomain = new Rectangle(0, 0, gridDim.x, gridDim.y);
Rectangle rect = gDomain.intersection(screenRect);
@ -1424,7 +1423,10 @@ public class GFEResource extends
// now, using this string's size in pixels, figure out how
// many grid cells it needs.
Rectangle2D labelExtent = target.getStringBounds(font, label);
DrawableString ds = new DrawableString(label, parm
.getDisplayAttributes().getBaseColor());
ds.font = font;
Rectangle2D labelExtent = target.getStringsBounds(ds);
int xLabelGrid = (int) (labelExtent.getWidth() * multiplier) + 1;
int yLabelGrid = (int) (labelExtent.getHeight() * multiplier) + 1;
@ -1457,11 +1459,11 @@ public class GFEResource extends
MapUtil.getGridGeometry(parm.getGridInfo()
.getGridLoc()), Type.GRID_CENTER);
Coordinate coord = c.asPixel(descriptor.getGridGeometry());
target.drawString(font, label, coord.x, coord.y, 0.0,
TextStyle.NORMAL, parm.getDisplayAttributes()
.getBaseColor(),
HorizontalAlignment.CENTER,
VerticalAlignment.MIDDLE, 0.0);
ds.setCoordinates(coord.x, coord.y);
ds.horizontalAlignment = HorizontalAlignment.CENTER;
ds.verticallAlignment = VerticalAlignment.MIDDLE;
ds.rotation = 0.0;
target.drawStrings(ds);
}
printLabel = true;
} catch (Exception e) {

21
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/ContinuousColorbar.java
View file

@ -26,6 +26,7 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.viz.core.DrawableColorMap;
import com.raytheon.uf.viz.core.DrawableLine;
import com.raytheon.uf.viz.core.DrawableString;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.IGraphicsTarget.HorizontalAlignment;
@ -57,6 +58,7 @@ import com.raytheon.viz.gfe.rsc.GFEResource;
* ------------ ---------- ----------- --------------------------
* 03/26/2008 chammack Initial Creation.
* 04/13/2009 2092 njensen Support for custom labels
* 08/20/2012 #1083 randerso Fixed user defined labels
*
* </pre>
*
@ -175,6 +177,10 @@ public class ContinuousColorbar implements IColorBarDisplay {
dstring.horizontalAlignment = HorizontalAlignment.CENTER;
dstring.verticallAlignment = VerticalAlignment.MIDDLE;
DrawableLine dline = new DrawableLine();
dline.basics.color = seColorBarTickColor;
dline.width = 1.0f;
if ((labels == null) || (labels.length < 1)) {
float[] val = computeIntervalAndPrecision(minParm, maxParm,
paintProps.getCanvasBounds().width, target);
@ -201,8 +207,10 @@ public class ContinuousColorbar implements IColorBarDisplay {
if (GFEColorbarResource.isLabelWithin(pe.getMinX(),
pe.getMaxX(), labelLoc, 0)) {
target.drawLine(labelLoc, pe.getMinY(), 0.0, labelLoc,
pe.getMaxY(), 0.0, seColorBarTickColor, 1.0f);
dline.setCoordinates(labelLoc, pe.getMinY(), 0.0);
dline.addPoint(labelLoc, pe.getMaxY(), 0.0);
target.drawLine(dline);
dstring.setCoordinates(labelLoc, center);
dstring.setText(labelText, seColorBarTextColor);
target.drawStrings(dstring);
@ -224,11 +232,14 @@ public class ContinuousColorbar implements IColorBarDisplay {
}
if (GFEColorbarResource.isLabelWithin(pe.getMinX(),
pe.getMaxX(), labelLoc, 0)) {
target.drawLine(labelLoc, pe.getMinY(), 0.0, labelLoc,
pe.getMaxY(), 0.0, seColorBarTickColor, 1.0f);
dline.setCoordinates(labelLoc, pe.getMinY(), 0.0);
dline.addPoint(labelLoc, pe.getMaxY(), 0.0);
target.drawLine(dline);
String s = GFEColorbarResource.formatString(labelValue,
precision);
dstring.font = colorbarResource.getColorbarScaleFont();
dstring.setCoordinates(labelLoc, center);
dstring.setText(s, seColorBarTextColor);
target.drawStrings(dstring);
}
}

23
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/DiscreteColorbar.java
View file

@ -82,6 +82,8 @@ import com.vividsolutions.jts.geom.Coordinate;
* ------------ ---------- ----------- --------------------------
* 05/23/2008 dfitch Initial Creation.
* Aug 20, 2008 dglazesk Updated for the new ColorMap interface
* Aug 20, 2012 1079 randerso Changed to display all discrete values for
* non-overlapping discretes
*
* </pre>
*
@ -148,6 +150,7 @@ public class DiscreteColorbar implements IColorBarDisplay,
*
* @see com.raytheon.viz.gfe.rsc.colorbar.IColorBarDisplay#dispose()
*/
@Override
public void dispose() {
parm.getListeners().removeGridChangedListener(this);
}
@ -264,13 +267,30 @@ public class DiscreteColorbar implements IColorBarDisplay,
}
private List<ColorEntry> calcGridColorTable(IGridData gridData) {
List<ColorEntry> cEntries = new ArrayList<ColorEntry>();
if (gridData == null) {
return new ArrayList<ColorEntry>();
return cEntries;
}
GridType gridType = parm.getGridInfo().getGridType();
ParmID parmId = parm.getParmID();
String siteId = parmId.getDbId().getSiteId();
String compName = parmId.getCompositeName();
// special case: discrete non-overlapping, use all keys
if (gridType.equals(GridType.DISCRETE)
&& !DiscreteKey.discreteDefinition(siteId).overlaps(compName)) {
List<String> dkeys = DiscreteKey.discreteDefinition(siteId)
.symbols(compName);
for (String key : dkeys) {
DiscreteKey dk = new DiscreteKey(siteId, key, parmId);
WxValue v = new DiscreteWxValue(dk, parm);
List<ImageAttr> attrs = DiscreteDisplayUtil
.getFillAttributes(v);
cEntries.add(new ColorEntry(v, attrs));
}
return cEntries;
}
// get the grid slice for the grid data
IGridSlice gs = gridData.getGridSlice();
@ -322,7 +342,6 @@ public class DiscreteColorbar implements IColorBarDisplay,
}
// map each WxValue and append ColorEntry to list
List<ColorEntry> cEntries = new ArrayList<ColorEntry>();
for (WxValue wxValue : gridWValues) {
List<ImageAttr> attrs = DiscreteDisplayUtil
.getFillAttributes(wxValue);

3212
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
View file

File diff suppressed because it is too large Load diff

4
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
View file

@ -610,12 +610,12 @@ public class TimeSeriesDlg extends CaveHydroSWTDialog {
if (!groupConfigFile.exists()) {
statusHandler.handle(Priority.PROBLEM,
"Unable to locate group configuration file - "
+ groupConfigFile.getAbsolutePath(), null);
+ groupConfigFile.getAbsolutePath());
this.groupConfigFilePath = null;
} else {
this.groupConfigFilePath = groupConfigFile.getAbsolutePath();
statusHandler.handle(Priority.PROBLEM, "Using standard AWIPS 2 group_definition.cfg file. "
+ "Unable to locate specified group configuration file.", null);
+ "Unable to locate specified group configuration file.");
}
} else {
this.groupConfigFilePath = groupConfigFile.getAbsolutePath();

5
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/ratingcurve/RatingCurveDlg.java
View file

@ -72,6 +72,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* 15 Dec 2009 2422 mpduff Fixed bad label.
* 21 Feb 2010 4167 mpduff Added TimeZone to SimpleDateFormat.
* 29 Apr 2010 4993 mpduff Fixed date format in error message.
* 26 Jul 2012 14711/963 mpduff Fix problems adding/removing shift points
* </pre>
*
* @author lvenable
@ -1332,10 +1333,10 @@ public class RatingCurveDlg extends CaveSWTDialog {
if (currentShift.isActive()) {
generateShiftList(currentShift);
} else {
remakeRatingCurveDataList();
generateShiftList(null);
}
} else {
remakeRatingCurveDataList();
generateShiftList(null);
}
if (noShiftCurveDataList.getItemCount() > 0) {

35
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
View file

@ -1278,8 +1278,7 @@ public class DailyQcUtils {
if (td_fp == null) {
statusHandler
.handle(Priority.PROBLEM,
"Could not open mpe_td_details_file in load_gage_data().",
null);
"Could not open mpe_td_details_file in load_gage_data().");
return 0;
}
try {
@ -1287,8 +1286,7 @@ public class DailyQcUtils {
} catch (IOException e) {
statusHandler
.handle(Priority.PROBLEM,
"Could not open mpe_td_details_file for writing, in load_gage_data().",
null);
"Could not open mpe_td_details_file for writing, in load_gage_data().");
}
}
@ -1344,8 +1342,7 @@ public class DailyQcUtils {
if (freezing_stations == null) {
statusHandler
.handle(Priority.PROBLEM,
"ERROR, Could not read freezing level station list file. DailyQC stopped.",
null);
"ERROR, Could not read freezing level station list file. DailyQC stopped.");
return DAILYQC_FAILED;
}
System.out.println("DQC: Reading Temperature Stations List. ");
@ -1354,8 +1351,7 @@ public class DailyQcUtils {
if (temperature_stations == null) {
statusHandler
.handle(Priority.PROBLEM,
"ERROR, Could not read temperature station list file. DailyQC stopped.",
null);
"ERROR, Could not read temperature station list file. DailyQC stopped.");
return DAILYQC_FAILED;
}
System.out.println("DQC: Reading Precip Stations List. ");
@ -1364,8 +1360,7 @@ public class DailyQcUtils {
if (precip_stations == null) {
statusHandler
.handle(Priority.PROBLEM,
"ERROR, Could not read precip station list file. DailyQC stopped.",
null);
"ERROR, Could not read precip station list file. DailyQC stopped.");
return DAILYQC_FAILED;
}
@ -1375,8 +1370,7 @@ public class DailyQcUtils {
if (status == false) {
statusHandler
.handle(Priority.PROBLEM,
"Could not read precipitation Climo file. DailyQC stopped.",
null);
"Could not read precipitation Climo file. DailyQC stopped.");
return DAILYQC_FAILED;
}
@ -1386,8 +1380,7 @@ public class DailyQcUtils {
if (status == false) {
statusHandler
.handle(Priority.PROBLEM,
"Could not read temperature Climo file. DailyQC stopped.",
null);
"Could not read temperature Climo file. DailyQC stopped.");
return DAILYQC_FAILED;
}
}
@ -1399,8 +1392,7 @@ public class DailyQcUtils {
if (status == false) {
statusHandler
.handle(Priority.PROBLEM,
"Could not read precipitation PRISM file. DailyQC stopped.",
null);
"Could not read precipitation PRISM file. DailyQC stopped.");
return DAILYQC_FAILED;
}
@ -1409,8 +1401,7 @@ public class DailyQcUtils {
smonth, emonth);
if (status == false) {
statusHandler.handle(Priority.PROBLEM,
"Could not read temperature PRISM file. DailyQC stopped.",
null);
"Could not read temperature PRISM file. DailyQC stopped.");
return DAILYQC_FAILED;
}
System.out.println("DQC: Finished loading Climo data. ");
@ -1438,8 +1429,7 @@ public class DailyQcUtils {
if (status == false) {
statusHandler
.handle(Priority.PROBLEM,
"Could not map freezing level points to the HRAP grid. DailyQC stopped.",
null);
"Could not map freezing level points to the HRAP grid. DailyQC stopped.");
return DAILYQC_FAILED;
}
System.out.println("DQC: Mapping temperature gages to grid. ");
@ -1450,8 +1440,7 @@ public class DailyQcUtils {
if (status == false) {
statusHandler
.handle(Priority.PROBLEM,
"Could not map temp level points to the HRAP grid. DailyQC stopped.",
null);
"Could not map temp level points to the HRAP grid. DailyQC stopped.");
return DAILYQC_FAILED;
}
long elapsed = System.currentTimeMillis() - start;
@ -1478,7 +1467,7 @@ public class DailyQcUtils {
mean_areal_precip_global, tag);
if (status == false) {
statusHandler.handle(Priority.PROBLEM,
"Error retrieving basin data. DailyQC Stopped.", null);
"Error retrieving basin data. DailyQC Stopped.");
return DAILYQC_FAILED;
}
}

3
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/MapPrecipGagesGrid.java
View file

@ -133,8 +133,7 @@ public class MapPrecipGagesGrid {
if (DailyQcUtils.topo == null) {
statusHandler
.handle(Priority.PROBLEM,
"Could not retrieve topo information ... Could not create map precipitation gages to HRAP grid. Check if topo file exists.",
null);
"Could not retrieve topo information ... Could not create map precipitation gages to HRAP grid. Check if topo file exists.");
return null;
}
topo = DailyQcUtils.topo;

50
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelFactory2.java
View file

@ -28,6 +28,7 @@ import java.text.ParseException;
import java.text.ParsePosition;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.Formatter;
@ -85,6 +86,9 @@ import com.raytheon.viz.pointdata.rsc.PlotResourceData;
* 11/20/2006 brockwoo Initial creation.
* 03/16/2009 jsanchez Added processAvailDirective.
* 06/29/2009 2538 jsanchez Implemented pointdata.
* ======================================
* AWIPS2 DR Work
* 08/09/2012 1085 jkorman Corrected data construction.
*
* </pre>
*
@ -978,7 +982,12 @@ public class PlotModelFactory2 {
case INT:
case LONG:
if (dimensions == 1) {
display = String.valueOf((ob.getNumber(element.parameter)));
Number n = ob.getNumber(element.parameter);
if((n != null) && (n.doubleValue() != -9999)) {
if((n.doubleValue() != -9999)&&(!Double.isNaN(n.doubleValue()))) {
display = n.toString();
}
}
} else if (dimensions == 2) {
Number[] values = ob.getNumberAllLevels(element.parameter);
fields = numberToStringArray(values);
@ -998,13 +1007,13 @@ public class PlotModelFactory2 {
display = fields[element.index];
} else if (element.ranking != null && fields != null) {
display = element.ranking.getRankedField(fields);
} else if (fields != null) {
display = fields[0];
for (int i = 1; i < fields.length; i++) {
if (fields[i].length() > 0) {
display = fields[i] + " " + display;
}
} else if ((fields != null)&&(fields.length > 0)) {
StringBuilder sb = new StringBuilder(fields[fields.length-1]);
for(int i = fields.length-2; i >= 0;i--) {
sb.append(" ");
sb.append(fields[i]);
}
display = sb.toString();
}
if (element.lookup != null) {
@ -1186,20 +1195,25 @@ public class PlotModelFactory2 {
return this.plotFields;
}
/**
* Convert an array of Numbers to their String representation. Note that indexing
* may be used on the return array so the output size must match the input size.
* @param values An array of Number to convert.
* @return The converted data. If the input is null, the return will be null.
*/
private String[] numberToStringArray(Number[] values) {
ArrayList<String> list = new ArrayList<String>();
// String[] retVal = new String[values.length];
for (int i = 0; i < values.length; i++) {
if (!String.valueOf(values[i]).equals("")) {
list.add(String.valueOf(values[i]));
String[] retVal = null;
if(values != null) {
retVal = new String[values.length];
Arrays.fill(retVal,"");
for(int i = 0;i < values.length;i++) {
Number n = values[i];
if((n.doubleValue() != -9999)&&(!Double.isNaN(n.doubleValue()))) {
retVal[i] = n.toString();
}
}
}
if (list.size() > 0) {
return list.toArray(new String[list.size()]);
} else {
return null;
}
return retVal;
}
public void setLowerLimit(double lowerLimit) {

4
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/fax/dialogs/FaxMessageDlg.java
View file

@ -38,10 +38,8 @@ import com.raytheon.uf.common.dataplugin.text.request.SendFaxRequest;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.viz.core.Activator;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.requests.ThriftClient;
import com.raytheon.uf.viz.core.status.StatusConstants;
import com.raytheon.viz.texteditor.TextWorkstationConstants;
import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
@ -287,7 +285,7 @@ public class FaxMessageDlg extends CaveSWTDialog {
Object retval = ThriftClient.sendRequest(faxReq);
if (retval instanceof String && !"Success".equals(retval)) {
statusHandler.handle(Priority.SIGNIFICANT,
(String) retval, null);
(String) retval);
}
} catch (VizException e) {
statusHandler.handle(Priority.SIGNIFICANT,

2
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/comm/WarningSender.java
View file

@ -208,7 +208,7 @@ public class WarningSender implements IWarngenObserver {
case 4:
statusHandler.handle(Priority.PROBLEM,
"Could not reconnect (" + id
+ ") after 3 tries: ", null);
+ ") after 3 tries: ");
break;
}
}

3
edexOsgi/com.raytheon.edex.plugin.pirep/src/com/raytheon/edex/plugin/pirep/decoder/PirepParser.java
View file

@ -63,6 +63,7 @@ import com.vividsolutions.jts.geom.Point;
* 08/09/2012 1011 jkorman Changed parser to use TEIInfo to
* parse text elements properly. Removed test code to unit-test
* parse TEIs.
* 08/23/2012 1011 jkorman Corrected test for icing NEG.
* </pre>
*
* @author jkorman
@ -1266,7 +1267,7 @@ public class PirepParser {
theIcingLayers = new ArrayList<AircraftFlightCondition>();
if (str.indexOf(NEG_ENTRY) > 0) {
if (str.indexOf(NEG_ENTRY) >= 0) {
AircraftFlightCondition at = new AircraftFlightCondition();
// NEG should be the only value! Used to indicate forecasted but

11
edexOsgi/com.raytheon.edex.plugin.pirep/src/com/raytheon/edex/plugin/pirep/decoder/TEIInfo.java
View file

@ -35,7 +35,8 @@ import java.util.List;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* AWIPS2 DR Work
* Aug 7, 2012 1011 jkorman Initial creation
* Aug 7, 2012 1011 jkorman Initial creation
* Aug 23, 2012 1011 jkorman Change control characters to spaces.
*
* </pre>
*
@ -157,6 +158,14 @@ public class TEIInfo implements Comparable<TEIInfo> {
public static List<TEIInfo> findTEIs(String str) {
List<TEIInfo> positions = new ArrayList<TEIInfo>();
if (str != null) {
StringBuilder sb = new StringBuilder(str);
for(int i = 0;i < sb.length();i++) {
char c = sb.charAt(i);
if(c < ' ') {
sb.setCharAt(i, ' ');
}
}
str = sb.toString();
int teiIndex = 0;
// loop over the valid TEIs
for (TEI tei : TEI.PIREP) {

105
edexOsgi/com.raytheon.uf.common.alertmonitor/src/com/raytheon/uf/common/alertmonitor/AbstractMonitorHandler.java
View file

@ -70,9 +70,22 @@ public abstract class AbstractMonitorHandler implements IUFStatusHandler {
status.getException());
}
/*
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.status.IUFStatusHandler#handle(com.raytheon.uf
* .common.status.UFStatus, java.lang.String)
*/
@Override
public void handle(UFStatus status, String category) {
this.handle(status.getPriority(), category, status.getMessage(),
status.getException());
}
@Override
public void handle(Priority p, String msg) {
this.handle(p, msg, null);
this.handle(p, msg, (Throwable) null);
}
@Override
@ -91,22 +104,63 @@ public abstract class AbstractMonitorHandler implements IUFStatusHandler {
sendMonitorMessage(p, msg, null, null);
}
/**
* Send a message to alertViz
*
* @param priority
* @param pluginName
* @param source
* @param message
* @param details
*/
/*
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.status.IUFStatusHandler#handle(com.raytheon.uf
* .common.status.UFStatus.Priority, java.lang.String, java.lang.String)
*/
@Override
public void handle(Priority priority, String category, String message) {
handle(priority, category, message, (Throwable) null);
}
@Override
public void handle(Priority p, String category, String msg, Throwable t) {
StringBuilder sb = new StringBuilder(msg.length() + 64);
sb.append(MONITOR);
if (source != null) {
sb.append(": ");
sb.append(source);
}
sb.append(" - ");
sb.append(msg);
msg = sb.toString();
sendMonitorMessage(p, category, msg, null, null);
}
/**
* Send a message to alertViz
*
* @param priority
* @param message
* @param details
* @param audioFile
*/
private void sendMonitorMessage(Priority priority, String message,
String details, String audioFile) {
sendMonitorMessage(priority, MONITOR, message, details, audioFile);
}
/**
* Send a message to alertViz
*
* @param priority
* @param category
* @param message
* @param details
* @param audioFile
*/
private void sendMonitorMessage(Priority priority, String category,
String message, String details, String audioFile) {
StatusMessage sm = new StatusMessage();
sm.setPriority(priority);
sm.setPlugin(pluginId);
sm.setCategory(MONITOR);
sm.setCategory(category);
sm.setMessage(message);
sm.setSourceKey(source);
sm.setDetails(details);
@ -150,27 +204,56 @@ public abstract class AbstractMonitorHandler implements IUFStatusHandler {
}
@Override
public void debug(String category, String message) {
handle(Priority.DEBUG, category, message);
}
@Override
public void info(String message) {
handle(Priority.INFO, message);
}
@Override
public void info(String category, String message) {
handle(Priority.INFO, category, message);
}
@Override
public void warn(String message) {
handle(Priority.WARN, message);
}
public void warn(String category, String message) {
handle(Priority.WARN, category, message);
}
@Override
public void error(String message) {
handle(Priority.ERROR, message);
}
@Override
public void error(String category, String message) {
handle(Priority.ERROR, category, message);
}
@Override
public void error(String message, Throwable throwable) {
handle(Priority.ERROR, message, throwable);
}
@Override
public void error(String category, String message, Throwable throwable) {
handle(Priority.ERROR, category, message, throwable);
}
@Override
public void fatal(String message, Throwable throwable) {
handle(Priority.FATAL, message, throwable);
}
@Override
public void fatal(String category, String message, Throwable throwable) {
handle(Priority.FATAL, category, message, throwable);
}
}

4
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/disk/DiskCache.java vendored
View file

@ -72,8 +72,8 @@ import com.raytheon.uf.common.util.SystemUtil;
public class DiskCache<K> implements ICache<K> {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(DiskCache.class.getPackage().getName(), "CAVE",
"WORKSTATION");
.getHandler(DiskCache.class.getPackage().getName(), "WORKSTATION",
"CAVE");
/**
* Should this be static or one writer thread per cache? Only have so much

4
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/disk/DiskCacheWriter.java vendored
View file

@ -34,8 +34,8 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
public class DiskCacheWriter extends Thread {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(DiskCacheWriter.class.getPackage().getName(), "CAVE",
"WORKSTATION");
.getHandler(DiskCacheWriter.class.getPackage().getName(),
"WORKSTATION", "CAVE");
protected static final int MAX_PENDING_WRITES = 100;

246
edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/IUFStatusHandler.java
View file

@ -49,42 +49,92 @@ public interface IUFStatusHandler {
*/
public void handle(UFStatus status);
/**
* Send a message to Status handler for logging/display.
*
* @param priority
* Message priority.
* @param message
* Text to be displayed in the message
*
* @see UFStatus
*/
/**
* Send a message to Status handler for logging/display.
*
* @param status
*/
public void handle(UFStatus status, String category);
/**
* Send a message to Status handler for logging/display.
*
* @param priority
* Message priority.
* @param message
* Text to be displayed in the message
*
* @see UFStatus
*/
public void handle(Priority priority, String message);
/**
* Send a message to Status handler for logging/display.
*
* @param priority
* Message priority.
* @param message
* Text to be displayed in the message
* @param throwable
* associated exception
*
* @see UFStatus
*/
/**
* Send a message to Status handler for logging/display.
*
* @param priority
* Message priority.
* @param category
* Message category
* @param message
* Text to be displayed in the message
*
* @see UFStatus
*/
public void handle(Priority priority, String category, String message);
/**
* Send a message to Status handler for logging/display.
*
* @param priority
* Message priority.
* @param message
* Text to be displayed in the message
* @param throwable
* associated exception
*
* @see UFStatus
*/
public void handle(Priority priority, String message, Throwable throwable);
/**
* Send a debug message to Status handler for logging/display.
*
* @param message
* Text to be displayed in the message
*
* @see UFStatus
*/
/**
* Send a message to Status handler for logging/display.
*
* @param priority
* Message priority.
* @param category
* Message category
* @param message
* Text to be displayed in the message
* @param throwable
* associated exception
*
* @see UFStatus
*/
public void handle(Priority priority, String category, String message,
Throwable throwable);
/**
* Send a debug message to Status handler for logging/display.
*
* @param message
* Text to be displayed in the message
*
* @see UFStatus
*/
public void debug(String message);
/**
* Send a debug message to Status handler for logging/display.
*
* @param category
* Message category
* @param message
* Text to be displayed in the message
*
* @see UFStatus
*/
public void debug(String category, String message);
/**
* Send an info message to Status handler for logging/display.
*
@ -95,47 +145,111 @@ public interface IUFStatusHandler {
*/
public void info(String message);
/**
* Send a warn message to Status handler for logging/display.
*
* @param message
* Text to be displayed in the message
*
* @see UFStatus
*/
/**
* Send an info message to Status handler for logging/display.
*
* @param category
* Message category
* @param message
* Text to be displayed in the message
*
* @see UFStatus
*/
public void info(String category, String message);
/**
* Send a warn message to Status handler for logging/display.
*
* @param message
* Text to be displayed in the message
*
* @see UFStatus
*/
public void warn(String message);
/**
* Send an error message to Status handler for logging/display.
*
* @param message
* Text to be displayed in the message
*
* @see UFStatus
*/
/**
* Send a warn message to Status handler for logging/display.
*
* @param category
* Message category
* @param message
* Text to be displayed in the message
*
* @see UFStatus
*/
public void warn(String category, String message);
/**
* Send an error message to Status handler for logging/display.
*
* @param message
* Text to be displayed in the message
*
* @see UFStatus
*/
public void error(String message);
/**
* Send an error message to Status handler for logging/display.
*
* @param message
* Text to be displayed in the message
* @param throwable
* associated exception
*
* @see UFStatus
*/
/**
* Send an error message to Status handler for logging/display.
*
* @param category
* Message category
* @param message
* Text to be displayed in the message
*
* @see UFStatus
*/
public void error(String category, String message);
/**
* Send an error message to Status handler for logging/display.
*
* @param message
* Text to be displayed in the message
* @param throwable
* associated exception
*
* @see UFStatus
*/
public void error(String message, Throwable throwable);
/**
* Send a fatal message to Status handler for logging/display.
*
* @param message
* Text to be displayed in the message
* @param throwable
* associated exception
*
* @see UFStatus
*/
/**
* Send an error message to Status handler for logging/display.
*
* @param category
* Message category
* @param message
* Text to be displayed in the message
* @param throwable
* associated exception
*
* @see UFStatus
*/
public void error(String category, String message, Throwable throwable);
/**
* Send a fatal message to Status handler for logging/display.
*
* @param message
* Text to be displayed in the message
* @param throwable
* associated exception
*
* @see UFStatus
*/
public void fatal(String message, Throwable throwable);
/**
* Send a fatal message to Status handler for logging/display.
*
* @param category
* Message category
* @param message
* Text to be displayed in the message
* @param throwable
* associated exception
*
* @see UFStatus
*/
public void fatal(String category, String message, Throwable throwable);
}

79
edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/SysErrStatusHandler.java
View file

@ -76,18 +76,48 @@ public class SysErrStatusHandler implements IUFStatusHandler {
handle(status.getPriority(), status.getMessage(), status.getException());
}
/*
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.status.IUFStatusHandler#handle(com.raytheon.uf
* .common.status.UFStatus.Priority, java.lang.String)
*/
/*
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.status.IUFStatusHandler#handle(com.raytheon.uf
* .common.status.UFStatus, java.lang.String)
*/
@Override
public void handle(UFStatus status, String category) {
handle(status.getPriority(), category, status.getMessage(),
status.getException());
}
/*
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.status.IUFStatusHandler#handle(com.raytheon.uf
* .common.status.UFStatus.Priority, java.lang.String)
*/
@Override
public void handle(Priority priority, String message) {
handle(priority, message, null);
handle(priority, message, (Throwable) null);
}
/*
* (non-Javadoc)
*
* @see
* com.raytheon.uf.common.status.IUFStatusHandler#handle(com.raytheon.uf
* .common.status.UFStatus.Priority, java.lang.String, java.lang.String)
*/
@Override
public void handle(Priority priority, String category, String message) {
handle(priority, category, message, (Throwable) null);
}
@Override
public void handle(Priority priority, String message, Throwable throwable) {
handle(priority, category, message, throwable);
}
/*
* (non-Javadoc)
*
@ -96,7 +126,8 @@ public class SysErrStatusHandler implements IUFStatusHandler {
* .common.status.UFStatus.Priority, java.lang.String, java.lang.Throwable)
*/
@Override
public void handle(Priority priority, String message, Throwable throwable) {
public void handle(Priority priority, String category, String message,
Throwable throwable) {
StringBuilder sb = new StringBuilder();
sb.append(priority).append(' ');
sb.append(this.pluginId).append(": ");
@ -124,28 +155,58 @@ public class SysErrStatusHandler implements IUFStatusHandler {
}
@Override
public void debug(String category, String message) {
handle(Priority.DEBUG, category, message);
}
@Override
public void info(String message) {
handle(Priority.INFO, message);
}
@Override
public void info(String category, String message) {
handle(Priority.INFO, category, message);
}
@Override
public void warn(String message) {
handle(Priority.WARN, message);
}
@Override
public void warn(String category, String message) {
handle(Priority.WARN, category, message);
}
@Override
public void error(String message) {
handle(Priority.ERROR, message);
}
@Override
public void error(String category, String message) {
handle(Priority.ERROR, category, message);
}
@Override
public void error(String message, Throwable throwable) {
handle(Priority.ERROR, message, throwable);
}
@Override
public void error(String category, String message, Throwable throwable) {
handle(Priority.ERROR, category, message, throwable);
}
@Override
public void fatal(String message, Throwable throwable) {
handle(Priority.FATAL, message, throwable);
}
@Override
public void fatal(String category, String message, Throwable throwable) {
handle(Priority.FATAL, category, message, throwable);
}
}

8
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/UpdateActiveTableHandler.java
View file

@ -19,6 +19,7 @@
**/
package com.raytheon.uf.edex.activetable;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
@ -51,6 +52,8 @@ import com.vividsolutions.jts.io.WKTReader;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Sep 13, 2010 wldougher Initial creation
* Aug 20, 2012 #1084 dgilling Properly zero pad incoming
* ETN values.
*
* </pre>
*
@ -191,7 +194,10 @@ public class UpdateActiveTableHandler implements
try {
atr.setVtecstr(template.get("vtecstr").toString());
atr.setEtn(template.get("etn").toString());
Integer incomingEtn = (Integer) template.get("etn");
DecimalFormat formatter = new DecimalFormat("0000");
String paddedEtn = formatter.format(incomingEtn);
atr.setEtn(paddedEtn);
atr.setSig(template.get("sig").toString());
atr.setPhen(template.get("phen").toString());
if (template.containsKey("segText")) {

0
nativeLib/nativeLib.ecl → edexOsgi/com.raytheon.uf.edex.binlightning.feature/com.raytheon.uf.edex.binlightning.feature.ecl
View file

0
edexOsgi/com.raytheon.uf.edex.bufr.feature/com.raytheon.uf.edex.bufr.feature.ecl Normal file
View file

0
edexOsgi/com.raytheon.uf.edex.common.core.feature/com.raytheon.uf.edex.common.core.feature.ecl Normal file
View file

0
edexOsgi/com.raytheon.uf.edex.core.feature/com.raytheon.uf.edex.core.feature.ecl Normal file
View file

0
edexOsgi/com.raytheon.uf.edex.cots.feature/com.raytheon.uf.edex.cots.feature.ecl Normal file
View file

0
edexOsgi/com.raytheon.uf.edex.dat.feature/com.raytheon.uf.edex.dat.feature.ecl Normal file
View file

0
edexOsgi/com.raytheon.uf.edex.dataplugins.feature/com.raytheon.uf.edex.dataplugins.feature.ecl Normal file
View file

0
edexOsgi/com.raytheon.uf.edex.gfe.feature/com.raytheon.uf.edex.gfe.feature.ecl Normal file
View file

0
edexOsgi/com.raytheon.uf.edex.grib.feature/com.raytheon.uf.edex.grib.feature.ecl Normal file
View file

0
edexOsgi/com.raytheon.uf.edex.hydro.feature/com.raytheon.uf.edex.hydro.feature.ecl Normal file
View file

53
edexOsgi/com.raytheon.uf.edex.log/src/com/raytheon/uf/edex/log/EdexLogHandler.java
View file

@ -98,6 +98,11 @@ public class EdexLogHandler implements IUFStatusHandler {
*/
@Override
public void handle(UFStatus status) {
handle(status, this.category);
}
@Override
public void handle(UFStatus status, String category) {
Priority p = status.getPriority();
String statusMsg = status.getMessage();
if (category != null) {
@ -149,6 +154,11 @@ public class EdexLogHandler implements IUFStatusHandler {
@Override
public void handle(Priority p, String msg) {
handle(p, this.category, msg);
}
@Override
public void handle(Priority p, String category, String msg) {
if (category != null) {
StringBuilder sb = new StringBuilder(msg.length() + 64);
sb.append(category);
@ -187,9 +197,13 @@ public class EdexLogHandler implements IUFStatusHandler {
@Override
public void handle(Priority p, String msg, Throwable t) {
// msg has been null if someone does e.getLocalizedMessage() and it is
// null
// which causes null pointer exception
handle(p, category, msg, t);
}
@Override
public void handle(Priority p, String category, String msg, Throwable t) {
// msg has been null if someone does e.getLocalizedMessage()
// and it is null which causes null pointer exception
msg = String.valueOf(msg);
if (category != null) {
StringBuilder sb = new StringBuilder(msg.length() + 64);
@ -235,27 +249,60 @@ public class EdexLogHandler implements IUFStatusHandler {
}
@Override
public void debug(String category, String message) {
if (this.clazzLogger.isDebugEnabled()) {
handle(Priority.DEBUG, category, message);
}
}
@Override
public void info(String message) {
handle(Priority.INFO, message);
}
@Override
public void info(String category, String message) {
handle(Priority.INFO, category, message);
}
@Override
public void warn(String message) {
handle(Priority.WARN, message);
}
@Override
public void warn(String category, String message) {
handle(Priority.WARN, category, message);
}
@Override
public void error(String message) {
handle(Priority.ERROR, message);
}
@Override
public void error(String category, String message) {
handle(Priority.ERROR, category, message);
}
@Override
public void error(String message, Throwable throwable) {
handle(Priority.ERROR, message, throwable);
}
@Override
public void error(String category, String message, Throwable throwable) {
handle(Priority.ERROR, category, message, throwable);
}
@Override
public void fatal(String message, Throwable throwable) {
handle(Priority.FATAL, message, throwable);
}
@Override
public void fatal(String category, String message, Throwable throwable) {
handle(Priority.FATAL, category, message, throwable);
}
}

0
edexOsgi/com.raytheon.uf.edex.radar.feature/com.raytheon.uf.edex.radar.feature.ecl Normal file
View file

0
edexOsgi/com.raytheon.uf.edex.satellite.feature/com.raytheon.uf.edex.satellite.feature.ecl Normal file
View file

0
edexOsgi/com.raytheon.uf.edex.text.feature/com.raytheon.uf.edex.text.feature.ecl Normal file
View file

200
nativeLib/rary.cots.jasper/jasper-1.900.1/src/msvc/imgcmp.dsp
View file

@ -1,100 +1,100 @@
# Microsoft Developer Studio Project File - Name="imgcmp" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=imgcmp - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "imgcmp.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "imgcmp.mak" CFG="imgcmp - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "imgcmp - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "imgcmp - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "imgcmp - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "imgcmp___Win32_Release"
# PROP BASE Intermediate_Dir "imgcmp___Win32_Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Win32_Release"
# PROP Intermediate_Dir "imgcmp___Win32_Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "..\libjasper\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "JAS_WIN_MSVC_BUILD" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjasper.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_Release"
!ELSEIF "$(CFG)" == "imgcmp - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "imgcmp___Win32_Debug"
# PROP BASE Intermediate_Dir "imgcmp___Win32_Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Win32_Debug"
# PROP Intermediate_Dir "imgcmp___Win32_Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\libjasper\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "JAS_WIN_MSVC_BUILD" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjasper.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_Debug"
!ENDIF
# Begin Target
# Name "imgcmp - Win32 Release"
# Name "imgcmp - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\appl\imgcmp.c
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project
# Microsoft Developer Studio Project File - Name="imgcmp" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=imgcmp - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "imgcmp.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "imgcmp.mak" CFG="imgcmp - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "imgcmp - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "imgcmp - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "imgcmp - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "imgcmp___Win32_Release"
# PROP BASE Intermediate_Dir "imgcmp___Win32_Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Win32_Release"
# PROP Intermediate_Dir "imgcmp___Win32_Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "..\libjasper\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "JAS_WIN_MSVC_BUILD" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjasper.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_Release"
!ELSEIF "$(CFG)" == "imgcmp - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "imgcmp___Win32_Debug"
# PROP BASE Intermediate_Dir "imgcmp___Win32_Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Win32_Debug"
# PROP Intermediate_Dir "imgcmp___Win32_Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\libjasper\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "JAS_WIN_MSVC_BUILD" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjasper.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_Debug"
!ENDIF
# Begin Target
# Name "imgcmp - Win32 Release"
# Name "imgcmp - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\appl\imgcmp.c
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project

204
nativeLib/rary.cots.jasper/jasper-1.900.1/src/msvc/imginfo.dsp
View file

@ -1,102 +1,102 @@
# Microsoft Developer Studio Project File - Name="imginfo" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=imginfo - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "imginfo.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "imginfo.mak" CFG="imginfo - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "imginfo - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "imginfo - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "imginfo - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "imginfo___Win32_Release"
# PROP BASE Intermediate_Dir "imginfo___Win32_Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Win32_Release"
# PROP Intermediate_Dir "imginfo___Win32_Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "..\libjasper\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "JAS_WIN_MSVC_BUILD" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjasper.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_Release"
!ELSEIF "$(CFG)" == "imginfo - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "imginfo___Win32_Debug"
# PROP BASE Intermediate_Dir "imginfo___Win32_Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Win32_Debug"
# PROP Intermediate_Dir "imginfo___Win32_Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\libjasper\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "JAS_WIN_MSVC_BUILD" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjasper.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_Debug"
!ENDIF
# Begin Target
# Name "imginfo - Win32 Release"
# Name "imginfo - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\appl\imginfo.c
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project
# Microsoft Developer Studio Project File - Name="imginfo" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=imginfo - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "imginfo.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "imginfo.mak" CFG="imginfo - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "imginfo - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "imginfo - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "imginfo - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "imginfo___Win32_Release"
# PROP BASE Intermediate_Dir "imginfo___Win32_Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Win32_Release"
# PROP Intermediate_Dir "imginfo___Win32_Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "..\libjasper\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "JAS_WIN_MSVC_BUILD" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjasper.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_Release"
!ELSEIF "$(CFG)" == "imginfo - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "imginfo___Win32_Debug"
# PROP BASE Intermediate_Dir "imginfo___Win32_Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Win32_Debug"
# PROP Intermediate_Dir "imginfo___Win32_Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\libjasper\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "JAS_WIN_MSVC_BUILD" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjasper.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_Debug"
!ENDIF
# Begin Target
# Name "imginfo - Win32 Release"
# Name "imginfo - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\appl\imginfo.c
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project

204
nativeLib/rary.cots.jasper/jasper-1.900.1/src/msvc/jasper.dsp
View file

@ -1,102 +1,102 @@
# Microsoft Developer Studio Project File - Name="jasper" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=jasper - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "jasper.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "jasper.mak" CFG="jasper - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "jasper - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "jasper - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "jasper - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Win32_Release"
# PROP Intermediate_Dir "jasper___Win32_Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "..\libjasper\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "JAS_WIN_MSVC_BUILD" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjasper.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_Release"
!ELSEIF "$(CFG)" == "jasper - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "jasper___Win32_Debug"
# PROP BASE Intermediate_Dir "jasper___Win32_Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Win32_Debug"
# PROP Intermediate_Dir "jasper___Win32_Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\libjasper\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "JAS_WIN_MSVC_BUILD" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjasper.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_Debug"
!ENDIF
# Begin Target
# Name "jasper - Win32 Release"
# Name "jasper - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\appl\jasper.c
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project
# Microsoft Developer Studio Project File - Name="jasper" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=jasper - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "jasper.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "jasper.mak" CFG="jasper - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "jasper - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "jasper - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "jasper - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Win32_Release"
# PROP Intermediate_Dir "jasper___Win32_Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "..\libjasper\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "JAS_WIN_MSVC_BUILD" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjasper.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_Release"
!ELSEIF "$(CFG)" == "jasper - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "jasper___Win32_Debug"
# PROP BASE Intermediate_Dir "jasper___Win32_Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Win32_Debug"
# PROP Intermediate_Dir "jasper___Win32_Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\libjasper\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "JAS_WIN_MSVC_BUILD" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjasper.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_Debug"
!ENDIF
# Begin Target
# Name "jasper - Win32 Release"
# Name "jasper - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\appl\jasper.c
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project

172
nativeLib/rary.cots.jasper/jasper-1.900.1/src/msvc/jasper.dsw
View file

@ -1,86 +1,86 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "imgcmp"=".\imgcmp.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name libjasper
End Project Dependency
}}}
###############################################################################
Project: "imginfo"=".\imginfo.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name libjasper
End Project Dependency
}}}
###############################################################################
Project: "jasper"=".\jasper.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name libjasper
End Project Dependency
}}}
###############################################################################
Project: "jiv"=".\jiv.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "libjasper"=".\libjasper.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "imgcmp"=".\imgcmp.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name libjasper
End Project Dependency
}}}
###############################################################################
Project: "imginfo"=".\imginfo.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name libjasper
End Project Dependency
}}}
###############################################################################
Project: "jasper"=".\jasper.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name libjasper
End Project Dependency
}}}
###############################################################################
Project: "jiv"=".\jiv.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "libjasper"=".\libjasper.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################

204
nativeLib/rary.cots.jasper/jasper-1.900.1/src/msvc/jiv.dsp
View file

@ -1,102 +1,102 @@
# Microsoft Developer Studio Project File - Name="jiv" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=jiv - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "jiv.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "jiv.mak" CFG="jiv - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "jiv - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "jiv - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "jiv - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Win32_Release"
# PROP Intermediate_Dir "jiv___Win32_Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "..\libjasper\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "JAS_WIN_MSVC_BUILD" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjasper.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_Release"
!ELSEIF "$(CFG)" == "jiv - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Win32_Debug"
# PROP Intermediate_Dir "jiv___Win32_Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\libjasper\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "JAS_WIN_MSVC_BUILD" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjasper.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_Debug"
!ENDIF
# Begin Target
# Name "jiv - Win32 Release"
# Name "jiv - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\appl\jiv.c
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project
# Microsoft Developer Studio Project File - Name="jiv" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=jiv - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "jiv.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "jiv.mak" CFG="jiv - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "jiv - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "jiv - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "jiv - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Win32_Release"
# PROP Intermediate_Dir "jiv___Win32_Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "..\libjasper\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "JAS_WIN_MSVC_BUILD" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjasper.lib /nologo /subsystem:console /machine:I386 /libpath:"Win32_Release"
!ELSEIF "$(CFG)" == "jiv - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Win32_Debug"
# PROP Intermediate_Dir "jiv___Win32_Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\libjasper\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "JAS_WIN_MSVC_BUILD" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libjasper.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Win32_Debug"
!ENDIF
# Begin Target
# Name "jiv - Win32 Release"
# Name "jiv - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\appl\jiv.c
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# End Group
# End Target
# End Project

856
nativeLib/rary.cots.jasper/jasper-1.900.1/src/msvc/libjasper.dsp
View file

@ -1,428 +1,428 @@
# Microsoft Developer Studio Project File - Name="libjasper" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=libjasper - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "libjasper.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "libjasper.mak" CFG="libjasper - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "libjasper - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "libjasper - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "libjasper - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Win32_Release"
# PROP Intermediate_Dir "libjasper___Win32_Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "..\libjasper\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "JAS_WIN_MSVC_BUILD" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "libjasper - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Win32_Debug"
# PROP Intermediate_Dir "libjasper___Win32_Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\libjasper\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "JAS_WIN_MSVC_BUILD" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "libjasper - Win32 Release"
# Name "libjasper - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\libjasper\bmp\bmp_cod.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\bmp\bmp_dec.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\bmp\bmp_enc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_cm.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_debug.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_getopt.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_icc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_iccdata.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_image.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_init.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_malloc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_seq.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_stream.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_string.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_tmr.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_tvp.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_version.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jp2\jp2_cod.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jp2\jp2_dec.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jp2\jp2_enc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_bs.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_cs.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_dec.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_enc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_math.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_mct.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_mqcod.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_mqdec.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_mqenc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_qmfb.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t1cod.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t1dec.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t1enc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t2cod.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t2dec.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t2enc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_tagtree.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_tsfb.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_util.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpg\jpg_dummy.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpg\jpg_val.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\mif\mif_cod.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\pgx\pgx_cod.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\pgx\pgx_dec.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\pgx\pgx_enc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\pnm\pnm_cod.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\pnm\pnm_dec.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\pnm\pnm_enc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\ras\ras_cod.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\ras\ras_dec.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\ras\ras_enc.c
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=..\libjasper\bmp\bmp_cod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\include\jasper\jas_cm.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\include\jasper\jas_icc.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\include\jasper\jas_tmr.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jp2\jp2_cod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jp2\jp2_dec.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_bs.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_cod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_cs.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_dec.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_enc.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_fix.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_flt.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_math.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_mct.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_mqcod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_mqdec.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_mqenc.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_qmfb.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t1cod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t1dec.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t1enc.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t2cod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t2dec.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t2enc.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_tagtree.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_tsfb.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_util.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpg\jpg_cod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\mif\mif_cod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\pgx\pgx_cod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\pnm\pnm_cod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\ras\ras_cod.h
# End Source File
# End Group
# End Target
# End Project
# Microsoft Developer Studio Project File - Name="libjasper" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=libjasper - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "libjasper.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "libjasper.mak" CFG="libjasper - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "libjasper - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "libjasper - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "libjasper - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Win32_Release"
# PROP Intermediate_Dir "libjasper___Win32_Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /W3 /GX /O2 /I "..\libjasper\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "JAS_WIN_MSVC_BUILD" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ELSEIF "$(CFG)" == "libjasper - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Win32_Debug"
# PROP Intermediate_Dir "libjasper___Win32_Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\libjasper\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "JAS_WIN_MSVC_BUILD" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo
!ENDIF
# Begin Target
# Name "libjasper - Win32 Release"
# Name "libjasper - Win32 Debug"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\libjasper\bmp\bmp_cod.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\bmp\bmp_dec.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\bmp\bmp_enc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_cm.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_debug.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_getopt.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_icc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_iccdata.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_image.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_init.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_malloc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_seq.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_stream.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_string.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_tmr.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_tvp.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\base\jas_version.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jp2\jp2_cod.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jp2\jp2_dec.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jp2\jp2_enc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_bs.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_cs.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_dec.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_enc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_math.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_mct.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_mqcod.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_mqdec.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_mqenc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_qmfb.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t1cod.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t1dec.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t1enc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t2cod.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t2dec.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t2enc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_tagtree.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_tsfb.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_util.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpg\jpg_dummy.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpg\jpg_val.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\mif\mif_cod.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\pgx\pgx_cod.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\pgx\pgx_dec.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\pgx\pgx_enc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\pnm\pnm_cod.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\pnm\pnm_dec.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\pnm\pnm_enc.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\ras\ras_cod.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\ras\ras_dec.c
# End Source File
# Begin Source File
SOURCE=..\libjasper\ras\ras_enc.c
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=..\libjasper\bmp\bmp_cod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\include\jasper\jas_cm.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\include\jasper\jas_icc.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\include\jasper\jas_tmr.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jp2\jp2_cod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jp2\jp2_dec.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_bs.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_cod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_cs.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_dec.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_enc.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_fix.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_flt.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_math.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_mct.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_mqcod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_mqdec.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_mqenc.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_qmfb.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t1cod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t1dec.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t1enc.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t2cod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t2dec.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_t2enc.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_tagtree.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_tsfb.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpc\jpc_util.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\jpg\jpg_cod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\mif\mif_cod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\pgx\pgx_cod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\pnm\pnm_cod.h
# End Source File
# Begin Source File
SOURCE=..\libjasper\ras\ras_cod.h
# End Source File
# End Group
# End Target
# End Project

0
ncep/com.raytheon.uf.edex.ncep.feature/com.raytheon.uf.edex.ncep.feature.ecl Normal file
View file

0
ncep/gov.noaa.nws.ncep.common.staticdata/gov.noaa.nws.ncep.common.staticdata.ecl Normal file
View file

38
ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/stationTables/IStationField.java
View file

@ -1,19 +1,19 @@
package gov.noaa.nws.ncep.edex.common.stationTables;
public interface IStationField {
public static enum StationField {
STID, // station id
STNM, // station number
NAME, // station name
ST, // state
CO, // country
//LAT, // latitude
//LON, // longitude
//ELV, // elevation
//PRI, // priority
WFO, // WFO
LOC // location
}
}
package gov.noaa.nws.ncep.edex.common.stationTables;
public interface IStationField {
public static enum StationField {
STID, // station id
STNM, // station number
NAME, // station name
ST, // state
CO, // country
//LAT, // latitude
//LON, // longitude
//ELV, // elevation
//PRI, // priority
WFO, // WFO
LOC // location
}
}

336
ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/stationTables/ObjectFactory.java
View file

@ -1,168 +1,168 @@
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2009.06.08 at 02:36:43 PM EDT
//
package gov.noaa.nws.ncep.edex.common.stationTables;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlElementDecl;
import javax.xml.bind.annotation.XmlRegistry;
import javax.xml.namespace.QName;
/**
* This object contains factory methods for each
* Java content interface and Java element interface
* generated in the gov.noaa.nws.ncep.viz.common.stnTables package.
* <p>An ObjectFactory allows you to programatically
* construct new instances of the Java representation
* for XML content. The Java representation of XML
* content can consist of schema derived interfaces
* and classes representing the binding of schema
* type definitions, element declarations and model
* groups. Factory methods for each of these are
* provided in this class.
*
*/
@XmlRegistry
public class ObjectFactory {
private final static QName _Wfo_QNAME = new QName("", "wfo");
private final static QName _Stid_QNAME = new QName("", "stid");
private final static QName _Stnnum_QNAME = new QName("", "stnnum");
private final static QName _Location_QNAME = new QName("", "location");
private final static QName _Priority_QNAME = new QName("", "priority");
private final static QName _Elevation_QNAME = new QName("", "elevation");
private final static QName _State_QNAME = new QName("", "state");
private final static QName _Longitude_QNAME = new QName("", "longitude");
private final static QName _Stnname_QNAME = new QName("", "stnname");
private final static QName _Latitude_QNAME = new QName("", "latitude");
private final static QName _Country_QNAME = new QName("", "country");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: gov.noaa.nws.ncep.viz.common.stnTables
*
*/
public ObjectFactory() {
}
/**
* Create an instance of {@link StationList }
*
*/
public StationList createStationList() {
return new StationList();
}
/**
* Create an instance of {@link Station }
*
*/
public Station createStation() {
return new Station();
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "wfo")
public JAXBElement<String> createWfo(String value) {
return new JAXBElement<String>(_Wfo_QNAME, String.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "stid")
public JAXBElement<String> createStid(String value) {
return new JAXBElement<String>(_Stid_QNAME, String.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "stnnum")
public JAXBElement<String> createStnnum(String value) {
return new JAXBElement<String>(_Stnnum_QNAME, String.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "location")
public JAXBElement<String> createLocation(String value) {
return new JAXBElement<String>(_Location_QNAME, String.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "priority")
public JAXBElement<Integer> createPriority(Integer value) {
return new JAXBElement<Integer>(_Priority_QNAME, Integer.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "elevation")
public JAXBElement<Integer> createElevation(Integer value) {
return new JAXBElement<Integer>(_Elevation_QNAME, Integer.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "state")
public JAXBElement<String> createState(String value) {
return new JAXBElement<String>(_State_QNAME, String.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link Float }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "longitude")
public JAXBElement<Float> createLongitude(Float value) {
return new JAXBElement<Float>(_Longitude_QNAME, Float.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "stnname")
public JAXBElement<String> createStnname(String value) {
return new JAXBElement<String>(_Stnname_QNAME, String.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link Float }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "latitude")
public JAXBElement<Float> createLatitude(Float value) {
return new JAXBElement<Float>(_Latitude_QNAME, Float.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "country")
public JAXBElement<String> createCountry(String value) {
return new JAXBElement<String>(_Country_QNAME, String.class, null, value);
}
}
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2009.06.08 at 02:36:43 PM EDT
//
package gov.noaa.nws.ncep.edex.common.stationTables;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlElementDecl;
import javax.xml.bind.annotation.XmlRegistry;
import javax.xml.namespace.QName;
/**
* This object contains factory methods for each
* Java content interface and Java element interface
* generated in the gov.noaa.nws.ncep.viz.common.stnTables package.
* <p>An ObjectFactory allows you to programatically
* construct new instances of the Java representation
* for XML content. The Java representation of XML
* content can consist of schema derived interfaces
* and classes representing the binding of schema
* type definitions, element declarations and model
* groups. Factory methods for each of these are
* provided in this class.
*
*/
@XmlRegistry
public class ObjectFactory {
private final static QName _Wfo_QNAME = new QName("", "wfo");
private final static QName _Stid_QNAME = new QName("", "stid");
private final static QName _Stnnum_QNAME = new QName("", "stnnum");
private final static QName _Location_QNAME = new QName("", "location");
private final static QName _Priority_QNAME = new QName("", "priority");
private final static QName _Elevation_QNAME = new QName("", "elevation");
private final static QName _State_QNAME = new QName("", "state");
private final static QName _Longitude_QNAME = new QName("", "longitude");
private final static QName _Stnname_QNAME = new QName("", "stnname");
private final static QName _Latitude_QNAME = new QName("", "latitude");
private final static QName _Country_QNAME = new QName("", "country");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: gov.noaa.nws.ncep.viz.common.stnTables
*
*/
public ObjectFactory() {
}
/**
* Create an instance of {@link StationList }
*
*/
public StationList createStationList() {
return new StationList();
}
/**
* Create an instance of {@link Station }
*
*/
public Station createStation() {
return new Station();
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "wfo")
public JAXBElement<String> createWfo(String value) {
return new JAXBElement<String>(_Wfo_QNAME, String.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "stid")
public JAXBElement<String> createStid(String value) {
return new JAXBElement<String>(_Stid_QNAME, String.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "stnnum")
public JAXBElement<String> createStnnum(String value) {
return new JAXBElement<String>(_Stnnum_QNAME, String.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "location")
public JAXBElement<String> createLocation(String value) {
return new JAXBElement<String>(_Location_QNAME, String.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "priority")
public JAXBElement<Integer> createPriority(Integer value) {
return new JAXBElement<Integer>(_Priority_QNAME, Integer.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "elevation")
public JAXBElement<Integer> createElevation(Integer value) {
return new JAXBElement<Integer>(_Elevation_QNAME, Integer.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "state")
public JAXBElement<String> createState(String value) {
return new JAXBElement<String>(_State_QNAME, String.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link Float }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "longitude")
public JAXBElement<Float> createLongitude(Float value) {
return new JAXBElement<Float>(_Longitude_QNAME, Float.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "stnname")
public JAXBElement<String> createStnname(String value) {
return new JAXBElement<String>(_Stnname_QNAME, String.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link Float }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "latitude")
public JAXBElement<Float> createLatitude(Float value) {
return new JAXBElement<Float>(_Latitude_QNAME, Float.class, null, value);
}
/**
* Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
*
*/
@XmlElementDecl(namespace = "", name = "country")
public JAXBElement<String> createCountry(String value) {
return new JAXBElement<String>(_Country_QNAME, String.class, null, value);
}
}

678
ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/stationTables/Station.java
View file

@ -1,339 +1,339 @@
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2009.06.08 at 02:36:43 PM EDT
//
package gov.noaa.nws.ncep.edex.common.stationTables;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
/**
* <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element ref="{}stid" minOccurs="0"/>
* &lt;element ref="{}stnnum" minOccurs="0"/>
* &lt;element ref="{}stnname" minOccurs="0"/>
* &lt;element ref="{}state" minOccurs="0"/>
* &lt;element ref="{}country" minOccurs="0"/>
* &lt;element ref="{}latitude" minOccurs="0"/>
* &lt;element ref="{}longitude" minOccurs="0"/>
* &lt;element ref="{}elevation" minOccurs="0"/>
* &lt;element ref="{}priority" minOccurs="0"/>
* &lt;element ref="{}location" minOccurs="0"/>
* &lt;element ref="{}wfo" minOccurs="0"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"stid",
"stnnum",
"stnname",
"state",
"country",
"latitude",
"longitude",
"elevation",
"priority",
"location",
"wfo"
})
@XmlRootElement(name = "station")
public class Station {
protected String stid;
protected String stnnum;
protected String stnname;
protected String state;
protected String country;
protected Float latitude;
protected Float longitude;
protected Integer elevation;
protected Integer priority;
protected String location;
protected String wfo;
/**
* Gets the value of the stid property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getStid() {
return stid;
}
/**
* Sets the value of the stid property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setStid(String value) {
this.stid = value;
}
/**
* Gets the value of the stnnum property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getStnnum() {
return stnnum;
}
/**
* Sets the value of the stnnum property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setStnnum(String value) {
this.stnnum = value;
}
/**
* Gets the value of the stnname property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getStnname() {
return stnname;
}
/**
* Sets the value of the stnname property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setStnname(String value) {
this.stnname = value;
}
/**
* Gets the value of the state property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getState() {
return state;
}
/**
* Sets the value of the state property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setState(String value) {
this.state = value;
}
/**
* Gets the value of the country property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getCountry() {
return country;
}
/**
* Sets the value of the country property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setCountry(String value) {
this.country = value;
}
/**
* Gets the value of the latitude property.
*
* @return
* possible object is
* {@link Float }
*
*/
public Float getLatitude() {
return latitude;
}
/**
* Sets the value of the latitude property.
*
* @param value
* allowed object is
* {@link Float }
*
*/
public void setLatitude(Float value) {
this.latitude = value;
}
/**
* Gets the value of the longitude property.
*
* @return
* possible object is
* {@link Float }
*
*/
public Float getLongitude() {
return longitude;
}
/**
* Sets the value of the longitude property.
*
* @param value
* allowed object is
* {@link Float }
*
*/
public void setLongitude(Float value) {
this.longitude = value;
}
/**
* Gets the value of the elevation property.
*
* @return
* possible object is
* {@link Integer }
*
*/
public Integer getElevation() {
return elevation;
}
/**
* Sets the value of the elevation property.
*
* @param value
* allowed object is
* {@link Integer }
*
*/
public void setElevation(Integer value) {
this.elevation = value;
}
/**
* Gets the value of the priority property.
*
* @return
* possible object is
* {@link Integer }
*
*/
public Integer getPriority() {
return priority;
}
/**
* Sets the value of the priority property.
*
* @param value
* allowed object is
* {@link Integer }
*
*/
public void setPriority(Integer value) {
this.priority = value;
}
/**
* Gets the value of the location property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getLocation() {
return location;
}
/**
* Sets the value of the location property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setLocation(String value) {
this.location = value;
}
/**
* Gets the value of the wfo property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getWfo() {
return wfo;
}
/**
* Sets the value of the wfo property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setWfo(String value) {
this.wfo = value;
}
}
//
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
// Generated on: 2009.06.08 at 02:36:43 PM EDT
//
package gov.noaa.nws.ncep.edex.common.stationTables;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
/**
* <p>Java class for anonymous complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType>
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element ref="{}stid" minOccurs="0"/>
* &lt;element ref="{}stnnum" minOccurs="0"/>
* &lt;element ref="{}stnname" minOccurs="0"/>
* &lt;element ref="{}state" minOccurs="0"/>
* &lt;element ref="{}country" minOccurs="0"/>
* &lt;element ref="{}latitude" minOccurs="0"/>
* &lt;element ref="{}longitude" minOccurs="0"/>
* &lt;element ref="{}elevation" minOccurs="0"/>
* &lt;element ref="{}priority" minOccurs="0"/>
* &lt;element ref="{}location" minOccurs="0"/>
* &lt;element ref="{}wfo" minOccurs="0"/>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
"stid",
"stnnum",
"stnname",
"state",
"country",
"latitude",
"longitude",
"elevation",
"priority",
"location",
"wfo"
})
@XmlRootElement(name = "station")
public class Station {
protected String stid;
protected String stnnum;
protected String stnname;
protected String state;
protected String country;
protected Float latitude;
protected Float longitude;
protected Integer elevation;
protected Integer priority;
protected String location;
protected String wfo;
/**
* Gets the value of the stid property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getStid() {
return stid;
}
/**
* Sets the value of the stid property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setStid(String value) {
this.stid = value;
}
/**
* Gets the value of the stnnum property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getStnnum() {
return stnnum;
}
/**
* Sets the value of the stnnum property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setStnnum(String value) {
this.stnnum = value;
}
/**
* Gets the value of the stnname property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getStnname() {
return stnname;
}
/**
* Sets the value of the stnname property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setStnname(String value) {
this.stnname = value;
}
/**
* Gets the value of the state property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getState() {
return state;
}
/**
* Sets the value of the state property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setState(String value) {
this.state = value;
}
/**
* Gets the value of the country property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getCountry() {
return country;
}
/**
* Sets the value of the country property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setCountry(String value) {
this.country = value;
}
/**
* Gets the value of the latitude property.
*
* @return
* possible object is
* {@link Float }
*
*/
public Float getLatitude() {
return latitude;
}
/**
* Sets the value of the latitude property.
*
* @param value
* allowed object is
* {@link Float }
*
*/
public void setLatitude(Float value) {
this.latitude = value;
}
/**
* Gets the value of the longitude property.
*
* @return
* possible object is
* {@link Float }
*
*/
public Float getLongitude() {
return longitude;
}
/**
* Sets the value of the longitude property.
*
* @param value
* allowed object is
* {@link Float }
*
*/
public void setLongitude(Float value) {
this.longitude = value;
}
/**
* Gets the value of the elevation property.
*
* @return
* possible object is
* {@link Integer }
*
*/
public Integer getElevation() {
return elevation;
}
/**
* Sets the value of the elevation property.
*
* @param value
* allowed object is
* {@link Integer }
*
*/
public void setElevation(Integer value) {
this.elevation = value;
}
/**
* Gets the value of the priority property.
*
* @return
* possible object is
* {@link Integer }
*
*/
public Integer getPriority() {
return priority;
}
/**
* Sets the value of the priority property.
*
* @param value
* allowed object is
* {@link Integer }
*
*/
public void setPriority(Integer value) {
this.priority = value;
}
/**
* Gets the value of the location property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getLocation() {
return location;
}
/**
* Sets the value of the location property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setLocation(String value) {
this.location = value;
}
/**
* Gets the value of the wfo property.
*
* @return
* possible object is
* {@link String }
*
*/
public String getWfo() {
return wfo;
}
/**
* Sets the value of the wfo property.
*
* @param value
* allowed object is
* {@link String }
*
*/
public void setWfo(String value) {
this.wfo = value;
}
}

120
ncep/gov.noaa.nws.ncep.edex.common/src/gov/noaa/nws/ncep/edex/common/stationTables/StationComparator.java
View file

@ -1,61 +1,61 @@
package gov.noaa.nws.ncep.edex.common.stationTables;
import java.util.Comparator;
/**
* Comparator for Station fields.
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 06/09 134 M. Li Initial Creation
*
* </pre>
*
* @author mli
* @version 1
*/
public class StationComparator implements Comparator<Station>, IStationField {
private StationField field;
public StationComparator(StationField f) {
this.field = f;
}
public int compare(Station o1, Station o2) {
switch (field) {
case STID:
return o1.getStid().compareToIgnoreCase(o2.getStid());
case STNM:
return o1.getStnnum().compareToIgnoreCase(o2.getStnnum());
case NAME:
return o1.getStnnum().compareToIgnoreCase(o2.getStnnum());
case ST:
return o1.getState().compareToIgnoreCase(o2.getState());
case CO:
return o1.getCountry().compareToIgnoreCase(o2.getCountry());
/*
case LAT:
return o1.getLatitude().compareTo(o2.getLatitude());
case LON:
return o1.getLongitude().compareTo(o2.getLongitude());
case ELV:
return o1.getElevation() - o2.getElevation();
case PRI:
return o1.getPriority() - o2.getPriority();
*/
case WFO:
return o1.getWfo().compareToIgnoreCase(o2.getWfo());
case LOC:
return o1.getLocation().compareToIgnoreCase(o2.getLocation());
default:
return 0;
}
}
package gov.noaa.nws.ncep.edex.common.stationTables;
import java.util.Comparator;
/**
* Comparator for Station fields.
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 06/09 134 M. Li Initial Creation
*
* </pre>
*
* @author mli
* @version 1
*/
public class StationComparator implements Comparator<Station>, IStationField {
private StationField field;
public StationComparator(StationField f) {
this.field = f;
}
public int compare(Station o1, Station o2) {
switch (field) {
case STID:
return o1.getStid().compareToIgnoreCase(o2.getStid());
case STNM:
return o1.getStnnum().compareToIgnoreCase(o2.getStnnum());
case NAME:
return o1.getStnnum().compareToIgnoreCase(o2.getStnnum());
case ST:
return o1.getState().compareToIgnoreCase(o2.getState());
case CO:
return o1.getCountry().compareToIgnoreCase(o2.getCountry());
/*
case LAT:
return o1.getLatitude().compareTo(o2.getLatitude());
case LON:
return o1.getLongitude().compareTo(o2.getLongitude());
case ELV:
return o1.getElevation() - o2.getElevation();
case PRI:
return o1.getPriority() - o2.getPriority();
*/
case WFO:
return o1.getWfo().compareToIgnoreCase(o2.getWfo());
case LOC:
return o1.getLocation().compareToIgnoreCase(o2.getLocation());
default:
return 0;
}
}
}

Some files were not shown because too many files have changed in this diff Show more