diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java index 5d743cc132..1224f01e10 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java @@ -28,6 +28,8 @@ import org.eclipse.ui.handlers.HandlerUtil; import com.raytheon.uf.common.localization.LocalizationFile; import com.raytheon.uf.common.localization.LocalizationUtil; +import com.raytheon.uf.common.status.IUFStatusHandler; +import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.viz.core.procedures.Procedure; import com.raytheon.uf.viz.d2d.ui.dialogs.procedures.OpenProcedureListDlg; import com.raytheon.uf.viz.d2d.ui.dialogs.procedures.ProcedureDlg; @@ -47,7 +49,8 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback; * Sep 13, 2007 chammack Initial Creation. * Oct 16, 2012 1229 rferrel Change to use ProcedureDlg.displayDialog. * Oct 16, 2012 1229 rferrel Changes for non-blocking ProcedureListDlg. - * Jun 7, 2013 2074 mnash Don't open the dialog if no procedures are deserialized + * Jun 07, 2013 2074 mnash Don't open the dialog if no procedures are deserialized + * Aug 11, 2014 3480 bclement added logging * * * @author chammack @@ -57,6 +60,9 @@ public class OpenAWIPSProcedure extends AbstractHandler { private OpenProcedureListDlg dialog; + private static final IUFStatusHandler log = UFStatus + .getHandler(OpenAWIPSProcedure.class); + /* * (non-Javadoc) * @@ -78,6 +84,8 @@ public class OpenAWIPSProcedure extends AbstractHandler { Procedure p = (Procedure) LoadSerializedXml .deserialize(f); if (p != null) { + log.info("Loading display file: " + + f.getAbsolutePath()); ProcedureDlg.displayDialog(LocalizationUtil .extractName(selectedFile.getName()), p, VizWorkbenchManager.getInstance() diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java index f50665e65d..eb58ca14ea 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java @@ -102,6 +102,7 @@ import com.raytheon.viz.ui.editor.AbstractEditor; * Jan 16, 2013 DR 15367 D. Friedman Enable save button for Up/Down changes. * Feb 25, 2013 1640 bsteffen Dispose old display in BundleLoader * Jun 7, 2013 2074 mnash Remove resource if doesn't instantiate correctly + * Aug 11, 2014 3480 bclement added info logging when procedure is loaded * * * @author unknown @@ -863,6 +864,7 @@ public class ProcedureDlg extends CaveSWTDialog { } private void load(final Bundle b) { + statusHandler.info("Loading bundle: " + b.getName()); String editorName = null; if (b.getDisplays().length > 0) { editorName = DescriptorMap.getEditorId(b.getDisplays()[0] diff --git a/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java b/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java index aefaaceff8..6297f8612c 100644 --- a/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java +++ b/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java @@ -21,8 +21,8 @@ package com.raytheon.viz.core.gl; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; -import java.util.LinkedList; -import java.util.List; +import java.util.IdentityHashMap; +import java.util.Map; import java.util.Queue; import java.util.concurrent.LinkedBlockingQueue; @@ -41,6 +41,8 @@ import javax.media.opengl.GL; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Feb 17, 2012 bsteffen Initial creation + * Aug 13, 2014 3510 bclement changed autoDisposers to map, + * remove auto if dispose called with disposer * * * @@ -51,7 +53,7 @@ public class GLDisposalManager { private static ReferenceQueue refQueue = new ReferenceQueue(); - private static List autoDisposers = new LinkedList(); + private static Map autoDisposers = new IdentityHashMap(); private static Queue disposeQueue = new LinkedBlockingQueue(); @@ -65,6 +67,7 @@ public class GLDisposalManager { */ private static void dispose(GLDisposer disposer) { disposeQueue.add(disposer); + autoDisposers.remove(disposer); } /** @@ -73,7 +76,8 @@ public class GLDisposalManager { * the disposer must have no references to object. Object should be the only * thing using these GL resources, this will not work for anything which * might be shared by multiple objects. This will also result in the dispose - * method of the disposer being called more than once so it should clear any + * method of the disposer being called more than once so it should be + * idempotent. * * @param disposer * - a disposer that will be called when object is garbage @@ -82,7 +86,7 @@ public class GLDisposalManager { * - an object which uses a gl resource. */ public static void autoDispose(GLDisposer disposer, Object object) { - autoDisposers.add(new GLAutoDisposer(object, disposer)); + autoDisposers.put(disposer, new GLAutoDisposer(object, disposer)); } /** @@ -99,7 +103,7 @@ public class GLDisposalManager { } GLAutoDisposer autoDisposer = (GLAutoDisposer) refQueue.poll(); while (autoDisposer != null) { - autoDisposers.remove(autoDisposer); + autoDisposers.remove(autoDisposer.disposer); autoDisposer.disposer.dispose(); autoDisposer = (GLAutoDisposer) refQueue.poll(); } diff --git a/cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java b/cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java index 983a4bafe5..9e9ef292be 100644 --- a/cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java +++ b/cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java @@ -95,6 +95,7 @@ import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability; * Feb 27, 2013 DCS 152 jgerth/elau Support for WWLLN and multiple sources * Jan 21, 2014 2667 bclement renamed record's lightSource field to source * Jun 6, 2014 DR 17367 D. Friedman Fix cache object usage. + * Aug 19, 2014 3542 bclement fixed strike count clipping issue * * * @@ -378,7 +379,13 @@ public class LightningResource extends if (magnification == 0.0) magnification=(float) 0.01; - IExtent extent = paintProps.getView().getExtent(); + /* + * we only want strikes that are visible so we have to filter any + * strikes that aren't in both the clipping pane and the view + */ + IExtent viewExtent = paintProps.getView().getExtent(); + IExtent clipExtent = paintProps.getClippingPane(); + IExtent extent = viewExtent.intersection(clipExtent); CacheObject cacheObject = cacheObjectMap .get(this.lastPaintedTime); diff --git a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java index 1b9c067a5a..84bf68eaf7 100644 --- a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java +++ b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java @@ -66,6 +66,7 @@ import com.raytheon.viz.ui.editor.AbstractEditor; * Mar 21, 2013 1638 mschenke Added method to load procedure to window * Oct 22, 2013 2491 bsteffen Switch serialization to * ProcedureXmlManager + * Aug 11, 2014 3480 bclement added info logging to execute() * * * @@ -95,6 +96,8 @@ public class LoadSerializedXml extends AbstractHandler { String fileName = fd.getFilterPath() + File.separator + fd.getFileName(); + statusHandler.info("Loading display file: " + fileName); + Object obj = deserialize(new File(fileName)); try { if (obj != null) { diff --git a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java index 5e963ae00e..8f76550302 100644 --- a/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java +++ b/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java @@ -41,6 +41,8 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPartReference; import org.eclipse.ui.IWorkbenchWindow; +import com.raytheon.uf.common.status.IUFStatusHandler; +import com.raytheon.uf.common.status.UFStatus; import com.raytheon.viz.ui.VizWorkbenchManager; /** @@ -55,6 +57,7 @@ import com.raytheon.viz.ui.VizWorkbenchManager; * ------------ ---------- ----------- -------------------------- * Apr 21, 2010 mschenke Initial creation * Mar 21, 2013 1638 mschenke Added method to get managed perspectives + * Aug 11, 2014 3480 bclement added log message in perspectiveOpened() * * * @@ -64,6 +67,9 @@ import com.raytheon.viz.ui.VizWorkbenchManager; public class VizPerspectiveListener implements IPerspectiveListener4 { + private static final IUFStatusHandler log = UFStatus + .getHandler(VizPerspectiveListener.class); + private static final String PERSPECTIVE_MANAGER_EXTENSION = "com.raytheon.viz.ui.perspectiveManager"; private static final String PERSPECTIVE_ID = "perspectiveId"; @@ -257,6 +263,7 @@ public class VizPerspectiveListener implements IPerspectiveListener4 { @Override public void perspectiveOpened(IWorkbenchPage page, IPerspectiveDescriptor perspective) { + log.info("Opened perspective: " + perspective.getId()); } @Override diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml index c1318f31f4..34202fab7c 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml @@ -16,11 +16,16 @@ + + + @@ -34,7 +39,9 @@ + @@ -49,7 +56,9 @@ + diff --git a/edexOsgi/build.edex/build.xml b/edexOsgi/build.edex/build.xml index 7a26a2e0cf..e75098d87c 100644 --- a/edexOsgi/build.edex/build.xml +++ b/edexOsgi/build.edex/build.xml @@ -118,6 +118,10 @@ + + + diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java index 9af2c1260e..1207ed3c65 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java +++ b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java @@ -56,6 +56,7 @@ import com.raytheon.uf.common.util.mapping.MultipleMappingException; * Apr 30, 2013 1961 bsteffen Add ability to disable grib tables. * Oct 14, 2013 2473 bsteffen Remove lookup of deprecated grib files. * Apr 25, 2014 2874 bsteffen Add processType + * Jul 30, 2014 3455 bsteffen Allow model matching with no grid defined. * * * @@ -148,6 +149,9 @@ public class GribModelLookup { return model; } } + } else { + String key = toKey(center, subcenter, null, process, processType); + return models.get(key); } return null; } diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml index 834500e458..4843b954ee 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml @@ -60,6 +60,11 @@ GFS201
6
+ + GFS1degGbl + GFS229 +
3
+
gfsLR mrfNH diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml index 3be44b3b4c..196f505517 100644 --- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml +++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml @@ -1650,7 +1650,7 @@ - gfs + GFS229
7
0 229 diff --git a/edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java b/edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java index 40dca31de6..6667a8a550 100644 --- a/edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java +++ b/edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java @@ -31,7 +31,7 @@ import java.util.regex.Pattern; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.Appender; -import ch.qos.logback.core.AppenderBase; +import ch.qos.logback.core.UnsynchronizedAppenderBase; import ch.qos.logback.core.spi.AppenderAttachable; /** @@ -44,7 +44,7 @@ import ch.qos.logback.core.spi.AppenderAttachable; * ------------ ---------- ----------- -------------------------- * Aug 25, 2010 rjpeter Initial creation * Jun 24, 2013 2142 njensen Changes for logback compatibility - * + * Aug 22, 2014 3534 rjpeter Extend UnsynchronizedAppenderBase. * * * @author rjpeter @@ -52,7 +52,7 @@ import ch.qos.logback.core.spi.AppenderAttachable; */ public class ThreadBasedAppender extends - AppenderBase implements AppenderAttachable { + UnsynchronizedAppenderBase implements AppenderAttachable { private Map> appenderMap = new HashMap>(); private Map> threadPatterns = new HashMap>();