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

Issue #2251 move style rules and preferences to common

Browse source 
Change-Id: I50bd92d1ed4e08d7d6204b7fa1cca0e8f1645030

Former-commit-id: 982f297ab19ebcb5e49f662c30b44992e63569cb
This commit is contained in:
Matt Nash 2013-09-10 09:04:08 -05:00
parent 27e04e5bae
commit f0a32e82a1
122 changed files with 2315 additions and 2084 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cave/com.raytheon.uf.viz.core.feature/feature.xml
View file

@ -199,4 +199,11 @@
install-size="0"
version="0.0.0"/>
<plugin
id="com.raytheon.uf.common.style"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

5
cave/com.raytheon.uf.viz.core/META-INF/MANIFEST.MF
View file

@ -41,7 +41,8 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.common.alertmonitor;bundle-version="1.12.1174",
com.raytheon.uf.common.python;bundle-version="1.12.1174",
com.raytheon.uf.common.velocity;bundle-version="1.0.0",
ch.qos.logback;bundle-version="1.0.13"
ch.qos.logback;bundle-version="1.0.13",
com.raytheon.uf.common.style;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Eclipse-BuddyPolicy: ext, registered, global
Eclipse-RegisterBuddy: org.apache.velocity, com.raytheon.uf.common.serialization, com.raytheon.uf.common.serialization.comm, com.raytheon.uf.common.status, com.raytheon.uf.common.dataplugin.level, com.raytheon.uf.common.comm, ch.qos.logback
@ -82,8 +83,6 @@ Export-Package: com.raytheon.uf.viz.core,
com.raytheon.uf.viz.core.rsc.updater,
com.raytheon.uf.viz.core.sampling,
com.raytheon.uf.viz.core.status,
com.raytheon.uf.viz.core.style,
com.raytheon.uf.viz.core.style.level,
com.raytheon.uf.viz.core.tile,
com.raytheon.uf.viz.core.time,
com.raytheon.viz.core.slice.request,

5
cave/com.raytheon.uf.viz.core/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -23,9 +23,4 @@ com.raytheon.uf.viz.core.rsc.ResourceList
com.raytheon.uf.viz.core.rsc.ResourceProperties
com.raytheon.uf.viz.core.rsc.ProgressiveDisclosureProperties
com.raytheon.uf.viz.core.rsc.LoadProperties
com.raytheon.uf.viz.core.style.level.SingleLevel
com.raytheon.uf.viz.core.style.level.RangeLevel
com.raytheon.uf.viz.core.style.StyleRule
com.raytheon.uf.viz.core.style.StyleRuleset
com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria

2
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/DataCubeKey.java
View file

@ -19,8 +19,8 @@
**/
package com.raytheon.uf.viz.core.datastructure;
import com.raytheon.uf.common.style.level.SingleLevel;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
/**
* Key for data in the data cube

2
cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/request/HeightScale.java
View file

@ -31,7 +31,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.adapters.UnitAdapter;
import com.raytheon.uf.viz.core.style.level.Level.LevelType;
import com.raytheon.uf.common.style.level.Level.LevelType;
/**
* Height scale used by volume browser

7
cave/com.raytheon.uf.viz.cwat/META-INF/MANIFEST.MF
View file

@ -9,9 +9,10 @@ Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
com.raytheon.viz.core,
com.raytheon.uf.common.dataplugin.cwat;bundle-version="1.0.0",
com.raytheon.uf.common.colormap;bundle-version="1.11.17",
com.raytheon.uf.common.monitor;bundle-version="1.11.17"
com.raytheon.uf.common.dataplugin.cwat,
com.raytheon.uf.common.colormap,
com.raytheon.uf.common.monitor,
com.raytheon.uf.common.style
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.viz.cwat

18
cave/com.raytheon.uf.viz.cwat/src/com/raytheon/uf/viz/cwat/CWATResource.java
View file

@ -40,6 +40,11 @@ import com.raytheon.uf.common.monitor.scan.SCTI;
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.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.image.ImagePreferences;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.drawables.ColorMapLoader;
@ -51,11 +56,7 @@ import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorMapCapability;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.viz.core.rsc.displays.GriddedImageDisplay2;
import com.raytheon.viz.core.style.image.ImagePreferences;
import com.vividsolutions.jts.geom.Coordinate;
/**
@ -216,8 +217,13 @@ public class CWATResource extends
ColorMapCapability.class).getColorMapParameters();
if (record != null && init) {
StyleRule sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.IMAGERY, getMatchCriteria());
StyleRule sr;
try {
sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.IMAGERY, getMatchCriteria());
} catch (StyleException e) {
throw new VizException(e.getLocalizedMessage(), e);
}
this.colormapfile = ((ImagePreferences) sr.getPreferences())
.getDefaultColormap();

4
cave/com.raytheon.uf.viz.d2d.gfe/META-INF/MANIFEST.MF
View file

@ -22,6 +22,8 @@ Import-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.message,
com.raytheon.uf.common.serialization.comm,
com.raytheon.uf.common.status,
com.raytheon.uf.common.style,
com.raytheon.uf.common.style.level,
com.raytheon.uf.common.time,
com.raytheon.uf.viz.core,
com.raytheon.uf.viz.core.catalog,
@ -32,8 +34,6 @@ Import-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.viz.core.rsc,
com.raytheon.uf.viz.core.rsc.capabilities,
com.raytheon.uf.viz.core.status,
com.raytheon.uf.viz.core.style,
com.raytheon.uf.viz.core.style.level,
com.raytheon.uf.viz.productbrowser,
com.raytheon.uf.viz.xy.timeseries,
com.raytheon.uf.viz.xy.timeseries.adapter,

13
cave/com.raytheon.uf.viz.d2d.gfe/src/com/raytheon/uf/viz/d2d/gfe/browser/GFEVbDataCatalog.java
View file

@ -36,6 +36,11 @@ import com.raytheon.uf.common.dataquery.responses.DbQueryResponse;
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.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleManager.StyleType;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.viz.core.drawables.ResourcePair;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.requests.ThriftClient;
@ -43,10 +48,6 @@ import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
import com.raytheon.uf.viz.core.rsc.AbstractResourceData;
import com.raytheon.uf.viz.core.rsc.DisplayType;
import com.raytheon.uf.viz.core.rsc.ResourceType;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.uf.viz.d2d.gfe.rsc.GFEGridResource;
import com.raytheon.uf.viz.d2d.gfe.rsc.GFEGridResourceData;
import com.raytheon.viz.volumebrowser.datacatalog.AbstractDataCatalog;
@ -283,7 +284,7 @@ public class GFEVbDataCatalog extends AbstractDataCatalog {
StyleRule sr = null;
try {
StyleManager.StyleType styleType = StyleManager.StyleType.CONTOUR;
StyleType styleType = StyleManager.StyleType.CONTOUR;
if (displayType.equals(DisplayType.IMAGE)) {
styleType = StyleManager.StyleType.IMAGERY;
@ -294,7 +295,7 @@ public class GFEVbDataCatalog extends AbstractDataCatalog {
}
sr = StyleManager.getInstance().getStyleRule(styleType, criteria);
} catch (VizStyleException e) {
} catch (StyleException e) {
statusHandler.handle(Priority.PROBLEM,
"Unable to obtain a style rule for"
+ catalogEntry.getSelectedData().getUniqueKey(), e);

12
cave/com.raytheon.uf.viz.d2d.gfe/src/com/raytheon/uf/viz/d2d/gfe/rsc/GFEGridResource.java
View file

@ -33,19 +33,19 @@ import com.raytheon.uf.common.dataplugin.gfe.slice.IGridSlice;
import com.raytheon.uf.common.dataplugin.gfe.slice.ScalarGridSlice;
import com.raytheon.uf.common.dataplugin.gfe.slice.VectorGridSlice;
import com.raytheon.uf.common.geospatial.MapUtil;
import com.raytheon.uf.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.level.Level;
import com.raytheon.uf.common.style.level.SingleLevel;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.DisplayType;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.level.Level;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.viz.grid.rsc.general.AbstractGridResource;
import com.raytheon.viz.grid.rsc.general.GeneralGridData;
/**
*
* TODO Add Description
* Resource to render GFE grid data in D2D.
*
* <pre>
*
@ -92,8 +92,8 @@ public class GFEGridResource extends AbstractGridResource<GFEGridResourceData> {
return;
}
try {
gfeRecord
.setGridInfo(GFEDataAccessUtil.getGridParmInfo(gfeRecord.getParmId()));
gfeRecord.setGridInfo(GFEDataAccessUtil.getGridParmInfo(gfeRecord
.getParmId()));
} catch (Exception e) {
throw new RuntimeException(e);
}

20
cave/com.raytheon.uf.viz.d2d.gfe/src/com/raytheon/uf/viz/d2d/gfe/xy/GfeTimeSeriesAdapter.java
View file

@ -18,14 +18,30 @@ import com.raytheon.uf.common.dataplugin.gfe.slice.IGridSlice;
import com.raytheon.uf.common.dataplugin.gfe.slice.ScalarGridSlice;
import com.raytheon.uf.common.dataplugin.gfe.slice.VectorGridSlice;
import com.raytheon.uf.common.geospatial.MapUtil;
import com.raytheon.uf.common.style.level.Level;
import com.raytheon.uf.common.style.level.SingleLevel;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.style.level.Level;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.uf.viz.xy.timeseries.adapter.AbstractTimeSeriesAdapter;
import com.raytheon.viz.core.graphing.xy.XYData;
import com.raytheon.viz.core.graphing.xy.XYDataList;
import com.raytheon.viz.core.graphing.xy.XYWindImageData;
/**
* Allows GFE data to be rendered on an XY display in D2D.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Sep 5, 2013 mnash Initial javadoc creation; we aren't able to pinpoint initial creation
*
* </pre>
*
* @author mnash
* @version 1.0
*/
public class GfeTimeSeriesAdapter extends AbstractTimeSeriesAdapter<GFERecord> {
private Unit<?> unit = Unit.ONE;

3
cave/com.raytheon.uf.viz.d2d.xy.adapters/META-INF/MANIFEST.MF
View file

@ -17,7 +17,8 @@ Require-Bundle: org.eclipse.core.runtime,
com.raytheon.uf.viz.xy.timeseries;bundle-version="1.12.1174",
javax.measure;bundle-version="1.0.0",
com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174",
com.raytheon.uf.common.comm;bundle-version="1.12.1174"
com.raytheon.uf.common.comm;bundle-version="1.12.1174",
com.raytheon.uf.common.style;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.dataplugin.grid,

4
cave/com.raytheon.uf.viz.d2d.xy.adapters/src/com/raytheon/uf/viz/d2d/xy/adapters/timeseries/DmdTimeSeriesAdapter.java
View file

@ -27,9 +27,9 @@ import javax.measure.unit.Unit;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.radar.RadarRecord;
import com.raytheon.uf.common.dataplugin.radar.util.RadarRecordUtil;
import com.raytheon.uf.common.style.level.SingleLevel;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.uf.viz.xy.timeseries.adapter.AbstractTimeSeriesAdapter;
import com.raytheon.viz.core.graphing.xy.XYData;
import com.raytheon.viz.core.graphing.xy.XYDataList;
@ -37,7 +37,7 @@ import com.raytheon.viz.radar.util.DmdTools;
import com.vividsolutions.jts.geom.Coordinate;
/**
* TODO Add Description
* Radar DMD data on a Time Series display.
*
* <pre>
*

2
cave/com.raytheon.uf.viz.d2d.xy.adapters/src/com/raytheon/uf/viz/d2d/xy/adapters/timeseries/GridTimeSeriesAdapter.java
View file

@ -43,11 +43,11 @@ import com.raytheon.uf.common.gridcoverage.GridCoverage;
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.common.style.level.SingleLevel;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.DisplayType;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.uf.viz.xy.timeseries.adapter.AbstractTimeSeriesAdapter;
import com.raytheon.viz.core.graphing.xy.XYData;
import com.raytheon.viz.core.graphing.xy.XYDataList;

27
cave/com.raytheon.uf.viz.d2d.xy.adapters/src/com/raytheon/uf/viz/d2d/xy/adapters/timeseries/PointDataTimeSeriesAdapter.java
View file

@ -45,6 +45,7 @@ import com.raytheon.uf.common.geospatial.MapUtil;
import com.raytheon.uf.common.pointdata.PointDataConstants;
import com.raytheon.uf.common.pointdata.PointDataContainer;
import com.raytheon.uf.common.pointdata.PointDataView;
import com.raytheon.uf.common.style.level.SingleLevel;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.common.time.DataTime.FLAG;
import com.raytheon.uf.common.time.TimeRange;
@ -53,7 +54,6 @@ import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.level.LevelUtilities;
import com.raytheon.uf.viz.core.rsc.DisplayType;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.uf.viz.objectiveanalysis.rsc.OAGridTransformer;
import com.raytheon.uf.viz.xy.timeseries.adapter.AbstractTimeSeriesAdapter;
import com.raytheon.viz.core.graphing.xy.XYData;
@ -121,10 +121,9 @@ public class PointDataTimeSeriesAdapter extends
// Perhaps this should just be done using the resource metadatamap
for (PluginDataObject pdo : recordsToLoad) {
DataTime dt = pdo.getDataTime();
dataTimeConstraint.addToConstraintValueList(dt
.toString());
dataTimeConstraint.addToConstraintValueList(dt.toString());
refTimeOnly &= !dt.getUtilityFlags().contains(FLAG.FCST_USED);
if(refTimeOnly){
if (refTimeOnly) {
refTimeConstraint.addToConstraintValueList(TimeUtil
.formatToSqlTimestamp(dt.getRefTime()));
}
@ -136,23 +135,23 @@ public class PointDataTimeSeriesAdapter extends
Map<String, RequestConstraint> constraints = new HashMap<String, RequestConstraint>(
resourceData.getMetadataMap());
String[] parameters = null;
if(refTimeOnly){
refTimeConstraint.setConstraintType(RequestConstraint.ConstraintType.IN);
if (refTimeOnly) {
refTimeConstraint
.setConstraintType(RequestConstraint.ConstraintType.IN);
constraints.put("dataTime.refTime", refTimeConstraint);
parameters = new String[] {
PointDataConstants.DATASET_REFTIME, parameter };
}else{
dataTimeConstraint.setConstraintType(RequestConstraint.ConstraintType.IN);
parameters = new String[] { PointDataConstants.DATASET_REFTIME,
parameter };
} else {
dataTimeConstraint
.setConstraintType(RequestConstraint.ConstraintType.IN);
constraints.put("dataTime", dataTimeConstraint);
parameters = new String[] {
PointDataConstants.DATASET_REFTIME,
parameters = new String[] { PointDataConstants.DATASET_REFTIME,
PointDataConstants.DATASET_FORECASTHR, parameter };
}
PointDataContainer pdc = DataCubeContainer.getPointData(
recordsToLoad[0].getPluginName(), parameters,
resourceData.getLevelKey(),
constraints);
resourceData.getLevelKey(), constraints);
ArrayList<XYData> data = new ArrayList<XYData>();
for (int uriCounter = 0; uriCounter < pdc.getAllocatedSz(); uriCounter++) {
PointDataView pdv = pdc.readRandom(uriCounter);

3
cave/com.raytheon.uf.viz.monitor.ffmp/META-INF/MANIFEST.MF
View file

@ -26,7 +26,8 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.viz.stats;bundle-version="1.0.0",
com.raytheon.uf.common.event;bundle-version="1.0.0",
com.raytheon.uf.common.dataaccess;bundle-version="1.0.0",
com.raytheon.uf.common.colormap;bundle-version="1.12.1174"
com.raytheon.uf.common.colormap;bundle-version="1.12.1174",
com.raytheon.uf.common.style;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Import-Package: com.raytheon.uf.common.pointdata

68
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
View file

@ -32,13 +32,14 @@ import com.raytheon.uf.common.colormap.prefs.ColorMapParameters;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPRecord;
import com.raytheon.uf.common.dataplugin.ffmp.FFMPRecord.FIELDS;
import com.raytheon.uf.common.localization.LocalizationFile;
import com.raytheon.uf.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleRuleset;
import com.raytheon.uf.common.style.image.ImagePreferences;
import com.raytheon.uf.viz.core.drawables.ColorMapLoader;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.viz.core.style.image.ImagePreferences;
/**
* FFMPColor Utility
@ -53,7 +54,7 @@ import com.raytheon.viz.core.style.image.ImagePreferences;
* 05/21/12 DR 14833 G. Zhang Error handling for invalid cmap
* Apr 26, 2013 1954 bsteffen Minor code cleanup throughout FFMP.
* Jun 10, 2013 2075 njensen Improved init time
*
* Sep 5, 2013 2051 mnash Moved style rule instantiation so that we don't get NPEs
* </pre>
*
* @author dhladky
@ -99,32 +100,33 @@ public class FFMPColorUtils {
try {
sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.IMAGERY, getMatchCriteria());
} catch (VizStyleException e) {
String colormapfile = ((ImagePreferences) sr.getPreferences())
.getDefaultColormap();
IColorMap cxml = null;
try {
cxml = ColorMapLoader.loadColorMap(colormapfile);
} catch (VizException e) {
e.printStackTrace();
}
if (cxml == null)
cxml = getDefaultColorMap(); // DR 14833: load the default map
ColorMap colorMap = new ColorMap(colormapfile, (ColorMap) cxml);
colormapparams = new ColorMapParameters();
colormapparams.setColorMap(colorMap);
colormapparams.setDisplayUnit(((ImagePreferences) sr
.getPreferences()).getDisplayUnits());
colormapparams.setDataMapping(((ImagePreferences) sr
.getPreferences()).getDataMapping());
colormapparams.setColorMapMin(0);
colormapparams.setColorMapMax(255);
} catch (StyleException e) {
e.printStackTrace();
}
String colormapfile = ((ImagePreferences) sr.getPreferences())
.getDefaultColormap();
IColorMap cxml = null;
try {
cxml = ColorMapLoader.loadColorMap(colormapfile);
} catch (VizException e) {
e.printStackTrace();
}
if (cxml == null)
cxml = getDefaultColorMap(); // DR 14833: load the default map
ColorMap colorMap = new ColorMap(colormapfile, (ColorMap) cxml);
colormapparams = new ColorMapParameters();
colormapparams.setColorMap(colorMap);
colormapparams.setDisplayUnit(((ImagePreferences) sr.getPreferences())
.getDisplayUnits());
colormapparams.setDataMapping(((ImagePreferences) sr.getPreferences())
.getDataMapping());
colormapparams.setColorMapMin(0);
colormapparams.setColorMapMax(255);
}
public ColorMapParameters getColorMapParameters() {
@ -350,8 +352,8 @@ public class FFMPColorUtils {
* StyleRule loaded. So it is guaranteed the default can be loaded.
*/
com.raytheon.uf.viz.core.style.StyleRuleset srs = StyleManager
.getInstance().getStyleRuleSet(StyleManager.StyleType.IMAGERY);
StyleRuleset srs = StyleManager.getInstance().getStyleRuleSet(
StyleManager.StyleType.IMAGERY);
for (StyleRule srl : srs.getStyleRules()) {
String pn = "", cm = "";
@ -383,7 +385,7 @@ public class FFMPColorUtils {
*
* //get the StyleRule try {
* sr=StyleManager.getInstance().getStyleRule(StyleManager
* .StyleType.IMAGERY, match); } catch (VizStyleException e) {
* .StyleType.IMAGERY, match); } catch (StyleException e) {
* e.printStackTrace(); } }
*/
// get the colormapfile name

3
cave/com.raytheon.uf.viz.npp.viirs/META-INF/MANIFEST.MF
View file

@ -25,7 +25,8 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174",
com.raytheon.uf.common.comm;bundle-version="1.12.1174",
com.raytheon.viz.alerts;bundle-version="1.12.1174",
com.raytheon.uf.viz.npp;bundle-version="1.0.0"
com.raytheon.uf.viz.npp;bundle-version="1.0.0",
com.raytheon.uf.common.style;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.viz.npp.viirs.rsc

22
cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSResource.java
View file

@ -52,6 +52,13 @@ import com.raytheon.uf.common.geospatial.util.EnvelopeIntersection;
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.common.style.LabelingPreferences;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleManager.StyleType;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.image.DataScale;
import com.raytheon.uf.common.style.image.ImagePreferences;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.DrawableImage;
import com.raytheon.uf.viz.core.IGraphicsTarget;
@ -72,17 +79,11 @@ import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorMapCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.ImagingCapability;
import com.raytheon.uf.viz.core.style.LabelingPreferences;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleManager.StyleType;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.tile.Tile;
import com.raytheon.uf.viz.core.tile.TileSetRenderable;
import com.raytheon.uf.viz.core.tile.TileSetRenderable.TileImageCreator;
import com.raytheon.uf.viz.npp.viirs.Activator;
import com.raytheon.uf.viz.npp.viirs.style.VIIRSDataRecordCriteria;
import com.raytheon.viz.core.style.image.DataScale;
import com.raytheon.viz.core.style.image.ImagePreferences;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.GeometryFactory;
@ -336,8 +337,13 @@ public class VIIRSResource extends
name += " " + parameter;
// Get style rule preferences
StyleRule styleRule = StyleManager.getInstance().getStyleRule(
StyleType.IMAGERY, new VIIRSDataRecordCriteria(dataRecord));
StyleRule styleRule;
try {
styleRule = StyleManager.getInstance().getStyleRule(
StyleType.IMAGERY, new VIIRSDataRecordCriteria(dataRecord));
} catch (StyleException e1) {
throw new VizException(e1.getLocalizedMessage(), e1);
}
ImagePreferences preferences = null;
if (styleRule != null) {
preferences = (ImagePreferences) styleRule.getPreferences();

8
cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/style/VIIRSDataMatchCriteria.java
View file

@ -26,8 +26,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import com.raytheon.uf.viz.core.style.MatchCriteria;
import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.uf.common.style.MatchCriteria;
import com.raytheon.uf.common.style.StyleException;
/**
* Style match criteria for VIIRS data, order of importance is parameter,
@ -65,11 +65,11 @@ public class VIIRSDataMatchCriteria extends MatchCriteria {
/*
* (non-Javadoc)
*
* @see com.raytheon.uf.viz.core.style.MatchCriteria#matches(com.raytheon
* @see com.raytheon.uf.common.style.MatchCriteria#matches(com.raytheon
* .uf. viz.core.style.MatchCriteria)
*/
@Override
public int matches(MatchCriteria aCriteria) throws VizStyleException {
public int matches(MatchCriteria aCriteria) throws StyleException {
int rval = -1;
if (aCriteria instanceof VIIRSDataRecordCriteria) {
return VIIRSDataRecordCriteria.matches(

8
cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/style/VIIRSDataRecordCriteria.java
View file

@ -20,8 +20,8 @@
package com.raytheon.uf.viz.npp.viirs.style;
import com.raytheon.uf.common.dataplugin.npp.viirs.VIIRSDataRecord;
import com.raytheon.uf.viz.core.style.MatchCriteria;
import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.uf.common.style.MatchCriteria;
import com.raytheon.uf.common.style.StyleException;
/**
* Match criteria for a populated {@link VIIRSDataRecord} object
@ -61,11 +61,11 @@ public class VIIRSDataRecordCriteria extends MatchCriteria {
* (non-Javadoc)
*
* @see
* com.raytheon.uf.viz.core.style.MatchCriteria#matches(com.raytheon.uf.
* com.raytheon.uf.common.style.MatchCriteria#matches(com.raytheon.uf.
* viz.core.style.MatchCriteria)
*/
@Override
public int matches(MatchCriteria aCriteria) throws VizStyleException {
public int matches(MatchCriteria aCriteria) throws StyleException {
int rval = -1;
if (aCriteria instanceof VIIRSDataMatchCriteria) {
return matches(this, (VIIRSDataMatchCriteria) aCriteria);

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

@ -22,7 +22,8 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.viz.core.contours;bundle-version="1.11.17",
com.raytheon.uf.viz.sounding;bundle-version="1.11.17",
com.raytheon.uf.common.dataplugin.bufrua;bundle-version="1.11.17",
com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174"
com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174",
com.raytheon.uf.common.style;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.viz.objectiveanalysis.rsc

14
cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OAResource.java
View file

@ -49,6 +49,11 @@ import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
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.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.level.SingleLevel;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.common.time.TimeRange;
import com.raytheon.uf.common.util.GridUtil;
@ -72,18 +77,13 @@ import com.raytheon.uf.viz.core.rsc.capabilities.DisplayTypeCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.ImagingCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.viz.core.contours.rsc.displays.GriddedContourDisplay;
import com.raytheon.viz.core.contours.rsc.displays.GriddedVectorDisplay;
import com.raytheon.viz.core.contours.util.VectorGraphicsRenderableFactory;
import com.raytheon.viz.core.drawables.ColorMapParameterFactory;
import com.raytheon.viz.core.rsc.displays.GriddedImageDisplay;
import com.raytheon.viz.core.rsc.displays.GriddedImageDisplay.GriddedImagePaintProperties;
import com.raytheon.viz.core.style.contour.ContourPreferences;
import com.raytheon.uf.common.style.contour.ContourPreferences;
import com.vividsolutions.jts.geom.Coordinate;
/**
@ -471,7 +471,7 @@ public class OAResource extends
.getPreferences();
this.parameterUnitString = prefs.getDisplayUnitLabel();
}
} catch (VizStyleException e) {
} catch (StyleException e) {
statusHandler.handle(Priority.VERBOSE, e.getLocalizedMessage(),
e);
}

4
cave/com.raytheon.uf.viz.objectiveanalysis/src/com/raytheon/uf/viz/objectiveanalysis/rsc/OAResourceData.java
View file

@ -33,14 +33,14 @@ import com.raytheon.uf.common.dataplugin.level.Level;
import com.raytheon.uf.common.dataplugin.level.LevelFactory;
import com.raytheon.uf.common.dataplugin.level.MasterLevel;
import com.raytheon.uf.common.dataplugin.level.mapping.LevelMappingFactory;
import com.raytheon.uf.common.style.level.SingleLevel;
import com.raytheon.uf.common.style.level.Level.LevelType;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.exception.VizCommunicationException;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.style.level.Level.LevelType;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
/**
* Resource Data for Objective Analysis

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

@ -25,7 +25,8 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.viz.awipstools;bundle-version="1.12.1174",
com.raytheon.uf.viz.radar.gl;bundle-version="1.12.1174",
com.raytheon.viz.core.gl;bundle-version="1.12.1174",
com.raytheon.uf.common.units;bundle-version="1.0.0"
com.raytheon.uf.common.units;bundle-version="1.0.0",
com.raytheon.uf.common.style;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.viz.preciprate,

61
cave/com.raytheon.uf.viz.preciprate/src/com/raytheon/uf/viz/preciprate/PrecipRateResource.java
View file

@ -19,13 +19,11 @@
**/
package com.raytheon.uf.viz.preciprate;
import java.awt.Rectangle;
import java.io.File;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Map;
import javax.measure.converter.MultiplyConverter;
import javax.measure.converter.UnitConverter;
import javax.measure.unit.NonSI;
import javax.measure.unit.Unit;
@ -47,27 +45,25 @@ import com.raytheon.uf.common.monitor.scan.ScanUtils;
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.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.image.ImagePreferences;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.common.units.PiecewisePixel;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.drawables.ColorMapLoader;
import com.raytheon.uf.viz.core.drawables.IDescriptor.FramesInfo;
import com.raytheon.uf.viz.core.drawables.IImage;
import com.raytheon.uf.viz.core.drawables.ext.colormap.IColormappedImageExtension;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorMapCapability;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.preciprate.xml.PrecipRateXML;
import com.raytheon.uf.viz.preciprate.xml.SCANConfigPrecipRateXML;
import com.raytheon.viz.core.style.image.ImagePreferences;
import com.raytheon.viz.radar.VizRadarRecord;
import com.raytheon.viz.radar.interrogators.IRadarInterrogator;
import com.raytheon.viz.radar.rsc.RadarTextResource.IRadarTextGeneratingResource;
import com.raytheon.viz.radar.rsc.image.RadarRadialResource;
import com.raytheon.viz.radar.util.DataUtilities;
public class PrecipRateResource extends RadarRadialResource implements
IRadarTextGeneratingResource {
@ -80,7 +76,7 @@ public class PrecipRateResource extends RadarRadialResource implements
private SCANConfigPrecipRateXML cfgMXL = null;
private PrecipRateRecord precipRecord;
private PrecipRateResourceData data = null;
public PrecipRateResource(PrecipRateResourceData data,
@ -217,16 +213,12 @@ public class PrecipRateResource extends RadarRadialResource implements
* raytheon.uf.viz.core.IGraphicsTarget,
* com.raytheon.uf.viz.core.drawables.ColorMapParameters,
* com.raytheon.uf.common.dataplugin.radar.RadarRecord, java.awt.Rectangle)
@Override
protected IImage createImage(IGraphicsTarget target,
ColorMapParameters params, final RadarRecord record,
final Rectangle rect) throws VizException {
return target.getExtension(IColormappedImageExtension.class)
.initializeRaster(
new RadarImageDataRetrievalAdapter(record, null, rect) {
}, params);
}
*
* @Override protected IImage createImage(IGraphicsTarget target,
* ColorMapParameters params, final RadarRecord record, final Rectangle
* rect) throws VizException { return
* target.getExtension(IColormappedImageExtension.class) .initializeRaster(
* new RadarImageDataRetrievalAdapter(record, null, rect) { }, params); }
*/
@Override
@ -236,8 +228,13 @@ public class PrecipRateResource extends RadarRadialResource implements
ColorMapParameters colorMapParameters = getCapability(
ColorMapCapability.class).getColorMapParameters();
colorMapParameters = new ColorMapParameters();
StyleRule sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.IMAGERY, getMatchCriteria());
StyleRule sr;
try {
sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.IMAGERY, getMatchCriteria());
} catch (StyleException e) {
throw new VizException(e.getLocalizedMessage(), e);
}
String colormapfile = ((ImagePreferences) sr.getPreferences())
.getDefaultColormap();
@ -252,10 +249,11 @@ public class PrecipRateResource extends RadarRadialResource implements
colorMapParameters.setDataMin(0);
colorMapParameters.setDataMapping(((ImagePreferences) sr
.getPreferences()).getDataMapping());
double[] d1 = {1,255};
double[] d2 = {0,25.4};
double[] d1 = { 1, 255 };
double[] d2 = { 0, 25.4 };
@SuppressWarnings({ "rawtypes", "unchecked" })
PiecewisePixel pw = new PiecewisePixel(NonSI.INCH.divide(NonSI.HOUR), d1, d2);
PiecewisePixel pw = new PiecewisePixel(NonSI.INCH.divide(NonSI.HOUR),
d1, d2);
colorMapParameters.setDataUnit(pw);
getCapability(ColorMapCapability.class).setColorMapParameters(
colorMapParameters);
@ -359,9 +357,9 @@ public class PrecipRateResource extends RadarRadialResource implements
dataVal = new RadarDataInterrogator(record).getDataValue(latLon
.asLatLon());
if (dataVal == 0) {
return "NO DATA";
return "NO DATA";
}
} catch (Exception e) {
UFStatus.getHandler().handle(
Priority.PROBLEM,
@ -372,7 +370,7 @@ public class PrecipRateResource extends RadarRadialResource implements
ColorMapParameters params = getCapability(ColorMapCapability.class)
.getColorMapParameters();
double val = params.getDataToDisplayConverter().convert(dataVal);
if (val >= ScanUtils.MM_TO_INCH * precipRecord.getHailcap()
|| Double.isNaN(val)) {
return String.format(
@ -390,11 +388,12 @@ public class PrecipRateResource extends RadarRadialResource implements
throws VizException {
return null;
}
protected byte[] createConversionTable(ColorMapParameters params,
RadarRecord record) {
UnitConverter dataToImage = params.getDataToImageConverter();;
UnitConverter dataToImage = params.getDataToImageConverter();
;
Unit<?> dataUnit = params.getDataUnit();
// precompute the converted value for every possible value in the
// record.

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

@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.viz.core.contours,
com.raytheon.viz.pointdata;bundle-version="1.11.1",
com.raytheon.uf.common.dataplugin.qpf;bundle-version="1.0.0",
com.raytheon.uf.viz.productbrowser;bundle-version="1.12.1153"
com.raytheon.uf.viz.productbrowser;bundle-version="1.12.1153",
com.raytheon.uf.common.style;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.viz.qpf

2
cave/com.raytheon.uf.viz.qpf/src/com/raytheon/uf/viz/qpf/QPFResource.java
View file

@ -33,13 +33,13 @@ import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.qpf.QPFRecord;
import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.DisplayTypeCapability;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.viz.grid.rsc.general.AbstractGridResource;
import com.raytheon.viz.grid.rsc.general.GeneralGridData;

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

@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.viz.pointdata;bundle-version="1.11.1",
com.raytheon.uf.common.dataplugin.vil;bundle-version="1.0.0",
com.raytheon.uf.common.colormap;bundle-version="1.11.17",
com.raytheon.uf.common.monitor;bundle-version="1.11.17"
com.raytheon.uf.common.monitor;bundle-version="1.11.17",
com.raytheon.uf.common.style;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.viz.vil

18
cave/com.raytheon.uf.viz.vil/src/com/raytheon/uf/viz/vil/VILResource.java
View file

@ -38,6 +38,11 @@ import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
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.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.image.ImagePreferences;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.drawables.ColorMapLoader;
@ -49,11 +54,7 @@ import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorMapCapability;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.viz.core.rsc.displays.GriddedImageDisplay2;
import com.raytheon.viz.core.style.image.ImagePreferences;
import com.vividsolutions.jts.geom.Coordinate;
/**
@ -234,8 +235,13 @@ public class VILResource extends
if (record != null && init) {
// Get default colormap
StyleRule sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.IMAGERY, getMatchCriteria());
StyleRule sr;
try {
sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.IMAGERY, getMatchCriteria());
} catch (StyleException e) {
throw new VizException(e.getLocalizedMessage(), e);
}
this.colormapfile = ((ImagePreferences) sr.getPreferences())
.getDefaultColormap();

10
cave/com.raytheon.uf.viz.xy.crosssection/META-INF/MANIFEST.MF
View file

@ -24,6 +24,11 @@ Import-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.dataquery.requests,
com.raytheon.uf.common.localization,
com.raytheon.uf.common.status,
com.raytheon.uf.common.style,
com.raytheon.uf.common.style.arrow,
com.raytheon.uf.common.style.contour,
com.raytheon.uf.common.style.graph,
com.raytheon.uf.common.style.level,
com.raytheon.uf.common.time,
com.raytheon.uf.common.topo,
com.raytheon.uf.viz.d2d.core.map,
@ -33,10 +38,7 @@ Import-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.viz.core.map,
com.raytheon.viz.core.rsc,
com.raytheon.viz.core.rsc.jts,
com.raytheon.viz.core.slice.request,
com.raytheon.viz.core.style.arrow,
com.raytheon.viz.core.style.contour,
com.raytheon.viz.core.style.graph
com.raytheon.viz.core.slice.request
Export-Package: com.raytheon.uf.viz.xy.crosssection,
com.raytheon.uf.viz.xy.crosssection.adapter,
com.raytheon.uf.viz.xy.crosssection.display,

4
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/graph/CrossSectionGraph.java
View file

@ -35,6 +35,7 @@ import com.raytheon.uf.common.geospatial.SpatialQueryResult;
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.common.style.level.Level.LevelType;
import com.raytheon.uf.common.topo.TopoQuery;
import com.raytheon.uf.common.wxmath.Hgt2Pres;
import com.raytheon.uf.viz.core.DrawableString;
@ -47,7 +48,6 @@ import com.raytheon.uf.viz.core.drawables.IWireframeShape;
import com.raytheon.uf.viz.core.drawables.PaintProperties;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
import com.raytheon.uf.viz.core.style.level.Level.LevelType;
import com.raytheon.uf.viz.xy.crosssection.display.CrossSectionDescriptor;
import com.raytheon.uf.viz.xy.crosssection.rsc.AbstractCrossSectionResource;
import com.raytheon.uf.viz.xy.graph.AbstractGraph;
@ -68,7 +68,7 @@ import com.vividsolutions.jts.geom.Point;
/**
*
* TODO Add Description
* Creates a cross section on a graph display.
*
* <pre>
*

13
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/AbstractCrossSectionResource.java
View file

@ -49,6 +49,9 @@ import com.raytheon.uf.common.geospatial.MapUtil;
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.common.style.AbstractStylePreferences;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.level.SingleLevel;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IExtent;
import com.raytheon.uf.viz.core.IGraphicsTarget;
@ -63,8 +66,6 @@ import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.DisplayTypeCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.style.AbstractStylePreferences;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.uf.viz.xy.crosssection.CrossSectionRotation;
import com.raytheon.uf.viz.xy.crosssection.adapter.AbstractCrossSectionAdapter;
import com.raytheon.uf.viz.xy.crosssection.display.CrossSectionDescriptor;
@ -166,8 +167,12 @@ public abstract class AbstractCrossSectionResource extends
@Override
protected void initInternal(IGraphicsTarget target) throws VizException {
if (prefs == null) {
prefs = GraphPrefsFactory.buildPreferences(
resourceData.getParameter(), null);
try {
prefs = GraphPrefsFactory.buildPreferences(
resourceData.getParameter(), null);
} catch (StyleException e) {
throw new VizException(e.getLocalizedMessage(), e);
}
}
int numTimes = dataTimes.size();
if (numTimes > 0) {

12
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionContourResource.java
View file

@ -37,6 +37,11 @@ import org.opengis.referencing.operation.TransformException;
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.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.contour.ContourPreferences;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IExtent;
import com.raytheon.uf.viz.core.IGraphicsTarget;
@ -53,15 +58,10 @@ import com.raytheon.uf.viz.core.rsc.capabilities.DensityCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.DisplayTypeCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.uf.viz.xy.crosssection.adapter.AbstractCrossSectionAdapter;
import com.raytheon.uf.viz.xy.crosssection.display.CrossSectionDescriptor;
import com.raytheon.viz.core.contours.ContourSupport;
import com.raytheon.viz.core.contours.ContourSupport.ContourGroup;
import com.raytheon.viz.core.style.contour.ContourPreferences;
import com.vividsolutions.jts.geom.Envelope;
/**
@ -118,7 +118,7 @@ public class CrossSectionContourResource extends AbstractCrossSectionResource
try {
sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.CONTOUR, match);
} catch (VizStyleException e) {
} catch (StyleException e) {
statusHandler.handle(Priority.PROBLEM,
"Error getting contour style rule", e);
}

10
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionImageResource.java
View file

@ -39,6 +39,10 @@ import com.raytheon.uf.common.geospatial.interpolation.data.FloatArrayWrapper;
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.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IExtent;
import com.raytheon.uf.viz.core.IGraphicsTarget;
@ -53,10 +57,6 @@ import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorMapCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.ImagingCapability;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.uf.viz.xy.crosssection.adapter.AbstractCrossSectionAdapter;
import com.raytheon.uf.viz.xy.crosssection.display.CrossSectionDescriptor;
import com.raytheon.viz.core.drawables.ColorMapParameterFactory;
@ -103,7 +103,7 @@ public class CrossSectionImageResource extends AbstractCrossSectionResource
try {
sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.IMAGERY, match);
} catch (VizStyleException e) {
} catch (StyleException e) {
statusHandler.handle(Priority.PROBLEM,
"Error getting contour style rule", e);
}

14
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
View file

@ -26,6 +26,11 @@ import org.opengis.referencing.operation.MathTransform;
import com.raytheon.uf.common.colormap.prefs.ColorMapParameters;
import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
import com.raytheon.uf.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.arrow.ArrowPreferences;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IExtent;
import com.raytheon.uf.viz.core.IGraphicsTarget;
@ -39,18 +44,13 @@ import com.raytheon.uf.viz.core.rsc.capabilities.DensityCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.DisplayTypeCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.uf.viz.xy.crosssection.adapter.AbstractCrossSectionAdapter;
import com.raytheon.viz.core.contours.util.VectorGraphicsRenderable;
import com.raytheon.viz.core.graphing.xy.XYWindImageData;
import com.raytheon.viz.core.style.arrow.ArrowPreferences;
import com.vividsolutions.jts.geom.Coordinate;
/**
* TODO Add Description
* Creates a vector resource on a cross section display.
*
* <pre>
*
@ -89,7 +89,7 @@ public class CrossSectionVectorResource extends AbstractCrossSectionResource {
try {
sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.ARROW, match);
} catch (VizStyleException e) {
} catch (StyleException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}

7
cave/com.raytheon.uf.viz.xy.timeheight/META-INF/MANIFEST.MF
View file

@ -18,6 +18,9 @@ Import-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.geospatial.interpolation,
com.raytheon.uf.common.serialization,
com.raytheon.uf.common.status,
com.raytheon.uf.common.style,
com.raytheon.uf.common.style.arrow,
com.raytheon.uf.common.style.contour,
com.raytheon.uf.common.time,
com.raytheon.uf.viz.core,
com.raytheon.uf.viz.core.data,
@ -30,7 +33,6 @@ Import-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.viz.core.rsc.capabilities,
com.raytheon.uf.viz.core.rsc.sampling,
com.raytheon.uf.viz.core.status,
com.raytheon.uf.viz.core.style,
com.raytheon.uf.viz.d2d.core.map,
com.raytheon.uf.viz.d2d.ui,
com.raytheon.uf.viz.xy,
@ -49,9 +51,6 @@ Import-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.viz.core.map,
com.raytheon.viz.core.rsc,
com.raytheon.viz.core.slice.request,
com.raytheon.viz.core.style.arrow,
com.raytheon.viz.core.style.contour,
com.raytheon.viz.core.style.graph,
com.raytheon.viz.grid.rsc,
com.raytheon.viz.pointdata,
com.raytheon.viz.ui.editor,

11
cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/rsc/AbstractTimeHeightResource.java
View file

@ -37,6 +37,8 @@ import com.raytheon.uf.common.dataplugin.PluginDataObject;
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.common.style.AbstractStylePreferences;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IExtent;
import com.raytheon.uf.viz.core.IGraphicsTarget;
@ -50,7 +52,6 @@ import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.DisplayTypeCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.style.AbstractStylePreferences;
import com.raytheon.uf.viz.xy.InterpUtils;
import com.raytheon.uf.viz.xy.graph.IGraph;
import com.raytheon.uf.viz.xy.graph.labeling.DataTimeLabel;
@ -228,8 +229,12 @@ public abstract class AbstractTimeHeightResource extends
secondaryResource.init(target);
}
if (prefs == null) {
prefs = GraphPrefsFactory.buildPreferences(
resourceData.getParameter(), null);
try {
prefs = GraphPrefsFactory.buildPreferences(
resourceData.getParameter(), null);
} catch (StyleException e) {
throw new VizException(e.getLocalizedMessage(), e);
}
}
if (interpolatedData == null) {
loadDataJob.schedule();

12
cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/rsc/TimeHeightContourResource.java
View file

@ -25,6 +25,11 @@ import java.util.Arrays;
import org.eclipse.swt.graphics.RGB;
import org.geotools.coverage.grid.GeneralGridGeometry;
import com.raytheon.uf.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.contour.ContourPreferences;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.IGraphicsTarget.LineStyle;
import com.raytheon.uf.viz.core.VizApp;
@ -38,16 +43,11 @@ import com.raytheon.uf.viz.core.rsc.capabilities.DensityCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.DisplayTypeCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.uf.viz.xy.timeheight.display.TimeHeightDescriptor;
import com.raytheon.uf.viz.xy.varheight.adapter.AbstractVarHeightAdapter;
import com.raytheon.viz.core.contours.ContourSupport;
import com.raytheon.viz.core.contours.ContourSupport.ContourGroup;
import com.raytheon.viz.core.rsc.ICombinedResourceData.CombineOperation;
import com.raytheon.viz.core.style.contour.ContourPreferences;
/**
* Resource for displaying cross sections as contours
@ -101,7 +101,7 @@ public class TimeHeightContourResource extends AbstractTimeHeightResource {
try {
sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.CONTOUR, match);
} catch (VizStyleException e) {
} catch (StyleException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}

10
cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/rsc/TimeHeightImageResource.java
View file

@ -31,6 +31,10 @@ import com.raytheon.uf.common.geospatial.interpolation.BilinearInterpolation;
import com.raytheon.uf.common.geospatial.interpolation.GridReprojection;
import com.raytheon.uf.common.geospatial.interpolation.GridSampler;
import com.raytheon.uf.common.geospatial.interpolation.data.FloatArrayWrapper;
import com.raytheon.uf.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.viz.core.IExtent;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.PixelCoverage;
@ -43,10 +47,6 @@ import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorMapCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.ImagingCapability;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.uf.viz.xy.timeheight.display.TimeHeightDescriptor;
import com.raytheon.uf.viz.xy.varheight.adapter.AbstractVarHeightAdapter;
import com.raytheon.viz.core.drawables.ColorMapParameterFactory;
@ -88,7 +88,7 @@ public class TimeHeightImageResource extends AbstractTimeHeightResource
try {
sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.IMAGERY, match);
} catch (VizStyleException e) {
} catch (StyleException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}

12
cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/rsc/TimeHeightVectorResource.java
View file

@ -30,6 +30,11 @@ import org.eclipse.swt.graphics.RGB;
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.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.arrow.ArrowPreferences;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IExtent;
import com.raytheon.uf.viz.core.IGraphicsTarget;
@ -44,10 +49,6 @@ import com.raytheon.uf.viz.core.rsc.capabilities.DensityCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.DisplayTypeCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.uf.viz.xy.InterpUtils;
import com.raytheon.uf.viz.xy.graph.IGraph;
import com.raytheon.uf.viz.xy.timeheight.display.TimeHeightDescriptor;
@ -56,7 +57,6 @@ import com.raytheon.uf.viz.xy.varheight.adapter.AbstractVarHeightAdapter;
import com.raytheon.viz.core.contours.util.VectorGraphicsRenderable;
import com.raytheon.viz.core.graphing.xy.XYData;
import com.raytheon.viz.core.graphing.xy.XYWindImageData;
import com.raytheon.viz.core.style.arrow.ArrowPreferences;
import com.vividsolutions.jts.geom.Coordinate;
/**
@ -104,7 +104,7 @@ public class TimeHeightVectorResource extends AbstractTimeHeightResource
try {
sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.ARROW, match);
} catch (VizStyleException e) {
} catch (StyleException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}

6
cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
View file

@ -22,6 +22,9 @@ Import-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.geospatial,
com.raytheon.uf.common.serialization,
com.raytheon.uf.common.status,
com.raytheon.uf.common.style,
com.raytheon.uf.common.style.graph,
com.raytheon.uf.common.style.level,
com.raytheon.uf.common.time,
com.raytheon.uf.viz.core,
com.raytheon.uf.viz.core.drawables,
@ -30,8 +33,6 @@ Import-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.viz.core.rsc,
com.raytheon.uf.viz.core.rsc.capabilities,
com.raytheon.uf.viz.core.status,
com.raytheon.uf.viz.core.style,
com.raytheon.uf.viz.core.style.level,
com.raytheon.uf.viz.d2d.core,
com.raytheon.uf.viz.d2d.ui,
com.raytheon.uf.viz.xy,
@ -42,7 +43,6 @@ Import-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.viz.core.graphing.util,
com.raytheon.viz.core.graphing.xy,
com.raytheon.viz.core.rsc,
com.raytheon.viz.core.style.graph,
com.raytheon.viz.ui.cmenu,
com.raytheon.viz.ui.editor,
com.raytheon.viz.ui.input,

4
cave/com.raytheon.uf.viz.xy.timeseries/src/com/raytheon/uf/viz/xy/timeseries/adapter/AbstractTimeSeriesAdapter.java
View file

@ -28,15 +28,15 @@ import javax.measure.unit.Unit;
import org.eclipse.swt.graphics.RGB;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.style.level.SingleLevel;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.DisplayType;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.uf.viz.xy.timeseries.rsc.TimeSeriesResourceData;
import com.raytheon.viz.core.graphing.xy.XYDataList;
/**
* TODO Add Description
* Adapts data for rendering on time series displays.
*
* <pre>
*

32
cave/com.raytheon.uf.viz.xy.timeseries/src/com/raytheon/uf/viz/xy/timeseries/rsc/TimeSeriesResource.java
View file

@ -46,6 +46,9 @@ import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
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.common.style.StyleException;
import com.raytheon.uf.common.style.graph.GraphPreferences;
import com.raytheon.uf.common.style.level.SingleLevel;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IExtent;
import com.raytheon.uf.viz.core.IGraphicsTarget;
@ -62,8 +65,6 @@ import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.DisplayTypeCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.uf.viz.xy.graph.IGraph;
import com.raytheon.uf.viz.xy.graph.labeling.DataTimeLabel;
import com.raytheon.uf.viz.xy.graph.labeling.DoubleLabel;
@ -80,7 +81,6 @@ import com.raytheon.viz.core.graphing.xy.XYImageData;
import com.raytheon.viz.core.graphing.xy.XYWindImageData;
import com.raytheon.viz.core.rsc.ICombinedResourceData;
import com.raytheon.viz.core.rsc.ICombinedResourceData.CombineOperation;
import com.raytheon.viz.core.style.graph.GraphPreferences;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Geometry;
@ -160,19 +160,21 @@ public class TimeSeriesResource extends
UnitConverter conv = currentUnit.getConverterTo(prefs
.getDisplayUnits());
ListIterator<XYData> it = data.getData().listIterator();
while(it.hasNext()) {
while (it.hasNext()) {
XYData d = it.next();
if(d instanceof XYWindImageData){
if (d instanceof XYWindImageData) {
XYWindImageData wind = (XYWindImageData) d;
double converted = conv.convert(wind.getWindSpd());
double converted = conv.convert(wind
.getWindSpd());
it.remove();
if(wind.getImage() != null){
if (wind.getImage() != null) {
wind.getImage().dispose();
}
it.add(new XYWindImageData(wind.getX(), wind.getY(), converted, wind.getWindDir()));
}else{
double converted = conv.convert(((Number) d.getY())
.doubleValue());
it.add(new XYWindImageData(wind.getX(), wind
.getY(), converted, wind.getWindDir()));
} else {
double converted = conv.convert(((Number) d
.getY()).doubleValue());
d.setY(converted);
}
}
@ -397,8 +399,8 @@ public class TimeSeriesResource extends
try {
prefs = GraphPrefsFactory.buildPreferences(
resourceData.getYParameter().code, adapter.getLevel());
} catch (VizStyleException e) {
throw e;
} catch (StyleException e) {
throw new VizException(e.getLocalizedMessage(), e);
}
}
@ -495,8 +497,8 @@ public class TimeSeriesResource extends
sb.append(" ").append(resourceData.getLevelKey());
}
sb.append(String.format(" %s %s %s", adapter.getParameterName(),
"TSer", units != null && units.equals("") == false ? "(" + units
+ ")" : ""));
"TSer", units != null && units.equals("") == false ? "("
+ units + ")" : ""));
if (secondaryResource != null) {
return ICombinedResourceData.CombineUtil.getName(sb.toString(),

4
cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
View file

@ -15,6 +15,8 @@ Import-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.geospatial,
com.raytheon.uf.common.serialization,
com.raytheon.uf.common.status,
com.raytheon.uf.common.style,
com.raytheon.uf.common.style.graph,
com.raytheon.uf.common.time,
com.raytheon.uf.viz.core,
com.raytheon.uf.viz.core.drawables,
@ -24,7 +26,6 @@ Import-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.viz.core.rsc,
com.raytheon.uf.viz.core.rsc.capabilities,
com.raytheon.uf.viz.core.status,
com.raytheon.uf.viz.core.style,
com.raytheon.uf.viz.d2d.core,
com.raytheon.uf.viz.d2d.ui,
com.raytheon.uf.viz.xy,
@ -39,7 +40,6 @@ Import-Package: com.raytheon.uf.common.dataplugin,
com.raytheon.viz.core.map,
com.raytheon.viz.core.rsc,
com.raytheon.viz.core.slice.request,
com.raytheon.viz.core.style.graph,
com.raytheon.viz.ui,
com.raytheon.viz.ui.cmenu,
com.raytheon.viz.ui.editor,

11
cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
View file

@ -31,6 +31,8 @@ import org.eclipse.swt.graphics.RGB;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.graph.GraphPreferences;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.DrawableLine;
import com.raytheon.uf.viz.core.IExtent;
@ -64,7 +66,6 @@ import com.raytheon.viz.core.map.GeoUtil;
import com.raytheon.viz.core.rsc.ICombinedResourceData;
import com.raytheon.viz.core.rsc.ICombinedResourceData.CombineOperation;
import com.raytheon.viz.core.slice.request.HeightScale;
import com.raytheon.viz.core.style.graph.GraphPreferences;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Geometry;
@ -130,8 +131,12 @@ public class VarHeightResource extends
this.combineOperation = combinedResourceData.getCombineOperation();
}
prefs = GraphPrefsFactory.buildPreferences(resourceData.getParameter(),
null);
try {
prefs = GraphPrefsFactory.buildPreferences(
resourceData.getParameter(), null);
} catch (StyleException e) {
throw new VizException(e.getLocalizedMessage(), e);
}
resourceData.addChangeListener(new IResourceDataChanged() {

7
cave/com.raytheon.viz.core.contours/META-INF/MANIFEST.MF
View file

@ -11,12 +11,13 @@ Require-Bundle: org.eclipse.core.runtime,
com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
com.raytheon.uf.common.status;bundle-version="1.12.1174",
com.raytheon.uf.common.util;bundle-version="1.12.1174",
com.raytheon.uf.viz.core;bundle-version="1.12.1174",
com.raytheon.uf.viz.core;bundle-version="1.12.1174",
com.raytheon.uf.common.wxmath;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.viz.core.contours,
com.raytheon.viz.core.contours.rsc.displays,
com.raytheon.viz.core.contours.util
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: com.raytheon.viz.core.interval,
com.raytheon.viz.core.style.contour
Import-Package: com.raytheon.uf.common.style,
com.raytheon.uf.common.style.contour,
com.raytheon.viz.core.interval

2
cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourCreateRequest.java
View file

@ -22,11 +22,11 @@ package com.raytheon.viz.core.contours;
import org.geotools.coverage.grid.GeneralGridGeometry;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.style.contour.ContourPreferences;
import com.raytheon.uf.viz.core.IExtent;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.map.IMapDescriptor;
import com.raytheon.viz.core.contours.ContourSupport.ContourGroup;
import com.raytheon.viz.core.style.contour.ContourPreferences;
/**
* ContourCreateRequest

2
cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
View file

@ -33,6 +33,7 @@ import org.opengis.referencing.operation.MathTransform;
import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.geospatial.MapUtil;
import com.raytheon.uf.common.style.contour.ContourPreferences;
import com.raytheon.uf.common.wxmath.DistFilter;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.IGraphicsTarget.LineStyle;
@ -45,7 +46,6 @@ import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.map.IMapDescriptor;
import com.raytheon.uf.viz.core.map.MapDescriptor;
import com.raytheon.viz.core.contours.ContourSupport.ContourGroup;
import com.raytheon.viz.core.style.contour.ContourPreferences;
import com.vividsolutions.jts.geom.Coordinate;
/**

4
cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourSupport.java
View file

@ -50,6 +50,7 @@ import com.raytheon.uf.common.geospatial.util.WorldWrapChecker;
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.common.style.LabelingPreferences;
import com.raytheon.uf.common.util.GridUtil;
import com.raytheon.uf.viz.core.DrawableString;
import com.raytheon.uf.viz.core.IExtent;
@ -62,7 +63,6 @@ import com.raytheon.uf.viz.core.drawables.IFont;
import com.raytheon.uf.viz.core.drawables.IWireframeShape;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.map.IMapDescriptor;
import com.raytheon.uf.viz.core.style.LabelingPreferences;
import com.raytheon.viz.core.contours.cache.SubGridCacheKey;
import com.raytheon.viz.core.contours.util.ContourContainer;
import com.raytheon.viz.core.contours.util.FortConBuf;
@ -72,7 +72,7 @@ import com.raytheon.viz.core.contours.util.StreamLineContainer.StreamLinePoint;
import com.raytheon.viz.core.contours.util.StrmPak;
import com.raytheon.viz.core.contours.util.StrmPakConfig;
import com.raytheon.viz.core.interval.XFormFunctions;
import com.raytheon.viz.core.style.contour.ContourPreferences;
import com.raytheon.uf.common.style.contour.ContourPreferences;
import com.vividsolutions.jts.geom.Geometry;
/**

2
cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/rsc/displays/GriddedContourDisplay.java
View file

@ -29,7 +29,7 @@ import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.map.IMapDescriptor;
import com.raytheon.viz.core.contours.ContourRenderable;
import com.raytheon.viz.core.style.contour.ContourPreferences;
import com.raytheon.uf.common.style.contour.ContourPreferences;
/**
* Displays contours from GFE Grid Data

3
cave/com.raytheon.viz.core.graphing/META-INF/MANIFEST.MF
View file

@ -16,7 +16,8 @@ Require-Bundle: org.eclipse.ui,
javax.measure,
org.jep;bundle-version="1.0.0",
com.raytheon.uf.common.python;bundle-version="1.11.17",
com.raytheon.uf.common.colormap;bundle-version="1.12.1174"
com.raytheon.uf.common.colormap;bundle-version="1.12.1174",
com.raytheon.uf.common.style;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.viz.core.graphing,
com.raytheon.viz.core.graphing.axis,

2
cave/com.raytheon.viz.core.graphing/src/com/raytheon/viz/core/graphing/DataAxisInfo.java
View file

@ -20,7 +20,7 @@
package com.raytheon.viz.core.graphing;
import com.raytheon.viz.core.style.graph.GraphPreferences;
import com.raytheon.uf.common.style.graph.GraphPreferences;
/**
* Ported from D2D

17
cave/com.raytheon.viz.core.graphing/src/com/raytheon/viz/core/graphing/axis/AxisFactory.java
View file

@ -29,10 +29,12 @@ import javax.measure.unit.Unit;
import org.eclipse.swt.graphics.RGB;
import com.raytheon.uf.common.style.graph.AxisScale;
import com.raytheon.uf.common.style.graph.GraphPreferences;
import com.raytheon.uf.common.style.level.SingleLevel;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.viz.core.ColorUtil;
import com.raytheon.viz.core.graphing.DataAxisInfo;
import com.raytheon.viz.core.graphing.GraphUtil;
@ -40,8 +42,6 @@ import com.raytheon.viz.core.graphing.util.GraphPrefsFactory;
import com.raytheon.viz.core.graphing.util.GraphUtilPorted;
import com.raytheon.viz.core.slice.request.HeightScale;
import com.raytheon.viz.core.slice.request.HeightScale.ScaleType;
import com.raytheon.viz.core.style.graph.AxisScale;
import com.raytheon.viz.core.style.graph.GraphPreferences;
/**
* Factory methods for generating axes.
@ -158,9 +158,10 @@ public class AxisFactory {
} else if (firstInfo == null || secondInfo == null) {
compatible = false;
} else {
compatible = GraphUtilPorted.verifyDataAxisInfo(firstInfo
.getDataMin(), dataAtZero, ABS_MIN, firstInfo.getDataMax(),
units, firstInfo.getStyle(), secondInfo, true);
compatible = GraphUtilPorted.verifyDataAxisInfo(
firstInfo.getDataMin(), dataAtZero, ABS_MIN,
firstInfo.getDataMax(), units, firstInfo.getStyle(),
secondInfo, true);
}
return compatible;
@ -239,8 +240,8 @@ public class AxisFactory {
rangeAxis.setRange(minLevel, maxLevel);
// TODO should be configurable
GraphPreferences style = GraphPrefsFactory.buildSimplePreferences(scale
.getScale() == ScaleType.LOG, minLevel, maxLevel);
GraphPreferences style = GraphPrefsFactory.buildSimplePreferences(
scale.getScale() == ScaleType.LOG, minLevel, maxLevel);
style.getAxisScale().setMaxValue(maxLevel);
style.getAxisScale().setMinValue(minLevel);
DataAxisInfo info = GraphUtilPorted.initDataAxisInfo((float) minLevel,

4
cave/com.raytheon.viz.core.graphing/src/com/raytheon/viz/core/graphing/axis/AxisUtil.java
View file

@ -22,9 +22,9 @@ package com.raytheon.viz.core.graphing.axis;
import java.text.DecimalFormat;
import java.util.HashMap;
import com.raytheon.uf.common.style.graph.AxisScale;
import com.raytheon.viz.core.graphing.DataAxisInfo;
import com.raytheon.viz.core.graphing.util.GraphUtilPorted;
import com.raytheon.viz.core.style.graph.AxisScale;
/**
*
@ -33,7 +33,7 @@ import com.raytheon.viz.core.style.graph.AxisScale;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* njensen Initial creation
* njensen Initial creation
*
* </pre>
*

20
cave/com.raytheon.viz.core.graphing/src/com/raytheon/viz/core/graphing/util/GraphPrefsFactory.java
View file

@ -21,13 +21,13 @@ package com.raytheon.viz.core.graphing.util;
import java.util.ArrayList;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.viz.core.style.graph.AxisScale;
import com.raytheon.viz.core.style.graph.GraphPreferences;
import com.raytheon.uf.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.graph.AxisScale;
import com.raytheon.uf.common.style.graph.GraphPreferences;
import com.raytheon.uf.common.style.level.SingleLevel;
/**
* Loads GraphPreferences from graph style rules
@ -36,7 +36,7 @@ import com.raytheon.viz.core.style.graph.GraphPreferences;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Oct 23, 2007 njensen Initial creation
* Oct 23, 2007 njensen Initial creation
*
* </pre>
*
@ -47,7 +47,7 @@ import com.raytheon.viz.core.style.graph.GraphPreferences;
public class GraphPrefsFactory {
public static GraphPreferences buildPreferences(String parameter,
SingleLevel level) throws VizStyleException {
SingleLevel level) throws StyleException {
GraphPreferences preferences = getPreferences(parameter, level);
if (preferences == null) {
preferences = new GraphPreferences();
@ -98,7 +98,7 @@ public class GraphPrefsFactory {
}
private static GraphPreferences getPreferences(String parameter,
SingleLevel level) throws VizStyleException {
SingleLevel level) throws StyleException {
GraphPreferences prefs = null;
ParamLevelMatchCriteria match = new ParamLevelMatchCriteria();
match.setLevel(level);

17
cave/com.raytheon.viz.core.graphing/src/com/raytheon/viz/core/graphing/util/GraphUtilPorted.java
View file

@ -20,10 +20,10 @@
package com.raytheon.viz.core.graphing.util;
import com.raytheon.uf.common.style.graph.AxisScale;
import com.raytheon.uf.common.style.graph.GraphPreferences;
import com.raytheon.viz.core.graphing.DataAxisInfo;
import com.raytheon.viz.core.interval.XFormFunctions;
import com.raytheon.viz.core.style.graph.AxisScale;
import com.raytheon.viz.core.style.graph.GraphPreferences;
/**
* Util methods ported from various parts of D2D. Mostly from XFormFunctions.
@ -367,8 +367,7 @@ public class GraphUtilPorted {
.getInterval());
else if (value > dataAxisInfo.getDLinear())
return (float) (N_GRAPH_DATA_DIVS - Math.log10(dataAxisInfo
.getDivMax()
/ value)
.getDivMax() / value)
/ dataAxisInfo.getInterval());
else
return dataAxisInfo.getZeroDiv() + value
@ -1288,11 +1287,11 @@ public class GraphUtilPorted {
float dataMax = valueOfAxisDivision(maxDiv, dataAxisInfo);
// fprintf(stderr,"zoomAxisInfo dataMin %f dataMax
// %f\n",dataMin,dataMax);
DataAxisInfo zoomedInfo = calcDataAxisInfo(dataMin, dataAxisInfo
.isZeroYes(), dataAxisInfo.getAbsMin(), dataMax, zoomFactor,
dataAxisInfo.getStyle(), dataAxisInfo.getDivMin(), dataAxisInfo
.getDivMax(), dataAxisInfo.getInterval(), dataAxisInfo
.getDLinear(), dataAxisInfo.getZeroDiv(), perDecade);
DataAxisInfo zoomedInfo = calcDataAxisInfo(dataMin,
dataAxisInfo.isZeroYes(), dataAxisInfo.getAbsMin(), dataMax,
zoomFactor, dataAxisInfo.getStyle(), dataAxisInfo.getDivMin(),
dataAxisInfo.getDivMax(), dataAxisInfo.getInterval(),
dataAxisInfo.getDLinear(), dataAxisInfo.getZeroDiv(), perDecade);
return zoomedInfo;
}

7
cave/com.raytheon.viz.core/META-INF/MANIFEST.MF
View file

@ -28,7 +28,8 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.common.serialization.comm,
org.eclipse.core.expressions,
com.raytheon.uf.viz.application;bundle-version="1.0.0",
com.raytheon.uf.common.topo;bundle-version="1.12.1174"
com.raytheon.uf.common.topo;bundle-version="1.12.1174",
com.raytheon.uf.common.style;bundle-version="1.0.0"
Eclipse-BuddyPolicy: ext, registered, global
Eclipse-RegisterBuddy: org.apache.velocity, com.raytheon.uf.common.geospatial, com.raytheon.uf.common.serialization, com.raytheon.uf.common.status
Export-Package:
@ -44,10 +45,6 @@ Export-Package:
com.raytheon.viz.core.rsc.hdf5,
com.raytheon.viz.core.rsc.jts,
com.raytheon.viz.core.spatial,
com.raytheon.viz.core.style.arrow,
com.raytheon.viz.core.style.contour,
com.raytheon.viz.core.style.graph,
com.raytheon.viz.core.style.image,
com.raytheon.viz.core.topo
Bundle-Vendor: Raytheon
Bundle-Activator: com.raytheon.viz.core.CorePlugin

4
cave/com.raytheon.viz.core/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,7 +1,3 @@
com.raytheon.viz.core.style.image.ImagePreferences
com.raytheon.viz.core.style.contour.ContourPreferences
com.raytheon.viz.core.style.arrow.ArrowPreferences
com.raytheon.viz.core.style.graph.GraphPreferences
com.raytheon.viz.core.rsc.BestResResourceData
com.raytheon.viz.core.rsc.BlendedResourceData
com.raytheon.viz.core.topo.TopoResourceData

28
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/drawables/ColorMapParameterFactory.java
View file

@ -37,18 +37,19 @@ import com.raytheon.uf.common.datastorage.records.IDataRecord;
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.common.style.LabelingPreferences;
import com.raytheon.uf.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.image.DataScale;
import com.raytheon.uf.common.style.image.DataScale.Type;
import com.raytheon.uf.common.style.image.ImagePreferences;
import com.raytheon.uf.common.style.level.RangeLevel;
import com.raytheon.uf.common.style.level.SingleLevel;
import com.raytheon.uf.common.util.GridUtil;
import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.style.LabelingPreferences;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.style.level.RangeLevel;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.viz.core.style.image.DataScale;
import com.raytheon.viz.core.style.image.DataScale.Type;
import com.raytheon.viz.core.style.image.ImagePreferences;
/**
* ColorMapParameterFactory
@ -92,8 +93,13 @@ public class ColorMapParameterFactory {
entityList.add(entity);
match.setCreatingEntityNames(entityList);
}
StyleRule sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.IMAGERY, match);
StyleRule sr;
try {
sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.IMAGERY, match);
} catch (StyleException e) {
throw new VizException(e.getLocalizedMessage(), e);
}
return build(sr, data, level, parameterUnits);
}

26
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/topo/TopoResource.java
View file

@ -38,6 +38,15 @@ import com.raytheon.uf.common.colormap.prefs.ColorMapParameters.PersistedParamet
import com.raytheon.uf.common.datastorage.DataStoreFactory;
import com.raytheon.uf.common.datastorage.IDataStore;
import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
import com.raytheon.uf.common.style.LabelingPreferences;
import com.raytheon.uf.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleManager.StyleType;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.image.DataScale;
import com.raytheon.uf.common.style.image.ImagePreferences;
import com.raytheon.uf.common.style.image.SamplePreferences;
import com.raytheon.uf.common.topo.TopoUtils;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.drawables.ColorMapLoader;
@ -49,16 +58,8 @@ import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorMapCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.ImagingCapability;
import com.raytheon.uf.viz.core.style.LabelingPreferences;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleManager.StyleType;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.tile.TileSetRenderable;
import com.raytheon.uf.viz.core.tile.TileSetRenderable.TileImageCreator;
import com.raytheon.viz.core.style.image.DataScale;
import com.raytheon.viz.core.style.image.ImagePreferences;
import com.raytheon.viz.core.style.image.SamplePreferences;
/**
* Provides an SRTM hdf5-backed topographic map
@ -125,8 +126,13 @@ public class TopoResource extends
// TODO: create topo style rules for topo and bathymetric topo
ParamLevelMatchCriteria criteria = new ParamLevelMatchCriteria();
criteria.setParameterName(Arrays.asList(resourceData.getTopoFile()));
StyleRule styleRule = StyleManager.getInstance().getStyleRule(
StyleType.IMAGERY, criteria);
StyleRule styleRule;
try {
styleRule = StyleManager.getInstance().getStyleRule(
StyleType.IMAGERY, criteria);
} catch (StyleException e) {
throw new VizException(e.getLocalizedMessage(), e);
}
// Default colormap
String colorMapName = "topo";

3
cave/com.raytheon.viz.dataaccess/META-INF/MANIFEST.MF
View file

@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.viz.core;bundle-version="1.12.1174",
com.raytheon.uf.common.colormap;bundle-version="1.12.1174",
javax.measure;bundle-version="1.0.0",
org.apache.commons.lang;bundle-version="2.3.0"
org.apache.commons.lang;bundle-version="2.3.0",
com.raytheon.uf.common.style;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.viz.dataaccess.rsc,

4
cave/com.raytheon.viz.dataaccess/src/com/raytheon/viz/dataaccess/rsc/grid/GenericGridResource.java
View file

@ -34,6 +34,8 @@ import com.raytheon.uf.common.colormap.prefs.ColorMapParameters;
import com.raytheon.uf.common.dataaccess.grid.IGridData;
import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
import com.raytheon.uf.common.geospatial.interpolation.data.FloatBufferWrapper;
import com.raytheon.uf.common.style.level.SingleLevel;
import com.raytheon.uf.common.style.level.Level.LevelType;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.drawables.ColorMapLoader;
@ -41,8 +43,6 @@ import com.raytheon.uf.viz.core.drawables.PaintProperties;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorMapCapability;
import com.raytheon.uf.viz.core.style.level.Level.LevelType;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.viz.core.drawables.ColorMapParameterFactory;
import com.raytheon.viz.core.rsc.displays.GriddedImageDisplay2;
import com.raytheon.viz.dataaccess.rsc.AbstractDataAccessResource;

3
cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
View file

@ -30,7 +30,8 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.common.auth;bundle-version="1.12.1174",
com.raytheon.uf.common.python;bundle-version="1.12.1174",
com.raytheon.uf.common.colormap;bundle-version="1.12.1174",
com.google.guava;bundle-version="1.0.0"
com.google.guava;bundle-version="1.0.0",
com.raytheon.uf.common.style;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.viz.gfe,
com.raytheon.viz.gfe.constants,

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

@ -74,6 +74,7 @@ import com.raytheon.uf.common.geospatial.ReferencedObject.Type;
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.common.style.LabelingPreferences;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.common.time.TimeRange;
import com.raytheon.uf.viz.core.DrawableString;
@ -104,14 +105,13 @@ import com.raytheon.uf.viz.core.rsc.capabilities.DensityCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.ImagingCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
import com.raytheon.uf.viz.core.style.LabelingPreferences;
import com.raytheon.uf.viz.core.time.TimeMatchingJob;
import com.raytheon.viz.core.contours.rsc.displays.GriddedContourDisplay;
import com.raytheon.viz.core.contours.rsc.displays.GriddedVectorDisplay;
import com.raytheon.viz.core.rsc.displays.GriddedImageDisplay;
import com.raytheon.viz.core.rsc.displays.GriddedImageDisplay.GriddedImagePaintProperties;
import com.raytheon.viz.core.rsc.jts.JTSCompiler;
import com.raytheon.viz.core.style.contour.ContourPreferences;
import com.raytheon.uf.common.style.contour.ContourPreferences;
import com.raytheon.viz.gfe.Activator;
import com.raytheon.viz.gfe.GFEPreference;
import com.raytheon.viz.gfe.actions.ChangeCombineMode;

10
cave/com.raytheon.viz.grid/META-INF/MANIFEST.MF
View file

@ -39,6 +39,11 @@ Import-Package: com.raytheon.uf.common.comm,
com.raytheon.uf.common.parameter,
com.raytheon.uf.common.pointdata,
com.raytheon.uf.common.serialization,
com.raytheon.uf.common.style,
com.raytheon.uf.common.style.arrow,
com.raytheon.uf.common.style.contour,
com.raytheon.uf.common.style.image,
com.raytheon.uf.common.style.level,
com.raytheon.uf.common.time,
com.raytheon.uf.common.topo,
com.raytheon.uf.viz.d2d.core.map,
@ -46,8 +51,5 @@ Import-Package: com.raytheon.uf.common.comm,
com.raytheon.viz.alerts.observers,
com.raytheon.viz.core.drawables,
com.raytheon.viz.core.rsc,
com.raytheon.viz.core.rsc.displays,
com.raytheon.viz.core.style.arrow,
com.raytheon.viz.core.style.contour,
com.raytheon.viz.core.style.image
com.raytheon.viz.core.rsc.displays
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

4
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/GridLevelTranslator.java
View file

@ -25,8 +25,8 @@ import javax.measure.unit.SI;
import javax.measure.unit.Unit;
import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.viz.core.style.level.Level;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.uf.common.style.level.Level;
import com.raytheon.uf.common.style.level.SingleLevel;
/**
* Grid Level Translator

34
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java
View file

@ -48,6 +48,18 @@ import com.raytheon.uf.common.geospatial.interpolation.data.FloatBufferWrapper;
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.common.style.AbstractStylePreferences;
import com.raytheon.uf.common.style.MatchCriteria;
import com.raytheon.uf.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleManager.StyleType;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.arrow.ArrowPreferences;
import com.raytheon.uf.common.style.contour.ContourPreferences;
import com.raytheon.uf.common.style.image.ImagePreferences;
import com.raytheon.uf.common.style.level.Level;
import com.raytheon.uf.common.style.level.SingleLevel;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.VizApp;
@ -73,15 +85,6 @@ import com.raytheon.uf.viz.core.rsc.capabilities.DisplayTypeCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.ImagingCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
import com.raytheon.uf.viz.core.style.AbstractStylePreferences;
import com.raytheon.uf.viz.core.style.MatchCriteria;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleManager.StyleType;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.uf.viz.core.style.level.Level;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.viz.core.contours.ContourRenderable;
import com.raytheon.viz.core.contours.rsc.displays.AbstractGriddedDisplay;
import com.raytheon.viz.core.contours.rsc.displays.GriddedContourDisplay;
@ -90,9 +93,6 @@ import com.raytheon.viz.core.contours.rsc.displays.GriddedVectorDisplay;
import com.raytheon.viz.core.contours.util.VectorGraphicsRenderableFactory;
import com.raytheon.viz.core.drawables.ColorMapParameterFactory;
import com.raytheon.viz.core.rsc.displays.GriddedImageDisplay2;
import com.raytheon.viz.core.style.arrow.ArrowPreferences;
import com.raytheon.viz.core.style.contour.ContourPreferences;
import com.raytheon.viz.core.style.image.ImagePreferences;
import com.raytheon.viz.grid.rsc.GriddedIconDisplay;
import com.vividsolutions.jts.geom.Coordinate;
@ -303,7 +303,11 @@ public abstract class AbstractGridResource<T extends AbstractResourceData>
@Override
protected void initInternal(IGraphicsTarget target) throws VizException {
initStylePreferences();
try {
initStylePreferences();
} catch (StyleException e) {
throw new VizException(e.getLocalizedMessage(), e);
}
initSampling();
}
@ -351,9 +355,9 @@ public abstract class AbstractGridResource<T extends AbstractResourceData>
/**
* Gets style preferences from the StyleManager
*
* @throws VizStyleException
* @throws StyleException
*/
protected void initStylePreferences() throws VizStyleException {
protected void initStylePreferences() throws StyleException {
DisplayType displayType = getDisplayType();
StyleRule styleRule = null;
MatchCriteria criteria = getMatchCriteria();

2
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/DifferenceGridResource.java
View file

@ -38,6 +38,7 @@ import org.opengis.referencing.operation.TransformException;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
import com.raytheon.uf.common.geospatial.interpolation.BilinearInterpolation;
import com.raytheon.uf.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.time.CombinedDataTime;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IGraphicsTarget;
@ -48,7 +49,6 @@ import com.raytheon.uf.viz.core.rsc.IResourceGroup;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.ResourceList;
import com.raytheon.uf.viz.core.rsc.capabilities.GroupNamingCapability;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.viz.core.rsc.ICombinedResourceData.CombineOperation;
import com.raytheon.viz.core.rsc.ICombinedResourceData.CombineUtil;

6
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GridResource.java
View file

@ -32,14 +32,14 @@ import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.grid.GridRecord;
import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.level.Level;
import com.raytheon.uf.common.style.level.SingleLevel;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.datastructure.DataCubeContainer;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.AbstractResourceData;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.level.Level;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.viz.grid.GridLevelTranslator;
/**

4
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/RadarAdapter.java
View file

@ -54,12 +54,12 @@ import com.raytheon.uf.common.gridcoverage.lookup.GridCoverageLookup;
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.common.style.level.SingleLevel;
import com.raytheon.uf.common.style.level.Level.LevelType;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.catalog.CatalogQuery;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.requests.ThriftClient;
import com.raytheon.uf.viz.core.style.level.Level.LevelType;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.uf.viz.derivparam.library.DerivParamDesc;
import com.raytheon.uf.viz.derivparam.library.DerivParamMethod;
import com.raytheon.uf.viz.derivparam.tree.AbstractRequestableNode;

3
cave/com.raytheon.viz.mpe.ui/META-INF/MANIFEST.MF
View file

@ -22,7 +22,8 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.common.dataplugin.shef;bundle-version="1.12.1174",
com.raytheon.uf.viz.application,
com.raytheon.viz.ui.personalities.awips;bundle-version="1.12.1174",
com.raytheon.uf.viz.core.rsc;bundle-version="1.0.0"
com.raytheon.uf.viz.core.rsc;bundle-version="1.0.0",
com.raytheon.uf.common.style;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.viz.mpe.ui.dialogs.gagetable.xml,
com.raytheon.viz.mpe.ui.displays,

18
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
View file

@ -43,16 +43,16 @@ import com.raytheon.uf.common.colormap.prefs.DataMappingPreferences.DataMappingE
import com.raytheon.uf.common.hydro.spatial.HRAPCoordinates;
import com.raytheon.uf.common.mpe.util.XmrgFile;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.style.LabelingPreferences;
import com.raytheon.uf.common.style.contour.ContourPreferences;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorMapCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
import com.raytheon.uf.viz.core.style.LabelingPreferences;
import com.raytheon.viz.core.contours.rsc.displays.GriddedContourDisplay;
import com.raytheon.viz.core.rsc.displays.GriddedImageDisplay2;
import com.raytheon.viz.core.style.contour.ContourPreferences;
import com.raytheon.viz.mpe.MPEDateFormatter;
import com.raytheon.viz.mpe.ui.Activator;
import com.raytheon.viz.mpe.ui.DisplayFieldData;
@ -320,15 +320,15 @@ public class MPEFieldResource extends
for (int i = 0; i < accumInterval; ++i) {
timeToLoad.setTime(currTime.getRefTime());
timeToLoad.add(Calendar.HOUR, -i);
if (displayField==DisplayFieldData.satPre) {
//SATPRE MPE file time stamp is the start time of the hour
//i.e. a 12z -13z product has a time stamp of 12z.
timeToLoad.add(Calendar.HOUR, -1);
if (displayField == DisplayFieldData.satPre) {
// SATPRE MPE file time stamp is the start time of the hour
// i.e. a 12z -13z product has a time stamp of 12z.
timeToLoad.add(Calendar.HOUR, -1);
}
XmrgFile file = MPEDisplayManager.getXmrgFile(displayField,
timeToLoad.getTime());
timeToLoad.getTime());
try {
file.load();
} catch (IOException e) {

6
cave/com.raytheon.viz.radar/META-INF/MANIFEST.MF
View file

@ -44,9 +44,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
com.raytheon.uf.viz.ui.menus;bundle-version="1.12.1174",
com.raytheon.viz.awipstools;bundle-version="1.12.1174",
org.apache.batik;bundle-version="1.6.0",
com.raytheon.uf.common.wxmath
com.raytheon.uf.common.wxmath,
com.raytheon.uf.common.style;bundle-version="1.0.0"
Import-Package: com.raytheon.viz.core.contours.util,
com.raytheon.viz.core.drawables,
com.raytheon.viz.core.rsc,
com.raytheon.viz.core.rsc.jts,
com.raytheon.viz.core.style.image
com.raytheon.viz.core.rsc.jts

12
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/interrogators/RadarDefaultInterrogator.java
View file

@ -38,12 +38,12 @@ import com.raytheon.uf.common.geospatial.CRSCache;
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.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.units.PiecewisePixel;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.viz.core.style.image.ImagePreferences;
import com.raytheon.uf.common.style.image.ImagePreferences;
import com.vividsolutions.jts.geom.Coordinate;
/**
@ -253,7 +253,7 @@ public class RadarDefaultInterrogator implements IRadarInterrogator {
try {
sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.IMAGERY, match);
} catch (VizStyleException e) {
} catch (StyleException e) {
statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
}
if (sr != null && sr.getPreferences() instanceof ImagePreferences) {

12
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/RadarNameGenerator.java
View file

@ -32,6 +32,10 @@ import com.raytheon.uf.common.dataplugin.radar.util.RadarInfoDict;
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.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.drawables.AbstractDescriptor;
import com.raytheon.uf.viz.core.map.MapDescriptor;
@ -39,11 +43,7 @@ import com.raytheon.uf.viz.core.rsc.AbstractNameGenerator;
import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
import com.raytheon.uf.viz.core.rsc.capabilities.BlendedCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorMapCapability;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.viz.core.style.image.ImagePreferences;
import com.raytheon.uf.common.style.image.ImagePreferences;
import com.raytheon.viz.radar.rsc.graphic.RadarGraphicsResource;
/**
@ -264,7 +264,7 @@ public class RadarNameGenerator extends AbstractNameGenerator {
// unitName = "(" + unitName + ") ";
}
}
} catch (VizStyleException e1) {
} catch (StyleException e1) {
// Don't worry about it just grab the units from the record.
}

12
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/util/DataUtilities.java
View file

@ -28,11 +28,11 @@ import com.raytheon.uf.common.dataplugin.radar.RadarRecord;
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.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.viz.core.style.image.ImagePreferences;
import com.raytheon.uf.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.image.ImagePreferences;
/**
* provides static utility method for getting the correct units for radar data.
@ -85,7 +85,7 @@ public class DataUtilities {
try {
sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.IMAGERY, match);
} catch (VizStyleException e) {
} catch (StyleException e) {
statusHandler.handle(Priority.PROBLEM,
"Error processing radar data Unit from Style Rules", e);

3
cave/com.raytheon.viz.satellite/META-INF/MANIFEST.MF
View file

@ -23,7 +23,8 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.viz.ui.menus;bundle-version="1.12.1174",
com.raytheon.viz.ui;bundle-version="1.12.1174",
com.raytheon.viz.core;bundle-version="1.12.1174",
javax.measure
javax.measure,
com.raytheon.uf.common.style;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.viz.satellite,
com.raytheon.viz.satellite.rsc

24
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
View file

@ -47,6 +47,14 @@ import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
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.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.common.style.image.ImagePreferences;
import com.raytheon.uf.common.style.image.SamplePreferences;
import com.raytheon.uf.common.style.level.Level;
import com.raytheon.uf.common.style.level.SingleLevel;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.DrawableImage;
import com.raytheon.uf.viz.core.IGraphicsTarget;
@ -59,15 +67,8 @@ import com.raytheon.uf.viz.core.rsc.AbstractPluginDataObjectResource;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.capabilities.AbstractCapability;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorMapCapability;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.style.level.Level;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.uf.viz.derivparam.library.DerivedParameterRequest;
import com.raytheon.viz.core.drawables.ColorMapParameterFactory;
import com.raytheon.viz.core.style.image.ImagePreferences;
import com.raytheon.viz.core.style.image.SamplePreferences;
import com.raytheon.viz.satellite.SatelliteConstants;
import com.raytheon.viz.satellite.tileset.SatDataRetriever;
import com.raytheon.viz.satellite.tileset.SatTileSetRenderable;
@ -299,8 +300,13 @@ public class SatResource extends
match.setParameterName(Arrays.asList(physicalElement));
match.setLevels(Arrays.asList((Level) level));
match.setCreatingEntityNames(Arrays.asList(record.getCreatingEntity()));
StyleRule sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.IMAGERY, match);
StyleRule sr;
try {
sr = StyleManager.getInstance().getStyleRule(
StyleManager.StyleType.IMAGERY, match);
} catch (StyleException e) {
throw new VizException(e.getLocalizedMessage(), e);
}
if (sr != null && sr.getPreferences() instanceof ImagePreferences) {
sampleRange = ((ImagePreferences) sr.getPreferences())
.getSamplePrefs();

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

@ -31,7 +31,8 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.uf.common.dataplugin.grid;bundle-version="1.0.0",
com.raytheon.uf.viz.ui.menus;bundle-version="1.12.1174",
com.raytheon.uf.viz.xy;bundle-version="1.12.1174",
com.raytheon.viz.core.graphing;bundle-version="1.12.1174"
com.raytheon.viz.core.graphing;bundle-version="1.12.1174",
com.raytheon.uf.common.style;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.viz.volumebrowser,
com.raytheon.viz.volumebrowser.datacatalog,

20
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/AbstractDataCatalog.java
View file

@ -37,6 +37,10 @@ import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
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.common.style.ParamLevelMatchCriteria;
import com.raytheon.uf.common.style.StyleManager;
import com.raytheon.uf.common.style.StyleRule;
import com.raytheon.uf.common.style.StyleException;
import com.raytheon.uf.viz.core.drawables.ResourcePair;
import com.raytheon.uf.viz.core.exception.VizCommunicationException;
import com.raytheon.uf.viz.core.level.LevelUtilities;
@ -45,10 +49,6 @@ import com.raytheon.uf.viz.core.rsc.DisplayType;
import com.raytheon.uf.viz.core.rsc.LoadProperties;
import com.raytheon.uf.viz.core.rsc.ResourceProperties;
import com.raytheon.uf.viz.core.rsc.ResourceType;
import com.raytheon.uf.viz.core.style.ParamLevelMatchCriteria;
import com.raytheon.uf.viz.core.style.StyleManager;
import com.raytheon.uf.viz.core.style.StyleRule;
import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.uf.viz.points.PointsDataManager;
import com.raytheon.uf.viz.xy.crosssection.rsc.CrossSectionResourceData;
import com.raytheon.uf.viz.xy.timeheight.rsc.TimeHeightResourceData;
@ -409,7 +409,7 @@ public abstract class AbstractDataCatalog implements IDataCatalog {
}
sr = StyleManager.getInstance().getStyleRule(styleType, match);
} catch (VizStyleException e) {
} catch (StyleException e) {
statusHandler.handle(Priority.PROBLEM,
"Unable to obtain a style rule for"
+ catalogEntry.getSelectedData().getUniqueKey(), e);
@ -486,14 +486,14 @@ public abstract class AbstractDataCatalog implements IDataCatalog {
protected boolean isLatLon(String plane) {
return ((plane != null) && (plane.startsWith("Lat")
|| plane.startsWith("Lon") || plane.equals("LATS") || plane
.equals("LONS")));
.equals("LONS")));
}
protected boolean isPointLine(String plane) {
return ((plane != null) && (plane.startsWith("Line") || plane
.startsWith("Point")));
}
/**
* Alter product parameters
*
@ -501,9 +501,9 @@ public abstract class AbstractDataCatalog implements IDataCatalog {
* @param selectedValue
* @param productParameters
*/
public void alterProductParameters(
String selectedKey,
String selectedValue, HashMap<String, RequestConstraint> productParameters) {
public void alterProductParameters(String selectedKey,
String selectedValue,
HashMap<String, RequestConstraint> productParameters) {
return;
}

7
edexOsgi/com.raytheon.uf.common.style/.classpath Normal file
View file

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

28
edexOsgi/com.raytheon.uf.common.style/.project Normal file
View file

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>com.raytheon.uf.common.style</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

7
edexOsgi/com.raytheon.uf.common.style/.settings/org.eclipse.jdt.core.prefs Normal file
View file

@ -0,0 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6

19
edexOsgi/com.raytheon.uf.common.style/META-INF/MANIFEST.MF Normal file
View file

@ -0,0 +1,19 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Style
Bundle-SymbolicName: com.raytheon.uf.common.style
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: RAYTHEON
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
Export-Package: com.raytheon.uf.common.style,
com.raytheon.uf.common.style.arrow,
com.raytheon.uf.common.style.contour,
com.raytheon.uf.common.style.graph,
com.raytheon.uf.common.style.image,
com.raytheon.uf.common.style.level
Require-Bundle: com.raytheon.uf.common.colormap;bundle-version="1.12.1174",
com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
javax.measure;bundle-version="1.0.0",
com.raytheon.uf.common.status;bundle-version="1.12.1174",
com.raytheon.uf.common.localization;bundle-version="1.12.1174"

9
edexOsgi/com.raytheon.uf.common.style/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject Normal file
View file

@ -0,0 +1,9 @@
com.raytheon.uf.common.style.image.ImagePreferences
com.raytheon.uf.common.style.contour.ContourPreferences
com.raytheon.uf.common.style.arrow.ArrowPreferences
com.raytheon.uf.common.style.graph.GraphPreferences
com.raytheon.uf.common.style.level.SingleLevel
com.raytheon.uf.common.style.level.RangeLevel
com.raytheon.uf.common.style.StyleRule
com.raytheon.uf.common.style.StyleRuleset
com.raytheon.uf.common.style.ParamLevelMatchCriteria

4
edexOsgi/com.raytheon.uf.common.style/build.properties Normal file
View file

@ -0,0 +1,4 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.

2
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/style/AbstractStylePreferences.java → edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/AbstractStylePreferences.java
View file

@ -18,7 +18,7 @@
* further licensing information.
**/
package com.raytheon.uf.viz.core.style;
package com.raytheon.uf.common.style;
import java.text.ParseException;
import java.text.ParsePosition;

2
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/style/LabelingPreferences.java → edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/LabelingPreferences.java
View file

@ -18,7 +18,7 @@
* further licensing information.
**/
package com.raytheon.uf.viz.core.style;
package com.raytheon.uf.common.style;
import java.util.Arrays;

4
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/style/MatchCriteria.java → edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/MatchCriteria.java
View file

@ -18,7 +18,7 @@
* further licensing information.
**/
package com.raytheon.uf.viz.core.style;
package com.raytheon.uf.common.style;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@ -54,5 +54,5 @@ public abstract class MatchCriteria implements ISerializableObject {
* than a lower value
*/
public abstract int matches(MatchCriteria aCriteria)
throws VizStyleException;
throws StyleException;
}

14
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/style/ParamLevelMatchCriteria.java → edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/ParamLevelMatchCriteria.java
View file

@ -18,7 +18,7 @@
* further licensing information.
**/
package com.raytheon.uf.viz.core.style;
package com.raytheon.uf.common.style;
import java.util.ArrayList;
import java.util.List;
@ -29,9 +29,9 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlRootElement;
import com.raytheon.uf.viz.core.style.level.Level;
import com.raytheon.uf.viz.core.style.level.RangeLevel;
import com.raytheon.uf.viz.core.style.level.SingleLevel;
import com.raytheon.uf.common.style.level.Level;
import com.raytheon.uf.common.style.level.RangeLevel;
import com.raytheon.uf.common.style.level.SingleLevel;
/**
*
@ -136,12 +136,12 @@ public class ParamLevelMatchCriteria extends MatchCriteria {
}
@Override
public int matches(MatchCriteria criteria) throws VizStyleException {
public int matches(MatchCriteria criteria) throws StyleException {
int returnValue = -1;
if (criteria instanceof ParamLevelMatchCriteria) {
ParamLevelMatchCriteria imgCriteria = (ParamLevelMatchCriteria) criteria;
if (this.parameterNames.size() != 1) {
throw new VizStyleException(
throw new StyleException(
"ParamLevelMatchCriteria requires single parameter to search for match against.");
}
String paramName = this.parameterNames.get(0);
@ -150,7 +150,7 @@ public class ParamLevelMatchCriteria extends MatchCriteria {
if (this.levels.size() == 1) {
level = levels.get(0);
} else if (this.levels.size() > 1) {
throw new VizStyleException(
throw new StyleException(
"ParamLevelMatchCriteria does not support matching against multiple levels.");
}

65
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/style/VizStyleException.java → edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/StyleException.java
View file

@ -18,55 +18,54 @@
* further licensing information.
**/
package com.raytheon.uf.viz.core.style;
import com.raytheon.uf.viz.core.exception.VizException;
package com.raytheon.uf.common.style;
/**
* VizException for styles.
* Exception for styles.
*
* <pre>
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Oct 1, 2007 njensen Initial creation
*
* Sep 5, 2013 2051 mnash Moved style rules to common and made
* this extend Exception instead of VizException
* </pre>
*
* @author njensen
*/
public class VizStyleException extends VizException {
public class StyleException extends Exception {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
/**
* Default Constructor
*
*/
public VizStyleException() {
super();
}
/**
* Default Constructor
*
*/
public StyleException() {
super();
}
/**
* @param message
*/
public VizStyleException(String message) {
super(message);
}
/**
* @param message
*/
public StyleException(String message) {
super(message);
}
/**
* @param message
* @param cause
*/
public VizStyleException(String message, Throwable cause) {
super(message, cause);
}
/**
* @param message
* @param cause
*/
public StyleException(String message, Throwable cause) {
super(message, cause);
}
/**
* @param cause
*/
public VizStyleException(Throwable cause) {
super(cause);
}
/**
* @param cause
*/
public StyleException(Throwable cause) {
super(cause);
}
}

71
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/style/StyleManager.java → edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/StyleManager.java
View file

@ -18,7 +18,7 @@
* further licensing information.
**/
package com.raytheon.uf.viz.core.style;
package com.raytheon.uf.common.style;
import java.util.EnumMap;
import java.util.List;
@ -86,8 +86,8 @@ public class StyleManager {
"styleRules", aType.extensions, true, true);
StyleRuleset rules = new StyleRuleset();
for (LocalizationFile lf : files) {
rules.addStyleRules((StyleRuleset) SerializationUtil
.jaxbUnmarshalFromXmlFile(lf.getFile().getPath()));
rules.addStyleRules(SerializationUtil.jaxbUnmarshalFromXmlFile(
StyleRuleset.class, lf.getFile().getPath()));
}
this.rules.put(aType, rules);
} catch (Exception e) {
@ -104,30 +104,33 @@ public class StyleManager {
* @param aCriteria
* the match criteria to find the best match for
* @return the best matching style rule, or null if no matches are found
* @throws VizStyleException
* @throws StyleException
*/
public StyleRule getStyleRule(StyleType aStyleType, MatchCriteria aCriteria)
throws VizStyleException {
throws StyleException {
synchronized (aStyleType) {
if (!this.rules.containsKey(aStyleType)) {
loadRules(aStyleType);
}
}
List<StyleRule> rules = this.rules.get(aStyleType).getStyleRules();
StyleRuleset set = this.rules.get(aStyleType);
StyleRule bestMatch = null;
int matchRank = 0;
try {
for (StyleRule rule : rules) {
int value = aCriteria.matches(rule.getMatchCriteria());
if (value > matchRank) {
matchRank = value;
bestMatch = rule;
if (set != null) {
List<StyleRule> rules = this.rules.get(aStyleType).getStyleRules();
int matchRank = 0;
try {
for (StyleRule rule : rules) {
int value = aCriteria.matches(rule.getMatchCriteria());
if (value > matchRank) {
matchRank = value;
bestMatch = rule;
}
}
} catch (Exception e) {
throw new StyleException(
"Error determining matching rules.", e);
}
} catch (Exception e) {
throw new VizStyleException("Error determining matching rules.", e);
}
return bestMatch;
}
@ -149,24 +152,24 @@ public class StyleManager {
return new double[] { vmin, vmax };
}
/**2012-05-21
* DR 14833: FFMP uses this getter to find the color
* map if a user modified ffmpImageryStlyeRules.xml
* incorrectly.
*
* @param st: StyleType
* @return: StyleRuleset related to the StyleType
/**
* 2012-05-21 DR 14833: FFMP uses this getter to find the color map if a
* user modified ffmpImageryStlyeRules.xml incorrectly.
*
* @param st
* : StyleType
* @return: StyleRuleset related to the StyleType
*/
public StyleRuleset getStyleRuleSet(StyleType st){
synchronized(st){
if( ! rules.containsKey(st)){
loadRules(st);
}
}
return rules.get(st);
public StyleRuleset getStyleRuleSet(StyleType st) {
synchronized (st) {
if (!rules.containsKey(st)) {
loadRules(st);
}
}
return rules.get(st);
}
}

2
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/style/StyleRule.java → edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/StyleRule.java
View file

@ -18,7 +18,7 @@
* further licensing information.
**/
package com.raytheon.uf.viz.core.style;
package com.raytheon.uf.common.style;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;

2
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/style/StyleRuleset.java → edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/StyleRuleset.java
View file

@ -18,7 +18,7 @@
* further licensing information.
**/
package com.raytheon.uf.viz.core.style;
package com.raytheon.uf.common.style;
import java.util.ArrayList;

4
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/style/arrow/ArrowPreferences.java → edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/arrow/ArrowPreferences.java
View file

@ -17,14 +17,14 @@
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.viz.core.style.arrow;
package com.raytheon.uf.common.style.arrow;
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.viz.core.style.AbstractStylePreferences;
import com.raytheon.uf.common.style.AbstractStylePreferences;
@XmlAccessorType(XmlAccessType.NONE)
@XmlRootElement(name = "arrowStyle")

6
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/style/contour/ContourPreferences.java → edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/contour/ContourPreferences.java
View file

@ -18,15 +18,15 @@
* further licensing information.
**/
package com.raytheon.viz.core.style.contour;
package com.raytheon.uf.common.style.contour;
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.viz.core.style.AbstractStylePreferences;
import com.raytheon.uf.viz.core.style.LabelingPreferences;
import com.raytheon.uf.common.style.AbstractStylePreferences;
import com.raytheon.uf.common.style.LabelingPreferences;
/**
*

2
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/style/graph/AxisScale.java → edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/graph/AxisScale.java
View file

@ -18,7 +18,7 @@
* further licensing information.
**/
package com.raytheon.viz.core.style.graph;
package com.raytheon.uf.common.style.graph;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;

6
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/style/graph/GraphPreferences.java → edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/graph/GraphPreferences.java
View file

@ -18,15 +18,15 @@
* further licensing information.
**/
package com.raytheon.viz.core.style.graph;
package com.raytheon.uf.common.style.graph;
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.viz.core.style.AbstractStylePreferences;
import com.raytheon.uf.viz.core.style.LabelingPreferences;
import com.raytheon.uf.common.style.AbstractStylePreferences;
import com.raytheon.uf.common.style.LabelingPreferences;
/**
* TODO class description

2
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/style/image/DataScale.java → edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/image/DataScale.java
View file

@ -18,7 +18,7 @@
* further licensing information.
**/
package com.raytheon.viz.core.style.image;
package com.raytheon.uf.common.style.image;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;

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