+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * 4/7/09 1994 bphillip Initial Creation + * + *+ * + * @author bphillip + * @version 1 + */ +public class GribSpatialCache { + + /** The logger */ + protected transient Log logger = LogFactory.getLog(getClass()); + + /** The singleton instance */ + private static GribSpatialCache instance = new GribSpatialCache(); + + /** + * Map containing the GridCoverages
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * May 1, 2012 #470 bphillip Initial creation + * + *+ * + * @author bphillip + * @version 1.0 + */ +public class PurgeDao extends CoreDao { + + /** + * Constructs a new purge data access object + */ + public PurgeDao() { + super(DaoConfig.forClass(PurgeJobStatus.class)); + } + + /** + * Gets the number of purge jobs currently running on the cluster. A job is + * considered running if the 'running' flag is set to true and the job has + * been started since validStartTime and has not met or exceeded the failed + * count. + * + * @param validStartTime + * @param failedCount + * @return The number of purge jobs currently running on the cluster + */ + public int getRunningClusterJobs(final Date validStartTime, + final int failedCount) { + final String query = "from " + + daoClass.getName() + + " obj where obj.running = true and obj.startTime > :startTime and obj.failedCount <= :failedCount"; + return (Integer) txTemplate.execute(new TransactionCallback() { + @Override + public Object doInTransaction(TransactionStatus status) { + Query hibQuery = getSession(false).createQuery(query); + hibQuery.setTimestamp("startTime", validStartTime); + hibQuery.setInteger("failedCount", failedCount); + List queryResult = hibQuery.list(); + if (queryResult == null) { + return 0; + } else { + return queryResult.size(); + } + } + }); + } + + /** + * Returns the jobs that have met or exceed the failed count. + * + * @param failedCount + * @return + */ + @SuppressWarnings("unchecked") + public List
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Apr 19, 2012 #470 bphillip Initial creation + * + *+ * + * @author bphillip + * @version 1.0 + */ +public class PurgeJob extends Thread { + + /** The type of purge */ + public enum PURGE_JOB_TYPE { + PURGE_ALL, PURGE_EXPIRED + } + + private long startTime; + + /** The cluster task name to use for purge jobs */ + public static final String TASK_NAME = "Purge Plugin Data"; + + /** The plugin associated with this purge job */ + private String pluginName; + + /** The type of purge job being executed */ + private PURGE_JOB_TYPE purgeType; + + /** Last time job has printed a timed out message */ + private long lastTimeOutMessage = 0; + + /** + * Creates a new Purge job for the specified plugin. + * + * @param pluginName + * The plugin to be purged + * @param purgeType + * The type of purge to be executed + */ + public PurgeJob(String pluginName, PURGE_JOB_TYPE purgeType) { + // Give the thread a name + this.setName("Purge-" + pluginName.toUpperCase() + "-Thread"); + this.pluginName = pluginName; + this.purgeType = purgeType; + } + + public void run() { + + // Flag used to track if this job has failed + boolean failed = false; + startTime = System.currentTimeMillis(); + PurgeLogger.logInfo("Purging expired data...", pluginName); + PluginDao dao = null; + + try { + dao = PluginFactory.getInstance().getPluginDao(pluginName); + if (dao.getDaoClass() != null) { + dao.purgeExpiredData(); + PurgeLogger.logInfo("Data successfully Purged!", pluginName); + } else { + Method m = dao.getClass().getMethod("purgeExpiredData", + new Class[] {}); + if (m != null) { + if (m.getDeclaringClass().equals(PluginDao.class)) { + PurgeLogger + .logWarn( + "Unable to purge data. This plugin does not specify a record class and does not implement a custom purger.", + pluginName); + } else { + if (this.purgeType.equals(PURGE_JOB_TYPE.PURGE_EXPIRED)) { + dao.purgeExpiredData(); + } else { + dao.purgeAllData(); + } + PurgeLogger.logInfo("Data successfully Purged!", + pluginName); + } + } + } + } catch (Exception e) { + failed = true; + // keep getting next exceptions with sql exceptions to ensure + // we can see the underlying error + PurgeLogger + .logError("Error purging expired data!\n", pluginName, e); + Throwable t = e.getCause(); + while (t != null) { + if (t instanceof SQLException) { + SQLException se = ((SQLException) t).getNextException(); + PurgeLogger.logError("Next exception:", pluginName, se); + } + t = t.getCause(); + } + } finally { + ClusterTask purgeLock = PurgeManager.getInstance().getPurgeLock(); + try { + /* + * Update the status accordingly if the purge failed or + * succeeded + */ + PurgeDao purgeDao = new PurgeDao(); + PurgeJobStatus status = purgeDao + .getJobForPlugin(this.pluginName); + if (status == null) { + PurgeLogger.logError( + "Purge job completed but no status object found!", + this.pluginName); + } else { + if (failed) { + status.incrementFailedCount(); + if (status.getFailedCount() >= PurgeManager + .getInstance().getFatalFailureCount()) { + PurgeLogger + .logFatal( + "Purger for this plugin has reached or exceeded consecutive failure limit of " + + PurgeManager + .getInstance() + .getFatalFailureCount() + + ". Data will no longer being purged for this plugin.", + pluginName); + } else { + PurgeLogger.logError("Purge job has failed " + + status.getFailedCount() + + " consecutive times.", this.pluginName); + // Back the start time off by half an hour to try to + // purgin soon, don't want to start immediately so + // it doesn't ping pong between servers in a time + // out scenario + Date startTime = status.getStartTime(); + startTime.setTime(startTime.getTime() - (1800000)); + } + } else { + status.setFailedCount(0); + } + + /* + * This purger thread has exceeded the time out duration but + * finally finished. Output a message and update the status + */ + int deadPurgeJobAge = PurgeManager.getInstance() + .getDeadPurgeJobAge(); + Calendar purgeTimeOutLimit = Calendar.getInstance(); + purgeTimeOutLimit.setTimeZone(TimeZone.getTimeZone("GMT")); + purgeTimeOutLimit.add(Calendar.MINUTE, -deadPurgeJobAge); + if (startTime < purgeTimeOutLimit.getTimeInMillis()) { + PurgeLogger + .logInfo( + "Purge job has recovered from timed out state!!", + pluginName); + } + status.setRunning(false); + purgeDao.update(status); + /* + * Log execution times + */ + long executionTime = getAge(); + long execTimeInMinutes = executionTime / 60000; + if (execTimeInMinutes > 0) { + PurgeLogger.logInfo("Purge run time: " + executionTime + + " ms (" + execTimeInMinutes + " minutes)", + this.pluginName); + } else { + PurgeLogger.logInfo("Purge run time: " + executionTime + + " ms", this.pluginName); + } + } + } catch (Throwable e) { + PurgeLogger + .logError( + "An unexpected error occurred upon completion of the purge job", + this.pluginName, e); + } finally { + ClusterLockUtils.unlock(purgeLock, false); + } + } + } + + public void printTimedOutMessage(int deadPurgeJobAge) { + // only print message every 5 minutes + if (System.currentTimeMillis() - lastTimeOutMessage > 300000) { + PurgeLogger.logFatal( + "Purger running time has exceeded timeout duration of " + + deadPurgeJobAge + + " minutes. Current running time: " + + (getAge() / 60000) + " minutes", pluginName); + printStackTrace(); + } + } + + /** + * Prints the stack trace for this job thread. + */ + public void printStackTrace() { + StringBuffer buffer = new StringBuffer(); + buffer.append("Stack trace for Purge Job Thread:\n"); + buffer.append(getStackTrace(this)); + // If this thread is blocked, output the stack traces for the other + // blocked threads to assist in determining the source of the + // deadlocked + // threads + if (this.getState().equals(State.BLOCKED)) { + buffer.append("\tDUMPING OTHER BLOCKED THREADS\n"); + buffer.append(getBlockedStackTraces()); + + } + PurgeLogger.logError(buffer.toString(), this.pluginName); + + } + + /** + * Gets the stack traces for all other threads in the BLOCKED state in the + * JVM + * + * @return The stack traces for all other threads in the BLOCKED state in + * the JVM + */ + private String getBlockedStackTraces() { + StringBuffer buffer = new StringBuffer(); + Map
+ * The purge manager is designed to adhere to the following rules: + *
+ * · The cluster may have no more than 6 purge jobs running simultaneously by
+ * default. This property is configurable in the project.properties file
+ * · Any given server may have no more than 2 purge jobs running simultaneously
+ * by default. This property is configurable in the project.properties file
+ * · A purge job for a plugin is considered 'hung' if it has been running for
+ * more than 20 minutes by default. This property is configurable in the
+ * project.properties file
+ * · If a purge job that was previously determined to be hung actually finishes
+ * it's execution, the cluster lock is updated appropriately and the purge job
+ * is able to resume normal operation. This is in place so if a hung purge
+ * process goes unnoticed for a period of time, the server will still try to
+ * recover autonomously if it can.
+ * · If a purge job is determined to be hung, the stack trace for the thread
+ * executing the job is output to the log. Furthermore, if the job is in the
+ * BLOCKED state, the stack traces for all other BLOCKED threads is output to
+ * the purge log as part of a rudimentary deadlock detection strategy to be used
+ * by personnel attempting to remedy the situation.
+ * · By default, a fatal condition occurs if a given plugin's purge job fails 3
+ * consecutive times.
+ * · If a purge job hangs on one server in the cluster, it will try and run on
+ * another cluster member at the next purge interval.
+ * · If the purge manager attempts to purge a plugin that has been running for
+ * longer than the 20 minute threshold, it is considered a failure, and the
+ * failure count is updated.
+ *
+ * + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Apr 18, 2012 #470 bphillip Initial creation + * + *+ * + * @author bphillip + * @version 1.0 + */ +public class PurgeManager { + + /** Purge Manager task name */ + private static final String PURGE_TASK_NAME = "Purge Manager"; + + /** Purge Manager task details */ + private static final String PURGE_TASK_DETAILS = "Purge Manager Job"; + + /** Purge Manager task override timeout. Currently 2 minutes */ + private static final long PURGE_MANAGER_TIMEOUT = 120000; + + /** + * The cluster limit property to be set via Spring with the value defined in + * project.properties + */ + private int clusterLimit = 6; + + /** + * The server limit property to be set via Spring with the value defined in + * project.properties + */ + private int serverLimit = 2; + + /** + * The time in minutes at which a purge job is considered 'dead' or 'hung' + * set via Spring with the value defined in project.properties + */ + private int deadPurgeJobAge = 20; + + /** + * The frequency, in minutes, that a plugin may be purged set via Spring + * with the value defined in project.properties + */ + private int purgeFrequency = 60; + + /** + * How many times a purger is allowed to fail before it is considered fatal. + * Set via Spring with the value defined in project.properties + */ + private int fatalFailureCount = 3; + + /** + * The master switch defined in project.properties that enables and disables + * data purging + */ + private boolean purgeEnabled = true; + + /** Map of purge jobs */ + private Map
+ * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * 2009 dfriedma Initial version + * 2012-04-30 DR 14908 D. Friedman Require radar name for valid RPS + * file names. + *+ * + */ public class Awips1RpsListUtil { // is 'maint' an opMode?? public static class Selector { @@ -187,7 +201,7 @@ public class Awips1RpsListUtil { } protected static final Pattern selectorPattern = Pattern - .compile("^(?:(.+)\\.)?(.+)\\.VCP(\\d+)(?:\\.(.*))?$"); + .compile("^(.+)\\.(.+)\\.VCP(\\d+)(?:\\.(.*))?$"); protected static final Pattern maintPattern = Pattern .compile("^([^\\.]+)\\.maint(?:\\.(.*))?$"); @@ -197,9 +211,7 @@ public class Awips1RpsListUtil { if (m.matches()) { Selector sel = new Selector(); - if (m.group(1) != null) { - sel.radar = m.group(1).toLowerCase(); - } + sel.radar = m.group(1).toLowerCase(); String opModeString = m.group(2).toLowerCase(); if (opModeString.equals("clear-air")) diff --git a/RadarServer/com.raytheon.rcm.server/src/com/raytheon/rcm/config/awips1/Awips1ConfigProvider.java b/RadarServer/com.raytheon.rcm.server/src/com/raytheon/rcm/config/awips1/Awips1ConfigProvider.java index 5a4003cc80..a77b4cef82 100755 --- a/RadarServer/com.raytheon.rcm.server/src/com/raytheon/rcm/config/awips1/Awips1ConfigProvider.java +++ b/RadarServer/com.raytheon.rcm.server/src/com/raytheon/rcm/config/awips1/Awips1ConfigProvider.java @@ -48,6 +48,15 @@ import com.raytheon.rcm.server.Log; * com.raytheon.rcm.config.awips1.FXA_LOCAL_SITE property. * * Note: Does not recognize the FILE_SERVER_DEFAULT_PATHS environment variable. + * + *
+ * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * 2009 dfriedma Initial version + * 2012-04-30 DR 14904 D. Friedman Add backup links to dial ORPGs. + **/ public class Awips1ConfigProvider implements ConfigurationProvider { @@ -410,10 +419,8 @@ public class Awips1ConfigProvider implements ConfigurationProvider { String radarName = ls.next().toLowerCase(); int nexradId = ls.nextInt(); - RadarConfig rc = radars.get(radarName.toLowerCase()); //config.getConfigForRadar(radarName); - // so only getting entries for current purpose .. does not - // allow easy switching - if (rc == null || rc.isDedicated() != dedicated) + RadarConfig rc = radars.get(radarName.toLowerCase()); + if (rc == null) continue; if (nexradId != rc.getNexradID()) { // warn... @@ -428,8 +435,6 @@ public class Awips1ConfigProvider implements ConfigurationProvider { lr.setLinkIndex(ls.nextInt()); lr.setTcmPassword(ls.next()); lr.setDedicated(dedicated); - // TODO: do something with max rps size? - // lr.setBackup(backup); if (dedicated) { lr.setMaxRpsListSize(ls.nextInt()); diff --git a/TextDao.java b/TextDao.java new file mode 100644 index 0000000000..069873d95d --- /dev/null +++ b/TextDao.java @@ -0,0 +1,72 @@ +/** + * This software was developed and / or modified by Raytheon Company, + * pursuant to Contract DG133W-05-CQ-1067 with the US Government. + * + * U.S. EXPORT CONTROLLED TECHNICAL DATA + * This software product contains export-restricted data whose + * export/transfer/disclosure is restricted by U.S. law. Dissemination + * to non-U.S. persons whether in the United States or abroad requires + * an export license or other authorization. + * + * Contractor Name: Raytheon Company + * Contractor Address: 6825 Pine Street, Suite 340 + * Mail Stop B8 + * Omaha, NE 68106 + * 402.291.0100 + * + * See the AWIPS II Master Rights File ("Master Rights File.pdf") for + * further licensing information. + **/ +package com.raytheon.edex.plugin.text.dao; + +import java.util.Calendar; + +import com.raytheon.edex.db.dao.DefaultPluginDao; +import com.raytheon.edex.textdb.dbapi.impl.TextDB; +import com.raytheon.uf.common.dataplugin.PluginException; +import com.raytheon.uf.edex.database.purge.PurgeLogger; + +/** + * DAO for text products + * + *
+ * + * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * Jul 10, 2009 2191 rjpeter Update retention time handling. + * Aug 18, 2009 2191 rjpeter Changed to version purging. + *+ * + * @author + * @version 1 + */ +public class TextDao extends DefaultPluginDao { + + public TextDao(String pluginName) throws PluginException { + super(pluginName); + } + + @Override + public void purgeAllData() { + logger.warn("purgeAllPluginData not implemented for text. No data will be purged."); + } + + protected void loadScripts() throws PluginException { + // no op + } + + public void purgeExpiredData() throws PluginException { + int deletedRecords = 0; + + // only do full purge every few hours since incremental purge runs every + // minute + if (Calendar.getInstance().get(Calendar.HOUR_OF_DAY) % 3 == 0) { + TextDB.purgeStdTextProducts(); + } + + PurgeLogger.logInfo("Purged " + deletedRecords + " items total.", + "text"); + } +} diff --git a/after.txt b/after.txt new file mode 100644 index 0000000000..1f9927016d --- /dev/null +++ b/after.txt @@ -0,0 +1,13 @@ +-rw-r--r-- 1 dmsys dmtool 94518 May 17 14:24 cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java +-rw-r--r-- 1 dmsys dmtool 7156 May 17 14:24 cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTableCellData.java +-rw-r--r-- 1 dmsys dmtool 71285 May 17 14:24 cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java +-rw-r--r-- 1 dmsys dmtool 9851 May 17 14:24 cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java +-rw-r--r-- 1 dmsys dmtool 40157 May 17 14:24 cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java +-rw-r--r-- 1 dmsys dmtool 18611 May 17 14:24 cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java +-rw-r--r-- 1 dmsys dmtool 147202 May 17 14:24 cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java +-rw-r--r-- 1 dmsys dmtool 14664 May 17 14:24 edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java +-rw-r--r-- 1 dmsys dmtool 26923 May 17 14:24 edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java +-rw-r--r-- 1 dmsys dmtool 61981 May 17 14:24 edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/ScanUtils.java +-rw-r--r-- 1 dmsys dmtool 17730 May 17 14:24 edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPURIFilter.java +-rw-r--r-- 1 dmsys dmtool 65982 May 17 14:24 edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java +-rw-r--r-- 1 dmsys dmtool 36163 May 17 14:24 edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java diff --git a/after_purge.out b/after_purge.out new file mode 100644 index 0000000000..1256a29121 --- /dev/null +++ b/after_purge.out @@ -0,0 +1,5 @@ +-rw-r--r-- 1 dmsys dmtool 24661 May 24 17:52 edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java +-rw-r--r-- 1 dmsys dmtool 2197 May 24 17:52 edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java +-rw-r--r-- 1 dmsys dmtool 9250 May 24 17:53 edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeDao.java +-rw-r--r-- 1 dmsys dmtool 9574 May 24 17:53 edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java +-rw-r--r-- 1 dmsys dmtool 15681 May 24 17:53 edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeManager.java diff --git a/before.txt b/before.txt new file mode 100644 index 0000000000..31b3c9450e --- /dev/null +++ b/before.txt @@ -0,0 +1,13 @@ +-rw-r--r-- 1 dmsys dmtool 95993 May 10 11:41 cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java +-r--r--r-- 1 dmsys dmtool 7016 Nov 10 2011 cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTableCellData.java +-rw-r--r-- 1 dmsys dmtool 71722 May 10 11:41 cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java +-r--r--r-- 1 dmsys dmtool 10752 Dec 7 15:05 cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java +-rw-r--r-- 1 dmsys dmtool 40273 May 10 11:41 cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java +-r--r--r-- 1 dmsys dmtool 19531 Jan 31 07:54 cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java +-rw-r--r-- 1 dmsys dmtool 147364 May 10 11:41 cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java +-rw-r--r-- 1 dmsys dmtool 15108 May 10 11:41 edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java +-r--r--r-- 1 dmsys dmtool 27099 Apr 16 08:06 edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java +-r--r--r-- 1 dmsys dmtool 61329 Feb 24 14:37 edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/ScanUtils.java +-r--r--r-- 1 dmsys dmtool 21327 Apr 18 12:03 edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPURIFilter.java +-rw-r--r-- 1 dmsys dmtool 65837 May 7 10:47 edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java +-rw-r--r-- 1 dmsys dmtool 36591 May 10 11:41 edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java diff --git a/before_purge.out b/before_purge.out new file mode 100644 index 0000000000..8563dd00e2 --- /dev/null +++ b/before_purge.out @@ -0,0 +1,5 @@ +-rw-r--r-- 1 dmsys dmtool 23911 May 10 11:41 edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java +-r--r--r-- 1 dmsys dmtool 2000 Jun 15 2011 edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java +-rw-r--r-- 1 dmsys dmtool 9022 May 10 11:41 edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeDao.java +-rw-r--r-- 1 dmsys dmtool 9090 May 10 11:41 edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java +-rw-r--r-- 1 dmsys dmtool 15020 May 10 11:41 edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeManager.java diff --git a/cave/build/cave/memorySettings.xml b/cave/build/cave/memorySettings.xml index 3f1b79fe5e..711e74b738 100644 --- a/cave/build/cave/memorySettings.xml +++ b/cave/build/cave/memorySettings.xml @@ -30,7 +30,7 @@
time
+ flux
+ * SOFTWARE HISTORY * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * 29 June, 2009 2521 dhladky Initial creation * 11 Apr. 2012 DR 14522 gzhang Fixing invalid thread error. - * 16 Apr. 2012 DR 14511 gzhang Handling NullPointer in getGraphData() ** @author dhladky * @version 1.0 @@ -207,7 +207,7 @@ public class FFMPResource extends private IShadedShape streamShadedShape = null; /** always the same vertexes, one for each CWA **/ - private FFMPShapeContainer shadedShapes = new FFMPShapeContainer(); + private FFMPShapeContainer shadedShapes = new FFMPShapeContainer(); /** Basin shaded shape **/ protected ConcurrentHashMap
+ * SOFTWARE HISTORY + * Date Ticket# Engineer Description + * ------------ ---------- ----------- -------------------------- + * 22 April, 2012 2521 dhladky Initial creation + *+ * + * @author dhladky + * @version 1.0 + */ + + +public class FFMPTime { + + public double time = 0.0; + public boolean split = false; + + public FFMPTime(double time, boolean split) { + this.time = time; + this.split = split; + } + + public double getTime() { + return time; + } + + public boolean isSplit() { + return split; + } + +} + diff --git a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java index 99b14c299a..c9f8cc9aa3 100644 --- a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java +++ b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java @@ -77,6 +77,8 @@ import com.vividsolutions.jts.geom.Geometry; * 3/2/2009 2047 grichard Added stationName array. * 10/7/2009 **** dhladky reworked * 11/30/2009 3424 Zhidong/Slav/Wen Adds stationTableData to keep station info. + * May 15, 2012 14510 zhao Modified processing at startup + * * * * @author dhladky @@ -157,7 +159,8 @@ public class FogMonitor extends ObsMonitor implements IFogResourceListener { monitor.createDataStructures(); monitor.getAdjAreas(); monitor.processProductAtStartup("fog"); - } + monitor.fireMonitorEvent(monitor); + } return monitor; } @@ -585,4 +588,12 @@ public class FogMonitor extends ObsMonitor implements IFogResourceListener { this.geoAdjAreas = geoAdjAreas; } + @Override + protected void processAtStartup(ObReport report) { + obData.addReport(report); + String zone = findZone(report.getPlatformId()); + getTableData().getArea(zone).addReport(report.getObservationTime(), + report); + } + } diff --git a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java index 98313c4435..d50b2eab0a 100644 --- a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java +++ b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java @@ -77,6 +77,7 @@ import com.vividsolutions.jts.geom.Geometry; * 11/30/2009 3424 Zhidong/Slav/wkwock Use real station data. * Dec 30, 2009 3424 zhao use ObMultiHrsReports for obs data archive over time * July 20,2010 4891 skorolev Added resource listener + * May 15, 2012 14510 zhao Modified processing at startup * * * @@ -157,6 +158,7 @@ public class SafeSeasMonitor extends ObsMonitor implements ISSResourceListener { monitor.createDataStructures(); monitor.getAdjAreas(); monitor.processProductAtStartup("ss"); + monitor.fireMonitorEvent(monitor); } return monitor; } @@ -529,4 +531,9 @@ public class SafeSeasMonitor extends ObsMonitor implements ISSResourceListener { } + @Override + protected void processAtStartup(ObReport report) { + obData.addReport(report); + } + } diff --git a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java index 45c18bc4d5..450ec979de 100644 --- a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java +++ b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java @@ -66,6 +66,7 @@ import com.raytheon.viz.alerts.observers.ProductAlertObserver; * Dec 18, 2009 3424 zhao use ObMultiHrsReports for obs data archive over time * Dec 22, 2009 3424 zhao revised processProductAtStartup method to retrieve all data * July 20,2010 4891 skorolev Added resource listener + * May 15, 2012 14510 zhao Modified processing at startup * * * @@ -131,12 +132,13 @@ public class SnowMonitor extends ObsMonitor { obData = new ObMultiHrsReports(CommonConfig.AppName.SNOW); obData.setThresholdMgr(SnowThresholdMgr.getInstance()); // Pre-populate dialog with an observation (METAR) for KOMA - processProductAtStartup("snow"); - } + } public static synchronized SnowMonitor getInstance() { if (monitor == null) { monitor = new SnowMonitor(); + monitor.processProductAtStartup("snow"); + monitor.fireMonitorEvent(monitor); } return monitor; } @@ -382,4 +384,9 @@ public class SnowMonitor extends ObsMonitor { public void setZoneDialog(SnowZoneTableDlg zoneDialog) { this.zoneDialog = zoneDialog; } + + @Override + protected void processAtStartup(ObReport report) { + obData.addReport(report); + } } diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/GenerateFSSObReport.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/GenerateFSSObReport.java index 61a51ff097..186cdafd5d 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/GenerateFSSObReport.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/GenerateFSSObReport.java @@ -10,7 +10,12 @@ import com.raytheon.uf.common.monitor.data.ObConst.ReportType; import com.raytheon.uf.viz.monitor.data.ObReport; /** - * @author skorolev + * @author skorolev (initial creation) + * + * Change history: + * Date Ticket # Engineer Description + * --------------------------------------------------- + * May 15, 2012 14510 zhao Modified generateObReport() * */ public class GenerateFSSObReport { @@ -28,8 +33,13 @@ public class GenerateFSSObReport { // Generate the observation report. ObReport obReport = new ObReport(); FSSObsRecord metar = (FSSObsRecord) report; - obReport.setObservationTime(metar.getTimeObs().getTime()); - obReport.setRefHour(metar.getRefHour().getTime()); + try { + obReport.setObservationTime(metar.getTimeObs().getTime()); + obReport.setRefHour(metar.getRefHour().getTime()); + } catch (Exception e) { + System.out.println("Warning: missing obsTime or refHour at getTimeObs() when processing obs data; " + e + "; trying to set obsTime and refHour from dataURI"); + obReport.setTimesFromFssobDataURI(report.getDataURI()); + } obReport.setPlatformId(metar.getPlatformId()); obReport.setStationary(true); obReport.setLatitude((float) metar.getLatitude()); diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ObsMonitor.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ObsMonitor.java index 14a57f9295..ab54e7aa90 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ObsMonitor.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ObsMonitor.java @@ -29,9 +29,6 @@ import org.eclipse.swt.widgets.Display; import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.fssobs.FSSObsRecord; 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.time.DataTime; import com.raytheon.uf.viz.core.alerts.AlertMessage; import com.raytheon.uf.viz.core.catalog.LayerProperty; @@ -54,6 +51,7 @@ import com.raytheon.uf.viz.monitor.events.IMonitorThresholdEvent; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Feb 25, 2010 4759 dhladky Initial creation. + * Mar 15, 2012 14510 zhao modified processProductAtStartup() * * * @@ -63,8 +61,6 @@ import com.raytheon.uf.viz.monitor.events.IMonitorThresholdEvent; */ public abstract class ObsMonitor extends Monitor { - private static final IUFStatusHandler statusHandler = UFStatus.getHandler( - ObsMonitor.class, "ObsMonitor"); @Override protected abstract boolean filterNotifyMessage(NotificationMessage alertMessage); @@ -90,6 +86,8 @@ public abstract class ObsMonitor extends Monitor { */ protected abstract void process(ObReport result) throws Exception; + + protected abstract void processAtStartup(ObReport report); @Override protected abstract void processNotifyMessage(NotificationMessage filtered); @@ -246,30 +244,19 @@ public abstract class ObsMonitor extends Monitor { final Object[] resp = Connector.getInstance().connect(script, null, 60000); - System.out.println("ObsMonitor: Retriving data for monitor: " - + monitorUse); + System.out.println("ObsMonitor: Retriving data for monitor: " + monitorUse); if ((resp != null) && (resp.length > 0)) { - Display.getDefault().syncExec(new Runnable() { - public void run() { + //Display.getDefault().syncExec(new Runnable() { + //public void run() { for (int j = 0; j < resp.length; j++) { PluginDataObject objectToSend = (PluginDataObject) resp[j]; - // ObReport obReport = new ObReport(); - // obReport.init(); - ObReport result = GenerateFSSObReport - .generateObReport(objectToSend); - try { - process(result); - } catch (Exception e) { - // TODO Auto-generated catch block. Please - // revise as appropriate. - statusHandler.handle(Priority.PROBLEM, - e.getLocalizedMessage(), e); - } + ObReport result = GenerateFSSObReport.generateObReport(objectToSend); + processAtStartup(result); } - } + //} - }); + //}); } else if (resp == null) { System.out diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/AreaContainer.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/AreaContainer.java index 39952c777d..f34434621b 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/AreaContainer.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/AreaContainer.java @@ -113,7 +113,6 @@ public class AreaContainer { if (report == null) { report = new ObReport(); - report.init(); } return report; diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObReport.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObReport.java index 02279c4a85..25f637af10 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObReport.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObReport.java @@ -19,6 +19,7 @@ **/ package com.raytheon.uf.viz.monitor.data; +import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.TimeZone; @@ -41,6 +42,7 @@ import com.raytheon.uf.common.time.SimulatedTime; * Feb 12, 2009 1999 grichard Initial creation. * Dec 9, 2009 3424 zhao Added member waveHeight and method get(varName) * Jan 22, 2010 3888 zhao Removed member waveHeight, which is the same as highResWaveHeight + * May 15, 2012 14510 zhao added setTimesFromFssobsDataURI() * * * @@ -175,11 +177,11 @@ public class ObReport { // Public constructor public ObReport() { - + init(); } // Initializer of report - public void init() { + private void init() { Date now = SimulatedTime.getSystemTime().getTime(); Calendar deltaTime = Calendar.getInstance(TimeZone.getTimeZone("UTC")); @@ -694,5 +696,22 @@ public class ObReport { public void setSeaLevelPress(float seaLevelPress) { this.seaLevelPress = seaLevelPress; } - +/** + * When obs time is missing; set obs time and ref time from fssobs dataURI + * Format of fssobs dataURI: + * /fssobs/2012-05-14_16:35:00.0/METAR/OAX/KSDA/40.75/-95.41999816894531/ss + */ + public void setTimesFromFssobDataURI(String dataURI) { + String str = dataURI.substring(8, 24); + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'_'hh:mm"); + try { + Date obsTime = df.parse(str); + Date refTime = TableUtil.getNominalTime(obsTime); + this.observationTime = obsTime; + this.refHour = refTime; + } catch (java.text.ParseException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } } diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObStnHourReports.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObStnHourReports.java index 2287568ad3..e2a057dc3a 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObStnHourReports.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObStnHourReports.java @@ -87,7 +87,6 @@ public class ObStnHourReports { ObReport report = null; if ( stnReports.isEmpty() ) { // empty report for empty/default row in station table report = new ObReport(); - report.init(); } else { report = stnReports.get(stnReports.lastKey()); } diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObZoneHourReports.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObZoneHourReports.java index 877ca33c92..0bd541647a 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObZoneHourReports.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObZoneHourReports.java @@ -91,7 +91,6 @@ public class ObZoneHourReports { private void InitWorstValues() { worstValues = new ObReport(); - worstValues.init(); worstValues.setZoneId(zone); // the ObReport's init() sets "zone id" to "" !!! } diff --git a/cave/com.raytheon.uf.viz.ncep.displays.feature/feature.xml b/cave/com.raytheon.uf.viz.ncep.displays.feature/feature.xml index a80cc9b566..32717cd93c 100644 --- a/cave/com.raytheon.uf.viz.ncep.displays.feature/feature.xml +++ b/cave/com.raytheon.uf.viz.ncep.displays.feature/feature.xml @@ -312,4 +312,25 @@ version="0.0.0" unpack="false"/> +
- * - * SOFTWARE HISTORY - * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Dec 6, 2011 mschenke Initial creation - * - *- * - * @author mschenke - * @version 1.0 - */ - -public class VIIRSProductBrowserDefinition extends - AbstractRequestableProductBrowserDataDefinition
- * - * SOFTWARE HISTORY - * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Nov 30, 2011 mschenke Initial creation - * - *- * - * @author mschenke - * @version 1.0 - */ - -public class VIIRSDataCallback implements IColorMapDataRetrievalCallback { - - private VIIRSDataRecord dataRecord; - - private Rectangle validDataBounds; - - public VIIRSDataCallback(VIIRSDataRecord dataRecord, - Rectangle validDataBounds) { - this.dataRecord = dataRecord; - this.validDataBounds = validDataBounds; - } - - /* - * (non-Javadoc) - * - * @see - * com.raytheon.uf.viz.core.data.IColorMapDataRetrievalCallback#getColorMapData - * () - */ - @Override - public ColorMapData getColorMapData() throws VizException { - try { - int[] sizes = new int[] { validDataBounds.width, - validDataBounds.height }; - IDataStore dataStore = DataStoreFactory.getDataStore(HDF5Util - .findHDF5Location(dataRecord)); - IDataRecord rawData = dataStore.retrieve(dataRecord.getDataURI(), - VIIRSDataRecord.getDataSet(0), - Request.buildSlab(new int[] { 0, 0 }, sizes)); - - Buffer shortData = ShortBuffer.wrap(((ShortDataRecord) rawData) - .getShortData()); - return new ColorMapData(shortData, sizes, - ColorMapDataType.UNSIGNED_SHORT); - } catch (Throwable t) { - throw new VizException(t); - } - } - - /* - * (non-Javadoc) - * - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result - + ((dataRecord == null) ? 0 : dataRecord.hashCode()); - result = prime * result - + ((validDataBounds == null) ? 0 : validDataBounds.hashCode()); - return result; - } - - /* - * (non-Javadoc) - * - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - VIIRSDataCallback other = (VIIRSDataCallback) obj; - if (dataRecord == null) { - if (other.dataRecord != null) - return false; - } else if (!dataRecord.equals(other.dataRecord)) - return false; - if (validDataBounds == null) { - if (other.validDataBounds != null) - return false; - } else if (!validDataBounds.equals(other.validDataBounds)) - return false; - return true; - } - -} diff --git a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSDataMathTransform.java b/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSDataMathTransform.java deleted file mode 100644 index b26db0540c..0000000000 --- a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSDataMathTransform.java +++ /dev/null @@ -1,300 +0,0 @@ -/** - * This software was developed and / or modified by Raytheon Company, - * pursuant to Contract DG133W-05-CQ-1067 with the US Government. - * - * U.S. EXPORT CONTROLLED TECHNICAL DATA - * This software product contains export-restricted data whose - * export/transfer/disclosure is restricted by U.S. law. Dissemination - * to non-U.S. persons whether in the United States or abroad requires - * an export license or other authorization. - * - * Contractor Name: Raytheon Company - * Contractor Address: 6825 Pine Street, Suite 340 - * Mail Stop B8 - * Omaha, NE 68106 - * 402.291.0100 - * - * See the AWIPS II Master Rights File ("Master Rights File.pdf") for - * further licensing information. - **/ -package com.raytheon.uf.viz.npp.viirs.rsc; - -import org.opengis.geometry.DirectPosition; -import org.opengis.geometry.MismatchedDimensionException; -import org.opengis.referencing.operation.MathTransform; -import org.opengis.referencing.operation.Matrix; -import org.opengis.referencing.operation.NoninvertibleTransformException; -import org.opengis.referencing.operation.TransformException; - -import com.vividsolutions.jts.geom.Coordinate; -import com.vividsolutions.jts.geom.LineSegment; - -/** - * TODO Add Description - * - *
- * - * SOFTWARE HISTORY - * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Nov 30, 2011 mschenke Initial creation - * - *- * - * @author mschenke - * @version 1.0 - */ - -public class VIIRSDataMathTransform implements MathTransform { - - private float[] latitudes; - - private float[] longitudes; - - private int width, height; - - public VIIRSDataMathTransform(float[][] projectionData, int width, - int height) { - this.longitudes = projectionData[0]; - this.latitudes = projectionData[1]; - this.height = height; - this.width = width; - } - - /* - * (non-Javadoc) - * - * @see - * org.opengis.referencing.operation.MathTransform#derivative(org.opengis - * .geometry.DirectPosition) - */ - @Override - public Matrix derivative(DirectPosition arg0) - throws MismatchedDimensionException, TransformException { - return null; - } - - /* - * (non-Javadoc) - * - * @see - * org.opengis.referencing.operation.MathTransform#getSourceDimensions() - */ - @Override - public int getSourceDimensions() { - return 0; - } - - /* - * (non-Javadoc) - * - * @see - * org.opengis.referencing.operation.MathTransform#getTargetDimensions() - */ - @Override - public int getTargetDimensions() { - return 0; - } - - /* - * (non-Javadoc) - * - * @see org.opengis.referencing.operation.MathTransform#inverse() - */ - @Override - public MathTransform inverse() throws NoninvertibleTransformException { - return null; - } - - /* - * (non-Javadoc) - * - * @see org.opengis.referencing.operation.MathTransform#isIdentity() - */ - @Override - public boolean isIdentity() { - return false; - } - - /* - * (non-Javadoc) - * - * @see org.opengis.referencing.operation.MathTransform#toWKT() - */ - @Override - public String toWKT() throws UnsupportedOperationException { - System.out.println("toWKT?"); - return null; - } - - /* - * (non-Javadoc) - * - * @see - * org.opengis.referencing.operation.MathTransform#transform(org.opengis - * .geometry.DirectPosition, org.opengis.geometry.DirectPosition) - */ - @Override - public DirectPosition transform(DirectPosition arg0, DirectPosition arg1) - throws MismatchedDimensionException, TransformException { - System.out.println("transform a bunch of DirectPositions?"); - return null; - } - - /* - * (non-Javadoc) - * - * @see org.opengis.referencing.operation.MathTransform#transform(double[], - * int, double[], int, int) - */ - @Override - public void transform(double[] in, int inOffset, double[] out, - int outOffset, int numPoints) throws TransformException { - for (int i = 0; i < numPoints; ++i) { - int xIdx = (i * 2); - int yIdx = (i * 2) + 1; - - double xLoc = in[xIdx] - 0.5; - // TODO: Why is data flipped along "y" axis? - double yLoc = height - in[yIdx] - 0.5; - out[xIdx] = getInterpolatedValue(xLoc, yLoc, 0); - out[yIdx] = getInterpolatedValue(xLoc, yLoc, 1); - } - } - - /* - * (non-Javadoc) - * - * @see org.opengis.referencing.operation.MathTransform#transform(float[], - * int, float[], int, int) - */ - @Override - public void transform(float[] arg0, int arg1, float[] arg2, int arg3, - int arg4) throws TransformException { - } - - /* - * (non-Javadoc) - * - * @see org.opengis.referencing.operation.MathTransform#transform(float[], - * int, double[], int, int) - */ - @Override - public void transform(float[] arg0, int arg1, double[] arg2, int arg3, - int arg4) throws TransformException { - } - - /* - * (non-Javadoc) - * - * @see org.opengis.referencing.operation.MathTransform#transform(double[], - * int, float[], int, int) - */ - @Override - public void transform(double[] arg0, int arg1, float[] arg2, int arg3, - int arg4) throws TransformException { - } - - protected float getInterpolatedValue(double xd, double yd, int dim) { - float value = 0.0f; - float missing = 1.0f; - - float x = (float) xd; - float y = (float) yd; - - int xi = (int) x; - int yi = (int) y; - // Upper left corner - float xWeight = 1 - x + xi; - float yWeight = 1 - y + yi; - float weight = xWeight * yWeight; - float val = getRawDataValue(xi, yi, dim); - if (Float.isNaN(val)) { - missing -= weight; - } else { - value += weight * val; - } - // upper right corner - xi = xi + 1; - xWeight = 1 - xi + x; - yWeight = 1 - y + yi; - weight = xWeight * yWeight; - val = getRawDataValue(xi, yi, dim); - if (Float.isNaN(val)) { - missing -= weight; - } else { - value += weight * val; - } - // lower right corner - yi = yi + 1; - xWeight = 1 - xi + x; - yWeight = 1 - yi + y; - weight = xWeight * yWeight; - val = getRawDataValue(xi, yi, dim); - if (Float.isNaN(val)) { - missing -= weight; - } else { - value += weight * val; - } - // lower left corner - xi = xi - 1; - xWeight = 1 - x + xi; - yWeight = 1 - yi + y; - weight = xWeight * yWeight; - val = getRawDataValue(xi, yi, dim); - if (Float.isNaN(val)) { - missing -= weight; - } else { - value += weight * val; - } - - return value / missing; - } - - /** - * @param xi - * @param yi - * @param dim - * @return - */ - private float getRawDataValue(int xi, int yi, int dim) { - Coordinate c = null; - if (xi >= 0 && xi < width && yi >= 0 && yi < height) { - c = index(xi, yi); - } else { - int xInc = 0; - int closestX = xi; - if (closestX < 0) { - closestX = 0; - xInc = 1; - } else if (closestX >= width) { - closestX = width - 1; - xInc = -1; - } - - int yInc = 0; - int closestY = yi; - if (closestY < 0) { - closestY = 0; - yInc = 1; - } else if (closestY >= height) { - closestY = height - 1; - yInc = -1; - } - - Coordinate a = index(closestX, closestY); - Coordinate b = index(closestX + xInc, closestY + yInc); - LineSegment ls = new LineSegment(a, b); - int xDiff = closestX - xi; - int yDiff = closestY - yi; - c = ls.pointAlong(-Math.sqrt(xDiff * xDiff + yDiff * yDiff)); - } - return (float) (dim == 0 ? c.x : c.y); - } - - private Coordinate index(int xi, int yi) { - return new Coordinate(longitudes[yi * width + xi], latitudes[yi * width - + xi]); - } -} \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSResource.java b/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSResource.java deleted file mode 100644 index 745f942f11..0000000000 --- a/cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSResource.java +++ /dev/null @@ -1,445 +0,0 @@ -/** - * This software was developed and / or modified by Raytheon Company, - * pursuant to Contract DG133W-05-CQ-1067 with the US Government. - * - * U.S. EXPORT CONTROLLED TECHNICAL DATA - * This software product contains export-restricted data whose - * export/transfer/disclosure is restricted by U.S. law. Dissemination - * to non-U.S. persons whether in the United States or abroad requires - * an export license or other authorization. - * - * Contractor Name: Raytheon Company - * Contractor Address: 6825 Pine Street, Suite 340 - * Mail Stop B8 - * Omaha, NE 68106 - * 402.291.0100 - * - * See the AWIPS II Master Rights File ("Master Rights File.pdf") for - * further licensing information. - **/ -package com.raytheon.uf.viz.npp.viirs.rsc; - -import java.awt.Point; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.measure.unit.Unit; - -import com.raytheon.uf.common.dataplugin.annotations.DataURI; -import com.raytheon.uf.common.dataplugin.npp.viirs.VIIRSDataRecord; -import com.raytheon.uf.common.dataplugin.npp.viirs.VIIRSSpatialRecord; -import com.raytheon.uf.common.datastorage.DataStoreFactory; -import com.raytheon.uf.common.datastorage.IDataStore; -import com.raytheon.uf.common.datastorage.Request; -import com.raytheon.uf.common.datastorage.records.FloatDataRecord; -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.time.BinOffset; -import com.raytheon.uf.common.time.DataTime; -import com.raytheon.uf.viz.core.DrawableImage; -import com.raytheon.uf.viz.core.HDF5Util; -import com.raytheon.uf.viz.core.IGraphicsTarget; -import com.raytheon.uf.viz.core.IGraphicsTarget.RasterMode; -import com.raytheon.uf.viz.core.drawables.ColorMapLoader; -import com.raytheon.uf.viz.core.drawables.ColorMapParameters; -import com.raytheon.uf.viz.core.drawables.IImage; -import com.raytheon.uf.viz.core.drawables.PaintProperties; -import com.raytheon.uf.viz.core.drawables.ext.colormap.IColormappedImageExtension; -import com.raytheon.uf.viz.core.exception.VizException; -import com.raytheon.uf.viz.core.map.IMapDescriptor; -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.rsc.capabilities.ImagingCapability; -import com.raytheon.uf.viz.core.rsc.hdf5.ImageTile; - -/** - * NPP VIIRS resource. Responsible for drawing a single color band - * - *
- * - * SOFTWARE HISTORY - * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Nov 30, 2011 mschenke Initial creation - * - *- * - * @author mschenke - * @version 1.0 - */ - -public class VIIRSResource extends - AbstractVizResource
- * - * SOFTWARE HISTORY - * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Nov 30, 2011 mschenke Initial creation - * - *- * - * @author mschenke - * @version 1.0 - */ -@XmlAccessorType(XmlAccessType.NONE) -public class VIIRSResourceData extends AbstractRequestableResourceData { - - /* - * (non-Javadoc) - * - * @see com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData# - * constructResource(com.raytheon.uf.viz.core.rsc.LoadProperties, - * com.raytheon.uf.viz.core.rsc.PluginDataObject[]) - */ - @Override - protected AbstractVizResource constructResource( - LoadProperties loadProperties, PluginDataObject[] objects) - throws VizException { - List
* SOFTWARE HISTORY
@@ -51,21 +48,14 @@ import com.raytheon.viz.core.gl.IGLTarget;
* @author estrabal
* @version 1.0
*/
-public class GLView2D extends GLAbstractView {
- private final Plane mapPlane = new Plane(0.0, 0.0, 1.0, 0.0, false);
+public class GLView2D implements IView {
- /*
- * (non-Javadoc)
- *
- * @see com.raytheon.viz.core.IView#getDisplayType()
- */
- @Override
- public String getDisplayType() {
- return "2D";
- }
+ private static final Plane mapPlane = new Plane(0.0, 0.0, 1.0, 0.0, false);
+
+ private IExtent extent;
public GLView2D() {
-
+ this(0, 0, 0, 0);
}
/**
@@ -75,20 +65,27 @@ public class GLView2D extends GLAbstractView {
* @param maxY
*/
public GLView2D(double minX, double maxX, double minY, double maxY) {
- super(new PixelExtent(minX, maxX, minY, maxY));
+ this.extent = new PixelExtent(minX, maxX, minY, maxY);
}
/**
* @param rect
*/
public GLView2D(Rectangle rect) {
-
this(rect.x, rect.x + rect.width, rect.y, rect.y + rect.height);
-
}
- public GLView2D(PixelExtent pe) {
- super(pe);
+ public GLView2D(IExtent pe) {
+ this.extent = pe;
+ }
+
+ protected IGLTarget asIGLTarget(IGraphicsTarget target) {
+ if (target instanceof IGLTarget) {
+ return (IGLTarget) target;
+ } else {
+ throw new IllegalArgumentException("Require type IGLTarget got "
+ + target);
+ }
}
/**
@@ -119,20 +116,6 @@ public class GLView2D extends GLAbstractView {
(extent.getMaxY() - extent.getMinY()) / worldHeight);
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object arg0) {
- if (arg0 == null || !(arg0 instanceof GLView2D)) {
- return false;
- }
-
- return this.getExtent().equals(((GLView2D) arg0).getExtent());
- }
-
public boolean isVisible(double[] pixel) {
return getExtent().contains(pixel);
}
@@ -167,81 +150,6 @@ public class GLView2D extends GLAbstractView {
return "GLView2D { " + this.getExtent().toString() + " }";
}
- // /**
- // * Serialize a pixel extent
- // *
- // * @param view
- // * @return the serialized form
- // */
- // public static String serialize(DisplayView view) {
- // if (view == null)
- // return null;
- //
- // StringBuffer sb = new StringBuffer();
- // sb.append(view.getMinX());
- // sb.append(" ");
- // sb.append(view.getMaxX());
- // sb.append(" ");
- // sb.append(view.getMinY());
- // sb.append(" ");
- // sb.append(view.getMaxY());
- // return sb.toString();
- // }
- //
- // /**
- // * Deserialize a pixel extent from a string
- // *
- // * @param data
- // * the serialized form fo the pixel extent
- // * @return the pixel extent object
- // */
- // public static DisplayView deserialize(String data) {
- // if (data == null) {
- // return null;
- // }
- //
- // String[] parts = data.split(" ");
- // if (parts.length != 4) {
- // return null;
- // }
- //
- // double[] vals = new double[4];
- // for (int i = 0; i < vals.length; i++) {
- // vals[i] = Double.parseDouble(parts[i]);
- // }
- //
- // return new DisplayView(vals[0], vals[1], vals[2], vals[3]);
- //
- // }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * com.raytheon.viz.core.gl.internal.GLAbstractView#setProjectionMatrix()
- */
- @Override
- protected void setProjectionMatrix(IGLTarget target) {
-
- // We "flip" y-axis for sanity reasons
- target.getGlu().gluOrtho2D(this.extent.getMinX(),
- this.extent.getMaxX(), this.extent.getMaxY(),
- this.extent.getMinY());
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see
- * com.raytheon.viz.core.gl.internal.GLAbstractView#setModelViewMatrix(IGLTarget
- * )
- */
- @Override
- protected void setModelViewMatrix(IGLTarget target) {
-
- }
-
/*
* (non-Javadoc)
*
@@ -296,32 +204,42 @@ public class GLView2D extends GLAbstractView {
return null;
}
- Vector3d i = this.mapPlane.intersection(r);
+ Vector3d i = mapPlane.intersection(r);
if (i == null) {
return null;
}
return new double[] { i.x, i.y, i.z };
}
- /*
- * (non-Javadoc)
+ /**
+ * Create a Ray starting a the near plane with direction towards the far
*
- * @see com.raytheon.viz.core.IView#setClippingPlanes()
+ * @param mouse
+ * mouse x,y
+ * @return Ray
*/
- @Override
- public void setClippingPlanes() throws VizException {
+ public Ray computeRay(double[] mouse, IGraphicsTarget target) {
+ Vector3d far = new Vector3d(screenToGrid(mouse[0], mouse[1], 1, target));
+ Vector3d near = new Vector3d(
+ screenToGrid(mouse[0], mouse[1], 0, target));
+ if (near == null || far == null) {
+ return null;
+ }
+ far.sub(near);
+ far.normalize();
+
+ return new Ray(near, far);
}
/*
* (non-Javadoc)
*
- * @see com.raytheon.viz.core.View#getClippingPlanes()
+ * @see com.raytheon.uf.viz.core.IView#getExtent()
*/
@Override
- public Plane[] getClippingPlanes() {
- // TODO Auto-generated method stub
- return null;
+ public IExtent getExtent() {
+ return extent;
}
/*
@@ -331,42 +249,7 @@ public class GLView2D extends GLAbstractView {
*/
@Override
public void setExtent(IExtent e) {
- extent = e;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#clone()
- */
- @Override
- public Object clone() {
-
- GLView2D v = new GLView2D((PixelExtent) this.extent.clone());
- return v;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.raytheon.viz.core.IView#shiftPOV(double[], double[])
- */
- @Override
- public boolean shiftPOV(double[] lastMouse, double[] currentMouse,
- POVShiftType shiftType, IGraphicsTarget target) {
- // TODO Auto-generated method stub
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.raytheon.viz.core.IView#setMapCenter(javax.vecmath.Vector3d)
- */
- @Override
- public void setCenter(Vector3d point) {
- // TODO Auto-generated method stub
-
+ this.extent = e;
}
/*
@@ -378,8 +261,8 @@ public class GLView2D extends GLAbstractView {
*/
@Override
public IExtent createExtent(PixelCoverage pc) {
- return new PixelExtent(pc.getMinX(), pc.getMaxX(), pc.getMinY(), pc
- .getMaxY());
+ return new PixelExtent(pc.getMinX(), pc.getMaxX(), pc.getMinY(),
+ pc.getMaxY());
}
/*
@@ -394,7 +277,6 @@ public class GLView2D extends GLAbstractView {
double[] end = screenToGrid(endScreen[0], endScreen[1], 0, target);
this.extent.shift(end[0] - start[0], end[1] - start[1]);
-
}
/*
@@ -430,18 +312,78 @@ public class GLView2D extends GLAbstractView {
this.extent.shift((f_worldWidth - extent.getWidth()) / 2,
(f_worldHeight - extent.getHeight()) / 2);
-
}
/*
* (non-Javadoc)
*
- * @see com.raytheon.viz.core.gl.internal.GLAbstractView#setViewArea()
+ * @see com.raytheon.uf.viz.core.IView#setupView(com.raytheon.uf.viz.core.
+ * IGraphicsTarget)
*/
@Override
- protected void setViewArea(IGLTarget target) {
- target.getGl().glDisable(GL.GL_DEPTH_TEST);
+ public void setupView(IGraphicsTarget target) {
+ IGLTarget glTarget = asIGLTarget(target);
+ GL gl = glTarget.getGl();
+ GLU glu = glTarget.getGlu();
+ boolean release = glTarget.makeContextCurrent();
+ gl.glMatrixMode(GL.GL_PROJECTION);
+ gl.glLoadIdentity();
+ // We "flip" y-axis for sanity reasons
+ glu.gluOrtho2D(this.extent.getMinX(), this.extent.getMaxX(),
+ this.extent.getMaxY(), this.extent.getMinY());
+
+ gl.glMatrixMode(GL.GL_MODELVIEW);
+ gl.glLoadIdentity();
+
+ gl.glDisable(GL.GL_DEPTH_TEST);
+ if (release) {
+ glTarget.releaseContext();
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.raytheon.uf.viz.core.IView#getZoom()
+ */
+ @Override
+ public double getZoom() {
+ return extent.getScale();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.raytheon.uf.viz.core.IView#zoom(double)
+ */
+ @Override
+ public void zoom(double zoomLevel) {
+ this.extent.scale(zoomLevel);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ @Override
+ public boolean equals(Object arg0) {
+ if (arg0 == null || !(arg0 instanceof GLView2D)) {
+ return false;
+ }
+
+ return this.getExtent().equals(((GLView2D) arg0).getExtent());
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Object#clone()
+ */
+ @Override
+ public Object clone() {
+ return new GLView2D((PixelExtent) this.extent.clone());
}
}
diff --git a/cave/com.raytheon.viz.core/src/com/raytheon/viz/core/drawables/ColorMapParameterFactory.java b/cave/com.raytheon.viz.core/src/com/raytheon/viz/core/drawables/ColorMapParameterFactory.java
index 7b8566b535..2a921cd2da 100644
--- a/cave/com.raytheon.viz.core/src/com/raytheon/viz/core/drawables/ColorMapParameterFactory.java
+++ b/cave/com.raytheon.viz.core/src/com/raytheon/viz/core/drawables/ColorMapParameterFactory.java
@@ -137,10 +137,11 @@ public class ColorMapParameterFactory {
min = Float.POSITIVE_INFINITY;
max = Float.NEGATIVE_INFINITY;
for (Number num : numArray) {
- if (num.floatValue() != Util.GRID_FILL_VALUE) {
+ if (num.floatValue() != Util.GRID_FILL_VALUE
+ && !Float.isNaN(num.floatValue())) {
colormapMin = min = Math.min(min, num.floatValue());
+ colormapMax = max = Math.max(max, num.floatValue());
}
- colormapMax = max = Math.max(max, num.floatValue());
}
if (min == Float.POSITIVE_INFINITY) {
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/DisplayModeButton.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/DisplayModeButton.java
index d17da51687..521fdd090c 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/DisplayModeButton.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/DisplayModeButton.java
@@ -21,9 +21,6 @@ package com.raytheon.viz.gfe.actions;
import java.util.Map;
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.commands.IElementUpdater;
import org.eclipse.ui.menus.UIElement;
@@ -32,6 +29,7 @@ import com.raytheon.viz.gfe.core.msgs.GMDisplayModeMsg;
import com.raytheon.viz.gfe.core.msgs.Message;
import com.raytheon.viz.gfe.gridmanager.GridMode;
import com.raytheon.viz.ui.UiUtil;
+import com.raytheon.viz.ui.actions.AbstractDropDownMenuHandler;
/**
* Display Mode Button
@@ -48,21 +46,9 @@ import com.raytheon.viz.ui.UiUtil;
* @version 1.0
*/
-public class DisplayModeButton extends AbstractHandler implements
+public class DisplayModeButton extends AbstractDropDownMenuHandler implements
IElementUpdater {
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands
- * .ExecutionEvent)
- */
- @Override
- public Object execute(ExecutionEvent arg0) throws ExecutionException {
- return null;
- }
-
/*
* (non-Javadoc)
*
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/EditAreaModeButton.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/EditAreaModeButton.java
index a79a950c09..e46d177c76 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/EditAreaModeButton.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/EditAreaModeButton.java
@@ -21,14 +21,12 @@ package com.raytheon.viz.gfe.actions;
import java.util.Map;
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
import org.eclipse.ui.commands.IElementUpdater;
import org.eclipse.ui.menus.UIElement;
import com.raytheon.viz.gfe.core.DataManager;
import com.raytheon.viz.gfe.core.IReferenceSetManager.RefSetMode;
+import com.raytheon.viz.ui.actions.AbstractDropDownMenuHandler;
/**
* TODO Add Description
@@ -45,24 +43,15 @@ import com.raytheon.viz.gfe.core.IReferenceSetManager.RefSetMode;
* @version 1.0
*/
-public class EditAreaModeButton extends AbstractHandler implements
+public class EditAreaModeButton extends AbstractDropDownMenuHandler implements
IElementUpdater {
/*
* (non-Javadoc)
*
- * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
- */
- @Override
- public Object execute(ExecutionEvent arg0) throws ExecutionException {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.commands.IElementUpdater#updateElement(org.eclipse.ui.menus.UIElement,
- * java.util.Map)
+ * @see
+ * org.eclipse.ui.commands.IElementUpdater#updateElement(org.eclipse.ui.
+ * menus.UIElement, java.util.Map)
*/
@Override
@SuppressWarnings("unchecked")
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/AbstractGridData.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/AbstractGridData.java
index b015a8d24b..50df7c16a5 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/AbstractGridData.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/AbstractGridData.java
@@ -242,6 +242,7 @@ public abstract class AbstractGridData implements IGridData {
* Resets the fields, then notifies the parm that history has updated.
*
*/
+ @Override
public void resetSavePublishHistory() {
for (GridDataHistory history : this.gridSlice.getHistory()) {
history.setUpdateTime(null);
@@ -256,6 +257,7 @@ public abstract class AbstractGridData implements IGridData {
*
* @return true if the method succeeded
*/
+ @Override
public boolean setSaveHistory() {
Date current = SimulatedTime.getSystemTime().getTime();
for (int i = 0; i < this.getHistory().length; i++) {
@@ -274,6 +276,7 @@ public abstract class AbstractGridData implements IGridData {
* the modifier
*
*/
+ @Override
public void updateHistoryToModified(WsId modifier) {
Date now = SimulatedTime.getSystemTime().getTime();
for (int i = 0; i < getHistory().length; i++) {
@@ -295,6 +298,7 @@ public abstract class AbstractGridData implements IGridData {
* @param sourceGrid
* the original grid
*/
+ @Override
public boolean copyGridValues(final IGridData sourceGrid) {
populate();
@@ -587,6 +591,7 @@ public abstract class AbstractGridData implements IGridData {
return false;
}
+ @Override
public boolean smooth(final Date time, Grid2DBit pointsToSmooth) {
populate();
@@ -730,6 +735,7 @@ public abstract class AbstractGridData implements IGridData {
// ---------------------------------------------------------
// Checks ok to edit. If okay, then calls virtual doMoveCopy.
// ---------------------------------------------------------------------------
+ @Override
public boolean moveCopyArea(final Date time,
final Grid2DBit pointsToMoveCopy, final Point delta, boolean copyOp) {
populate();
@@ -857,6 +863,10 @@ public abstract class AbstractGridData implements IGridData {
if (!this.isPopulated()) {
return;
}
+ String msg = "Depopulating " + getParm().getParmID() + " tr="
+ + getGridTime();
+ statusHandler.handle(Priority.DEBUG, msg, new Exception("Debug: "
+ + msg));
this.lastAccessTime = SimulatedTime.getSystemTime().getTime();
setGridSliceDataToNull();
@@ -865,6 +875,7 @@ public abstract class AbstractGridData implements IGridData {
protected abstract void setGridSliceDataToNull();
+ @Override
public List getHistorySites() {
GridDataHistory[] h = this.getHistory();
List sites = new ArrayList();
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/DiscreteGridData.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/DiscreteGridData.java
index f6f28d79df..f61fb64209 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/DiscreteGridData.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/DiscreteGridData.java
@@ -831,14 +831,17 @@ public class DiscreteGridData extends AbstractGridData implements INumpyable {
return setIt;
}
+ @Override
public Object[] getNumPy() {
return new Object[] { this.getGrid().getBuffer().array() };
}
+ @Override
public int getNumpyX() {
return this.getGrid().getXdim();
}
+ @Override
public int getNumpyY() {
return this.getGrid().getYdim();
}
@@ -927,7 +930,7 @@ public class DiscreteGridData extends AbstractGridData implements INumpyable {
if (points.get(i, j) == 1) {
DiscreteKey combined = DiscreteKey.combine(
key.get(values.get(i, j)),
- doGetDiscreteValue(grid, key, new Point(i, j)));
+ doGetDiscreteValue(i, j));
grid.set(i, j, lookupKeyValue(combined));
}
}
@@ -937,10 +940,9 @@ public class DiscreteGridData extends AbstractGridData implements INumpyable {
setGrid(grid);
}
- protected DiscreteKey doGetDiscreteValue(Grid2DByte grid,
- List key, Point gridLoc) {
- byte gridValue = grid.get(gridLoc.x, gridLoc.y);
- return key.get(gridValue);
+ protected DiscreteKey doGetDiscreteValue(int x, int y) {
+ byte gridValue = getGrid().get(x, y);
+ return getKey()[gridValue];
}
/*
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/WeatherGridData.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/WeatherGridData.java
index bfc9e30f3b..5b4168bac7 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/WeatherGridData.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/WeatherGridData.java
@@ -807,14 +807,17 @@ public class WeatherGridData extends AbstractGridData implements INumpyable {
return pointsToFillIn;
}
+ @Override
public Object[] getNumPy() {
return new Object[] { this.getGrid().getBuffer().array() };
}
+ @Override
public int getNumpyX() {
return this.getGrid().getXdim();
}
+ @Override
public int getNumpyY() {
return this.getGrid().getYdim();
}
@@ -897,8 +900,7 @@ public class WeatherGridData extends AbstractGridData implements INumpyable {
if (points.get(i, j) == 1) {
WeatherKey combined = new WeatherKey(key.get(values
.get(i, j)));
- combined.addAll(doGetWeatherValue(grid, key, new Point(
- i, j)));
+ combined.addAll(doGetWeatherValue(i, j));
grid.set(i, j, lookupKeyValue(combined));
}
}
@@ -908,10 +910,9 @@ public class WeatherGridData extends AbstractGridData implements INumpyable {
setGrid(grid);
}
- protected WeatherKey doGetWeatherValue(Grid2DByte grid,
- List key, Point gridLoc) {
- byte gridValue = grid.get(gridLoc.x, gridLoc.y);
- return key.get(gridValue);
+ protected WeatherKey doGetWeatherValue(int x, int y) {
+ byte gridValue = getGrid().get(x, y);
+ return getKeys()[gridValue];
}
/*
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
index cb820f0e0f..32f2fdcf80 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
@@ -39,6 +39,7 @@ import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
import com.raytheon.uf.common.dataplugin.gfe.discrete.DiscreteKey;
import com.raytheon.uf.common.dataplugin.gfe.server.lock.LockTable;
import com.raytheon.uf.common.dataplugin.gfe.server.lock.LockTable.LockMode;
+import com.raytheon.uf.common.dataplugin.gfe.server.lock.LockTable.LockStatus;
import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerMsg;
import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
import com.raytheon.uf.common.dataplugin.gfe.server.request.LockRequest;
@@ -471,6 +472,7 @@ public class DbParm extends Parm {
// List gridsSaved = new ArrayList();
List sgr = new ArrayList();
List lreq = new ArrayList();
+ List pendingUnlocks = new ArrayList();
GridLocation gloc = this.getGridInfo().getGridLoc();
int gridSize = gloc.getNx() * gloc.getNy();
@@ -488,6 +490,7 @@ public class DbParm extends Parm {
}
boolean success = true;
+ long size = 0;
for (int i = 0; i < trs.size(); i++) {
// ensure we have a lock for the time period
TimeRange lockTime = new TimeRange();
@@ -507,7 +510,6 @@ public class DbParm extends Parm {
IGridData[] grids = this.getGridInventory(lockTime);
List records = new ArrayList();
- long size = 0;
boolean allSaved = true;
// time range remaining to be saved
@@ -539,7 +541,19 @@ public class DbParm extends Parm {
.getGridTime().getEnd());
sgr.add(new SaveGridRequest(getParmID(), tr, records,
dataManager.clientISCSendStatus()));
- allSaved &= doSave(sgr);
+
+ // save this batch of grids
+ if (doSave(sgr)) {
+ // if successful add pending locks to unlock requests
+ for (TimeRange t : pendingUnlocks) {
+ lreq.add(new LockRequest(getParmID(), t,
+ LockMode.UNLOCK));
+ }
+ } else {
+ allSaved = false;
+ }
+
+ pendingUnlocks.clear();
sgr.clear();
records.clear();
size = 0;
@@ -551,14 +565,25 @@ public class DbParm extends Parm {
if (size > 0 || saveTime.getDuration() > 0) {
sgr.add(new SaveGridRequest(getParmID(), saveTime, records,
dataManager.clientISCSendStatus()));
- allSaved &= doSave(sgr);
}
+ // if we haven't had a failure yet add to pending locks
if (allSaved) {
- lreq.add(new LockRequest(getParmID(), lockTime, LockMode.UNLOCK));
+ pendingUnlocks.add(lockTime);
}
+
success &= allSaved;
}
+ // if any pending saves
+ if (sgr.size() > 0) {
+ if (doSave(sgr)) {
+ for (TimeRange t : pendingUnlocks) {
+ lreq.add(new LockRequest(getParmID(), t, LockMode.UNLOCK));
+ }
+ } else {
+ success = false;
+ }
+ }
if (lreq.size() > 0) {
success &= requestLock(lreq);
@@ -617,8 +642,6 @@ public class DbParm extends Parm {
}
long milliseconds = 1000L * seconds;
- // get my locks
- List myLocks = this.getLockTable().lockedByMe();
// go through each grid in existence
// must use for i loop to avoid concurrentModification exception
@@ -646,18 +669,15 @@ public class DbParm extends Parm {
// grid is populated, is it modified?
final TimeRange gTime = grid.getGridTime();
- boolean locked = false;
- for (int j = 0; j < myLocks.size(); j++) {
- if (gTime.overlaps(myLocks.get(j))) {
- locked = true;
- break;
- }
- }
+ boolean locked = this.getLockTable().checkLock(gTime)
+ .equals(LockStatus.LOCKED_BY_ME);
// only deallocate unlocked grids
if (!locked) {
- // logDebug << "Deallocating " << parmID() << " tr="
- // << gTime << std::endl;
+ String msg = "Deallocating " + getParmID() + " tr=" + gTime;
+ statusHandler.handle(Priority.DEBUG, msg, new Exception(
+ "Debug: " + msg));
+
grid.depopulate();
}
}
@@ -679,6 +699,11 @@ public class DbParm extends Parm {
List lreq = new ArrayList(timesToSave.size());
for (int i = 0; i < timesToSave.size(); i++) {
+ String msg = "Reverting " + getParmID() + " tr="
+ + timesToSave.get(i);
+ statusHandler.handle(Priority.DEBUG, msg, new Exception("Debug: "
+ + msg));
+
boolean success = true;
IGridData[] grids = null;
try {
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/Parm.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/Parm.java
index 32c5bd5c84..4d3f994ecf 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/Parm.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/Parm.java
@@ -1963,6 +1963,12 @@ public abstract class Parm implements Comparable {
int i;
for (i = 0; i < this.undoBuffers.size(); i++) {
UndoBuffer undoBuffer = this.undoBuffers.get(i);
+
+ String msg = "Undoing " + getParmID() + " tr="
+ + undoBuffer.getUndoTimeRange();
+ statusHandler.handle(Priority.DEBUG, msg, new Exception("Debug: "
+ + msg));
+
baffectedTR[i] = undoBuffer.getUndoTimeRange();
bgridCopies[i] = new ArrayList();
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ParmListeners.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ParmListeners.java
index 5895942315..4b4fa0464e 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ParmListeners.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ParmListeners.java
@@ -21,7 +21,6 @@ package com.raytheon.viz.gfe.core.parm;
import org.apache.commons.lang.Validate;
import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.swt.widgets.Display;
import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
import com.raytheon.uf.common.dataplugin.gfe.server.lock.LockTable;
@@ -58,7 +57,6 @@ import com.raytheon.viz.gfe.core.wxvalue.WxValue;
* multiple registration
* Feb 23, 2012 #346 dgilling Implement clearParmListeners.
* Mar 01, 2012 #346 dgilling Use identity-based ListenerLists.
- * Mar 21, 2012 14583 mli fix invalid thread access for PickupValueChange
*
*
*
@@ -248,13 +246,14 @@ public class ParmListeners {
for (Object listener : this.pickupValueChangedListeners.getListeners()) {
final IPickupValueChangedListener casted = (IPickupValueChangedListener) listener;
- Display.getDefault().asyncExec( new Runnable() {
-
+ Runnable notTask = new Runnable() {
+
@Override
public void run() {
casted.pickupValueChanged(parm, pickupValue);
}
- });
+ };
+ notificationPool.schedule(notTask);
}
}
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
index c6df76ca74..aa6dbacf2d 100755
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
@@ -149,8 +149,6 @@ public class ProductEditorComp extends Composite implements
private static final String EMPTY = "";
- private static final String SPC = " ";
-
/**
* Parent composite.
*/
@@ -320,8 +318,6 @@ public class ProductEditorComp extends Composite implements
*/
private ITransmissionState transmissionCB;
- private String productTime = null;
-
private SimpleDateFormat purgeTimeFmt = new SimpleDateFormat("ddHHmm");
private SimpleDateFormat vtecTimeFmt = new SimpleDateFormat(
@@ -442,6 +438,7 @@ public class ProductEditorComp extends Composite implements
init();
visibilityListener = new Listener() {
+ @Override
public void handleEvent(Event e) {
switch (e.type) {
case SWT.Hide:
@@ -643,8 +640,8 @@ public class ProductEditorComp extends Composite implements
});
menuItems.add(storeMI);
- // TODO : we can't color the background of the menu item so
- // we may want to use an image like the tab folder.
+ // we can't color the background of the menu item so
+ // we use an image like the tab folder.
transmitMI = new MenuItem(fileMenu, SWT.PUSH);
transmitMI.setText("Transmit...");
transmitMI.setImage(transLiveImg);
@@ -952,11 +949,8 @@ public class ProductEditorComp extends Composite implements
});
buttons.add(transmitBtn);
- gd = new GridData(SWT.RIGHT, SWT.DEFAULT, true, false);
- gd.widthHint = 35;
Button checkBtn = new Button(bottomComp, SWT.PUSH);
checkBtn.setImage(checkImg);
- checkBtn.setLayoutData(gd);
checkBtn.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
@@ -964,8 +958,9 @@ public class ProductEditorComp extends Composite implements
}
});
- gd = new GridData(30, 20);
Label sepLbl = new Label(bottomComp, SWT.SEPARATOR | SWT.VERTICAL);
+ gd = new GridData(SWT.DEFAULT, SWT.FILL, false, true);
+ gd.heightHint = 1;
sepLbl.setLayoutData(gd);
Label typeLbl = new Label(bottomComp, SWT.NONE);
@@ -979,8 +974,9 @@ public class ProductEditorComp extends Composite implements
}
});
- gd = new GridData(30, 20);
Label sepLbl2 = new Label(bottomComp, SWT.SEPARATOR | SWT.VERTICAL);
+ gd = new GridData(SWT.DEFAULT, SWT.FILL, false, true);
+ gd.heightHint = 1;
sepLbl2.setLayoutData(gd);
Label prodExpiresLbl = new Label(bottomComp, SWT.NONE);
@@ -1011,6 +1007,7 @@ public class ProductEditorComp extends Composite implements
private void updateExpireTimeFromTimer() {
VizApp.runAsync(new Runnable() {
+ @Override
public void run() {
updateExpireTime();
}
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/edittool/contour/ContourTool.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/edittool/contour/ContourTool.java
index ef0f9b1fae..b8f43e364d 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/edittool/contour/ContourTool.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/edittool/contour/ContourTool.java
@@ -1084,16 +1084,14 @@ public class ContourTool extends AbstractFreeformTool implements
{
Collections.reverse(insert);
contour.remove(0, startIndex);
- contour.remove(endIndex,
- contour.getLineString().getNumPoints() - 1);
+ contour.replace(endIndex, contour.getLineString()
+ .getNumPoints(), insert);
} else // startIndex > endIndex
{
- contour.remove(startIndex, contour.getLineString()
- .getNumPoints() - 1);
+ contour.replace(startIndex, contour.getLineString()
+ .getNumPoints(), insert);
contour.remove(0, endIndex);
}
- // append the new points
- contour.append(insert);
contour.setModified(true);
}
contours.set(contourIndex, contour);
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/edittool/sample/SamplePainter.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/edittool/sample/SamplePainter.java
index ff1626be93..bae55eb71d 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/edittool/sample/SamplePainter.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/edittool/sample/SamplePainter.java
@@ -280,6 +280,9 @@ public class SamplePainter {
inGrid = true;
}
+ // sample label color
+ RGB labelColor = new RGB(255, 255, 255);
+
// get the list of samples that should be painted and in the
// order
for (GridID grid : grids) {
@@ -290,30 +293,6 @@ public class SamplePainter {
continue; // skip
}
- // calculate color
- RGB labelColor;
- // AFPSConfig.get(pName + "_Sample_color", labelColor);
- String cfgColor = Activator.getDefault().getPreferenceStore()
- .getString(pName + "_Sample_color");
- if (!cfgColor.equals("")) {
- labelColor = RGBColors.getRGBColor(cfgColor);
- } else {
- labelColor = grid.getParm().getDisplayAttributes()
- .getBaseColor();
- if (grid.equals(imageGrid)) {
- RGB color = new RGB(255, 255, 255);
- String imgLegColor = Activator.getDefault()
- .getPreferenceStore()
- .getString("ImageLegend_color");
-
- if (!imgLegColor.equals("")) {
- color = RGBColors.getRGBColor(imgLegColor);
- }
-
- labelColor = color;
- }
- }
-
// get the data value
String label = NO_DATA_LABEL;
if (inGrid) {
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ifpimage/GfeImageUtil.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ifpimage/GfeImageUtil.java
index fe18040fa1..ff26a863b4 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ifpimage/GfeImageUtil.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ifpimage/GfeImageUtil.java
@@ -50,8 +50,8 @@ import com.vividsolutions.jts.geom.Point;
public class GfeImageUtil {
public static GridGeometry2D getLocationGeometry(GridLocation gloc,
- com.vividsolutions.jts.geom.Envelope env, float width,
- float height, float percentLeft, float percentRight,
+ com.vividsolutions.jts.geom.Envelope env, Integer width,
+ Integer height, float percentLeft, float percentRight,
float percentTop, float percentBottom) {
Envelope envelope = null;
@@ -88,9 +88,33 @@ public class GfeImageUtil {
envelope.getMaximum(0) + dRight);
newEnvelope.setRange(1, envelope.getMinimum(1) - dBottom,
envelope.getMaximum(1) + dTop);
+
+ org.eclipse.swt.graphics.Point p = adjustAspect(width, height,
+ newEnvelope);
+
newGridGeometry = new GridGeometry2D(new GeneralGridEnvelope(new int[] {
- 0, 0 }, new int[] { (int) width, (int) height }), newEnvelope);
+ 0, 0 }, new int[] { p.x, p.y }), newEnvelope);
return newGridGeometry;
}
+
+ private static org.eclipse.swt.graphics.Point adjustAspect(Integer width,
+ Integer height, GeneralEnvelope wd) {
+ // Calculate the correct aspect ratio and adjust the width
+ // and height to fit.
+ if (width == null && height == null) {
+ width = 400; // The default
+ }
+
+ org.eclipse.swt.graphics.Point p = new org.eclipse.swt.graphics.Point(
+ 0, 0);
+ if (width != null) {
+ p.x = width;
+ p.y = (int) ((width * wd.getSpan(1)) / wd.getSpan(0));
+ } else {
+ p.x = (int) ((height * wd.getSpan(0)) / wd.getSpan(1));
+ p.y = height;
+ }
+ return p;
+ }
}
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureUtil.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureUtil.java
index 5d93e61105..0cbf79a5ae 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureUtil.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureUtil.java
@@ -45,6 +45,7 @@ import com.raytheon.viz.gfe.smarttool.PreviewInfo;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Feb 9, 2010 njensen Initial creation
+ * 4/26/2012 14748 ryu Use edit area and time range from preview info
*
*
*
@@ -84,8 +85,8 @@ public class ProcedureUtil {
final ProcedureRequest req = new ProcedureRequest();
req.setProcedureName(procName);
req.setPreview(pi);
- req.setRefSet(editArea);
- req.setTimeRange(timeRange);
+ req.setRefSet(pi.getEditAction().getRefSet());
+ req.setTimeRange(pi.getEditAction().getTimeRange());
if (varDict != null) {
req.setVarDict(varDict);
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/ContinuousColorbar.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/ContinuousColorbar.java
index c9e13ae6eb..502eb176cc 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/ContinuousColorbar.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/ContinuousColorbar.java
@@ -37,6 +37,7 @@ import com.raytheon.uf.viz.core.drawables.PaintProperties;
import com.raytheon.uf.viz.core.drawables.ResourcePair;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.rsc.capabilities.ColorMapCapability;
+import com.raytheon.uf.viz.core.rsc.capabilities.ImagingCapability;
import com.raytheon.viz.gfe.Activator;
import com.raytheon.viz.gfe.GFEOperationFailedException;
import com.raytheon.viz.gfe.core.DataManager;
@@ -134,11 +135,6 @@ public class ContinuousColorbar implements IColorBarDisplay {
PixelExtent pe = colorbarResource.getExtent();
float center = (float) ((pe.getMinY() + pe.getMaxY()) / 2.0);
- DrawableColorMap dcm = new DrawableColorMap(cmap);
- dcm.alpha = 1.0f;
- dcm.extent = pe;
- target.drawColorRamp(dcm);
-
ResourcePair rscPair = spatialDisplayManager.getResourcePair(parm);
if (rscPair == null) {
// spatial display manager deactivated since we got the color map?
@@ -146,6 +142,14 @@ public class ContinuousColorbar implements IColorBarDisplay {
+ parm.getParmID().getCompositeName() + ", exiting paint()");
return;
}
+
+ DrawableColorMap dcm = new DrawableColorMap(cmap);
+ dcm.alpha = 1.0f;
+ dcm.extent = pe;
+ dcm.interpolate = rscPair.getResource()
+ .getCapability(ImagingCapability.class).isInterpolationState();
+ target.drawColorRamp(dcm);
+
GFEResource rsc = (GFEResource) rscPair.getResource();
float minParm = rsc.getCapability(ColorMapCapability.class)
.getColorMapParameters().getColorMapMin();
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smartscript/FieldDefinition.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smartscript/FieldDefinition.java
index d980d3a15a..620df82026 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smartscript/FieldDefinition.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smartscript/FieldDefinition.java
@@ -111,6 +111,8 @@ public class FieldDefinition {
private List valueList;
private float resolution;
+
+ private int precision;
public FieldDefinition() {
valueList = new ArrayList