Ben Steffensmeier
a50be67e0e
Issue #1065 fix contexts to deactivate when unrecognized views activate.
...
Former-commit-id: e65418717f
[formerly e8524301b5
] [formerly 2c40ab1f8c26cfd8f57817473987d3fbf3e8c49b [formerly 6d9d0a406f
]] [formerly 4203807a77
[formerly 6d9d0a406f
[formerly 5046660b52594a165d4a8749ac12c236d5ec027d]]]
Former-commit-id: 4203807a77
Former-commit-id: 0f7510411fcfebd4307421621a6b66de713609a0 [formerly 8a170234b8
]
Former-commit-id: d7597d8cf7
2012-08-15 16:36:05 -05:00
Steve Harris
d3023f15ac
12.9.1-1 baseline
...
Former-commit-id: b9fb1c89d4
[formerly 8309193ce9
] [formerly 31ae7ea218
] [formerly 79ce6cfd97
[formerly 31ae7ea218
[formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416
]
Former-commit-id: aed7a644df
2012-08-15 13:59:00 -05:00
Ben Steffensmeier
47059f915b
Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container
...
Former-commit-id: 2c64112a4c
[formerly 474fe44037
] [formerly a4c46c7f55
] [formerly 0857d971b5
[formerly a4c46c7f55
[formerly 7ae4af9778cfa58fc755041479aadec5e6ad90b0]]]
Former-commit-id: 0857d971b5
Former-commit-id: 65c0e971652eab1efeba6ce2a63fccbf32b0da33 [formerly a02bb2c092
]
Former-commit-id: 08021bcfc2
2012-08-14 10:25:38 -05:00
Nate Jensen
cdccfa21de
Merge "Issue #808 create API for managing floating views and made CaveDetachedWindow more robust." into development
...
Former-commit-id: 39d65bbdbd
[formerly da1e9ae3c3
] [formerly c0dad4432c
] [formerly 1b3d6560e4
[formerly c0dad4432c
[formerly 80746bd2c441de92304fb1dabdcfbd66ce3f49a6]]]
Former-commit-id: 1b3d6560e4
Former-commit-id: e6c20d7103adfd2547af480b29383bc04aee6aed [formerly 565100d787
]
Former-commit-id: ca0c314851
2012-07-12 17:17:57 -05:00
Ben Steffensmeier
7943034530
Issue #808 create API for managing floating views and made CaveDetachedWindow more robust.
...
Former-commit-id: e565237b63
[formerly 45a1cc1997
] [formerly ea0c7046af
] [formerly 8984b35ff8
[formerly ea0c7046af
[formerly 1f9b6d2a0b7d45f68bda57c6fcaeec493cbb835a]]]
Former-commit-id: 8984b35ff8
Former-commit-id: 237718f6c294129e4e532f14b6baf4909a02e31f [formerly 1c68f4e01e
]
Former-commit-id: 32d4848ef2
2012-07-12 13:35:52 -05:00
Roger Ferrel
9116d93f52
Issue #875 - Create com.raytheon.uf.viz.points
...
Amend: fixing code per review comments
Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627
Former-commit-id: cc1aecde2f
[formerly bfcefac909
] [formerly 0cf7d64cf4
] [formerly 9071334fe9
[formerly 0cf7d64cf4
[formerly f3d38c3b1ea1b8118f90ce38937a689a9581b2bb]]]
Former-commit-id: 9071334fe9
Former-commit-id: 02403b301463b98f598c97b53f769f6aa9cdf6a2 [formerly b3df932794
]
Former-commit-id: c317c5d0a3
2012-07-12 11:32:03 -05:00
Steve Harris
e528bb0df2
12.6.1-9 baseline
...
Former-commit-id: 32fdf6ed3b
[formerly 7c064b6868
] [formerly 2c0ff851ca
] [formerly 27afa60345
[formerly 2c0ff851ca
[formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0
]
Former-commit-id: dc50bc8443
2012-07-10 07:53:49 -05:00
Max Schenkelberg
58abd127b7
Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function
...
Amend: Fixed Richard's comments
Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3
Former-commit-id: 3bff06cf92
[formerly 7d13c7d339
] [formerly 9bbb68a547
] [formerly 98c2ec7dc5
[formerly 9bbb68a547
[formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]]]
Former-commit-id: 98c2ec7dc5
Former-commit-id: 16ed73fb714995ccf7fe67f7b63b429bcc378657 [formerly 7286b4e962
]
Former-commit-id: c6d324aaeb
2012-07-06 16:01:47 -05:00
Max Schenkelberg
e0ab853ca7
Issue #821 Fixed editor menu so plugin.xml action contribution items
...
are created every time the menu is shown to make sure any submenus are
recreated in the action.
Change-Id: I9f2103b1e8fcddc5bc790d74753733a42f9e6382
Former-commit-id: 4b91c8e169
[formerly 53fd2ec047
] [formerly 84ae717563
] [formerly 668838364d
[formerly 84ae717563
[formerly 537240ee2e9dfb7c110f8d3a63566932b599dfdf]]]
Former-commit-id: 668838364d
Former-commit-id: 42947fd159b2be8315aff7a6c8c72bf8a602e2ec [formerly e3524fd4df
]
Former-commit-id: f1eb4b4713
2012-06-28 11:53:21 -05:00
Bryan Kowal
dfd75b4c72
Merge branch 'ss_sync' (OB12.6.1-10) into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
rpms/awips2-rpm.db
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 455d7b90a9
[formerly b1b294c401
] [formerly a33740e915
] [formerly b87b66abc5
[formerly a33740e915
[formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]
Former-commit-id: b87b66abc5
Former-commit-id: 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe
]
Former-commit-id: b4917e6708
2012-06-27 17:21:48 -05:00
Max Schenkelberg
3caff8171f
Issue #590 fixed context activation for GFE when non GFE views/editors are active. Generalized so any perspective can take advantage of it.
...
Change-Id: I98fa8bd80d2235d605f94f227490e4438ef70ca5
Former-commit-id: c1b95ef2c9
[formerly a691f425ea
] [formerly d0b06374e9
] [formerly 130692aefd
[formerly d0b06374e9
[formerly 75fb17528d393b767df8d8a34abd5e41f007b771]]]
Former-commit-id: 130692aefd
Former-commit-id: a277ad161643ccdccd8ce94496000eaa48028c29 [formerly 859e041e10
]
Former-commit-id: e8e159bed0
2012-06-21 16:07:20 -05:00
Steve Harris
944e3148d4
Revert "12.6.1-10 baseline"
...
This reverts commit 530dfc0563
[formerly f8497470fc
] [formerly c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf
]] [formerly a2c0893d1a
] [formerly 16fd236f2d
[formerly 06f1c7b73c
] [formerly ddde63eee0
] [formerly a2c0893d1a
[formerly ddde63eee0
[formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]].
Former-commit-id: 584f7eddf8
[formerly 62cf6a9f92
] [formerly b4b1f6975f
] [formerly 25198a5cd6
[formerly b4b1f6975f
[formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]]]
Former-commit-id: 25198a5cd6
Former-commit-id: 52c1eb5688c898376b24c6add0a2d1a4c3ff2981 [formerly 8367fb50f5
]
Former-commit-id: 333fd9c64e
2012-06-21 08:51:08 -05:00
Steve Harris
530dfc0563
12.6.1-10 baseline
...
Former-commit-id: 16fd236f2d
[formerly 06f1c7b73c
] [formerly ddde63eee0
] [formerly a2c0893d1a
[formerly ddde63eee0
[formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]]]
Former-commit-id: a2c0893d1a
Former-commit-id: c1748a5eb25e81f51401dbad2116292ba34e48b2 [formerly b33c5bdfcf
]
Former-commit-id: f8497470fc
2012-06-21 08:38:48 -05:00
Max Schenkelberg
ea948bbb82
Issue #697 added support for multiple editors
...
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82
Former-commit-id: 816500d7c4
[formerly 51c2a41e68
] [formerly dd99479eeb
] [formerly fceef3c5a1
[formerly dd99479eeb
[formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]]]
Former-commit-id: fceef3c5a1
Former-commit-id: f94add25d0e7e6bf562b43f3ede6e45e7d953f95 [formerly e5e1a4de6a
]
Former-commit-id: f0d2893e97
2012-06-13 17:52:11 -05:00
Matt Nash
455ac1faf9
Issue #659 fix floating view issue when minimize happened
...
Former-commit-id: 7dc3044f26
[formerly 3689ed489e
] [formerly 96bf8b356a
] [formerly b65a0f124e
[formerly 96bf8b356a
[formerly 82f0b55ac176aad663d7febe94c64d2982bcc45c]]]
Former-commit-id: b65a0f124e
Former-commit-id: d25734d06b93a1a330c627b9c997a28dbfb4665a [formerly 3bd1a43af2
]
Former-commit-id: 9e81392638
2012-06-13 10:04:12 -05:00
Steve Harris
6c0d8be39e
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 48860df690
[formerly 2f20a86a30
[formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]
Former-commit-id: 48860df690
Former-commit-id: 2439ad1c1bff354f69594e31d7a2a27f4fc21bc4 [formerly 27b50c57bd
]
Former-commit-id: d7a4853091
2012-06-12 14:37:12 -05:00
Steve Harris
d5c94ccef2
12.6.1-5 baseline
...
Former-commit-id: 1ad64ffa98
[formerly 09f73b0601
] [formerly c99afab05f
] [formerly 8947efbc7f
[formerly c99afab05f
[formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]
Former-commit-id: 8947efbc7f
Former-commit-id: 1cc870696aedf27ab003448e1146bd540b248a33 [formerly a945ed8e6d
]
Former-commit-id: b69fa75919
2012-06-11 16:23:47 -05:00
Matt Nash
a45f167db2
Issue #659 make fixes to float/dock
...
Former-commit-id: 8acb6d3be2
[formerly 5accda84c9
] [formerly cc5c172a77
] [formerly 1f54c2d09d
[formerly cc5c172a77
[formerly 6ce7d566d2da59436b6d141ad96503873b11f1aa]]]
Former-commit-id: 1f54c2d09d
Former-commit-id: 89258ee3faab44a96efb6b9c4e30d16189f39336 [formerly ae53309d60
]
Former-commit-id: b55c763a34
2012-06-11 10:21:40 -05:00
Steve Harris
1f521a70b3
12.5.1-15 baseline
...
Former-commit-id: 2f10c7a1e4
[formerly 8552902906
] [formerly b13cbb7e00
] [formerly 3904c4ccf5
[formerly b13cbb7e00
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f
]
Former-commit-id: 97c4db937e
2012-06-08 13:39:48 -05:00
Matt Nash
75ed94c837
Issue #659 toolbar is in session view now
...
Former-commit-id: ca96492c0e
[formerly 373db85359
] [formerly 00f55c1d80
] [formerly e43fee4483
[formerly 00f55c1d80
[formerly a516cc2073fa33c88f13678a55dda4bdbe3ed120]]]
Former-commit-id: e43fee4483
Former-commit-id: da5e2155fd0c122d5fa28bd9148319c145e52549 [formerly 304970e9a9
]
Former-commit-id: f2d8da6b3d
2012-06-05 13:25:36 -05:00
Matt Nash
0a225b2540
Issue #659 float button for cool detachable functionality
...
Former-commit-id: bfcfcba572
[formerly 2b1ce9e674
] [formerly 855193aa77
] [formerly cab515cbfd
[formerly 855193aa77
[formerly 9b1c62c4851f95ad270b58ceacf756a616f7c136]]]
Former-commit-id: cab515cbfd
Former-commit-id: 8443892ca2884191c2aab260370223421cc04482 [formerly 633fd997e5
]
Former-commit-id: 945095e345
2012-05-30 16:13:21 -05:00
Steve Harris
bc695ee025
12.5.1-6 baseline
...
Former-commit-id: ba6d779949
[formerly df80148db6
] [formerly ffae06aa7059ba46bdf5d6194d790ed5d3513713 [formerly 24474489f9
]] [formerly fa87dc6cf1
[formerly 24474489f9
[formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: 0fa00c0acf0db00500f5839edb5595f4cd6535d5 [formerly c452cce633
]
Former-commit-id: 4792884ab2
2012-05-16 16:41:22 -05:00
Nate Jensen
a017a4cb07
Issue #590 fix issue when exiting GFE
...
Change-Id: I6dd72855e80a49be5735f9d805fbc42e42c7f157
Former-commit-id: b6ab7baf51
[formerly 7abedf8904
] [formerly 75754040cb
] [formerly c92f9ee705
[formerly 75754040cb
[formerly 258fead57d05a908b32b0b74a2e34ab19be0947f]]]
Former-commit-id: c92f9ee705
Former-commit-id: 79efdc4893b23722a798dfe52e27083bec43a468 [formerly c55862a1ab
]
Former-commit-id: 4be7493c21
2012-05-11 13:58:46 -05:00
Max Schenkelberg
985ee5a034
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
...
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 82298cb03b
[formerly 06ee0bbf6f
] [formerly 78e1bd2c62
] [formerly 1f5abc6e20
[formerly 78e1bd2c62
[formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 0465afe50a2e0abf332ee9d7e74c28a75a577f5d [formerly 3ca8ca6f01
]
Former-commit-id: 2db836b296
2012-05-09 15:02:30 -05:00
Steve Harris
43f936900c
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 58037cb5d1
[formerly 27bc369818
[formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]
Former-commit-id: 58037cb5d1
Former-commit-id: ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7
]
Former-commit-id: 9c9e01dbda
2012-05-09 13:14:00 -05:00
Steve Harris
8025cc609e
12.5.1-2 baseline
...
Former-commit-id: c1bc408f84
[formerly ac708c050d
] [formerly 84d191e7b6
] [formerly b36c69cc67
[formerly 84d191e7b6
[formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]
Former-commit-id: b36c69cc67
Former-commit-id: 22cf2530d98a6c3d2d24e8ef75454ae00fe19292 [formerly a821111fbf
]
Former-commit-id: f6300cd995
2012-05-03 19:17:13 -05:00
Steve Harris
3992b18e28
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 7b75b781ad
[formerly 2ed7249613
[formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809
]
Former-commit-id: 7c7fc97131
2012-05-01 18:31:09 -05:00
Steve Harris
40aa780b3d
12.4.1-10 baseline
...
Former-commit-id: 7fa9dbd5fb
[formerly 4bfbdad17d
] [formerly 9f8cb727a5
] [formerly 8485b90ff8
[formerly 9f8cb727a5
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5
]
Former-commit-id: 33a67cdd82
2012-05-01 18:06:13 -05:00
Steve Harris
caab7c1fbb
12.4.1-10 baseline
...
Former-commit-id: 931087306f
[formerly 418489e726
] [formerly 704b75e1a1
] [formerly 01457fbbde
[formerly 704b75e1a1
[formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]]
Former-commit-id: 01457fbbde
Former-commit-id: bd1ff6d9b99902d235b63b9c84d31f1a058625ee [formerly aabc3842ac
]
Former-commit-id: 97caaa0327
2012-04-24 15:38:29 -05:00
Steve Harris
6aa0898aae
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 625cd4262c
[formerly 4d7572a632
[formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]
Former-commit-id: 625cd4262c
Former-commit-id: f6efcfd8ee5a2a4ca8ad3ed217945853b75bfa5f [formerly def458753d
]
Former-commit-id: e86dc647be
2012-04-19 11:11:02 -05:00
Steve Harris
98d8b3f188
12.4.1-4 baseline
...
Former-commit-id: 4767b0e069
[formerly 750b7543dd
] [formerly 67a5a68300
] [formerly 2a216f333c
[formerly 67a5a68300
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd
]
Former-commit-id: a2a6a18fae
2012-04-18 15:18:16 -05:00
Max Schenkelberg
c19de5dcc3
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: 65e7184cc4
[formerly a5fa19c914
] [formerly cbe92bdf32
] [formerly 6812c1ba2b
[formerly cbe92bdf32
[formerly c7badfd1c2a77d410cd3b841fef967c07c9e6434]]]
Former-commit-id: 6812c1ba2b
Former-commit-id: a24149c0db6c44d2a20bc8fb7a45708e704473a7 [formerly 824b24dfcb
]
Former-commit-id: 532f2d691b
2012-04-06 10:23:24 -05:00
Max Schenkelberg
4fbb7ea290
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 16056d53c5
[formerly 54aaf05209
[formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]]]
Former-commit-id: 16056d53c5
Former-commit-id: 265f2d1efade092dd1793dfa515ef1708447df02 [formerly b4b754c7cc
]
Former-commit-id: 20ad9fe872
2012-04-05 13:52:20 -05:00
Max Schenkelberg
f3ff93f96f
Merge branch 'ss_sync (12.3.1)' into 11-Collaboration
...
Former-commit-id: 0b1caa67df
[formerly c56707c6bc
] [formerly 23d65caf2e
] [formerly 753de872e0
[formerly 23d65caf2e
[formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]]]
Former-commit-id: 753de872e0
Former-commit-id: adc59a45b53d18b81a0ef2d2163602690fcd76f2 [formerly e3477c90ae
]
Former-commit-id: c7165384f1
2012-04-02 16:15:21 -05:00
Steve Harris
c6071e24c5
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 5cdda77afb
[formerly d3ad6095b7
[formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]
Former-commit-id: 5cdda77afb
Former-commit-id: a5d7cad4cf9dcde7d77f5ce8ca8a3ccca2fdde58 [formerly 6aa18f74f6
]
Former-commit-id: 9845ef53f9
2012-03-30 09:50:48 -05:00
Nate Jensen
274e2df586
Issue #427 Right click on editor tab support
...
Change-Id: Ia9240a01c145c81bbf98268d4df5fd2242ca7987
Former-commit-id: a4965d6bf9
[formerly 202bd0adf8
] [formerly d2d3a245b3
] [formerly aa000b4b06
[formerly d2d3a245b3
[formerly 7597db5bbc0642072143e4c7ea0291108154eb40]]]
Former-commit-id: aa000b4b06
Former-commit-id: a6d73562ce75aff32ab9bfe5f1b0ddce7553fd0c [formerly 6aae45687a
]
Former-commit-id: 9792be406a
2012-03-29 10:44:08 -05:00
Max Schenkelberg
458f5970aa
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: 5a61f3ae23
[formerly 8fb7eccb73
] [formerly 6e5964df9d
] [formerly 50765e8a34
[formerly 6e5964df9d
[formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]
Former-commit-id: 50765e8a34
Former-commit-id: 87c83af55da8aec24c975aa2f80b06b4449fa969 [formerly cf440b3884
]
Former-commit-id: 8f08fab0a7
2012-03-14 09:49:32 -05:00
Max Schenkelberg
8b6aa63464
Issue #358 Merging core drawing API improvements from Collaboration
...
Former-commit-id: 3beecc1cdf
[formerly 18805c68f7
] [formerly d43b0456d8
] [formerly 89f603f448
[formerly d43b0456d8
[formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]
Former-commit-id: 89f603f448
Former-commit-id: 69a2b029e678fdd8a18305144330e4c95774ec78 [formerly 4662ece060
]
Former-commit-id: f78b932abb
2012-03-09 12:31:50 -06:00
Max Schenkelberg
52c7dec2e8
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: fe1811c167
[formerly e2cd95d3f4
] [formerly ae47d9683e
] [formerly 48b6d45f00
[formerly ae47d9683e
[formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 22d12e35f7b0f5789a9dd62c8684fad371d63859 [formerly 3212cc6ebb
]
Former-commit-id: 0554abdde0
2012-03-01 16:59:40 -06:00
Steve Harris
2e0f1d3ecc
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: eda787edea
[formerly d971880b98
] [formerly cabf9fd956
] [formerly 5e9d2dd367
[formerly cabf9fd956
[formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]]
Former-commit-id: 5e9d2dd367
Former-commit-id: a529cc7da8a5f072c8a414b5af753a556a2be162 [formerly 33483f3960
]
Former-commit-id: b12f5e5d75
2012-02-20 13:03:39 -06:00
Steve Harris
4ffbe4780e
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
...
Former-commit-id: cc45f5a268
[formerly a2fd2cf6fa
] [formerly 6a064cb78b
] [formerly d02529fef4
[formerly 6a064cb78b
[formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]]
Former-commit-id: d02529fef4
Former-commit-id: b1cec7b0617c7b5f5c46fade03d4b59fd4aeb442 [formerly d133454b27
]
Former-commit-id: b41e5f2415
2012-02-20 12:54:25 -06:00
Steve Harris
43c3cfdd1a
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: 7b4b066a2b
[formerly c209d6de36
] [formerly 93f6535bd8
] [formerly b137302802
[formerly 93f6535bd8
[formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]
Former-commit-id: b137302802
Former-commit-id: eeaad2f7633b220d953999828d906362e3a79992 [formerly 65b22abd24
]
Former-commit-id: 1ac6b36d1f
2012-02-17 10:55:02 -06:00
Steve Harris
1d529a0d83
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: c2a47087ce
[formerly 46dda7b8bd
] [formerly 2119a1513e
] [formerly 2e29bc8ee2
[formerly 2119a1513e
[formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]]]
Former-commit-id: 2e29bc8ee2
Former-commit-id: 1e32c15008441ec81c586e6dfaf0f8d5acded476 [formerly cb3371ee28
]
Former-commit-id: d23d12d596
2012-02-14 15:54:46 -06:00
Ben Steffensmeier
59d62510ea
Issue #235 add an export menu to cave to handle screen capture, print, and displays
...
Change-Id: I44656c7cbe8cb845250d228d13b0ba09ab7e5c98
Former-commit-id: ced66f23a5
[formerly 6e95175ba2
] [formerly ebbbd0bafc
] [formerly f7985bff7b
[formerly ebbbd0bafc
[formerly 622a02770dc84c8cedd9707b741f5f1e2b6ab81d]]]
Former-commit-id: f7985bff7b
Former-commit-id: d92b9c3f75bd9c764113a021ca2bf3440df9c8f6 [formerly a9e13fac26
]
Former-commit-id: 99557a2a0f
2012-02-10 12:13:34 -06:00
Ben Steffensmeier
34c03d78d0
Issue #235 Added ability to capture multiple frames to NSharp
...
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc
Former-commit-id: 8a5a87c2b1
[formerly 08e8343d98
] [formerly 5cdcd5a261
] [formerly 6bfd8ccfee
[formerly 5cdcd5a261
[formerly 447253e7cd0ea5ab64c020a4fe0822ffc3a01d3f]]]
Former-commit-id: 6bfd8ccfee
Former-commit-id: b17c805c928548abe79f8ce56d670d4b8f032bbf [formerly 512e0f1bd5
]
Former-commit-id: 9d442083a1
2012-02-09 10:54:02 -06:00
Steve Harris
5ee70f0f28
Merge branch '10-Tech_Blocked' into 104-integration
...
Former-commit-id: 60b350f7f2
[formerly 695e2979c3
] [formerly 1002555dbd
] [formerly f693b6d0a7
[formerly 1002555dbd
[formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]]]
Former-commit-id: f693b6d0a7
Former-commit-id: ad66d263d16a34b9108e5df9e52a2625e742ad07 [formerly f650243958
]
Former-commit-id: 93e856457b
2012-02-09 08:54:18 -06:00
Ben Steffensmeier
9e2d8f88e2
Issue #235 Ability to screen capture or print multiple frames at once.
...
Change-Id: I58176883e701fbe0d9e0bcc0e43b60bd5c0053a7
Former-commit-id: 8eb80818ce
[formerly 2e37808e48
] [formerly e904dadb5e
] [formerly c74dae631e
[formerly e904dadb5e
[formerly 9062fe4b8fdb62840b21aba7c648f48fa691986a]]]
Former-commit-id: c74dae631e
Former-commit-id: 48be892967e3c67b6967381d7bc91582cd36bbf6 [formerly 0873a518c6
]
Former-commit-id: 9c6081d7a3
2012-02-07 15:33:23 -06:00
Matt Nash
628da725c1
Issue #26 fix classes using HandlerUtil.getActiveEditor() for tear off menus
...
Former-commit-id: e512d27770
[formerly a659029ea0
] [formerly f4c5d7f94b
] [formerly 28e3da498e
[formerly f4c5d7f94b
[formerly c12bae0a615198f6d409cf5e6d79a6a32e57494d]]]
Former-commit-id: 28e3da498e
Former-commit-id: d0e84e05ac9aabb1cf0f0936159cb5c6919bb005 [formerly ef18b8c47f
]
Former-commit-id: 8dbb17b2e8
2012-02-07 11:45:28 -06:00
Matt Nash
8dcbb297c9
Issue #206 radio buttons only select one at a time
...
Former-commit-id: 3430c01156
[formerly 42b4f10d37
] [formerly 5094c1ec1c
] [formerly c8365fa660
[formerly 5094c1ec1c
[formerly 38de69ea29c429a2295518fb9d8c1707efe1d3c4]]]
Former-commit-id: c8365fa660
Former-commit-id: 864503773583d07d8597244deea399d7f0d59d17 [formerly 3b247ad783
]
Former-commit-id: e977aefb73
2012-01-27 11:50:34 -06:00
Ben Steffensmeier
b92663faed
Issue #199 Do not endFrame for panes which are not drawn. This prevents
...
gl from swapping buffers which leads to a flicker on intel graphics
cards.
Former-commit-id: 5ff423894d
[formerly 6cdc7f561a
] [formerly 6cbe5bbf71
] [formerly 0f906ac4d5
[formerly 6cbe5bbf71
[formerly 05ac4ac87d5371cabc91d82322b2c9728373e8b1]]]
Former-commit-id: 0f906ac4d5
Former-commit-id: d3fb31a063b0236fcdc41f2db8896dcab112716c [formerly 0e27eeebf6
]
Former-commit-id: 54990c6377
2012-01-26 15:20:56 -06:00