Max Schenkelberg
|
471e8249b2
|
Issue #1214 Made VizGlobalsManager check for null window before calling getPage() since getInstance() still returns succesfully when null window is passed in. Change TimeMatchingJob to be shutdown when core plugin stops and cancels existing jobs.
Amend: Removed println
Change-Id: I3559b13074eb025e9bf931685cda3e804037baff
Former-commit-id: 51e565c6ff [formerly 4b2467e639 ] [formerly 51e565c6ff [formerly 4b2467e639 ] [formerly edfd7fd22f [formerly fc617c1392d9585d2e91e371af74aad4b24acfbb]]]
Former-commit-id: edfd7fd22f
Former-commit-id: f0376e0240 [formerly 63c30eafc2 ]
Former-commit-id: e021aee0c8
|
2012-09-24 15:39:18 -05:00 |
|
Steve Harris
|
ff96578fb4
|
Merge branch 'development' into Enhanced_points and Enhanced_points into development
Former-commit-id: c64e9b0ad9 [formerly 72ecefa9ee ] [formerly c64e9b0ad9 [formerly 72ecefa9ee ] [formerly fe92909f53 [formerly 9f938d77412ff1d09a8314bb650ddef8eabf73fb]]]
Former-commit-id: fe92909f53
Former-commit-id: 91f26b6c0e [formerly b8d2ff47ca ]
Former-commit-id: f9166b9d83
|
2012-09-17 14:58:23 -05:00 |
|
Bryan Kowal
|
eaca9d0306
|
Issue #1181 - replace EnhancedPatternLayout with PatternLayout
Former-commit-id: 9915d4c006 [formerly 77d12d0275 ] [formerly 9915d4c006 [formerly 77d12d0275 ] [formerly 3a037ffd49 [formerly 29b131727eb8b5b9c450a7f0fd9d1c2c073cc393]]]
Former-commit-id: 3a037ffd49
Former-commit-id: 9dc8747553 [formerly f516e61f20 ]
Former-commit-id: 219c939169
|
2012-09-14 12:25:41 -05:00 |
|
Steve Harris
|
40ddaa276f
|
Merge branch 'development' into Enhanced_points
Former-commit-id: 2e47ad78bc [formerly 321e2191b1 ] [formerly 2e47ad78bc [formerly 321e2191b1 ] [formerly 6146f56ce4 [formerly ee63462d73511ef55dc0d80b3e94ef08a37f3305]]]
Former-commit-id: 6146f56ce4
Former-commit-id: bc86013d8f [formerly 9ca736f901 ]
Former-commit-id: 69b6272658
|
2012-09-13 15:25:12 -05:00 |
|
Brad Gonzales
|
f4e27386cd
|
Issue #951 added Appender EnvConfigurableRollingFileAppender.
Change-Id: Icfab60803c647afad6aa30e516083e46b27be75b
Former-commit-id: 32df328434 [formerly 4b383c3274 ] [formerly 32df328434 [formerly 4b383c3274 ] [formerly d10cabc917 [formerly 4d103fe06c94b8d5067e44aaabfdac88347f9a96]]]
Former-commit-id: d10cabc917
Former-commit-id: 2ea4005704 [formerly 41dc92ba3a ]
Former-commit-id: b9937ef456
|
2012-09-13 07:50:56 -05:00 |
|
Steve Harris
|
73b1005512
|
Merge branch 'development' into Enhanced_points
Former-commit-id: 892598dc66 [formerly 1dd1305a5d ] [formerly 892598dc66 [formerly 1dd1305a5d ] [formerly ada1066831 [formerly 632a766ec44337156bab8df73aecdee8b7bc2853]]]
Former-commit-id: ada1066831
Former-commit-id: e0ee6bbf96 [formerly d85659d9de ]
Former-commit-id: d20a1de861
|
2012-09-12 14:14:56 -05:00 |
|
Max Schenkelberg
|
fbc35a39d4
|
Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed.
Change-Id: I7f72f9782f0f28b25a202e48e5391d1ad34ce91d
Former-commit-id: a6cc869ada [formerly 7294025e26 ] [formerly a6cc869ada [formerly 7294025e26 ] [formerly 2f8f1ce9b2 [formerly 64194223bc30a629b32ca8aa5cefbcfdf8fd6776]]]
Former-commit-id: 2f8f1ce9b2
Former-commit-id: 52e812ec0e [formerly c26d21d908 ]
Former-commit-id: 1badd11cdb
|
2012-09-11 16:27:41 -05:00 |
|
Max Schenkelberg
|
29ab00a4cb
|
Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view.
Change-Id: Id6862f29f431dd79758e39282659a670fe3a1536
Former-commit-id: 6d78afd423 [formerly 80439b309b ] [formerly 6d78afd423 [formerly 80439b309b ] [formerly 84658dd03a [formerly 1d5b8912fe38bd21496c7b9f4ba385e27d7dedcd]]]
Former-commit-id: 84658dd03a
Former-commit-id: d2d74fac20 [formerly 20f5d966db ]
Former-commit-id: 264bc403d6
|
2012-09-10 10:45:37 -05:00 |
|
Max Schenkelberg
|
9980bf4f49
|
Issue #29 Changed how TileLevel calculate pixel density to make densities more consistent between granules on display. Changed TileSetRenderable level change threshold to smaller value so displays look less pixelated with new pixel density calculation. Fixed FileTreeView from throwing errors if two definitions with same name defined which came to light from NPP build
Change-Id: I66b556b74e1a856dace5447c4b9f090d026c493c
Former-commit-id: a14d5d4c86 [formerly c183a0e614 ] [formerly a14d5d4c86 [formerly c183a0e614 ] [formerly 28d6308444 [formerly a4dd750d4bbdaae4a548c9a296436cc783d2d71a]]]
Former-commit-id: 28d6308444
Former-commit-id: 45d6b7bcb5 [formerly 87bcbdb4cc ]
Former-commit-id: 4f86d1c819
|
2012-09-05 11:51:38 -05:00 |
|
Steve Harris
|
f8e7459dfb
|
Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: 0e046d847a [formerly bba4eb12d0 ] [formerly 0e046d847a [formerly bba4eb12d0 ] [formerly af106f1d29 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]
Former-commit-id: af106f1d29
Former-commit-id: f224e3e8ad [formerly 53e29f59e4 ]
Former-commit-id: e9582cb789
|
2012-09-04 12:11:03 -05:00 |
|
Steve Harris
|
a924a8347a
|
12.10.1-1 baseline
Former-commit-id: 0abf64b77c [formerly 195158c004 ] [formerly 0abf64b77c [formerly 195158c004 ] [formerly d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: e720b8ed31 [formerly 7bd9c63dc7 ]
Former-commit-id: d65f35ffe9
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
7c1cebf5b1
|
Merge branch 'development' into Enhanced_points
Former-commit-id: fa7c31206b [formerly 5feac55dbd ] [formerly fa7c31206b [formerly 5feac55dbd ] [formerly 32cf7fd764 [formerly 3aec6326bfce36758b93c7955ce3d0ee49e30cc3]]]
Former-commit-id: 32cf7fd764
Former-commit-id: 5a8e58eda5 [formerly 592ab923bb ]
Former-commit-id: 66ac1051bc
|
2012-08-30 15:43:06 -05:00 |
|
Steve Harris
|
3f44e46a6f
|
Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
Conflicts:
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
Former-commit-id: 51eb89eb2a [formerly 91e39617cb ] [formerly 51eb89eb2a [formerly 91e39617cb ] [formerly a71dac6cad [formerly b9db13cf5bff60511d815f92f0239a4313498265]]]
Former-commit-id: a71dac6cad
Former-commit-id: dbcb28ce77 [formerly 87a602dfee ]
Former-commit-id: 0b647c0c9d
|
2012-08-27 09:53:55 -05:00 |
|
Max Schenkelberg
|
713f9be08b
|
Issue #28 Changed ResourceList so it can be extended to allow duplicates. Removed deleted files from ISerializableObject files. Made TileSetRenderable properly issue refresh when images were still being requested. Made true color code work by only showing intersecting areas of all bands on screen. Made so shader files would be reread in if edited.
Change-Id: Ib2ce27522c59f25ce1cef65e6d7665e28963f081
Former-commit-id: 1f84ddbddf [formerly 75b2cdff47 ] [formerly 1f84ddbddf [formerly 75b2cdff47 ] [formerly c4812b7745 [formerly 291edbc6bd69815e003179e9ce708b6fdad254ad]]]
Former-commit-id: c4812b7745
Former-commit-id: 6f96fa5045 [formerly 7f506ce81d ]
Former-commit-id: 8e894dba11
|
2012-08-23 17:37:12 -05:00 |
|
Steve Harris
|
2d928d328e
|
12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c ] [formerly a1d931fd44 [formerly 61f269f54c ] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5 [formerly 72824561cb ]
Former-commit-id: 9b5c2094ed
|
2012-08-21 15:27:03 -05:00 |
|
Max Schenkelberg
|
dcbab7d58f
|
Issue #28 Cleaned up True Color code and removed old MultiChannel code. Adding capping index back to indexing.glsl and added no data value to ColorMapParameters that should be used for finding no data values in shader and in java. True color dialog was written but not hooked in yet as need to still think about single resource tied to multiple channels and serializing changes.
Change-Id: I20bff443fe4c9b9330c0a66779218227c48df014
Former-commit-id: fc06265360 [formerly b69d2cad1c ] [formerly fc06265360 [formerly b69d2cad1c ] [formerly 1b406ecfca [formerly 564b38b30562a371cf0345de572b32ea8f53e82e]]]
Former-commit-id: 1b406ecfca
Former-commit-id: 47cefd1513 [formerly aa9df46a1d ]
Former-commit-id: 362d34bee0
|
2012-08-20 14:47:14 -05:00 |
|
root
|
0eb9520e15
|
Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: 0987fc6b3d [formerly cb46f57879 ] [formerly 0987fc6b3d [formerly cb46f57879 ] [formerly 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 537dbadf64 [formerly 8a66b2f209 ]
Former-commit-id: 1792158ef8
|
2012-08-15 22:15:20 +00:00 |
|
Steve Harris
|
16d7d955fc
|
12.9.1-1 baseline
Former-commit-id: 8309193ce9 [formerly 31ae7ea218 ] [formerly 8309193ce9 [formerly 31ae7ea218 ] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: aed7a644df [formerly 0c5d9e2416 ]
Former-commit-id: 63bcadf121
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
5fc58b8e12
|
Merge branch 'development' into Enhanced_points
Former-commit-id: e372481f81 [formerly 346d775f57 ] [formerly e372481f81 [formerly 346d775f57 ] [formerly f7f97d9f54 [formerly 25026a4d9955b76039bf25861380cadebff19665]]]
Former-commit-id: f7f97d9f54
Former-commit-id: 73e357c39d [formerly 031b655ab5 ]
Former-commit-id: 14923a89e9
|
2012-08-15 13:35:47 -05:00 |
|
Max Schenkelberg
|
3d43480508
|
Issue #28 Implemented generic true color resource with new extension. Wrote new, more efficient, accurate, and scalable TileSet rendering/managing code to replace AbstractTileSet which VIIRS uses since it took over 10s to load a single frame of data with AbstractTileSet and around 20-30s to load a single true color frame of VIIRS. Put true color code in separate projects to encapsulate functionality. Resources need not depend on these projects, they just have to set the ImagingProvider in their ImagingCapability and true color resource can be loaded through a bundle file.
Change-Id: I624edb115b02611470e2e434e27759c45600111c
Former-commit-id: d6522f8e3a [formerly 93e8619fa5 ] [formerly d6522f8e3a [formerly 93e8619fa5 ] [formerly 09b0db0a13 [formerly 7d75620c07c992ab74a8305a69ed87817f8f0639]]]
Former-commit-id: 09b0db0a13
Former-commit-id: 107efcaee3 [formerly 784c43ab7c ]
Former-commit-id: 79f15e475e
|
2012-08-13 12:20:05 -05:00 |
|
Roger Ferrel
|
4e15803926
|
Issue #875 Markers and group added to Cave.
Amend: Removed python file
Amemd: Changes based on reviewer comments and additon of popup menus in the PontsMgrDlg.
Amend: deleted unwanted .project file
Amend: Removed comment out code and fix class descriptions
Amend: Changes based on reviewer comments.
Change-Id: I32c9dd754d1bfa06b470872b052b61e42adf11e8
Former-commit-id: b3c357c964 [formerly 2e3fc4b400 ] [formerly b3c357c964 [formerly 2e3fc4b400 ] [formerly f4ae8eb150 [formerly c8e5bf1a82979ebc2445acb88682e32ca8813f43]]]
Former-commit-id: f4ae8eb150
Former-commit-id: 69f22fe6bb [formerly ae41499ba2 ]
Former-commit-id: 4e356b8a13
|
2012-08-08 13:35:47 -05:00 |
|
Steve Harris
|
078b4fff3c
|
Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
rpms/awips2.64/Installer.h5py/component.spec
rpms/awips2.64/Installer.python/component.spec
rpms/awips2.64/Installer.python/src/lapack.patch1
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/python.site-packages/Installer.pupynere/component.spec
Former-commit-id: fb47934159 [formerly 6d77b94217 ] [formerly fb47934159 [formerly 6d77b94217 ] [formerly 51e38ca887 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]]
Former-commit-id: 51e38ca887
Former-commit-id: d2291ba23f [formerly 3476fe755b ]
Former-commit-id: e892eb4628
|
2012-08-01 12:43:12 -05:00 |
|
Steve Harris
|
d3be09bd74
|
12.8.1-5 baseline
Former-commit-id: 2653ddc2e3 [formerly fd2abfb6f1 ] [formerly 2653ddc2e3 [formerly fd2abfb6f1 ] [formerly cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: dab00b12e6 [formerly e0c3722fd1 ]
Former-commit-id: e86949a8d3
|
2012-08-01 10:45:37 -05:00 |
|
Nate Jensen
|
c2558bdb79
|
Issue #882 fix auto updates, more efficiently set simulated time
Change-Id: I29f497df91920618e5271bf0ff436547d6225413
Former-commit-id: ac8d12ce13 [formerly 3d07fc8ebf ] [formerly ac8d12ce13 [formerly 3d07fc8ebf ] [formerly dbe185f3a0 [formerly da03e63d10f5f7b6fa77d0e302b11e7501475e22]]]
Former-commit-id: dbe185f3a0
Former-commit-id: 4e0a0f10dc [formerly 67edb6917d ]
Former-commit-id: 70d269fc34
|
2012-07-26 17:43:29 -05:00 |
|
Ben Steffensmeier
|
317c75a71e
|
Issue #772 switch satellite from offscreen rendering to mosaic for a more well defined graphics API.
Change-Id: If293a65f577f13f6ba2ccae41b100dd9542d6998
Former-commit-id: 5bf019e1bb [formerly 74a69d1fb9 ] [formerly 5bf019e1bb [formerly 74a69d1fb9 ] [formerly 79ab850efa [formerly 009e769a180898cb62e9df4a604b40e139cf2886]]]
Former-commit-id: 79ab850efa
Former-commit-id: 612e586a6c [formerly 4182352f8c ]
Former-commit-id: a0b80d6e96
|
2012-07-10 16:04:56 -05:00 |
|
Steve Harris
|
37f2b6e138
|
12.6.1-9 baseline
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca ] [formerly 7c064b6868 [formerly 2c0ff851ca ] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: dc50bc8443 [formerly 4f7bb90bb0 ]
Former-commit-id: d5fa61041b
|
2012-07-10 07:53:49 -05:00 |
|
Max Schenkelberg
|
3325ed5deb
|
Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function
Amend: Fixed Richard's comments
Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3
Former-commit-id: 7d13c7d339 [formerly 9bbb68a547 ] [formerly 7d13c7d339 [formerly 9bbb68a547 ] [formerly 98c2ec7dc5 [formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]]
Former-commit-id: 98c2ec7dc5
Former-commit-id: c6d324aaeb [formerly 7286b4e962 ]
Former-commit-id: d876190d68
|
2012-07-06 16:01:47 -05:00 |
|
Ben Steffensmeier
|
44d3823a51
|
Issue #704 introduce canvas based rendering for making KML screen overlays
Change-Id: I6fc7873d98fe140ebea84899b7e4732719866def
Former-commit-id: e3c0387f6e [formerly 02e2c7b579 ] [formerly e3c0387f6e [formerly 02e2c7b579 ] [formerly 881896c21b [formerly bb83a95f5f00cce75b47e7fab084cf3258f65aba]]]
Former-commit-id: 881896c21b
Former-commit-id: 8a86a66376 [formerly b0f5013c7c ]
Former-commit-id: bce842f480
|
2012-06-28 13:58:29 -05:00 |
|
Bryan Kowal
|
2e5a850d28
|
Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
rpms/awips2-rpm.db
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: b1b294c401 [formerly a33740e915 ] [formerly b1b294c401 [formerly a33740e915 ] [formerly b87b66abc5 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]
Former-commit-id: b87b66abc5
Former-commit-id: b4917e6708 [formerly 9a7d0492fe ]
Former-commit-id: 611925412d
|
2012-06-27 17:21:48 -05:00 |
|
Steve Harris
|
e77a15c047
|
Revert "12.6.1-10 baseline"
This reverts commit 95e7f4fc0c [formerly aecc6a8474 ] [formerly f8497470fc [formerly b33c5bdfcf ]] [formerly a2c0893d1a ] [formerly 06f1c7b73c [formerly ddde63eee0 ] [formerly 06f1c7b73c [formerly ddde63eee0 ] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]].
Former-commit-id: 62cf6a9f92 [formerly b4b1f6975f ] [formerly 62cf6a9f92 [formerly b4b1f6975f ] [formerly 25198a5cd6 [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 333fd9c64e [formerly 8367fb50f5 ]
Former-commit-id: 75f77df418
|
2012-06-21 08:51:08 -05:00 |
|
Steve Harris
|
95e7f4fc0c
|
12.6.1-10 baseline
Former-commit-id: 06f1c7b73c [formerly ddde63eee0 ] [formerly 06f1c7b73c [formerly ddde63eee0 ] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]
Former-commit-id: a2c0893d1a
Former-commit-id: f8497470fc [formerly b33c5bdfcf ]
Former-commit-id: aecc6a8474
|
2012-06-21 08:38:48 -05:00 |
|
Ben Steffensmeier
|
19ce6f7e77
|
Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later
Former-commit-id: c2191c83dc [formerly d317777ee6 ] [formerly c2191c83dc [formerly d317777ee6 ] [formerly 0c69731e18 [formerly 65e7e8b2c891d1938f0b98c3c8737f18517fe27f]]]
Former-commit-id: 0c69731e18
Former-commit-id: 8b107023d1 [formerly b55a4f026c ]
Former-commit-id: 63b55f454f
|
2012-06-20 14:13:37 -05:00 |
|
Bryan Kowal
|
a6d1f97dec
|
Merge branch '11-Collaboration' into development
Conflicts:
cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
Former-commit-id: 9361f3eb94 [formerly f528e10391 ] [formerly 9361f3eb94 [formerly f528e10391 ] [formerly f0e3b957e3 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]
Former-commit-id: f0e3b957e3
Former-commit-id: 21e8618852 [formerly 1ee59eac71 ]
Former-commit-id: cbc8964e5b
|
2012-06-18 11:16:28 -05:00 |
|
Ben Steffensmeier
|
1a3e1ba291
|
Issue #704 rewrite shared meshes and tilesets to be more efficient and less deprecated.
Change-Id: I9f6ebba1bd75682b56a1e8de5a8d0b8974153f97
Former-commit-id: 2da8a0df2f [formerly aad1eb18b0 ] [formerly 2da8a0df2f [formerly aad1eb18b0 ] [formerly 9068e049cb [formerly 901f061f9e19f39cf5096a394cbd238c5562d733]]]
Former-commit-id: 9068e049cb
Former-commit-id: bded5dde2b [formerly dd496b3d90 ]
Former-commit-id: 541f1b74f3
|
2012-06-14 16:44:19 -05:00 |
|
Ben Steffensmeier
|
117c77bfe0
|
Issue #704 various core changes to make things work smoothly in kml
Change-Id: I048f9dfdb411a95765410f48fddb54aa8eefbd16
Former-commit-id: 2c27ec20b5 [formerly d187436589 ] [formerly 2c27ec20b5 [formerly d187436589 ] [formerly 58356c49cb [formerly faec1cb4e4e0ef6444da31971b937ad3ee79160a]]]
Former-commit-id: 58356c49cb
Former-commit-id: 352648586a [formerly e604271c54 ]
Former-commit-id: 3e4b09847b
|
2012-06-14 16:41:05 -05:00 |
|
Max Schenkelberg
|
7bac48f643
|
Issue #697 added support for multiple editors
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82
Former-commit-id: 51c2a41e68 [formerly dd99479eeb ] [formerly 51c2a41e68 [formerly dd99479eeb ] [formerly fceef3c5a1 [formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]]]
Former-commit-id: fceef3c5a1
Former-commit-id: f0d2893e97 [formerly e5e1a4de6a ]
Former-commit-id: f2e34fe03c
|
2012-06-13 17:52:11 -05:00 |
|
Steve Harris
|
b3c2646e5e
|
Removed duplicate method created by merge
Former-commit-id: 282682ccc1 [formerly 5f66b0995a ] [formerly 282682ccc1 [formerly 5f66b0995a ] [formerly 308737bff8 [formerly 90fc678948690cc74488e6e1fd18cf8c72c5c0c9]]]
Former-commit-id: 308737bff8
Former-commit-id: 383f9d2d56 [formerly 55b4d7c5da ]
Former-commit-id: 0de9e03c5a
|
2012-06-13 08:41:24 -05:00 |
|
Steve Harris
|
70a928d039
|
Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java
Former-commit-id: af6c0529ad [formerly 2f20a86a30 ] [formerly af6c0529ad [formerly 2f20a86a30 ] [formerly 48860df690 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]
Former-commit-id: 48860df690
Former-commit-id: d7a4853091 [formerly 27b50c57bd ]
Former-commit-id: 2838ca117f
|
2012-06-12 14:37:12 -05:00 |
|
Steve Harris
|
3b468d9f50
|
12.6.1-5 baseline
Former-commit-id: 09f73b0601 [formerly c99afab05f ] [formerly 09f73b0601 [formerly c99afab05f ] [formerly 8947efbc7f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]
Former-commit-id: 8947efbc7f
Former-commit-id: b69fa75919 [formerly a945ed8e6d ]
Former-commit-id: 91e65230ad
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
518fa79f7f
|
12.6.1-3 baseline
Former-commit-id: 7c5306b795 [formerly 42f3513175 ] [formerly 7c5306b795 [formerly 42f3513175 ] [formerly d57eb02b9e [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 32c0464d79 [formerly 1fdc0aa237 ]
Former-commit-id: ca8baf18a3
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
c01b096242
|
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: c7024992a3 [formerly 37793c86b1 ] [formerly c7024992a3 [formerly 37793c86b1 ] [formerly d325d496f5 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]
Former-commit-id: d325d496f5
Former-commit-id: 23c34c469a [formerly cf3c768213 ]
Former-commit-id: 3dd5b84aa2
|
2012-06-11 15:24:03 -05:00 |
|
Steve Harris
|
39ff9954f8
|
12.5.1-15 baseline
Former-commit-id: 8552902906 [formerly b13cbb7e00 ] [formerly 8552902906 [formerly b13cbb7e00 ] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e [formerly 676ea3192f ]
Former-commit-id: 9054c5ab6c
|
2012-06-08 13:39:48 -05:00 |
|
Max Schenkelberg
|
58c5d00acd
|
Issue #664 Changed hydro legend resource to be system resource
Change-Id: I769463a967ee1ec76a9a3c09d48d27106caa0937
Former-commit-id: dbb8a6b93d [formerly 3cd4f75170 ] [formerly dbb8a6b93d [formerly 3cd4f75170 ] [formerly 85a7897b1e [formerly 9a726e2686e7ed79c1a436156a16e98083608e14]]]
Former-commit-id: 85a7897b1e
Former-commit-id: a8e2e4c8c1 [formerly f5c8240c92 ]
Former-commit-id: 69b203439e
|
2012-06-05 13:44:48 -05:00 |
|
Max Schenkelberg
|
e80b6c8dce
|
Issue #239 Got IColormapShadedShapeExtension implemented
Change-Id: Idb2b5a894530b739cd8b00f8f3b294f186d5143f
Former-commit-id: c98b6e28c7 [formerly ae8236aa21 ] [formerly c98b6e28c7 [formerly ae8236aa21 ] [formerly 1c11323103 [formerly 6ddfe51e93d62145678d87ed3db208e90d3146e3]]]
Former-commit-id: 1c11323103
Former-commit-id: d0d619b048 [formerly 696c2f4894 ]
Former-commit-id: f2bd302796
|
2012-05-23 09:14:21 -05:00 |
|
Steve Harris
|
26ed02c3dc
|
12.5.1-6 baseline
Former-commit-id: df80148db6 [formerly 24474489f9 ] [formerly df80148db6 [formerly 24474489f9 ] [formerly fa87dc6cf1 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: 4792884ab2 [formerly c452cce633 ]
Former-commit-id: 2738af2019
|
2012-05-16 16:41:22 -05:00 |
|
Max Schenkelberg
|
bc6563c49f
|
Issue #239 Added IShadedShape capability to remote target
Change-Id: I9616a1dff3ba7f73ed1382027dd725928587efad
Former-commit-id: 193bc7e249 [formerly 1ca2a9ce13 ] [formerly 193bc7e249 [formerly 1ca2a9ce13 ] [formerly 0e5fd5cd15 [formerly a2f8c091c08d47d7b8354071e0ceedc978168a29]]]
Former-commit-id: 0e5fd5cd15
Former-commit-id: 25b9975bc3 [formerly b764f03353 ]
Former-commit-id: 3d58fb358e
|
2012-05-16 15:01:41 -05:00 |
|
Max Schenkelberg
|
0f3d4cf0e4
|
Issue #588 Got crude string rendering working. Doesn't quite look good if canvas bounds are not same size and legends are not handled specially
Change-Id: I8f3d0560869178598f160fb2e7914c45f656a860
Former-commit-id: 5fca70461f [formerly 31243a9dfe ] [formerly 5fca70461f [formerly 31243a9dfe ] [formerly 074b9aba8c [formerly 24b673fcc45a4da27ac349bdebf8b48f6405607b]]]
Former-commit-id: 074b9aba8c
Former-commit-id: d2d6a4d1eb [formerly d22b403f48 ]
Former-commit-id: fc471eb557
|
2012-05-10 18:03:00 -05:00 |
|
Max Schenkelberg
|
5729c0acc5
|
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 06ee0bbf6f [formerly 78e1bd2c62 ] [formerly 06ee0bbf6f [formerly 78e1bd2c62 ] [formerly 1f5abc6e20 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 2db836b296 [formerly 3ca8ca6f01 ]
Former-commit-id: 6cd18a09dc
|
2012-05-09 15:02:30 -05:00 |
|
Steve Harris
|
d040b14742
|
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: d7f7c26582 [formerly 092efd6072 ] [formerly d7f7c26582 [formerly 092efd6072 ] [formerly 31b3e87ffa [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 53d2822329 [formerly 98447412f8 ]
Former-commit-id: 7ee04eb560
|
2012-05-09 13:19:47 -05:00 |
|
Steve Harris
|
1d2ad9224a
|
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: 572e1bb476 [formerly 27bc369818 ] [formerly 572e1bb476 [formerly 27bc369818 ] [formerly 58037cb5d1 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 9c9e01dbda [formerly 63ea8599d7 ]
Former-commit-id: 7978d3b640
|
2012-05-09 13:14:00 -05:00 |
|