Steve Harris
|
34d0f59592
|
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: abdc733151 [formerly 64744fdb19 ] [formerly a0573644c4 ] [formerly abdc733151 [formerly 64744fdb19 ] [formerly a0573644c4 ] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]]
Former-commit-id: 2641d578e2
Former-commit-id: 7e48d3e684 [formerly 4f155a183a ] [formerly 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1 ]]
Former-commit-id: 52ef36f1490e95f8582d69438eed38f21061eafb [formerly f3c3191a1c ]
Former-commit-id: b5d9e75b95
|
2013-02-21 15:41:39 -06:00 |
|
Steve Harris
|
fac2d20002
|
13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e ] [formerly 71e8990021 ] [formerly e0406d3183 [formerly 8ae397085e ] [formerly 71e8990021 ] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]
Former-commit-id: d2a654625f
Former-commit-id: db712e1fcf [formerly e4435815c9 ] [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4 ]]
Former-commit-id: 30806b31de967d82824f245a2f6cb89f081cfd19 [formerly b3b56830b0 ]
Former-commit-id: 8c828dbd75
|
2013-02-20 16:19:40 -06:00 |
|
Bryan Kowal
|
bf314b5ae1
|
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: 832094f721 [formerly 6ea0653c78 ] [formerly 964b30d5f2 ] [formerly 832094f721 [formerly 6ea0653c78 ] [formerly 964b30d5f2 ] [formerly 5d83f9f3d1 [formerly 964b30d5f2 [formerly 8155a2cc6dc16df4addf5b567c08890278dc48c3]]]]
Former-commit-id: 5d83f9f3d1
Former-commit-id: 46fb2fcfcc [formerly 0557ecfed3 ] [formerly 3ee1df2f447ab32d118f3e09a714122496b12556 [formerly e86fda2a6f ]]
Former-commit-id: 4b38d51d5710b6a2fb3b24290123b50943b45fa6 [formerly c4e18dd6e6 ]
Former-commit-id: df8f224bde
|
2013-01-31 10:03:10 -06:00 |
|
Steve Harris
|
b92dfd1b62
|
13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816 ] [formerly 83e9157df7 ] [formerly a4fa438a41 [formerly 33bc5fd816 ] [formerly 83e9157df7 ] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]
Former-commit-id: 328c6dccad
Former-commit-id: ce726fadc7 [formerly d9be4dce21 ] [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79 ]]
Former-commit-id: 281ab815ed143a9ff49cedae7054da06195e3c69 [formerly 547c1dedd1 ]
Former-commit-id: 2779f5c6d9
|
2013-01-23 11:18:44 -05:00 |
|
Ron Anderson
|
464ceb1658
|
Issue #1395 Updated ShadeableCapability to specify opacity (alpha) to be used for shading
Change-Id: Ifeb87aa3dc83c34c4599f22bbb2ed540e82d6c06
Former-commit-id: 0c849c04d7 [formerly 45914e0a46 ] [formerly bb163074fa ] [formerly 0c849c04d7 [formerly 45914e0a46 ] [formerly bb163074fa ] [formerly b6fcd999f4 [formerly bb163074fa [formerly 596a5c305e2c7be6e76c8d623a2fd4d5a5ffb7f7]]]]
Former-commit-id: b6fcd999f4
Former-commit-id: 7c09ef9001 [formerly c5b3111795 ] [formerly a37aae4d7e209290f67a1eb565eee632c0e19fd2 [formerly 70cca3900b ]]
Former-commit-id: 341f47a5a9d882b376fc4121ea445322390c9a2b [formerly 111c0495a4 ]
Former-commit-id: b02f3a733f
|
2012-12-06 17:02:56 -06:00 |
|
Ron Anderson
|
8ea12b6e21
|
Issue #1395 Factored out AbstractMapHandler pattern
Change-Id: I24e9e12f10742292b04dbf31571f0adfe24e35cd
Former-commit-id: a6f52387eb [formerly 7ec03736a8 ] [formerly 91f8c043e1 ] [formerly a6f52387eb [formerly 7ec03736a8 ] [formerly 91f8c043e1 ] [formerly 87fbaf8ff4 [formerly 91f8c043e1 [formerly 522b3bd9cc24c1d75fe5fbdf6222e72ffb8a8468]]]]
Former-commit-id: 87fbaf8ff4
Former-commit-id: 3f21e14753 [formerly af067ab22c ] [formerly 0c305e80ac175f8d1460d27b3bca7f90c499c2c8 [formerly 39509a66bb ]]
Former-commit-id: c27f9d87c9f720a02c20cb06d316daaca5babc94 [formerly 39866900ea ]
Former-commit-id: 1a27d852e1
|
2012-12-06 15:18:49 -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
|
8794e3b599
|
12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9 ] [formerly d3497e47eb ] [formerly 6e44abdba1 [formerly 98171b5de9 ] [formerly d3497e47eb ] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07 ] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce ]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3 ]
Former-commit-id: 35e34308c5
|
2012-10-16 13:27:07 -05:00 |
|
Max Schenkelberg
|
ac6183c275
|
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: 6db6d435a4 [formerly b96e8e9d88 ] [formerly 78d515a01b ] [formerly 6db6d435a4 [formerly b96e8e9d88 ] [formerly 78d515a01b ] [formerly 8644d00178 [formerly 78d515a01b [formerly 3b8e3e4ed319f2efc846ae6b15421718a7505bbb]]]]
Former-commit-id: 8644d00178
Former-commit-id: 198c66146b [formerly 9924916642 ] [formerly 8ad231b1ace2c54455f1e71da8c05c0b8e2ec8f4 [formerly af04746b90 ]]
Former-commit-id: e62044893dc0974955331182ffb3cf14d0edeeeb [formerly 6eb4163fc1 ]
Former-commit-id: f5b4872c58
|
2012-10-03 17:57:39 -05:00 |
|
Max Schenkelberg
|
90526d979a
|
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: 6ddec55b3c [formerly eb9cd3003a ] [formerly 8cd4f17cd4 ] [formerly 6ddec55b3c [formerly eb9cd3003a ] [formerly 8cd4f17cd4 ] [formerly d63f741ab5 [formerly 8cd4f17cd4 [formerly ac247423f66f1b29b2235595f08b8cee03962842]]]]
Former-commit-id: d63f741ab5
Former-commit-id: 8886c0b8fd [formerly 962ea1d376 ] [formerly 0ffa284e8b3dda34b675dfdd98b48897797a3fef [formerly b35aefa9e0 ]]
Former-commit-id: e499596b4610ac26dd386c74414f051adb9bd008 [formerly b093240644 ]
Former-commit-id: c1b115e17f
|
2012-09-28 11:43:03 -05:00 |
|
Ron Anderson
|
fb457a2274
|
Issue #1091 Added localMaps.py capability
Change-Id: Ifae18fabd6c3914a34bfc66f4e54c7286153f67f
Former-commit-id: 28efe7e4d6 [formerly dbe4f8f9b8 ] [formerly 6e2130a790 ] [formerly 28efe7e4d6 [formerly dbe4f8f9b8 ] [formerly 6e2130a790 ] [formerly 776214bf24 [formerly 6e2130a790 [formerly 21db6a603d237716744d7cac93482c9a51952403]]]]
Former-commit-id: 776214bf24
Former-commit-id: 5d6911f931 [formerly f5463c2e83 ] [formerly ce627290c20dc07d9b98e24e92ec594b3262f299 [formerly e917b45f38 ]]
Former-commit-id: 8bb619723c08949aabd1cee2270fe47f033fb0ea [formerly af7cac638e ]
Former-commit-id: 43f30abdf3
|
2012-09-19 17:41:48 -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 |
|
Ben Steffensmeier
|
b55bf099f1
|
Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later
Former-commit-id: 7bd0cce0a1 [formerly c2191c83dc ] [formerly d317777ee6 ] [formerly 7bd0cce0a1 [formerly c2191c83dc ] [formerly d317777ee6 ] [formerly 0c69731e18 [formerly d317777ee6 [formerly 65e7e8b2c891d1938f0b98c3c8737f18517fe27f]]]]
Former-commit-id: 0c69731e18
Former-commit-id: acbf7fd3b5 [formerly 8b107023d1 ] [formerly c5371f37fe36db2e2f33d1cc3ac56441d034b0d1 [formerly b55a4f026c ]]
Former-commit-id: 5dc0b8c70d6e5a44a1db2255eb73085b81017657 [formerly 63b55f454f ]
Former-commit-id: 19ce6f7e77
|
2012-06-20 14:13:37 -05:00 |
|
Steve Harris
|
ec9204fa94
|
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: 03383359f3 [formerly af6c0529ad ] [formerly 2f20a86a30 ] [formerly 03383359f3 [formerly af6c0529ad ] [formerly 2f20a86a30 ] [formerly 48860df690 [formerly 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]]
Former-commit-id: 48860df690
Former-commit-id: 6c0d8be39e [formerly d7a4853091 ] [formerly 2439ad1c1bff354f69594e31d7a2a27f4fc21bc4 [formerly 27b50c57bd ]]
Former-commit-id: e4fb4019cc599080c632d3e4becfebc21fb21929 [formerly 2838ca117f ]
Former-commit-id: 70a928d039
|
2012-06-12 14:37:12 -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 |
|
Max Schenkelberg
|
8765371cc0
|
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: 8e6f278c38 [formerly b6a93f9d41 ] [formerly 49fa818762 ] [formerly 8e6f278c38 [formerly b6a93f9d41 ] [formerly 49fa818762 ] [formerly ef669a0297 [formerly 49fa818762 [formerly 20e6ddde20749721784a80a4bb78736de1140a40]]]]
Former-commit-id: ef669a0297
Former-commit-id: 1986b9d6a4 [formerly e01ed896d7 ] [formerly 8f1b1c169c1de0ff617c7d8862e91d6e58d12b04 [formerly 8a19179310 ]]
Former-commit-id: 149fc4b710ecbcf8e0b1099f1e82118fcf3645f6 [formerly 6582ca4f5a ]
Former-commit-id: edf6b8eafb
|
2012-06-07 18:22:01 -05:00 |
|
Steve Harris
|
c76fddc7e4
|
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: bcc12e03ed [formerly 572e1bb476 ] [formerly 27bc369818 ] [formerly bcc12e03ed [formerly 572e1bb476 ] [formerly 27bc369818 ] [formerly 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 43f936900c [formerly 9c9e01dbda ] [formerly ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7 ]]
Former-commit-id: c26989a65231e5bf4f604b7a06a750251f0cd612 [formerly 7978d3b640 ]
Former-commit-id: 1d2ad9224a
|
2012-05-09 13:14:00 -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 |
|
Max Schenkelberg
|
e191d8372f
|
Issue #239 Added remote capability injection code through factory
method. Cleaned up old/unmaintained 3D references
Former-commit-id: e525c9c35d [formerly 48ca9ca105 ] [formerly 54aaf05209 ] [formerly e525c9c35d [formerly 48ca9ca105 ] [formerly 54aaf05209 ] [formerly 16056d53c5 [formerly 54aaf05209 [formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]]]]
Former-commit-id: 16056d53c5
Former-commit-id: 4fbb7ea290 [formerly 20ad9fe872 ] [formerly 265f2d1efade092dd1793dfa515ef1708447df02 [formerly b4b754c7cc ]]
Former-commit-id: 64590c6aeb3aeb7336aeaaa39d73b4ea63738378 [formerly 9bcd4b911a ]
Former-commit-id: 01bf183cf3
|
2012-04-05 13:52:20 -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
|
714bb7dfec
|
Issue #358 Merging core drawing API improvements from Collaboration
Former-commit-id: 3beecc1cdf [formerly 18805c68f7 ] [formerly d43b0456d8 ] [formerly 3beecc1cdf [formerly 18805c68f7 ] [formerly d43b0456d8 ] [formerly 89f603f448 [formerly d43b0456d8 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]]
Former-commit-id: 89f603f448
Former-commit-id: 8b6aa63464 [formerly f78b932abb ] [formerly 69a2b029e678fdd8a18305144330e4c95774ec78 [formerly 4662ece060 ]]
Former-commit-id: 633ae123a39ad609c62c4173a428f3bfbc1fedbd [formerly 1303289d12 ]
Former-commit-id: 0f005d3521
|
2012-03-09 12:31:50 -06:00 |
|
Steve Harris
|
9df09d3111
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 60b350f7f2 [formerly 695e2979c3 ] [formerly 1002555dbd ] [formerly 60b350f7f2 [formerly 695e2979c3 ] [formerly 1002555dbd ] [formerly f693b6d0a7 [formerly 1002555dbd [formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]]]]
Former-commit-id: f693b6d0a7
Former-commit-id: 5ee70f0f28 [formerly 93e856457b ] [formerly ad66d263d16a34b9108e5df9e52a2625e742ad07 [formerly f650243958 ]]
Former-commit-id: c794a75c8d74844afb8888a761b9fa0f1da0eaac [formerly 3cbce90726 ]
Former-commit-id: 87ffdc4f01
|
2012-02-09 08:54:18 -06:00 |
|
Max Schenkelberg
|
18662550ee
|
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: 885f291b35 [formerly be37f19c90 ] [formerly 370e20f0ae ] [formerly 885f291b35 [formerly be37f19c90 ] [formerly 370e20f0ae ] [formerly a7ccea5eda [formerly 370e20f0ae [formerly 875c90104e80d95798956330e24b59d83ef52942]]]]
Former-commit-id: a7ccea5eda
Former-commit-id: 26b5acd957 [formerly 825bd76f55 ] [formerly ead10f07881d137ecc80314da8c248c4e77e5f1b [formerly a6622153d7 ]]
Former-commit-id: ab8f916eb71b9c4a01d3b1b2acdc2d21f22703d0 [formerly 4ba7705369 ]
Former-commit-id: a6c4e04126
|
2012-02-07 16:12:19 -06:00 |
|
Ben Steffensmeier
|
4d9bd2fa9b
|
Issue #227 enhanced caching of maps for thin client
Change-Id: Ib2c6665d1725bcfde70be6ed5a490e68115c6b94
Former-commit-id: 2c1110953c [formerly 138b4de82f ] [formerly 0617773c79 ] [formerly 2c1110953c [formerly 138b4de82f ] [formerly 0617773c79 ] [formerly 9b78596436 [formerly 0617773c79 [formerly 067ba5b7d28174d99119d5bf87a28334578f78dd]]]]
Former-commit-id: 9b78596436
Former-commit-id: 68e1a7c2f1 [formerly 5deb83a291 ] [formerly ed3367219c6c038731023f39d10bc892cdd2132f [formerly a714f57f78 ]]
Former-commit-id: 2e5faaafda0772397c471d118d97379815249b52 [formerly 82db9d2c0c ]
Former-commit-id: 774f2614d0
|
2012-01-31 10:53:10 -06:00 |
|
Matt Nash
|
ff53dcd67f
|
Issue #26 add tear off code to git baseline
Former-commit-id: ea6ef73802 [formerly 892cb9a7ae ] [formerly cf4e1f764e ] [formerly ea6ef73802 [formerly 892cb9a7ae ] [formerly cf4e1f764e ] [formerly 4286cb0342 [formerly cf4e1f764e [formerly dedac216cfa51bd413f7c4d1f7db5ee8ce665866]]]]
Former-commit-id: 4286cb0342
Former-commit-id: e4fb11ce75 [formerly e8d239e963 ] [formerly 6e2a1045719c1a26e7628366b3ec9f4ceaa8912c [formerly 8e3d2af84e ]]
Former-commit-id: 1e134f6cafd331aaf1b78e49c9aa7f8df38c2bf3 [formerly 240ac978f2 ]
Former-commit-id: 8997f82570
|
2012-01-25 12:50:31 -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 |
|