From 92dc90e7afa466e983f49711704621b31c557155 Mon Sep 17 00:00:00 2001 From: "Bruce.Hundermark" Date: Mon, 2 Mar 2015 17:23:33 +0000 Subject: [PATCH] ASM #13961 - GFE: ISC_Discrepancies tool creates unnecessary alarms Change-Id: I7d4aec9d82a6f792bdf2a20d2b3fd271829d1edb Former-commit-id: fe162829defa31b42729d8dc3d0b52c5622b36a5 [formerly 19bd1d7d169521f322fbfb828ee27327515e0152] Former-commit-id: b5075807377790d3c30393585ae4eeb55f4bf743 --- .../localization/gfe/userPython/utilities/ISC_Utility.py | 5 ++++- edexOsgi/build.edex/edex/common.properties | 4 +++- nativeLib/rary.cots.jasper/.project | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/ISC_Utility.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/ISC_Utility.py index 7ddcc9e51a..b27e9f0fe8 100644 --- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/ISC_Utility.py +++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/ISC_Utility.py @@ -1039,7 +1039,10 @@ class ISC_Utility(SmartScript.SmartScript): # def _convertTimeRange(self, trName): if trName == "All Grids": - timeRange = TimeRange.allTimes() + curTime = time.gmtime() + startHour = curTime[3] + timeRange = self.createTimeRange(startHour, 204) + #timeRange = TimeRange.allTimes() # timeRange = AFPS.TimeRange(AFPS.AbsTime(0), # AFPS.AbsTime_maxFutureTime()) elif trName == "Selected Time": diff --git a/edexOsgi/build.edex/edex/common.properties b/edexOsgi/build.edex/edex/common.properties index 41418ebc7c..0535009b8c 100644 --- a/edexOsgi/build.edex/edex/common.properties +++ b/edexOsgi/build.edex/edex/common.properties @@ -7,8 +7,10 @@ includegen.filter=raytheon|noaa\.nws|noaa\.gsd|gov\.nasa\.msfc|edu\.wisc\.ssec\. core.repo=ufcore core-foss.repo=ufcore-foss awips2-foss.repo=AWIPS2_foss +ncep.repo=AWIPS2_NCEP +cimss.repo=AWIPS2_CIMSS -core.repositories=${core.repo},${core-foss.repo},${awips2-foss.repo} +core.repositories=${core.repo},${core-foss.repo},${awips2-foss.repo},${ncep.repo},${cimss.repo} # Note: currently, there is a limit of 99 plugin directories. dir.01=cave diff --git a/nativeLib/rary.cots.jasper/.project b/nativeLib/rary.cots.jasper/.project index f36beb4867..d8796d6ad0 100644 --- a/nativeLib/rary.cots.jasper/.project +++ b/nativeLib/rary.cots.jasper/.project @@ -51,7 +51,7 @@ org.eclipse.cdt.make.core.fullBuildTarget - all + copyJasper org.eclipse.cdt.make.core.stopOnError