Steve Harris
2c958713b6
Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
Seems to have solved itself or was not actually a conflict
Former-commit-id: dcadf7baa4dcadf7baa486e586befe938dc5b21c
2012-02-23 12:38:55 -06:00
Steve Harris
7f8343833e
Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
...
Former-commit-id: 957d232286957d232286a82f2c5750e6c3afa7a2
2012-02-23 10:19:54 -06:00
Steve Harris
ae9c52b012
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: d0bbbfefccd0bbbfefcc7a10ca97663d511fe719
2012-02-23 10:06:18 -06:00
Ben Steffensmeier
8f34946969
Issue #345 allow double dispose of GLTarget
...
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be
Former-commit-id: 06c9d4cdcf06c9d4cdcf55aa66a5105d6b036ed7
2012-02-22 17:40:48 -06:00
Steve Harris
15c56d11bc
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: c8aae98741c8aae9874154be9660f14450cf8963
2012-02-22 11:14:43 -06:00
Steve Harris
156ad8471d
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 94c2ea985b94c2ea985b9995d22e25aaead73ec5
2012-02-22 10:12:49 -06:00
Steve Harris
a14d90ed4d
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 84926c80be84926c80bef3fe839c1c6d1b04e62c
2012-02-21 10:37:36 -06:00
Nate Jensen
f92be47f79
Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
...
Former-commit-id: b90611d995b90611d995ec0cd8d08613ea11ddfc
2012-02-21 08:57:12 -06:00
Ben Steffensmeier
f949f622dd
Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
...
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db
Former-commit-id: 69e8cde11569e8cde11573d24fad2fdcbe4fc7da
2012-02-20 15:28:20 -06:00
Steve Harris
acd7845ebd
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: cabf9fd956cabf9fd9565e9d2dd36733483f3960
2012-02-20 13:03:39 -06:00
Steve Harris
d9c8a99210
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
...
Former-commit-id: 6a064cb78b6a064cb78bd02529fef4d133454b27
2012-02-20 12:54:25 -06:00
Steve Harris
09b81c6e00
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: 4b76d22f774b76d22f77cc66c8be2454b5b6baef
2012-02-20 12:43:38 -06:00
Steve Harris
f265cb965d
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 62c587b84162c587b841c825bd03a20fab56e0f1
2012-02-20 07:49:13 -06:00
Steve Harris
895404abeb
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: 93f6535bd893f6535bd8b13730280265b22abd24
2012-02-17 10:55:02 -06:00
Ben Steffensmeier
c286cb0406
Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
...
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0
Former-commit-id: 26d82729c926d82729c93e3e4bd4e3d4e7df98a9
2012-02-16 16:36:56 -06:00
Steve Harris
c2cf0253bf
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: e2989d1a9fe2989d1a9f64ddef69b6ff45f4eaab
2012-02-16 14:23:01 -06:00
Ben Steffensmeier
1aff4d27fb
Issue #343 remove extra perspectives when in thinclient component
...
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee
Former-commit-id: 28c7e6bc2228c7e6bc228cf7360e3bb819bfa8e9
2012-02-15 17:10:34 -06:00
Steve Harris
dc9df63a11
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 2119a1513e2119a1513e2e29bc8ee2cb3371ee28
2012-02-14 15:54:46 -06:00
Nate Jensen
ab4ab01dd4
Merge "Issue #235 add an export menu to cave to handle screen capture, print, and displays" into 4-Thin_Client
...
Former-commit-id: da7d13d933da7d13d93306327646d9dd8500b081
2012-02-13 11:40:36 -06:00
Bryan Kowal
e40f50ba36
Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes.
...
Former-commit-id: 34d9122f1434d9122f14c77b9558e12c3f67d470
2012-02-13 10:08:15 -06:00
Ben Steffensmeier
7d16f12962
Issue #235 add an export menu to cave to handle screen capture, print, and displays
...
Change-Id: I44656c7cbe8cb845250d228d13b0ba09ab7e5c98
Former-commit-id: ebbbd0bafcebbbd0bafcf7985bff7ba9e13fac26
2012-02-10 12:13:34 -06:00
Ben Steffensmeier
e1eeef7827
Issue #235 Added ability to capture multiple frames to NSharp
...
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc
Former-commit-id: 5cdcd5a2615cdcd5a2616bfd8ccfee512e0f1bd5
2012-02-09 10:54:02 -06:00
Steve Harris
3cbce90726
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: 1002555dbd1002555dbdf693b6d0a7f650243958
2012-02-09 08:54:18 -06:00
Ben Steffensmeier
6164ad39b6
Issue #245 only use a depth buffer for offscreen rendering if depth testing is enabled
...
Change-Id: I58fefef03829acf32db8b7c91b15983ba482d1b9
Former-commit-id: 863fa0f635863fa0f6353f60daa9c7d49939ddb2
2012-02-08 16:29:02 -06:00
Matt Nash
bbb3cacd0d
Merge "Issue #26 fix gage color for hydro to refresh" into 10-Tech_Blocked
...
Former-commit-id: e52a1315b2e52a1315b225b9659dc75c10b1d587
2012-02-08 08:53:19 -06:00
Matt Nash
7ef7069905
Issue #26 fix gage color for hydro to refresh
...
Former-commit-id: f7652d25e3f7652d25e3bb4f69039382089434e5
2012-02-07 16:49:34 -06:00
Max Schenkelberg
e4fca4c6f7
Issue #206 fixed dialog context deactivation bug
...
Former-commit-id: 9535ae2d0e9535ae2d0efe59c3e8d89a7efcaae8
2012-02-07 16:45:59 -06:00
Matt Nash
3fd575652b
Merge "Issue #206 - Fixed loading and disposing bugs in tear off menus" into 10-Tech_Blocked
...
Former-commit-id: 81ec1d5dac81ec1d5dacbe92a03f2de629c0bc38
2012-02-07 16:13:03 -06:00
Max Schenkelberg
4ba7705369
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: 370e20f0ae370e20f0aea7ccea5edaa6622153d7
2012-02-07 16:12:19 -06:00
Ben Steffensmeier
4b748f8a34
Issue #235 Ability to screen capture or print multiple frames at once.
...
Change-Id: I58176883e701fbe0d9e0bcc0e43b60bd5c0053a7
Former-commit-id: e904dadb5ee904dadb5ec74dae631e0873a518c6
2012-02-07 15:33:23 -06:00
Matt Nash
cc50a32732
Issue #26 fix classes using HandlerUtil.getActiveEditor() for tear off menus
...
Former-commit-id: f4c5d7f94bf4c5d7f94b28e3da498eef18b8c47f
2012-02-07 11:45:28 -06:00
Ben Steffensmeier
031e2867b3
Issue #229 make sure default cache directory exists when opening the preference page.
...
Change-Id: I25ba5cba8c74b764e39c1a42c78ee14f861ba283
Former-commit-id: a1455f9c7da1455f9c7d34f45958ce7db3623545
2012-02-06 17:16:52 -06:00
Matt Nash
6f5a048cac
Issue #26 tear off menu changes to fix issues
...
Former-commit-id: 542049e455542049e4550ff3ef8d7288689efbfa
2012-02-03 13:13:15 -06:00
Ben Steffensmeier
ffe5d42a03
Issue #230 fix scaling problems with printing to high dpi printers
...
Change-Id: I64e609d3b01a839d3b8927eedfd85f81ffc0301f
Former-commit-id: d35d365b7fd35d365b7ff78fa301a855689025ff
2012-02-03 12:49:59 -06:00
Max Schenkelberg
ac56b2955b
Issue #29 Fixed issue with radar menu dispose
...
Former-commit-id: f131667c9ef131667c9e8f0fbbf4e8f33039a269
2012-02-02 16:53:53 -06:00
Matt Nash
eee44ec373
Issue #26 radio buttons hopefully gerrit doesn't screw this up
...
Change-Id: I5ebc3356f83b3f5eb213cb659badd5ae93694d11
Former-commit-id: c966b7d8fdc966b7d8fdb2367335376a23c2537f
2012-02-02 15:32:33 -06:00
Max Schenkelberg
81f3e94746
Issue #206 Fixed issue with local radar menu items getting disposed
...
Former-commit-id: 84ead088ca84ead088caba619200c95ef6d79ef9
2012-02-02 14:24:19 -06:00
Matt Nash
17722801da
Issue #26 fix the issue with the checkboxes out of sync
...
Change-Id: Ibeb05ddfc4a495d3d56a9d3c6bcc64c3494e3d32
Former-commit-id: 4ee3ccb1334ee3ccb1333716c7424f2b7d5941d5
2012-02-01 17:32:51 -06:00
Matt Nash
93aed37ee8
Merge "Issue #206 Made tear off menu dialog activate contexts for perspective" into 10-Tech_Blocked
...
Former-commit-id: 54d27a840f54d27a840fb1eca1ae8f1b4a05d33a
2012-02-01 17:13:10 -06:00
Max Schenkelberg
1954b637a4
Issue #206 Made tear off menu dialog activate contexts for perspective
...
Former-commit-id: 5f8d30bb435f8d30bb43e422b13ded3a26b0cea5
2012-02-01 17:03:20 -06:00
Ben Steffensmeier
48469f7077
Issue #229 moving caches into the caveData directory
...
Change-Id: I3d502ef858939738adf1835d2292f55e2b3edc44
Former-commit-id: fc541f61a7fc541f61a7b3da2a3429699ad82d97
2012-02-01 15:26:34 -06:00
Matt Nash
fc37e8fa3a
Issue #206 radio buttons ready to update when menu is clicked
...
Change-Id: I8218e920bb3221e986d4698771d3199398cb655f
Former-commit-id: 75d6af1ab975d6af1ab90981e7044db0b1c9cc11
2012-02-01 14:07:50 -06:00
Ben Steffensmeier
70e38a4506
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: d976603262d97660326213a99abe7b63ef103145
2012-02-01 12:45:56 -06:00
Nate Jensen
f7541736f7
Merge "Issue #227 enhanced caching of maps for thin client" into 4-Thin_Client
...
Former-commit-id: 0608677c670608677c67b1810ddd3f8a0c505bac
2012-02-01 08:45:42 -06:00
Ben Steffensmeier
82db9d2c0c
Issue #227 enhanced caching of maps for thin client
...
Change-Id: Ib2c6665d1725bcfde70be6ed5a490e68115c6b94
Former-commit-id: 0617773c790617773c799b78596436a714f57f78
2012-01-31 10:53:10 -06:00
Nate Jensen
866b1b79d6
Merge "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." into 4-Thin_Client
...
Former-commit-id: b50765ded4b50765ded4ec1188f95f2925a1638f
2012-01-30 17:16:47 -06:00
Ben Steffensmeier
0c4a26a41c
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: 9cc983549d9cc983549d9254b762ff484a0f64f8
2012-01-30 17:04:47 -06:00
Nate Jensen
213cc51b86
Merge "Issue #185 change LevelFactory to throw exceptions when there is no network connection so that everything can be reinitialized when the connection is restored.." into 4-Thin_Client
...
Former-commit-id: 5f7b1e87b45f7b1e87b4cc1cf725b7f4fe967eba
2012-01-30 16:45:56 -06:00
Ben Steffensmeier
713811bb95
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: b3463d27fcb3463d27fc0d75fbf942c22f135dbc
2012-01-30 16:39:57 -06:00
Roger Ferrel
3b7d7ad2ad
Issue #27
...
Changes for alertviz exit
Former-commit-id: e4718d87aae4718d87aab2254f8df4b2f5691167
2012-01-30 16:25:53 -06:00
