diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java index 1b39e65504..9c0b1b732d 100644 --- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java +++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java @@ -74,6 +74,7 @@ import com.raytheon.uf.viz.monitor.ffmp.xml.FFMPTableColumnXML; * issue on the images being blank and throwing errors. * Also cleaned up some code. * Jun 11, 2013 2075 njensen Optimized createTableItems() + * Nov 07, 2013 DR 16703 gzhang Check in code for Lee for FFMP Table line * * * @author lvenable @@ -260,7 +261,10 @@ public abstract class FFMPTable extends Composite { event.gc.setLineWidth(1); event.gc.drawLine(rect.x + rect.width - 2, rect.y - 1, rect.x + rect.width - 2, rect.y - 1 + rect.height); - + + // Draw a top line + event.gc.drawLine(rect.x, rect.y, rect.x + rect.width, rect.y); + if ((tableIndex >= 0) && (tableIndex < table.getItemCount())) { event.gc.setForeground(parent.getDisplay().getSystemColor( SWT.COLOR_BLUE)); diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TabItemComp.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TabItemComp.java index f4c2c59128..2a05ff8b0a 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TabItemComp.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TabItemComp.java @@ -49,7 +49,8 @@ import com.raytheon.uf.viz.monitor.thresholds.AbstractThresholdMgr.ThresholdKey; * ------------ ---------- ----------- -------------------------- * Apr 6, 2009 lvenable Initial creation * Aug 5, 2010 6396 wkwock Change the layout of threshold edit dialog - * + * Nov 7, 2013 DR 16703 gzhang Check in code for Lee for FFMP and Safeseas + * * * * @author lvenable @@ -206,7 +207,7 @@ public abstract class TabItemComp extends Composite GridData gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false); gd.heightHint = 250; dataList = new List(listComp, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL); - dataList.setFont(smFont); + dataList.setFont(bigFont); //dataList.setFont(smFont); dataList.setLayoutData(gd); populateList(); diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java index df53549e3c..f93d5a76d5 100644 --- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java +++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java @@ -65,6 +65,7 @@ import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants; * ------------ ---------- ----------- -------------------------- * Apr 7, 2009 lvenable Initial creation * Oct 7, 2013 #2436 lvenable Disposed of the sort color. + * Nov 7, 2013 DR 16703 gzhang Check in code for Lee for FFMP and Safeseas * * * @@ -273,6 +274,9 @@ public abstract class TableComp extends Composite { event.gc.drawLine(rect.x + rect.width - 2, rect.y - 1, rect.x + rect.width - 2, rect.y - 1 + rect.height); + // Draw a top line + event.gc.drawLine(rect.x, rect.y, rect.x + rect.width, rect.y); + if (tableIndex >= 0) { event.gc.setForeground(parent.getDisplay().getSystemColor( SWT.COLOR_BLUE)); diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java index 0f8748e27e..750c703738 100644 --- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java +++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.java @@ -684,6 +684,7 @@ public class StationProfileDlg extends CaveSWTDialog { if (stationList != null) { SimpleDateFormat sdf = new SimpleDateFormat("HH:mm MM/dd"); sdf.setTimeZone(TimeZone.getTimeZone("GMT")); + int i = 0; for (Statprof station : stationList) { // Skip gage if the river mile is not valid @@ -694,6 +695,7 @@ public class StationProfileDlg extends CaveSWTDialog { e.gc.setForeground(getDisplay().getSystemColor(SWT.COLOR_BLACK)); x = calcRiverMileXCoord(station.getId().getMile()); y = calcElevationYCoord(station.getId().getZd()); + i++; // hash mark at each site e.gc.drawLine(x, y, x, y + POINT_HASH); diff --git a/edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF index 7fa37b096c..41dd748753 100644 --- a/edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF @@ -19,5 +19,5 @@ Export-Package: com.raytheon.edex.plugin.text, Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: com.raytheon.uf.common.dataplugin.text, com.raytheon.uf.common.dataplugin.text.db, - com.raytheon.uf.common.dataplugin.text.request, + com.raytheon.uf.common.dataplugin.text.request org.apache.commons.logging diff --git a/nativeLib/build.native/makefile.arch b/nativeLib/build.native/makefile.arch index c3fb33ce2c..da3d33d748 100644 --- a/nativeLib/build.native/makefile.arch +++ b/nativeLib/build.native/makefile.arch @@ -6,7 +6,7 @@ # set to one of: {-m32, -m64} to specify the architecture. # setting the flag to anything other than -m32 or -m64 will # cause unknown, potentially chaotic, build results. -ARCHFLAGS = -m64 +ARCHFLAGS = -m32 # ARCHFLAGS is set into the build environment so that scripts # that utilize this script can execute their own architecture diff --git a/nativeLib/build.native/tools/compile.sh b/nativeLib/build.native/tools/compile.sh old mode 100644 new mode 100755 diff --git a/nativeLib/edex_com/.cproject b/nativeLib/edex_com/.cproject index dd7ddd29eb..1e8eec0762 100644 --- a/nativeLib/edex_com/.cproject +++ b/nativeLib/edex_com/.cproject @@ -1,7 +1,5 @@ - - - + @@ -20,12 +18,12 @@ - + @@ -118,12 +116,12 @@ - + diff --git a/nativeLib/edex_notify/.cproject b/nativeLib/edex_notify/.cproject index a0a2fc7b03..b62dd8dd2b 100644 --- a/nativeLib/edex_notify/.cproject +++ b/nativeLib/edex_notify/.cproject @@ -1,7 +1,5 @@ - - - + @@ -21,12 +19,12 @@ - + @@ -105,12 +103,12 @@ - + diff --git a/nativeLib/ncep_grib2module/.cproject b/nativeLib/ncep_grib2module/.cproject index 657f34d2ca..454d476391 100644 --- a/nativeLib/ncep_grib2module/.cproject +++ b/nativeLib/ncep_grib2module/.cproject @@ -16,12 +16,12 @@ - + @@ -125,12 +125,12 @@ - + diff --git a/nativeLib/rary.cots.jepp/.cproject b/nativeLib/rary.cots.jepp/.cproject index 3b99ad9f87..a95b772a52 100644 --- a/nativeLib/rary.cots.jepp/.cproject +++ b/nativeLib/rary.cots.jepp/.cproject @@ -1,7 +1,5 @@ - - - + diff --git a/nativeLib/rary.empty.motif/.cproject b/nativeLib/rary.empty.motif/.cproject index 0bdcb332a1..c7a3e7707e 100644 --- a/nativeLib/rary.empty.motif/.cproject +++ b/nativeLib/rary.empty.motif/.cproject @@ -1,420 +1,421 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nativeLib/rary.empty.motif/src/X11.c b/nativeLib/rary.empty.motif/src/X11.c index 66e52cb8eb..478e0839ad 100644 --- a/nativeLib/rary.empty.motif/src/X11.c +++ b/nativeLib/rary.empty.motif/src/X11.c @@ -7,8 +7,6 @@ #include "error.h" -void XDestroyRegion () {nolibError("Motif");} - void XFreeFont () {nolibError("Motif");} void XGetWindowAttributes () {nolibError("Motif");} @@ -17,8 +15,6 @@ void XGrabButton () {nolibError("Motif");} void XLoadFont () {nolibError("Motif");} void XMapWindow () {nolibError("Motif");} -void XPointInRegion () {nolibError("Motif");} -void XPolygonRegion () {nolibError("Motif");} void XQueryColor () {nolibError("Motif");} void XQueryFont () {nolibError("Motif");} void XReadBitmapFile () {nolibError("Motif");} diff --git a/nativeLib/rary.ohd.pproc/.cproject b/nativeLib/rary.ohd.pproc/.cproject index 491f807a58..615d1b8513 100644 --- a/nativeLib/rary.ohd.pproc/.cproject +++ b/nativeLib/rary.ohd.pproc/.cproject @@ -1,359 +1,359 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nativeLib/rary.wfoapi.getTestMode/.cproject b/nativeLib/rary.wfoapi.getTestMode/.cproject index d91c8ab1ab..1c819a935a 100644 --- a/nativeLib/rary.wfoapi.getTestMode/.cproject +++ b/nativeLib/rary.wfoapi.getTestMode/.cproject @@ -1,951 +1,535 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nativeLib/rary.wfoapi.getTestMode/src/getTestMode.C b/nativeLib/rary.wfoapi.getTestMode/src/getTestMode.C index 49ce749a1c..5996e9453c 100644 --- a/nativeLib/rary.wfoapi.getTestMode/src/getTestMode.C +++ b/nativeLib/rary.wfoapi.getTestMode/src/getTestMode.C @@ -102,7 +102,6 @@ #include #include #include -#include "LogStream.H" #include "testmode.H" #define DEVRUN true @@ -209,7 +208,7 @@ int main(int argc, char *argv[]) int rc = 0; int runLocal = 0; // Meaning both xt and lx workstations are present - logVerbose << "Startup" << std::endl; + std::cout << "Startup" << std::endl; if (argc > 3) ExitWithHelp(); diff --git a/nativeLib/rary.wfoapi.getTestMode/src/sockhelp.C b/nativeLib/rary.wfoapi.getTestMode/src/sockhelp.C index 184ce9be38..22b1a0b008 100644 --- a/nativeLib/rary.wfoapi.getTestMode/src/sockhelp.C +++ b/nativeLib/rary.wfoapi.getTestMode/src/sockhelp.C @@ -8,6 +8,7 @@ // ---************************************************************************* #include #include +#include #include #include #include @@ -15,7 +16,6 @@ #include #include #include "sockhelp.H" -#include "LogStream.H" #include "testmode.H" // +++ Function Name: atoport @@ -263,7 +263,7 @@ int getTestModeQuery(char *hostname, int port) ssize_t status = -1; sock = make_connection(DEFAULT_PORT_NUM, SOCK_STREAM, hostname, port); - logVerbose << "Connected on socket " << sock << std::endl; + std::cout << "Connected on socket " << sock << std::endl; if (sock == -1) { close(sock); return OPERATION_MODE; @@ -273,13 +273,13 @@ int getTestModeQuery(char *hostname, int port) sprintf(input_buf.msg,"RequestForTestModeInfo"); send(sock,(const void*) &input_buf, sizeof(input_buf),0); - logVerbose << "Sent socket msg """ << input_buf.msg << """" << std::endl; + std::cout << "Sent socket msg """ << input_buf.msg << """" << std::endl; status = recv(sock, (void*) &output_buf,sizeof(output_buf),0); close(sock); if (status != -1) { - logVerbose << "Received socket msg """ << output_buf.msg + std::cout << "Received socket msg """ << output_buf.msg << """" << std::endl; if (strcmp(output_buf.msg,"Test")== 0) { return TEST_MODE; @@ -296,7 +296,7 @@ int getTestModeQuery(char *hostname, int port) } else { - logVerbose << "Warning - No socket msg was received; everything will crash!" << std::endl; + std::cout << "Warning - No socket msg was received; everything will crash!" << std::endl; return PANIC_MODE; } } diff --git a/nativeLib/rary.wfoapi.showBanner/src/showBanner.C b/nativeLib/rary.wfoapi.showBanner/src/showBanner.C index cafc341753..d3b4265403 100644 --- a/nativeLib/rary.wfoapi.showBanner/src/showBanner.C +++ b/nativeLib/rary.wfoapi.showBanner/src/showBanner.C @@ -24,7 +24,6 @@ #include // for signal #include "tmbUtil.H" #include "testmode.H" -#include "LogStream.H" #define MAX_DISPLAYS 5 #define FONT_NAME "-*-helvetica-bold-r-normal--12-*" #define INTERVAL 2000 // number of milliseconds to go off diff --git a/nativeLib/rary.wfoapi.test_WorkstationTestMode/.cproject b/nativeLib/rary.wfoapi.test_WorkstationTestMode/.cproject index 630423a47f..7aa9f94cc7 100644 --- a/nativeLib/rary.wfoapi.test_WorkstationTestMode/.cproject +++ b/nativeLib/rary.wfoapi.test_WorkstationTestMode/.cproject @@ -1,952 +1,536 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nativeLib/rary.wfoapi.test_WorkstationTestMode/src/sockhelp.C b/nativeLib/rary.wfoapi.test_WorkstationTestMode/src/sockhelp.C index 184ce9be38..22b1a0b008 100644 --- a/nativeLib/rary.wfoapi.test_WorkstationTestMode/src/sockhelp.C +++ b/nativeLib/rary.wfoapi.test_WorkstationTestMode/src/sockhelp.C @@ -8,6 +8,7 @@ // ---************************************************************************* #include #include +#include #include #include #include @@ -15,7 +16,6 @@ #include #include #include "sockhelp.H" -#include "LogStream.H" #include "testmode.H" // +++ Function Name: atoport @@ -263,7 +263,7 @@ int getTestModeQuery(char *hostname, int port) ssize_t status = -1; sock = make_connection(DEFAULT_PORT_NUM, SOCK_STREAM, hostname, port); - logVerbose << "Connected on socket " << sock << std::endl; + std::cout << "Connected on socket " << sock << std::endl; if (sock == -1) { close(sock); return OPERATION_MODE; @@ -273,13 +273,13 @@ int getTestModeQuery(char *hostname, int port) sprintf(input_buf.msg,"RequestForTestModeInfo"); send(sock,(const void*) &input_buf, sizeof(input_buf),0); - logVerbose << "Sent socket msg """ << input_buf.msg << """" << std::endl; + std::cout << "Sent socket msg """ << input_buf.msg << """" << std::endl; status = recv(sock, (void*) &output_buf,sizeof(output_buf),0); close(sock); if (status != -1) { - logVerbose << "Received socket msg """ << output_buf.msg + std::cout << "Received socket msg """ << output_buf.msg << """" << std::endl; if (strcmp(output_buf.msg,"Test")== 0) { return TEST_MODE; @@ -296,7 +296,7 @@ int getTestModeQuery(char *hostname, int port) } else { - logVerbose << "Warning - No socket msg was received; everything will crash!" << std::endl; + std::cout << "Warning - No socket msg was received; everything will crash!" << std::endl; return PANIC_MODE; } } diff --git a/nativeLib/rary.wfoapi.tmb/.cproject b/nativeLib/rary.wfoapi.tmb/.cproject index 837dc769b2..6cbef15b29 100644 --- a/nativeLib/rary.wfoapi.tmb/.cproject +++ b/nativeLib/rary.wfoapi.tmb/.cproject @@ -1,953 +1,536 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nativeLib/rary.wfoapi.tmb/src/sockhelp.C b/nativeLib/rary.wfoapi.tmb/src/sockhelp.C index 184ce9be38..22b1a0b008 100644 --- a/nativeLib/rary.wfoapi.tmb/src/sockhelp.C +++ b/nativeLib/rary.wfoapi.tmb/src/sockhelp.C @@ -8,6 +8,7 @@ // ---************************************************************************* #include #include +#include #include #include #include @@ -15,7 +16,6 @@ #include #include #include "sockhelp.H" -#include "LogStream.H" #include "testmode.H" // +++ Function Name: atoport @@ -263,7 +263,7 @@ int getTestModeQuery(char *hostname, int port) ssize_t status = -1; sock = make_connection(DEFAULT_PORT_NUM, SOCK_STREAM, hostname, port); - logVerbose << "Connected on socket " << sock << std::endl; + std::cout << "Connected on socket " << sock << std::endl; if (sock == -1) { close(sock); return OPERATION_MODE; @@ -273,13 +273,13 @@ int getTestModeQuery(char *hostname, int port) sprintf(input_buf.msg,"RequestForTestModeInfo"); send(sock,(const void*) &input_buf, sizeof(input_buf),0); - logVerbose << "Sent socket msg """ << input_buf.msg << """" << std::endl; + std::cout << "Sent socket msg """ << input_buf.msg << """" << std::endl; status = recv(sock, (void*) &output_buf,sizeof(output_buf),0); close(sock); if (status != -1) { - logVerbose << "Received socket msg """ << output_buf.msg + std::cout << "Received socket msg """ << output_buf.msg << """" << std::endl; if (strcmp(output_buf.msg,"Test")== 0) { return TEST_MODE; @@ -296,7 +296,7 @@ int getTestModeQuery(char *hostname, int port) } else { - logVerbose << "Warning - No socket msg was received; everything will crash!" << std::endl; + std::cout << "Warning - No socket msg was received; everything will crash!" << std::endl; return PANIC_MODE; } } diff --git a/nativeLib/rary.wfoapi.tmb_exit/.cproject b/nativeLib/rary.wfoapi.tmb_exit/.cproject index eb097f7f77..c6bf784845 100644 --- a/nativeLib/rary.wfoapi.tmb_exit/.cproject +++ b/nativeLib/rary.wfoapi.tmb_exit/.cproject @@ -1,951 +1,535 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nativeLib/rary.wfoapi.tmb_exit/src/sockhelp.C b/nativeLib/rary.wfoapi.tmb_exit/src/sockhelp.C index 184ce9be38..22b1a0b008 100644 --- a/nativeLib/rary.wfoapi.tmb_exit/src/sockhelp.C +++ b/nativeLib/rary.wfoapi.tmb_exit/src/sockhelp.C @@ -8,6 +8,7 @@ // ---************************************************************************* #include #include +#include #include #include #include @@ -15,7 +16,6 @@ #include #include #include "sockhelp.H" -#include "LogStream.H" #include "testmode.H" // +++ Function Name: atoport @@ -263,7 +263,7 @@ int getTestModeQuery(char *hostname, int port) ssize_t status = -1; sock = make_connection(DEFAULT_PORT_NUM, SOCK_STREAM, hostname, port); - logVerbose << "Connected on socket " << sock << std::endl; + std::cout << "Connected on socket " << sock << std::endl; if (sock == -1) { close(sock); return OPERATION_MODE; @@ -273,13 +273,13 @@ int getTestModeQuery(char *hostname, int port) sprintf(input_buf.msg,"RequestForTestModeInfo"); send(sock,(const void*) &input_buf, sizeof(input_buf),0); - logVerbose << "Sent socket msg """ << input_buf.msg << """" << std::endl; + std::cout << "Sent socket msg """ << input_buf.msg << """" << std::endl; status = recv(sock, (void*) &output_buf,sizeof(output_buf),0); close(sock); if (status != -1) { - logVerbose << "Received socket msg """ << output_buf.msg + std::cout << "Received socket msg """ << output_buf.msg << """" << std::endl; if (strcmp(output_buf.msg,"Test")== 0) { return TEST_MODE; @@ -296,7 +296,7 @@ int getTestModeQuery(char *hostname, int port) } else { - logVerbose << "Warning - No socket msg was received; everything will crash!" << std::endl; + std::cout << "Warning - No socket msg was received; everything will crash!" << std::endl; return PANIC_MODE; } } diff --git a/nativeLib/rary.wfoapi.tmcp/src/tmcp.C b/nativeLib/rary.wfoapi.tmcp/src/tmcp.C index 4a061cd422..6120756a48 100644 --- a/nativeLib/rary.wfoapi.tmcp/src/tmcp.C +++ b/nativeLib/rary.wfoapi.tmcp/src/tmcp.C @@ -900,7 +900,7 @@ static void events_handler( Widget w, XtPointer client_data, XtPointer call_data { int rc; int pc; // pre-condition flag - int which = (int) client_data; + int which = (long) client_data; XmString label; XmString button_label; char command[512]; diff --git a/rpms/build/x86_64/build.sh b/rpms/build/x86_64/build.sh index 99f418a8a0..90a6e8866f 100644 --- a/rpms/build/x86_64/build.sh +++ b/rpms/build/x86_64/build.sh @@ -425,7 +425,7 @@ if [ "${1}" = "-viz" ]; then if [ $? -ne 0 ]; then exit 1 fi - #buildRPM "awips2-alertviz" + buildRPM "awips2-alertviz" exit 0 fi @@ -436,7 +436,7 @@ if [ "${1}" = "-edex" ]; then if [ $? -ne 0 ]; then exit 1 fi - buildRPM "awips2-python-dynamicserialize" + #buildRPM "awips2-python-dynamicserialize" exit 0 fi @@ -446,7 +446,8 @@ if [ "${1}" = "-custom" ]; then #if [ $? -ne 0 ]; then # exit 1 #fi - buildRPM "awips2-python" + buildRPM "awips2-alertviz" + #buildRPM "awips2-python" #buildRPM "awips2-alertviz" #buildRPM "awips2-eclipse"