Juliya Dynina
92e7f244fc
Merge "ASM #15648 Change to Cities.xml" into asm_14.2.2
...
Former-commit-id: 37587144c0
[formerly 264920b8af1b2665b17c1015afe02e6f4a719419]
Former-commit-id: fc27de56d2
2014-07-30 07:48:43 -05:00
Daniel.Huffman
008255ad0e
ASM #15648 Change to Cities.xml
...
Change-Id: Idc89484cf45fcd1fb30538119d254ed9c0fd79e2
Former-commit-id: ea11c48008
[formerly 1e2b8582fa4dec428b70a2e8aaa1e401ddbfcee7]
Former-commit-id: aca63e248f
2014-07-29 21:41:00 +00:00
Nate Jensen
82bef00378
Issue #2954 actually log when the scalesInfo.xml cannot be parsed before
...
falling back to the base version
Change-Id: I2df669504061160c6ace76560f07845f99a80912
Former-commit-id: 2a01b1ebcd
[formerly 894e6ac1db5b34e6466c68aefa5877b9405bfd59]
Former-commit-id: da731be2f7
2014-07-17 13:27:48 -05:00
Nate Jensen
c07802a208
Issue #2954 fall back to existing map scales if map scale is missing
...
Change-Id: I75083325edec689c38f2fe7661c635ddf3e0f527
Former-commit-id: ed9bee5533
[formerly c7167ad2f59ba02edc842f321d12cd36cd6da8bb]
Former-commit-id: 6e21526fd2
2014-07-15 18:27:09 -05:00
Mike Duff
b876d9755a
ASM #605 - Cherry-pick Omaha Issue #2954 from 14.3.1 into 14.2.2 to fix CAVE not starting if scale bundle is missing.
...
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1
Former-commit-id: 39173c380c
[formerly 7fe0dae041cb68aba968e22d5895cce22a210ee6]
Former-commit-id: 81ab64d7ff
2014-06-06 16:03:14 -04:00
Daniel.Huffman
f675fab121
ASM #76
...
Added lpi resources. File latLonOcean.xml is an example.
Change-Id: I533aa7616d837a70d2b14a4bbe00397ef2a7ddff
Former-commit-id: a34124c355
[formerly 733a80d0019ccf7f5529abbd6054cb485412e962]
Former-commit-id: 9c29bddee0
2014-02-24 22:59:41 +00:00
Ben Steffensmeier
8a7d3ceab1
Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images
...
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0
Former-commit-id: 3696896b49
[formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]
Former-commit-id: 927801985a
2013-11-25 11:31:57 -06:00
Nate Jensen
058c963aa2
Issue #2361 fix map style preferences
...
Change-Id: I34f4dd16a1c10196e4d8b0e32aab9fd3cefe7049
Former-commit-id: 43bbf31347
[formerly 4a3ae6311f17e56d9ba095f80f5c6b6c2529c5ae]
Former-commit-id: ec319b7dd0
2013-11-08 10:38:11 -06:00
Nate Jensen
a52e7b677f
Issue #2361 speed up map initialization by moving field queries off UI
...
thread
Change-Id: Ia7d72842723435cc93fe22a1d3266b80dcfe5ab5
Former-commit-id: cc2998b487
[formerly 75c1037145b0aec9cd5e0c0707f0904f4b703bc3]
Former-commit-id: d4b6ad1eee
2013-11-07 11:44:07 -06:00
Ben Steffensmeier
e15fecc459
Issue #2491 Bug fixes and clean up all remaining resource datas.
...
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6
Former-commit-id: 27a392f90e
[formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]
Former-commit-id: 5b395f7417
2013-10-29 17:35:55 -05:00
Ben Steffensmeier
a935ffadf7
Issue #2491 Use reflections to build Procedure JAXB context.
...
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b
Former-commit-id: fa0a0619bc
[formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]
Former-commit-id: bfc3faf08f
2013-10-24 11:28:06 -05:00
Max Schenkelberg
b64050ff1e
Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104.
...
Amend: Accepted ticket, cleanup, comments
Change-Id: I78649dd0268b030624888544740a8d7af3e83e97
Former-commit-id: 01c0e022d5
[formerly fb196f5b8659e568ea1406cc5c5e01aa82525a76]
Former-commit-id: 7a66a3c995
2013-10-11 10:21:37 -05:00
Ron Anderson
5afcf8bee2
Merge "Issue #1133 Better error handling for invalid polygons in map resource. Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442" into development
...
Former-commit-id: ca560e5fc0
[formerly 9f4d6e687d0dae6dd9104fd39c44144c0d7ce174]
Former-commit-id: 2b491f11ad
2013-08-15 10:50:57 -05:00
Ben Steffensmeier
aa08c8af42
Issue #1133 Better error handling for invalid polygons in map resource.
...
Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442
Former-commit-id: 7f9bbf3d52
[formerly 68f1b06c79639874b94b87e4f4365f1fe36c7bac]
Former-commit-id: 27594e6808
2013-08-15 10:32:28 -05:00
Max Schenkelberg
6c92aa9dd7
Issue #2033 moved bundles and menu files into corresponding plugins
...
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc
Former-commit-id: 06dbae8bdb
[formerly fe1b35711ec55a022027bb8ff1a27924b3926911]
Former-commit-id: 5ab8b6e2c6
2013-08-14 09:20:28 -05:00
Ron Anderson
a5da46c360
Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay.
...
Change-Id: I3d2541a057440a3813837a91bef4e86172d73e4c
Former-commit-id: 4aceedceb5
[formerly 0f490c934d197bc45fea1fad2c034c47a2556988]
Former-commit-id: ebdfbebcfc
2013-07-29 18:12:24 -05:00
Max Schenkelberg
82b7e03b10
Issue #1638 Moved common map actions to core.maps from d2d
...
Change-Id: I1a41dc0ec41ea97172a5513b3018f22aa2f6879c
Former-commit-id: 0ad6f8a594
[formerly eacca79223be9b743e97ecfe00813f1d529a05de]
Former-commit-id: 2592dafc5d
2013-04-25 16:02:02 -05:00
Max Schenkelberg
473b90d885
Issue #1638 Refactored topo resource to load different topo files. Added GMT TimeZone to TimeUtil.
...
Change-Id: I4d94a9a2a6dc7ad1261e2ed52c97bab67256b4c8
Former-commit-id: 532211dc69
[formerly 06107e34a04a2ef0df707a7643daad9e1ec11a0b]
Former-commit-id: b141397516
2013-04-24 18:11:30 -05:00
Max Schenkelberg
dabffdbf79
Issue #1638 Made Map scales more generalized for use outside of D2D
...
Amend: Added generalization to JaxbManager
Change-Id: Ic210b8b0d50b4f362321855268570147c439cc2a
Former-commit-id: e17d691400
[formerly 1e5812d9796a77559d70392be18619a8f7316f2d]
Former-commit-id: fd375314cd
2013-03-25 15:38:36 -05:00
Max Schenkelberg
07ae94c499
Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe.
...
Amend: Moved Pair class into uf.common.util to reduce amount of duplicate code
Amend: Added hashCode/equals to Pair
Change-Id: I9a390989f6a7a7ee6618a57d0f50ec681a598dc0
Former-commit-id: 126be0cfe5
[formerly eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae]
Former-commit-id: ea26d0de84
2013-03-22 10:54:44 -05:00
Ben Steffensmeier
d27d30c2db
Issue #1532 Delete uf.common.image and clean up the mess it left behind.
...
Former-commit-id: 2ca86633d6
[formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]
Former-commit-id: f46686a6e2
2013-02-28 17:00:56 -06:00
Steve Harris
64744fdb19
Merge branch 'development' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: 2641d578e2
[formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]
Former-commit-id: a0573644c4
2013-02-21 15:41:39 -06:00
Steve Harris
8ae397085e
13.3.1-1 baseline
...
Former-commit-id: d2a654625f
[formerly 34684c71436ce4c395ea523eb34ded6792476816]
Former-commit-id: 71e8990021
2013-02-20 16:19:40 -06:00
Bryan Kowal
6ea0653c78
Issue #1551 - adding maps to the Data Access Framework
...
- initial commit of Maps Geometry Factory
- re-factored geometry factory code
- addressing peer review comments
- cast to Timestamp
Change-Id: Ie12177b5ae1a8d8d9151d061682730841cfcc807
Former-commit-id: 5d83f9f3d1
[formerly 8155a2cc6dc16df4addf5b567c08890278dc48c3]
Former-commit-id: 964b30d5f2
2013-01-31 10:03:10 -06:00
Steve Harris
33bc5fd816
13.2.1-2 baseline
...
Former-commit-id: 328c6dccad
[formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 83e9157df7
2013-01-23 11:18:44 -05:00
Ron Anderson
45914e0a46
Issue #1395 Updated ShadeableCapability to specify opacity (alpha) to be used for shading
...
Change-Id: Ifeb87aa3dc83c34c4599f22bbb2ed540e82d6c06
Former-commit-id: b6fcd999f4
[formerly 596a5c305e2c7be6e76c8d623a2fd4d5a5ffb7f7]
Former-commit-id: bb163074fa
2012-12-06 17:02:56 -06:00
Ron Anderson
7ec03736a8
Issue #1395 Factored out AbstractMapHandler pattern
...
Change-Id: I24e9e12f10742292b04dbf31571f0adfe24e35cd
Former-commit-id: 87fbaf8ff4
[formerly 522b3bd9cc24c1d75fe5fbdf6222e72ffb8a8468]
Former-commit-id: 91f8c043e1
2012-12-06 15:18:49 -06:00
Steve Harris
c2839cc86d
12.12.1-1 baseline
...
Former-commit-id: e1498006c7
[formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]
Former-commit-id: e4bd20a515
2012-11-07 12:41:20 -06:00
Steve Harris
98171b5de9
12.11.1-4 baseline
...
Former-commit-id: 6958b861f0
[formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]
Former-commit-id: d3497e47eb
2012-10-16 13:27:07 -05:00
Max Schenkelberg
b96e8e9d88
Issue #1170 Sped up WWC by using original polygon if no correcting is required. Changed DbMapResource to always do bbox intersections with lowest level geom field.
...
Change-Id: I81bc0cd1d21a49330e4f91db9541b9bfe3229055
Former-commit-id: 8644d00178
[formerly 3b8e3e4ed319f2efc846ae6b15421718a7505bbb]
Former-commit-id: 78d515a01b
2012-10-03 17:57:39 -05:00
Max Schenkelberg
eb9cd3003a
Issue #1222 Fixed MapResourceGroup to manage keeping capabilties in sync with underlying resources by using listeners. Also fixed issue where you can set map resources to be time match basis to avoid errors. Fixed build when merging in 12.10
...
Change-Id: Iec0389be3a563df2d14f079cdd127a32ba552237
Former-commit-id: d63f741ab5
[formerly ac247423f66f1b29b2235595f08b8cee03962842]
Former-commit-id: 8cd4f17cd4
2012-09-28 11:43:03 -05:00
Ron Anderson
dbe4f8f9b8
Issue #1091 Added localMaps.py capability
...
Change-Id: Ifae18fabd6c3914a34bfc66f4e54c7286153f67f
Former-commit-id: 776214bf24
[formerly 21db6a603d237716744d7cac93482c9a51952403]
Former-commit-id: 6e2130a790
2012-09-19 17:41:48 -05:00
Steve Harris
a1d931fd44
12.9.1-5 baseline
...
Former-commit-id: f2fac39428
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: 61f269f54c
2012-08-21 15:27:03 -05:00
Ben Steffensmeier
c2191c83dc
Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later
...
Former-commit-id: 0c69731e18
[formerly 65e7e8b2c891d1938f0b98c3c8737f18517fe27f]
Former-commit-id: d317777ee6
2012-06-20 14:13:37 -05:00
Steve Harris
af6c0529ad
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: 48860df690
[formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]
Former-commit-id: 2f20a86a30
2012-06-12 14:37:12 -05:00
Steve Harris
8552902906
12.5.1-15 baseline
...
Former-commit-id: 3904c4ccf5
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: b13cbb7e00
2012-06-08 13:39:48 -05:00
Max Schenkelberg
b6a93f9d41
Issue #697 Made multiple editors display on single participant editor properly. Made participant editors more restrictive so they can not be attempted to be used by the perspective since they are perspective agnostic
...
Change-Id: I6605e82c428bda79162adaccea2808f197eba440
Former-commit-id: ef669a0297
[formerly 20e6ddde20749721784a80a4bb78736de1140a40]
Former-commit-id: 49fa818762
2012-06-07 18:22:01 -05:00
Steve Harris
572e1bb476
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: 58037cb5d1
[formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]
Former-commit-id: 27bc369818
2012-05-09 13:14:00 -05:00
Steve Harris
4ec294b525
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
...
used git cherry-pick -m 1 879a2e0
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Conflicts:
ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java
Former-commit-id: 7b75b781ad
[formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]
Former-commit-id: 2ed7249613
2012-05-01 18:31:09 -05:00
Steve Harris
4bfbdad17d
12.4.1-10 baseline
...
Former-commit-id: 8485b90ff8
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]
Former-commit-id: 9f8cb727a5
2012-05-01 18:06:13 -05:00
Steve Harris
63f11892e8
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
...
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Former-commit-id: 625cd4262c
[formerly 5e1b9319941eed516a08a135a2049c14bad77863]
Former-commit-id: 4d7572a632
2012-04-19 11:11:02 -05:00
Steve Harris
750b7543dd
12.4.1-4 baseline
...
Former-commit-id: 2a216f333c
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 67a5a68300
2012-04-18 15:18:16 -05:00
Max Schenkelberg
48ca9ca105
Issue #239 Added remote capability injection code through factory
...
method. Cleaned up old/unmaintained 3D references
Former-commit-id: 16056d53c5
[formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]
Former-commit-id: 54aaf05209
2012-04-05 13:52:20 -05:00
Steve Harris
a4e4792bb5
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
...
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Former-commit-id: 5cdda77afb
[formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]
Former-commit-id: d3ad6095b7
2012-03-30 09:50:48 -05:00
Max Schenkelberg
18805c68f7
Issue #358 Merging core drawing API improvements from Collaboration
...
Former-commit-id: 89f603f448
[formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]
Former-commit-id: d43b0456d8
2012-03-09 12:31:50 -06:00
Steve Harris
695e2979c3
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: f693b6d0a7
[formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]
Former-commit-id: 1002555dbd
2012-02-09 08:54:18 -06:00
Max Schenkelberg
be37f19c90
Issue #206 - Fixed loading and disposing bugs in tear off menus
...
Issue #206 Fixed bugs in maps menu and other dynamically created menus
Former-commit-id: a7ccea5eda
[formerly 875c90104e80d95798956330e24b59d83ef52942]
Former-commit-id: 370e20f0ae
2012-02-07 16:12:19 -06:00
Ben Steffensmeier
138b4de82f
Issue #227 enhanced caching of maps for thin client
...
Change-Id: Ib2c6665d1725bcfde70be6ed5a490e68115c6b94
Former-commit-id: 9b78596436
[formerly 067ba5b7d28174d99119d5bf87a28334578f78dd]
Former-commit-id: 0617773c79
2012-01-31 10:53:10 -06:00
Matt Nash
892cb9a7ae
Issue #26 add tear off code to git baseline
...
Former-commit-id: 4286cb0342
[formerly dedac216cfa51bd413f7c4d1f7db5ee8ce665866]
Former-commit-id: cf4e1f764e
2012-01-25 12:50:31 -06:00
Matt Nash
580e2938d7
Moving 12.1.1 into ss_sync
...
Former-commit-id: c83e5ff474
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: 66be3bec40
2012-01-19 11:53:12 -06:00