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
Steve Harris
ef49f63d8d
12.5.1-2 baseline
...
Former-commit-id: ac708c050d
[formerly 84d191e7b6
] [formerly ac708c050d
[formerly 84d191e7b6
] [formerly b36c69cc67
[formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]
Former-commit-id: b36c69cc67
Former-commit-id: f6300cd995
[formerly a821111fbf
]
Former-commit-id: 377ae76413
2012-05-03 19:17:13 -05:00
Max Schenkelberg
42c569430b
Issue #587 Got colorbars rendering properly
...
Change-Id: I9fe1b846e68dbdc947202cfcfe88aa7c8e1c1103
Former-commit-id: 0f6240eaea
[formerly d4c10e5548
] [formerly 0f6240eaea
[formerly d4c10e5548
] [formerly c81c225a6e
[formerly 218d9138f8c096d3f99305e2f3ac80b3b30c9cfe]]]
Former-commit-id: c81c225a6e
Former-commit-id: 726c543266
[formerly c6edfad263
]
Former-commit-id: 1189dba8a7
2012-05-03 13:07:43 -05:00
Max Schenkelberg
e9e4327ec9
Issue #239 Fixed bug with mosaic being up and starting a session
...
Change-Id: Ibe0b238806e3cb55b65a38da5a93caeddadc2c01
Former-commit-id: 3ffb18b767
[formerly a045f6f3b9
] [formerly 3ffb18b767
[formerly a045f6f3b9
] [formerly b82eb49055
[formerly 3155b7b27c0c9ddc8557ac8a0240548b0d50292c]]]
Former-commit-id: b82eb49055
Former-commit-id: 887177aa84
[formerly 6a1b035c2d
]
Former-commit-id: f4bd13133e
2012-05-02 10:20:20 -05:00
Steve Harris
491aa53a0c
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: 4ec294b525
[formerly 2ed7249613
] [formerly 4ec294b525
[formerly 2ed7249613
] [formerly 7b75b781ad
[formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 7c7fc97131
[formerly 6dd3ee8809
]
Former-commit-id: fd9e226b35
2012-05-01 18:31:09 -05:00
Steve Harris
0c25458510
12.4.1-10 baseline
...
Former-commit-id: 4bfbdad17d
[formerly 9f8cb727a5
] [formerly 4bfbdad17d
[formerly 9f8cb727a5
] [formerly 8485b90ff8
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 33a67cdd82
[formerly a28d70b5c5
]
Former-commit-id: e5543a0e86
2012-05-01 18:06:13 -05:00
Dave Hladky
7fc0c65ef4
Issue #15 Re-wrote SimDate integration for menus, alert observers after
...
merge headache.
Former-commit-id: 42a12fa7a5
[formerly 1b7473572f
] [formerly 42a12fa7a5
[formerly 1b7473572f
] [formerly 5b7ecea866
[formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]]
Former-commit-id: 5b7ecea866
Former-commit-id: a1a3a361dd
[formerly 61e31c62ff
]
Former-commit-id: d2e16d486b
2012-04-30 13:43:34 -05:00
Max Schenkelberg
cd7fe895bc
Added network logging for http traffic
...
Change-Id: I69f571fba23fc03e0d850180650f61b4581e8a25
Former-commit-id: 2cc5794428
[formerly a912786429
] [formerly 2cc5794428
[formerly a912786429
] [formerly f74b6b4a93
[formerly 7696dd610b5d6f0fc3620db461de68ba06c61699]]]
Former-commit-id: f74b6b4a93
Former-commit-id: 7bb4057d32
[formerly 2d25e8bb78
]
Former-commit-id: 936fa688c0
2012-04-25 17:28:52 -05:00
Steve Harris
f1eb6efb23
12.4.1-10 baseline
...
Former-commit-id: 418489e726
[formerly 704b75e1a1
] [formerly 418489e726
[formerly 704b75e1a1
] [formerly 01457fbbde
[formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]]
Former-commit-id: 01457fbbde
Former-commit-id: 97caaa0327
[formerly aabc3842ac
]
Former-commit-id: 3ed3a665cb
2012-04-24 15:38:29 -05:00
Nate Jensen
2bce81c6c8
Issue #443 better logging of traffic
...
Change-Id: Ia968b79a9d6ee1e5224678ac63684fb9c7aa5b81
Former-commit-id: 14f70d1122
[formerly a4b0addeee
] [formerly 14f70d1122
[formerly a4b0addeee
] [formerly 39ebbc3913
[formerly 4a7faa743900edada4ecf8b42aa3315515617e71]]]
Former-commit-id: 39ebbc3913
Former-commit-id: 83e6f5acf4
[formerly 8130c22b64
]
Former-commit-id: 776ef738f7
2012-04-23 11:23:22 -05:00
Max Schenkelberg
f6a582c033
Issue #239 Started persistable object event pattern. Made construction
...
of single color images cheaper to allow object construction to happen
immediately
Former-commit-id: 9d0eecb9b1
[formerly 523c90b697
] [formerly 9d0eecb9b1
[formerly 523c90b697
] [formerly da5e17d6e3
[formerly 995ddaebb670eb1689aeb44e3cb760731db46e80]]]
Former-commit-id: da5e17d6e3
Former-commit-id: baf778717f
[formerly f05528979d
]
Former-commit-id: 04cf9dba60
2012-04-19 16:03:07 -05:00
Steve Harris
9b8c6e395d
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: 63f11892e8
[formerly 4d7572a632
] [formerly 63f11892e8
[formerly 4d7572a632
] [formerly 625cd4262c
[formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]
Former-commit-id: 625cd4262c
Former-commit-id: e86dc647be
[formerly def458753d
]
Former-commit-id: 19657ae52d
2012-04-19 11:11:02 -05:00
Steve Harris
74b66d9683
12.4.1-4 baseline
...
Former-commit-id: 750b7543dd
[formerly 67a5a68300
] [formerly 750b7543dd
[formerly 67a5a68300
] [formerly 2a216f333c
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae
[formerly a4e519f3cd
]
Former-commit-id: 8cd5974f4c
2012-04-18 15:18:16 -05:00
Max Schenkelberg
0e60d7deb0
Issue #239 Got reprojection event working
...
Former-commit-id: 6efccf10a5
[formerly 29f24e3ec5
] [formerly 6efccf10a5
[formerly 29f24e3ec5
] [formerly 005beff18a
[formerly 99e432cd258c9bf570a66be4702d28ac68204052]]]
Former-commit-id: 005beff18a
Former-commit-id: 8096fc5ad3
[formerly 044f21e405
]
Former-commit-id: fef058d9c6
2012-04-18 14:01:09 -05:00
Max Schenkelberg
b681ea25a2
Issue #239 Fixed mosaic bug, refactored dispatching colormap images so
...
mosaic could resuse
Former-commit-id: c1ebd04d4d
[formerly 40ca446e53
] [formerly c1ebd04d4d
[formerly 40ca446e53
] [formerly 29184d46ce
[formerly aea5c30443970933bf1517ced6d7e91a1008c9d5]]]
Former-commit-id: 29184d46ce
Former-commit-id: e68e6130a0
[formerly a82f07b25d
]
Former-commit-id: 78126cd777
2012-04-17 13:09:07 -05:00
Max Schenkelberg
96a6f4f647
Issue #239 Added wireframe shape capability
...
Former-commit-id: 7900e78944
[formerly 12dcb4b044
] [formerly 7900e78944
[formerly 12dcb4b044
] [formerly 5be2b4e745
[formerly f56dd661225103b08b1d51a9f0cb174bd73340eb]]]
Former-commit-id: 5be2b4e745
Former-commit-id: 3e781ede4f
[formerly f6a2f5e55c
]
Former-commit-id: 12c672e400
2012-04-12 14:46:08 -05:00
Max Schenkelberg
cc8542f7fb
Issue #239 got offscreen rendering working for clients
...
Former-commit-id: b1687af0ac
[formerly 5ae0ed10d5
] [formerly b1687af0ac
[formerly 5ae0ed10d5
] [formerly 2de39bb487
[formerly f41733465eb0ee048fb76a0d5467ce456d1cf7c9]]]
Former-commit-id: 2de39bb487
Former-commit-id: 0f62e40dda
[formerly 1a340bb6e5
]
Former-commit-id: 8c70d7b4d6
2012-04-12 10:45:50 -05:00
Max Schenkelberg
5977b8bcba
Issue #239 Got zoom/pan events working for remote users
...
Former-commit-id: 65f6c07530
[formerly 6e0c5c3cdf
] [formerly 65f6c07530
[formerly 6e0c5c3cdf
] [formerly 18e9f2c6ad
[formerly a817a720868fe887deca6ce6589014f0cd439c2d]]]
Former-commit-id: 18e9f2c6ad
Former-commit-id: 9853d46099
[formerly 0d21a9a35e
]
Former-commit-id: dbd37bb4ae
2012-04-10 14:40:51 -05:00
Steve Harris
f51d290333
Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
...
Conflicts:
edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
Former-commit-id: c90ce9d54e
[formerly ed26e06df2
] [formerly c90ce9d54e
[formerly ed26e06df2
] [formerly fee53dea94
[formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]]
Former-commit-id: fee53dea94
Former-commit-id: 51bb9ebb46
[formerly dcdd7f0648
]
Former-commit-id: 58cb18d860
2012-04-10 12:50:03 -05:00
Max Schenkelberg
54d8c44956
Issue #239 Fixed D2D context activation so as not to override important
...
keys when a unrelated view is active such as Product Browser or
Collaboration views.
Former-commit-id: a5fa19c914
[formerly cbe92bdf32
] [formerly a5fa19c914
[formerly cbe92bdf32
] [formerly 6812c1ba2b
[formerly c7badfd1c2a77d410cd3b841fef967c07c9e6434]]]
Former-commit-id: 6812c1ba2b
Former-commit-id: 532f2d691b
[formerly 824b24dfcb
]
Former-commit-id: a6c9c88b4f
2012-04-06 10:23:24 -05:00
Max Schenkelberg
01bf183cf3
Issue #239 Added remote capability injection code through factory
...
method. Cleaned up old/unmaintained 3D references
Former-commit-id: 48ca9ca105
[formerly 54aaf05209
] [formerly 48ca9ca105
[formerly 54aaf05209
] [formerly 16056d53c5
[formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]]]
Former-commit-id: 16056d53c5
Former-commit-id: 20ad9fe872
[formerly b4b754c7cc
]
Former-commit-id: 9bcd4b911a
2012-04-05 13:52:20 -05:00
Max Schenkelberg
5b50c04d63
Issue #239 Start of remote target capabilities
...
Former-commit-id: ac1fc79f5b
[formerly 6c411ffb07
] [formerly ac1fc79f5b
[formerly 6c411ffb07
] [formerly d2d03e2c64
[formerly 30b76609cff9a737b8e4190bbfebb5a37a259fad]]]
Former-commit-id: d2d03e2c64
Former-commit-id: 3b9699d896
[formerly 5d7e504e89
]
Former-commit-id: 522382bb0b
2012-04-03 15:11:20 -05:00
Max Schenkelberg
8e521d2c29
Merge branch 'ss_sync (12.3.1)' into 11-Collaboration
...
Former-commit-id: c56707c6bc
[formerly 23d65caf2e
] [formerly c56707c6bc
[formerly 23d65caf2e
] [formerly 753de872e0
[formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]]]
Former-commit-id: 753de872e0
Former-commit-id: c7165384f1
[formerly e3477c90ae
]
Former-commit-id: 5ebb709ef6
2012-04-02 16:15:21 -05:00
Steve Harris
1556e72eeb
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: a4e4792bb5
[formerly d3ad6095b7
] [formerly a4e4792bb5
[formerly d3ad6095b7
] [formerly 5cdda77afb
[formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]
Former-commit-id: 5cdda77afb
Former-commit-id: 9845ef53f9
[formerly 6aa18f74f6
]
Former-commit-id: 9fee09c9e4
2012-03-30 09:50:48 -05:00
Nate Jensen
a0c6c92587
Issue #427 Right click on editor tab support
...
Change-Id: Ia9240a01c145c81bbf98268d4df5fd2242ca7987
Former-commit-id: 202bd0adf8
[formerly d2d3a245b3
] [formerly 202bd0adf8
[formerly d2d3a245b3
] [formerly aa000b4b06
[formerly 7597db5bbc0642072143e4c7ea0291108154eb40]]]
Former-commit-id: aa000b4b06
Former-commit-id: 9792be406a
[formerly 6aae45687a
]
Former-commit-id: ac8087a21a
2012-03-29 10:44:08 -05:00
Max Schenkelberg
e73e40dc78
Issue #358 Made wireframe shapes rely more on the grid geoemtry of the
...
descriptor than the actual descriptor as the descriptor is used purely
for convenience
Former-commit-id: 66eaffb9ee
[formerly 15a9245592
] [formerly 66eaffb9ee
[formerly 15a9245592
] [formerly f10f1a5319
[formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]]]
Former-commit-id: f10f1a5319
Former-commit-id: bbab188fb9
[formerly ac11dd0c18
]
Former-commit-id: 2f3b9f0067
2012-03-28 13:32:04 -05:00
Max Schenkelberg
d585d19f48
Issue #358 Fixed painting and sampling regression in radar mosaic due to
...
core improvements from NPP in GL mosaic imaging extension and discovered
while testing IMesh improvements
Former-commit-id: 10b720381b
[formerly 719f87c261
] [formerly 10b720381b
[formerly 719f87c261
] [formerly 556a270a09
[formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]]
Former-commit-id: 556a270a09
Former-commit-id: a4b859ae54
[formerly ba8af4dcc1
]
Former-commit-id: 682aca1dda
2012-03-14 18:03:44 -05:00
Max Schenkelberg
9366a5f308
Issue #358 Cleaned up mesh extension and API to use geotools for
...
defining a mesh. This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.
Former-commit-id: 8fb7eccb73
[formerly 6e5964df9d
] [formerly 8fb7eccb73
[formerly 6e5964df9d
] [formerly 50765e8a34
[formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]
Former-commit-id: 50765e8a34
Former-commit-id: 8f08fab0a7
[formerly cf440b3884
]
Former-commit-id: 6378e8c4ee
2012-03-14 09:49:32 -05:00
Max Schenkelberg
0f005d3521
Issue #358 Merging core drawing API improvements from Collaboration
...
Former-commit-id: 18805c68f7
[formerly d43b0456d8
] [formerly 18805c68f7
[formerly d43b0456d8
] [formerly 89f603f448
[formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]
Former-commit-id: 89f603f448
Former-commit-id: f78b932abb
[formerly 4662ece060
]
Former-commit-id: 1303289d12
2012-03-09 12:31:50 -06:00
Max Schenkelberg
ae389f0b57
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: e2cd95d3f4
[formerly ae47d9683e
] [formerly e2cd95d3f4
[formerly ae47d9683e
] [formerly 48b6d45f00
[formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 0554abdde0
[formerly 3212cc6ebb
]
Former-commit-id: 585e979c76
2012-03-01 16:59:40 -06:00
Steve Harris
7ca623525e
Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
...
Conflicts:
.gitignore
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
deltaScripts/.pydevproject
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
Former-commit-id: ec0f1aebfc
[formerly b89ebc5e01
] [formerly ec0f1aebfc
[formerly b89ebc5e01
] [formerly 496cc6a06b
[formerly 85082f273a85a3967d54d4a489b6ea973d0688be]]]
Former-commit-id: 496cc6a06b
Former-commit-id: dd3a5a8d88
[formerly 4a93298877
]
Former-commit-id: 37e57b6588
2012-02-20 16:38:06 -06:00
Steve Harris
bcccffbaa4
Merge branch '10-Tech_Blocked' into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
rpms/awips2.edex/Installer.edex-cots/component.spec
Former-commit-id: d971880b98
[formerly cabf9fd956
] [formerly d971880b98
[formerly cabf9fd956
] [formerly 5e9d2dd367
[formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]]
Former-commit-id: 5e9d2dd367
Former-commit-id: b12f5e5d75
[formerly 33483f3960
]
Former-commit-id: acd7845ebd
2012-02-20 13:03:39 -06:00
Steve Harris
d3c80a1557
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
...
Former-commit-id: a2fd2cf6fa
[formerly 6a064cb78b
] [formerly a2fd2cf6fa
[formerly 6a064cb78b
] [formerly d02529fef4
[formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]]
Former-commit-id: d02529fef4
Former-commit-id: b41e5f2415
[formerly d133454b27
]
Former-commit-id: d9c8a99210
2012-02-20 12:54:25 -06:00
Steve Harris
9a09879521
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: c209d6de36
[formerly 93f6535bd8
] [formerly c209d6de36
[formerly 93f6535bd8
] [formerly b137302802
[formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]
Former-commit-id: b137302802
Former-commit-id: 1ac6b36d1f
[formerly 65b22abd24
]
Former-commit-id: 895404abeb
2012-02-17 10:55:02 -06:00
Steve Harris
caa8a19335
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: c26a22cfb7
[formerly e2989d1a9f
] [formerly c26a22cfb7
[formerly e2989d1a9f
] [formerly 64ddef69b6
[formerly d3ca90194ff9d361ba9ff7679c2f4da43a439de4]]]
Former-commit-id: 64ddef69b6
Former-commit-id: 840c858697
[formerly ff45f4eaab
]
Former-commit-id: c2cf0253bf
2012-02-16 14:23:01 -06:00
Ben Steffensmeier
2d4d4faf20
Issue #343 remove extra perspectives when in thinclient component
...
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee
Former-commit-id: 0104e1970d
[formerly 28c7e6bc22
] [formerly 0104e1970d
[formerly 28c7e6bc22
] [formerly 8cf7360e3b
[formerly cb03ef54be5e9dae57d758903f6956a8c2a9a617]]]
Former-commit-id: 8cf7360e3b
Former-commit-id: 7de650c868
[formerly b819bfa8e9
]
Former-commit-id: 1aff4d27fb
2012-02-15 17:10:34 -06:00
Steve Harris
87ffdc4f01
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: 695e2979c3
[formerly 1002555dbd
] [formerly 695e2979c3
[formerly 1002555dbd
] [formerly f693b6d0a7
[formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]]]
Former-commit-id: f693b6d0a7
Former-commit-id: 93e856457b
[formerly f650243958
]
Former-commit-id: 3cbce90726
2012-02-09 08:54:18 -06:00
Max Schenkelberg
0f4a0c7948
Issue #206 Made tear off menu dialog activate contexts for perspective
...
Former-commit-id: c410a4eb33
[formerly 5f8d30bb43
] [formerly c410a4eb33
[formerly 5f8d30bb43
] [formerly e422b13ded
[formerly 56103eb133de5325d62bb3453b2353e5d5e23ddd]]]
Former-commit-id: e422b13ded
Former-commit-id: 2185e1a31e
[formerly 3a26b0cea5
]
Former-commit-id: 1954b637a4
2012-02-01 17:03:20 -06:00
Ben Steffensmeier
a7bc0dc8f3
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: 6194dc8210
[formerly 9cc983549d
] [formerly 6194dc8210
[formerly 9cc983549d
] [formerly 9254b762ff
[formerly 94d4feb2973ed201d369a21126b3443606041179]]]
Former-commit-id: 9254b762ff
Former-commit-id: 75f49627c8
[formerly 484a0f64f8
]
Former-commit-id: 0c4a26a41c
2012-01-30 17:04:47 -06:00
Ben Steffensmeier
50d560a874
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: 3c673896a0
[formerly b3463d27fc
] [formerly 3c673896a0
[formerly b3463d27fc
] [formerly 0d75fbf942
[formerly 1b2496a6db33fc65efecfdffb380d8b4e07ec590]]]
Former-commit-id: 0d75fbf942
Former-commit-id: 8b1cdd8db1
[formerly c22f135dbc
]
Former-commit-id: 713811bb95
2012-01-30 16:39:57 -06:00
Ben Steffensmeier
36e2e8ebf8
Issue #33 rearrange Thin Client preferences to allow connectivity preferences to enable/disable other preferences when they are selected.
...
Change-Id: I3647ea498e9e44d7175cc755183fefa3d322c059
Former-commit-id: 71ba2e305b
[formerly ab1273cc02
] [formerly 71ba2e305b
[formerly ab1273cc02
] [formerly 563f93b261
[formerly 53fac28e86ae499846a54cc175f72e2e16b24e37]]]
Former-commit-id: 563f93b261
Former-commit-id: c603c5fdde
[formerly d9151fb62e
]
Former-commit-id: 8fd50c5841
2012-01-27 13:17:08 -06:00