Commit graph

59 commits

Author SHA1 Message Date
Lee Venable
58c83b9662 Merge "Issue #1830 - Don't allow base level config files for FFMP" into development
Former-commit-id: e994040887 [formerly 4a8c4b64df] [formerly f1e8faf9ff [formerly 9c117d43e77ffa074c8464771918116f8835b382]]
Former-commit-id: f1e8faf9ff
Former-commit-id: 35d27f89f1
2013-04-01 12:26:23 -05:00
Mike Duff
e627279d7c Issue #1830 - Don't allow base level config files for FFMP
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77

Former-commit-id: fa8ca827d1 [formerly 261a39122d] [formerly 9c2ac87482 [formerly 9ecafb5aacbdb2928902435f342aa4547c2f5903]]
Former-commit-id: 9c2ac87482
Former-commit-id: 11ca7c2c20
2013-04-01 11:36:53 -05:00
Roger Ferrel
8c1116eaae Issue #1790 Last of the bug fixes. Reviewer changes
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa

Former-commit-id: 20f6baba0e [formerly 8f4492c63c] [formerly 463407a40e [formerly 336427570fba81616b8d02f3ed2948042d7dbf41]]
Former-commit-id: 463407a40e
Former-commit-id: ec5f32aec6
2013-03-29 11:35:08 -05:00
Roger Ferrel
380846374f Issue #1790 Bug fixes for SCAN.
Change-Id: I5743cd94be6c06808acb0add38d63ea381d13c65

Former-commit-id: 009cd032cb [formerly 9c560ab626] [formerly e204276c17 [formerly 2bb23a6015638266ed17034777489c9ec6dc1307]]
Former-commit-id: e204276c17
Former-commit-id: 216fa1b23b
2013-03-28 09:16:24 -05:00
Steve Harris
02105701a0 Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.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/internal/ext/mosaic/GLMosaicImageExtension.java
	edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
	edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: b0621d90bc [formerly fd71e44f0f] [formerly a23cecdb26 [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]
Former-commit-id: a23cecdb26
Former-commit-id: e96e95b565
2013-03-26 10:12:34 -05:00
Mike Duff
b366778df0 Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParm.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.qpid/0.7/build.sh
	rpms/awips2.qpid/build.sh

Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb

Former-commit-id: c1f7d33bb8 [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]
Former-commit-id: 9ebc7606b1
Former-commit-id: 4c3011edce
2013-03-26 09:19:39 -05:00
Steve Harris
f80f98cee2 13.3.1-12 baseline
Former-commit-id: be96282207 [formerly 0be473728a] [formerly aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: aaac0b51e5
Former-commit-id: bc439aee4f
2013-03-25 13:27:13 -05:00
Mike Duff
fcb46897e3 Issue #1818 - Added an isDisposed check to the Attributes Dialog open action
Change-Id: Icb0c6fd5112cc11b796aaa74c8afc9b10760f2dc

Former-commit-id: 86e0184414 [formerly 593cb668bf] [formerly 7118f04843 [formerly c0e79f8fa9cfd55a86d48130fa7ff448ae5231b0]]
Former-commit-id: 7118f04843
Former-commit-id: c682fb2e9a
2013-03-24 12:21:51 -05:00
Steve Harris
2a26783ba7 Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: 28ef804e1b [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 900b9aadde
2013-03-18 16:52:00 -05:00
Dave Hladky
3ba473351b Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1

Former-commit-id: a1c4148918 [formerly 9b495681ec] [formerly c57d5574ef [formerly 8b498ee96ab7309bc3cb70a4f93e05c0af60c824]]
Former-commit-id: c57d5574ef
Former-commit-id: db207a732c
2013-03-14 15:59:39 -05:00
Dave Hladky
9e97fc9efe Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 765be278bb [formerly 38b952a220] [formerly 5dc454c7ef [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 160e1594b8
2013-03-13 13:56:33 -05:00
Dustin Johnson
f5a3b57107 Issue #1784 Move NCF bandwidth manager code to data delivery repo
Amend:
  Publish JUnit test reports as XML, in support of Jenkins.
  Fix build/merge of 13.3.1 code so it compiles.

Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4

Former-commit-id: 2983ed29e4 [formerly 71365cd945] [formerly 1930183036 [formerly 60efd125706d618ae06eb84f959302213da2f7f1]]
Former-commit-id: 1930183036
Former-commit-id: 48a96911c8
2013-03-13 08:39:08 -05:00
Steve Harris
bca46a1354 Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java

Former-commit-id: 36261cb095 [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]
Former-commit-id: 0cd7e56e65
Former-commit-id: d5bcdb0015
2013-03-12 16:04:23 -05:00
Dave Hladky
155903d135 Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227

Former-commit-id: 5c65862b8f [formerly a1006667e0] [formerly 4b08491880 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]
Former-commit-id: 4b08491880
Former-commit-id: 6ea95002de
2013-03-12 15:48:34 -05:00
Steve Harris
6fe4b16924 13.3.1-6 baseline
Former-commit-id: 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 566b677d09
Former-commit-id: 4ed21b702b
2013-03-12 08:35:45 -05:00
Dave Hladky
dd446abd03 Issue #1769 Crashing FFMP caused by thread wait
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611

Former-commit-id: 50696bee89 [formerly 2a854d7c30] [formerly bb4c54eff0 [formerly 6ad5dcd3f980677a9120633f043887527cbe0eda]]
Former-commit-id: bb4c54eff0
Former-commit-id: 73c21a6ead
2013-03-08 09:58:17 -06:00
Steve Harris
4a0b8772ec Merge branch 'omaha_13.3.1' into development
Former-commit-id: 6b13492420 [formerly d5b80f9225] [formerly aa0e9acefd [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]
Former-commit-id: aa0e9acefd
Former-commit-id: b9563da8a8
2013-03-05 12:29:44 -06:00
Dave Hladky
0f3c9ba997 Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4

Former-commit-id: 22ebfe0ecb [formerly 680317d9c4] [formerly fc36146f48 [formerly ef45479b067655db8203f199502ea4e772a80e34]]
Former-commit-id: fc36146f48
Former-commit-id: 1260b40307
2013-03-04 17:41:11 -06:00
Ben Steffensmeier
334af0001b Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: d27d30c2db [formerly f46686a6e2] [formerly 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]
Former-commit-id: 2ca86633d6
Former-commit-id: 5068b18c6a
2013-02-28 17:00:56 -06:00
Steve Harris
e46625f8f2 Merge branch 'development' into omaha_13.3.1
Former-commit-id: 0a4564eb97 [formerly 67f090638f] [formerly 6ec9e73035 [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]
Former-commit-id: 6ec9e73035
Former-commit-id: 0051276ad1
2013-02-25 15:58:48 -06:00
Mike Duff
01ef273417 Issue #1552 - Implement FFMP Data Access
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55

Former-commit-id: 8a8e8f7a73 [formerly 8bddd467b1] [formerly 81649d346a [formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]
Former-commit-id: 81649d346a
Former-commit-id: b1a549a99f
2013-02-25 09:29:16 -06:00
Steve Harris
4f155a183a 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: 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: 2641d578e2
Former-commit-id: 33dd2589f1
2013-02-21 15:41:39 -06:00
Steve Harris
e4435815c9 13.3.1-1 baseline
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
2013-02-20 16:19:40 -06:00
Dave Hladky
261d00c544 Issue #1635 Second Guidance source verification, general cleanup
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526

Former-commit-id: e7993c968d [formerly 7b36b055f1] [formerly 41f2ea7efe [formerly 798b106211b1248c7fc932cfb2ebccddf15a0d66]]
Former-commit-id: 41f2ea7efe
Former-commit-id: b1c8f153e0
2013-02-20 16:13:08 -06:00
Nate Jensen
f5a1165062 Issue #1639 Replaced monitor's ConcurrentHashMaps with data structures, removed references to FFMPCacheRecord
Change-Id: I24cbcbfe1b3cc5309a78469da9ba021f6953b0eb

Former-commit-id: e0884ed550 [formerly c2d4f8e164] [formerly e6e2d8905c [formerly 4582146fd6f0ea348c7f4d01fdb68f6473439761]]
Former-commit-id: e6e2d8905c
Former-commit-id: a7b74e1f79
2013-02-20 13:48:26 -06:00
Mike Duff
3e59308771 Issue #1584 - FFMP performance stats and performance logger
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c

Former-commit-id: 897262630c [formerly 0b044dba9c] [formerly 9c1e0ab639 [formerly 1334488810c13f02e692c234a52d8f0f505a5846]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 079ec4b6dd
2013-02-18 08:16:57 -06:00
Dave Hladky
7f6381ec5c Issue #1627 Sped up FFMp load by removing un-needed DB calls.
Change-Id: Ice81630bd72b7f64d6f0817d2e531877b0072956

Former-commit-id: 83fe9ca104 [formerly 8247da158f] [formerly a8f6635a6f [formerly db09538ad0664b8a7f3eb83f062a47490975f7b1]]
Former-commit-id: a8f6635a6f
Former-commit-id: 4cd9b2e8b2
2013-02-14 15:12:29 -06:00
Dave Hladky
a17dee033a Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT
Change-Id: I693debea540667cfda6efe1496dd1084b8d0e950

Former-commit-id: 2655952304 [formerly 7b3a310f67] [formerly 381aec5976 [formerly 2ea8409800917d8c9a4c76c3b63492a2eb1f2c62]]
Former-commit-id: 381aec5976
Former-commit-id: 5c66cbcd27
2013-02-14 13:58:32 -06:00
Mike Duff
317b174c24 Issue #1580 - Implementation of Stats/Event framework.
Change-Id: I45a5a855f81c975a8a13d73f18ab9de3ddecf7cd

Former-commit-id: 804f526206 [formerly def0464898] [formerly b9f317bbd0 [formerly ca2f288876b80fe5e491f335fb6b22b20a468fca]]
Former-commit-id: b9f317bbd0
Former-commit-id: 15f96b75a5
2013-02-08 10:23:45 -06:00
Steve Harris
bbe92e6824 13.2.1-6 baseline
Former-commit-id: d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: a46e33f06e
Former-commit-id: 30d38334cc
2013-02-07 16:00:39 -06:00
Dave Hladky
b134741e4c Issue #1478 FFMP cache file read/writes overloading NAS, more efficiency
Change-Id: Ib5f49d9c1551b72a3620629437386d52c12b0ecf

Former-commit-id: 7b49430e34 [formerly c0712160d7] [formerly 7af5aab08a [formerly 9c7d813ee094864e0a7da60d54dee5424c50efba]]
Former-commit-id: 7af5aab08a
Former-commit-id: f6bd4ea0fa
2013-02-05 12:23:56 -06:00
Steve Harris
d9be4dce21 13.2.1-2 baseline
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
2013-01-23 11:18:44 -05:00
Dave Hladky
9d935baf22 Issue #1475 QPF standalonoe displays appear slow
Change-Id: I352de7f76ade5d3d981b3c6206086955c2243f6a

Former-commit-id: ffd3faa84b [formerly 0f7a64798d] [formerly 6822591e1a [formerly 6e7c86aba7103c445823ac2a11a2241939e4b6c2]]
Former-commit-id: 6822591e1a
Former-commit-id: 81c9f8e21e
2013-01-15 15:50:27 -06:00
Lee Venable
78a124efe3 Merge "Issue #1353 old test code classes." into development
Former-commit-id: 4ae765fc4f [formerly 0d74bf9e67] [formerly 4e13d01e67 [formerly 54765a26d6ca098133ff1e0b16c56e94e4053f74]]
Former-commit-id: 4e13d01e67
Former-commit-id: fa143bd2e1
2012-12-07 13:22:46 -06:00
Roger Ferrel
ddab76526a Issue #1353 old test code classes.
Change-Id: I5b0f7a45ff6e00c669aa1acc6493350f90a66350

Former-commit-id: 754afb9c52 [formerly cfb11d2d38] [formerly 327f35c657 [formerly 51f185625e30425c1466a04d46b3eac39dfac4dc]]
Former-commit-id: 327f35c657
Former-commit-id: 125d271d40
2012-12-07 11:27:31 -06:00
Roger Ferrel
351e3711fb Issue #1353 Changes for non-blocking FFMPSplash and LoadSaveConfigDlg dialogs.
Change-Id: Ie8589daa43e45a83835d119bdecc1674c7104ed0

Former-commit-id: 991c64f0a9 [formerly 0c83b2a277] [formerly 3cb0385a93 [formerly c243a7bdb065db53dee2a01b251e5fbc5f1ec23e]]
Former-commit-id: 3cb0385a93
Former-commit-id: b6ae15b04e
2012-12-07 10:46:14 -06:00
Roger Ferrel
b736c70e88 Issue #1353 Changes for non-blocking AttributeThresholdDlg, BasinTrendDlg and ConfigSummaryDlg.
Change-Id: Ie5ed937d78478c91eab84998024ee3347f79c95e

Former-commit-id: d99abd8f22 [formerly 7233f6fd64] [formerly c30152a13d [formerly ea9896b2e8653b5d521c3f2d4a497116d135ea64]]
Former-commit-id: c30152a13d
Former-commit-id: 2a4a7a605f
2012-12-06 13:40:48 -06:00
Roger Ferrel
9e0ca8f515 Issue #1353 Changes for non-blocking AttributesDlg.
Change-Id: I10c64bc287d7b5f79836ce14567df9cb05e4aa5d

Former-commit-id: 48143df9b1 [formerly bdaf7fa39e] [formerly 6efe221abf [formerly da1fcd1d3d1716a1742b2e394d5d28b7d641ec3e]]
Former-commit-id: 6efe221abf
Former-commit-id: 7a146ba846
2012-12-06 09:54:13 -06:00
Lee Venable
a533c424c7 Merge "Issue #1353 Delete old test classes that no longer work or are referenced anywhere." into development
Former-commit-id: 45630ede78 [formerly 67243cacf8] [formerly 3fb520b16b [formerly ff448dd0525f9e66f844c74556228b73a3e68196]]
Former-commit-id: 3fb520b16b
Former-commit-id: 7943e69cf8
2012-12-05 16:19:05 -06:00
Roger Ferrel
f8fb1d2748 Issue #1353 Delete old test classes that no longer work or are referenced anywhere.
Change-Id: Idcd6f01985b73f6a29af1e69699798d23ffc2d22

Former-commit-id: a74be95da7 [formerly eef69ff910] [formerly e985aca148 [formerly 881bff62599a078b6266483f79b8f2b2583fa6e0]]
Former-commit-id: e985aca148
Former-commit-id: 104e7e54ee
2012-12-05 16:06:19 -06:00
Roger Ferrel
778100f3d6 Issue #1353 Changes for non-blocking FFTIControlDlg.
Change-Id: Idf182e728a60d55aeb671201396c97beb3752bb3

Former-commit-id: d509833714 [formerly b81d12f775] [formerly 171dd5c3bf [formerly 8bf40b32fc3d9e0fa11133d8fb7ac94e6dcf4c05]]
Former-commit-id: 171dd5c3bf
Former-commit-id: 2f3b693576
2012-12-05 15:45:43 -06:00
Roger Ferrel
061b0ca7ef Issue #1353 Changes for non-blocking RetrieveMergeDlg and LoadSaveDelteSelectDlg close callbacks added to FFFGDlg.
Change-Id: I6ae982cef57ed66093145c93f4bec0491402882c

Former-commit-id: 1ba00e7eab [formerly 6eb1c3cac3] [formerly 45a957ebf3 [formerly 5c23c4d932b4a4ae2274c58fe5257be9a46c7076]]
Former-commit-id: 45a957ebf3
Former-commit-id: 3bdff81196
2012-12-03 10:24:18 -06:00
Roger Ferrel
1533fda1e3 Issue #1353 Changes for non-blocking FFFGDlg, AboutDlg, AcknowledgmentsDlg and HelpDlg dialogs.
Change-Id: Id72c6a0c0329f485fe7a9ca115c3f029019145e6

Former-commit-id: 9832e2dbb0 [formerly 64a78503b2] [formerly f3b83e02b4 [formerly 372417c1d355e3c5eef327f14be9b72dfe1e0f08]]
Former-commit-id: f3b83e02b4
Former-commit-id: 391f07ea69
2012-11-29 13:21:15 -06:00
Steve Harris
2c82d9cb07 12.11.1-4 baseline
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
2012-10-16 13:27:07 -05:00
Steve Harris
a903893a09 12.10.1-5 baseline
Former-commit-id: 82feb4de50 [formerly a96d35a1fa] [formerly 4fd8893e55 [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]
Former-commit-id: 4fd8893e55
Former-commit-id: deed84c1a2
2012-09-17 15:42:31 -05:00
Nate Jensen
846158f252 Issue #1048 re-commit code cleanup changes from other branch
Change-Id: I2789e2c268f802c004f1594d7d2e5636065b5740

Former-commit-id: fa0043a012 [formerly bdfb01c501] [formerly 8f7dbdb619 [formerly da4f41b2627e52bde097ab331e1f99c169a7e494]]
Former-commit-id: 8f7dbdb619
Former-commit-id: 00abcef8a0
2012-09-17 15:29:52 -05:00
Dave Hladky
02b00ddf47 Issue #1161 Fixed anomaly with RFCFFG and graph QPE times
Change-Id: I23212f3281290d86621e72c88478b00d37336494

Former-commit-id: 33f222783d [formerly 28912552fe] [formerly 6818408d40 [formerly 2088328c090d5a7d3f6218c42619fd3ab6d45dd9]]
Former-commit-id: 6818408d40
Former-commit-id: 655939bba7
2012-09-11 08:56:51 -05:00
Steve Harris
dc5ec3d16d 12.9.1-11 baseline
Former-commit-id: d07c18918d [formerly 6eb6b0909b] [formerly fc405efab7 [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]
Former-commit-id: fc405efab7
Former-commit-id: a14374fcd4
2012-08-30 14:36:12 -05:00
Steve Harris
f43a5af47f 12.9.1-10 baseline
Former-commit-id: bdb45cdfae [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]
Former-commit-id: cb9b80f3a0
Former-commit-id: dc08c5a71a
2012-08-30 14:28:27 -05:00
Steve Harris
7fb0b17bd5 12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
2012-08-21 15:27:03 -05:00