Dave Hladky
b111edeb8b
Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
...
Former-commit-id: 7d2c1bc4d5
[formerly 765be278bb
] [formerly 38b952a220
] [formerly 7d2c1bc4d5
[formerly 765be278bb
] [formerly 38b952a220
] [formerly 5dc454c7ef
[formerly 38b952a220
[formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 68114535f2
[formerly 9e97fc9efe
] [formerly b6128220fe67cb5d5fd130270ec6ca785e2ef6af [formerly 160e1594b8
]]
Former-commit-id: 39e44db397ec904e6c2a1254ad2d956f2cd9c180 [formerly cb5ee4a7b8
]
Former-commit-id: b85e19282b
2013-03-13 13:56:33 -05:00
Steve Harris
352658125b
13.3.1-7 baseline
...
Former-commit-id: 23faf84455
[formerly 97d2f521e4
] [formerly a72254cc75
] [formerly 23faf84455
[formerly 97d2f521e4
] [formerly a72254cc75
] [formerly e12ed113ae
[formerly a72254cc75
[formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]]
Former-commit-id: e12ed113ae
Former-commit-id: 45a2d0501d
[formerly ed5f1dbab6
] [formerly d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca
]]
Former-commit-id: 096ac88075679da8529975d1e43734a1aba18a81 [formerly 3084a860cd
]
Former-commit-id: 88b28c39c1
2013-03-13 09:50:28 -05:00
Nate Jensen
222a006501
Issue #1601 fix error
...
Change-Id: Ia9749ff77222ea5f136fff7b5bf575b42c29906b
Former-commit-id: 337be8ee06
[formerly 762d2d54e1
] [formerly a34a9941c7
] [formerly 337be8ee06
[formerly 762d2d54e1
] [formerly a34a9941c7
] [formerly e6b7bd9034
[formerly a34a9941c7
[formerly a893b0ea01e31e1c5c8b5048f536b59cc36ca810]]]]
Former-commit-id: e6b7bd9034
Former-commit-id: ea528bd75d
[formerly 0abf696eee
] [formerly 1692a3b7541ae78795e0630b71507a295abbc0de [formerly 5315c1d40a
]]
Former-commit-id: 894e2446f5c7b93477e25cfd789893a099434a93 [formerly d3deaff692
]
Former-commit-id: ce341edf4c
2013-02-11 15:40:39 -06:00
Steve Harris
b43935a991
13.2.1-6 baseline
...
Former-commit-id: 52f48669f6
[formerly d66ad2f77b
] [formerly d0752de66c
] [formerly 52f48669f6
[formerly d66ad2f77b
] [formerly d0752de66c
] [formerly a46e33f06e
[formerly d0752de66c
[formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]]
Former-commit-id: a46e33f06e
Former-commit-id: 5027d2365b
[formerly bbe92e6824
] [formerly 133f9034fb8163fb8efb8d8bbd27d7ed610a6e0d [formerly 30d38334cc
]]
Former-commit-id: 0cd3f4b5889bda9de32b546358edf3d8210d3ad8 [formerly 0c128dd8f0
]
Former-commit-id: dc55ef579a
2013-02-07 16:00:39 -06:00
Nate Jensen
5c7ebc1e4f
Issue #1567 refactor updates of plots for efficiency/clarity
...
Change-Id: Id3d52ef2eb671138c078bc721c690867ba3dada3
Former-commit-id: a073a5826c
[formerly 48a503e3dd
] [formerly b9b730aac5
] [formerly a073a5826c
[formerly 48a503e3dd
] [formerly b9b730aac5
] [formerly 2a3f3e6a40
[formerly b9b730aac5
[formerly b2788eb6bbc807d6fecc8e097e15dfbcb3ff8105]]]]
Former-commit-id: 2a3f3e6a40
Former-commit-id: 9c6c549740
[formerly 029aa60957
] [formerly df189aea3c94329d7e08ada924b8f477914c9f01 [formerly a56d672039
]]
Former-commit-id: 1a0a22d8197191d6bcb27119f57ed814177b00a0 [formerly fce50aaf62
]
Former-commit-id: 353f7f513d
2013-02-05 11:07:21 -06:00
Max Schenkelberg
f6a854755a
Issue #1474 Fixed MetarPrecipResourceData and LightningResourceData so updates do not required requery. Made an AutoUpdater per plugin so they process independently of each other.
...
Amend: Only register product alerts in thin client if JMS is not disabled
Change-Id: Ic46daf57ef3ede3aad2a2f067e9764f85f7df9a2
Former-commit-id: 73fbdc6da3
[formerly a8dc166a1f
] [formerly 9655d64069
] [formerly 73fbdc6da3
[formerly a8dc166a1f
] [formerly 9655d64069
] [formerly b6a29c38a5
[formerly 9655d64069
[formerly 115dc26748e0779b4c67cc74fe08c5bf17542632]]]]
Former-commit-id: b6a29c38a5
Former-commit-id: c709c91154
[formerly ecce9be8ce
] [formerly 52f3bdc976aa7b28a5a0097fdc6d4d6c63530fb5 [formerly 11c8dd6fff
]]
Former-commit-id: 75e5474b19b240758634d24dabc0961fd75c2813 [formerly 12318158c2
]
Former-commit-id: 8bfa47f929
2013-01-23 16:50:17 -06:00
Steve Harris
2c834d0f58
13.2.1-1 baseline
...
Former-commit-id: 11b05eedeb
[formerly 48d1aa7732
] [formerly 9771dfae6b
] [formerly 11b05eedeb
[formerly 48d1aa7732
] [formerly 9771dfae6b
] [formerly c63f9bcae0
[formerly 9771dfae6b
[formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 1d1791b3b4
[formerly 8ed6a53113
] [formerly b971e3aabeeb8f14462f7ad6502dafe876153e63 [formerly f6670806bf
]]
Former-commit-id: c7cd6e75591b001d138f41ea10b2ed691477e255 [formerly 9146e727f9
]
Former-commit-id: 08bf724a6c
2013-01-23 11:13:03 -05:00
Steve Harris
e5f32a2bbe
13.2.1-1 baseline
...
Former-commit-id: 8dd688c878
[formerly 5dfe4d10f1
] [formerly e62172c8c7
] [formerly 8dd688c878
[formerly 5dfe4d10f1
] [formerly e62172c8c7
] [formerly 81849e3cbb
[formerly e62172c8c7
[formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]]
Former-commit-id: 81849e3cbb
Former-commit-id: 3d35fd52d5
[formerly e34695538d
] [formerly c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca
]]
Former-commit-id: d5a28dcde502767d0f84d7301207580849e0a584 [formerly ebff2a6275
]
Former-commit-id: b4556ea28f
2013-01-14 18:42:21 -05:00
Steve Harris
745f2c6409
13.1.2-2 baseline
...
Former-commit-id: e8f4a2f031
[formerly 51208e5515
] [formerly c0c1d56f3a
] [formerly e8f4a2f031
[formerly 51208e5515
] [formerly c0c1d56f3a
] [formerly 4ba416aeb3
[formerly c0c1d56f3a
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491
[formerly cd4185ef5c
] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553
]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858
]
Former-commit-id: f52ec0b0a0
2013-01-06 14:32:24 -06:00
Steve Harris
94cd5a1388
12.12.1-1 baseline
...
Former-commit-id: 8278cac143
[formerly c2839cc86d
] [formerly e4bd20a515
] [formerly 8278cac143
[formerly c2839cc86d
] [formerly e4bd20a515
] [formerly e1498006c7
[formerly e4bd20a515
[formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]]
Former-commit-id: e1498006c7
Former-commit-id: 3cb24c1d06
[formerly 4f243de928
] [formerly cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63
]]
Former-commit-id: 5b863edab7014aa1117ea6831f473bf942ace0fe [formerly a5be98d6de
]
Former-commit-id: af59663a99
2012-11-07 12:41:20 -06:00
Steve Harris
2d368b5b0b
12.11.1-6 baseline
...
Former-commit-id: 58cd1e90f8
[formerly 30c786a885
] [formerly fba4a443a0
] [formerly 58cd1e90f8
[formerly 30c786a885
] [formerly fba4a443a0
] [formerly 5c1f3cdc46
[formerly fba4a443a0
[formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: ae73939b02
[formerly 8beb6fc0b8
] [formerly 4bf85ed3f3986d98a009ad57add9c40fe46fa2f2 [formerly 08fc9f6b14
]]
Former-commit-id: bfbc6b62be31cb07dee1061fd2ffeb9b2a9e932a [formerly 4f27cbb406
]
Former-commit-id: 9c597c7060
2012-10-18 15:53:01 -05:00
Steve Harris
e42c12350b
12.11.1-3 baseline
...
Former-commit-id: a65c057df5
[formerly 196afa0e5f
] [formerly 2d0c424713
] [formerly a65c057df5
[formerly 196afa0e5f
] [formerly 2d0c424713
] [formerly 5d796f775c
[formerly 2d0c424713
[formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]]]
Former-commit-id: 5d796f775c
Former-commit-id: 7fcbb49a3e
[formerly 725b2f8ba5
] [formerly 0e268084394b033a5de6dba694d14423a1da3040 [formerly 5723fb0031
]]
Former-commit-id: eaae8c3b883f287ffd1c17522c62444fa45a6410 [formerly bf1f88482b
]
Former-commit-id: c25ebcdc41
2012-10-15 16:30:31 -05:00
Steven Harris
db663faca9
12.11.1-1 baseline
...
Former-commit-id: ffe3641057
[formerly 0e86bfd1d3
] [formerly 618aa3f316
] [formerly ffe3641057
[formerly 0e86bfd1d3
] [formerly 618aa3f316
] [formerly feec28f274
[formerly 618aa3f316
[formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]]
Former-commit-id: feec28f274
Former-commit-id: 9c67bbab77
[formerly f5e63d5f93
] [formerly 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022
]]
Former-commit-id: d6911f5473d9aadbb4a4b9d3389106feb8c83693 [formerly a544be6d83
]
Former-commit-id: 2f855322f6
2012-09-27 15:57:45 -05:00
Steve Harris
bc97cf788a
12.10.1-1 baseline
...
Former-commit-id: 7248f8b762
[formerly 0abf64b77c
] [formerly 195158c004
] [formerly 7248f8b762
[formerly 0abf64b77c
] [formerly 195158c004
] [formerly d708932029
[formerly 195158c004
[formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]]
Former-commit-id: d708932029
Former-commit-id: 9f4fa7bf83
[formerly e720b8ed31
] [formerly eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7
]]
Former-commit-id: 93d844e1d6c245b4e49c2fcb70d3a7143c1fc5c2 [formerly d65f35ffe9
]
Former-commit-id: a924a8347a
2012-09-04 12:07:27 -05:00
Steve Harris
98059f9ef1
12.9.1-5 baseline
...
Former-commit-id: 77cbd6c1e5
[formerly a1d931fd44
] [formerly 61f269f54c
] [formerly 77cbd6c1e5
[formerly a1d931fd44
] [formerly 61f269f54c
] [formerly f2fac39428
[formerly 61f269f54c
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f
[formerly 7fb0b17bd5
] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb
]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed
]
Former-commit-id: 2d928d328e
2012-08-21 15:27:03 -05:00
Steve Harris
867586657b
12.9.1-4 baseline
...
Former-commit-id: 71b024e3a1
[formerly 36c108e960
] [formerly dcda3a2290
] [formerly 71b024e3a1
[formerly 36c108e960
] [formerly dcda3a2290
] [formerly 33b95fb96d
[formerly dcda3a2290
[formerly df38541c9df38c634626ae214f288b606004a768]]]]
Former-commit-id: 33b95fb96d
Former-commit-id: 80655bf0a3
[formerly d7d60cc623
] [formerly a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b
]]
Former-commit-id: e06a87e5baa81edcd3ffe2ce62e1eb2416c1ee57 [formerly de9b64b501
]
Former-commit-id: 7e1d1f6e08
2012-08-15 15:19:10 -05:00
Steve Harris
1098368e19
12.8.1-5 baseline
...
Former-commit-id: 2e804fc8c4
[formerly 2653ddc2e3
] [formerly fd2abfb6f1
] [formerly 2e804fc8c4
[formerly 2653ddc2e3
] [formerly fd2abfb6f1
] [formerly cd49ef3eda
[formerly fd2abfb6f1
[formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]]
Former-commit-id: cd49ef3eda
Former-commit-id: 4f47148ced
[formerly dab00b12e6
] [formerly 470040dd3334156744a98f7368531647893ed93d [formerly e0c3722fd1
]]
Former-commit-id: 573a0cc46f2d0efe2e8514f12ca675b4673c9160 [formerly e86949a8d3
]
Former-commit-id: d3be09bd74
2012-08-01 10:45:37 -05:00
Steve Harris
23dc8deeb0
12.7.1-8 baseline
...
Former-commit-id: b242dd98d6
[formerly 11f96dbedd
] [formerly 16bf591a33
] [formerly b242dd98d6
[formerly 11f96dbedd
] [formerly 16bf591a33
] [formerly c42ae0fa39
[formerly 16bf591a33
[formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]]
Former-commit-id: c42ae0fa39
Former-commit-id: e1eb7f5972
[formerly f2102bfb24
] [formerly 02bef853ef7c7fae6630b12e89ad4d9ef11bc391 [formerly 9f97182964
]]
Former-commit-id: 8c3889c2ea3f00fe58aa1f356c175dee2c28f99c [formerly 9aabe438b9
]
Former-commit-id: 36e2ad3023
2012-07-19 16:20:40 -05:00
Steve Harris
c74431ba29
12.6.1-9 baseline
...
Former-commit-id: 32fdf6ed3b
[formerly 7c064b6868
] [formerly 2c0ff851ca
] [formerly 32fdf6ed3b
[formerly 7c064b6868
] [formerly 2c0ff851ca
] [formerly 27afa60345
[formerly 2c0ff851ca
[formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2
[formerly dc50bc8443
] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0
]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b
]
Former-commit-id: 37f2b6e138
2012-07-10 07:53:49 -05:00
Steve Harris
46068c6716
12.5.1-15 baseline
...
Former-commit-id: 2f10c7a1e4
[formerly 8552902906
] [formerly b13cbb7e00
] [formerly 2f10c7a1e4
[formerly 8552902906
] [formerly b13cbb7e00
] [formerly 3904c4ccf5
[formerly b13cbb7e00
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3
[formerly 97c4db937e
] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f
]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c
]
Former-commit-id: 39ff9954f8
2012-06-08 13:39:48 -05:00
Steve Harris
3419f72215
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: fe946166ed
[formerly 4ec294b525
] [formerly 2ed7249613
] [formerly fe946166ed
[formerly 4ec294b525
] [formerly 2ed7249613
] [formerly 7b75b781ad
[formerly 2ed7249613
[formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 3992b18e28
[formerly 7c7fc97131
] [formerly 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809
]]
Former-commit-id: 7a3a10e1ab59cf68f5e1476abff39883afb9ef4b [formerly fd9e226b35
]
Former-commit-id: 491aa53a0c
2012-05-01 18:31:09 -05:00
Steve Harris
7f90924706
12.4.1-10 baseline
...
Former-commit-id: 7fa9dbd5fb
[formerly 4bfbdad17d
] [formerly 9f8cb727a5
] [formerly 7fa9dbd5fb
[formerly 4bfbdad17d
] [formerly 9f8cb727a5
] [formerly 8485b90ff8
[formerly 9f8cb727a5
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d
[formerly 33a67cdd82
] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5
]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86
]
Former-commit-id: 0c25458510
2012-05-01 18:06:13 -05:00
Steve Harris
0cf19dc505
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: 634d40a156
[formerly 63f11892e8
] [formerly 4d7572a632
] [formerly 634d40a156
[formerly 63f11892e8
] [formerly 4d7572a632
] [formerly 625cd4262c
[formerly 4d7572a632
[formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]]
Former-commit-id: 625cd4262c
Former-commit-id: 6aa0898aae
[formerly e86dc647be
] [formerly f6efcfd8ee5a2a4ca8ad3ed217945853b75bfa5f [formerly def458753d
]]
Former-commit-id: 8ce2584572b74cd38fac4b323558490c8c29e686 [formerly 19657ae52d
]
Former-commit-id: 9b8c6e395d
2012-04-19 11:11:02 -05:00
Steve Harris
5b35d8a6e0
12.4.1-4 baseline
...
Former-commit-id: 4767b0e069
[formerly 750b7543dd
] [formerly 67a5a68300
] [formerly 4767b0e069
[formerly 750b7543dd
] [formerly 67a5a68300
] [formerly 2a216f333c
[formerly 67a5a68300
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188
[formerly a2a6a18fae
] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd
]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c
]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
Steve Harris
095b190063
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: b4846ce8a8
[formerly a4e4792bb5
] [formerly d3ad6095b7
] [formerly b4846ce8a8
[formerly a4e4792bb5
] [formerly d3ad6095b7
] [formerly 5cdda77afb
[formerly d3ad6095b7
[formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]]
Former-commit-id: 5cdda77afb
Former-commit-id: c6071e24c5
[formerly 9845ef53f9
] [formerly a5d7cad4cf9dcde7d77f5ce8ca8a3ccca2fdde58 [formerly 6aa18f74f6
]]
Former-commit-id: 863dd9f649ac647186ce86d3db6a31c7237682d4 [formerly 9fee09c9e4
]
Former-commit-id: 1556e72eeb
2012-03-30 09:50:48 -05:00
Max Schenkelberg
67b1edb767
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: fe1811c167
[formerly e2cd95d3f4
] [formerly ae47d9683e
] [formerly fe1811c167
[formerly e2cd95d3f4
] [formerly ae47d9683e
] [formerly 48b6d45f00
[formerly ae47d9683e
[formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 52c7dec2e8
[formerly 0554abdde0
] [formerly 22d12e35f7b0f5789a9dd62c8684fad371d63859 [formerly 3212cc6ebb
]]
Former-commit-id: de90ce0a3f7817cfc15c75089e7f6a081fef0acc [formerly 585e979c76
]
Former-commit-id: ae389f0b57
2012-03-01 16:59:40 -06:00
Ben Steffensmeier
42ef274021
Issue #228 change plots, grid icons, and radar icons
...
to use a new PointImageExtension which provides an
interface for drawing images at a single point,
which kml can use to extract plot images.
Change-Id: I29b07ed4f9e8ea95ed131ab1eb3ca27efadaf0e2
Former-commit-id: 0fe5fe9c99
[formerly 792dc75f4d
] [formerly d976603262
] [formerly 0fe5fe9c99
[formerly 792dc75f4d
] [formerly d976603262
] [formerly 13a99abe7b
[formerly d976603262
[formerly 0f56c76ab830ef088a9576301c795dca7c855033]]]]
Former-commit-id: 13a99abe7b
Former-commit-id: 7c0e0c0365
[formerly ec90cad810
] [formerly 74f934c8254e91895c63256920cd1aef0bf21fd8 [formerly 63ef103145
]]
Former-commit-id: efb9f151d1843415599b612d587198c7b55787fa [formerly 70e38a4506
]
Former-commit-id: f6b65b8467
2012-02-01 12:45:56 -06:00
Ben Steffensmeier
e15eb35dc0
Issue #176 Change plots to no longer require id in updates. Change thin client updates to request pdo's instead of redoTimeMatching, which grabs any updates, not just new resource times.
...
Change-Id: I23763bae287d5c49d3973707228e78144cc83ab1
Former-commit-id: 539ebd56d3
[formerly 6194dc8210
] [formerly 9cc983549d
] [formerly 539ebd56d3
[formerly 6194dc8210
] [formerly 9cc983549d
] [formerly 9254b762ff
[formerly 9cc983549d
[formerly 94d4feb2973ed201d369a21126b3443606041179]]]]
Former-commit-id: 9254b762ff
Former-commit-id: 174dd81c57
[formerly 75f49627c8
] [formerly 2274967c42d2f8b4145457a05f022995e7ac081d [formerly 484a0f64f8
]]
Former-commit-id: 6a86c4e1118e38197943db10530a027ffb9a08f8 [formerly 0c4a26a41c
]
Former-commit-id: a7bc0dc8f3
2012-01-30 17:04:47 -06:00
Ben Steffensmeier
8c733c95b1
Issue #185 change LevelFactory to throw exceptions when there is no network connection so that everything can be reinitialized when the connection is restored..
...
Change-Id: Id5c82e7d01e7f229bc99366b1339bc38333ffa5a
Former-commit-id: 700cb47baa
[formerly 3c673896a0
] [formerly b3463d27fc
] [formerly 700cb47baa
[formerly 3c673896a0
] [formerly b3463d27fc
] [formerly 0d75fbf942
[formerly b3463d27fc
[formerly 1b2496a6db33fc65efecfdffb380d8b4e07ec590]]]]
Former-commit-id: 0d75fbf942
Former-commit-id: 13f6e4f868
[formerly 8b1cdd8db1
] [formerly 3e19b92cbce5cee988b6ee87c18925f5342d0749 [formerly c22f135dbc
]]
Former-commit-id: 42253bc94fbbcaf565d110a034287d18a8369666 [formerly 713811bb95
]
Former-commit-id: 50d560a874
2012-01-30 16:39:57 -06:00
Matt Nash
515196cb86
Moving 12.1.1 into ss_sync
...
Former-commit-id: d8da2252c3
[formerly 580e2938d7
] [formerly 66be3bec40
] [formerly d8da2252c3
[formerly 580e2938d7
] [formerly 66be3bec40
] [formerly c83e5ff474
[formerly 66be3bec40
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90
[formerly 82300ccdcf
] [formerly 21d2361f00
[formerly 1faae42484
]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
2012-01-19 11:53:12 -06:00
root
7dbd17a5aa
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 133dc97f67
[formerly a02aeb236c
] [formerly 9f19e3f712
] [formerly 133dc97f67
[formerly a02aeb236c
] [formerly 9f19e3f712
] [formerly 06a8b51d6d
[formerly 9f19e3f712
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf
[formerly 8e80217e59
] [formerly 377dcd10b9
[formerly 3360eb6c5f
]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00