[Kst] branches/work/kst/1.6/kst

[Andrew Walker]

SVN commit 765318 by arwalker:

continue merging changes from 1.4.1

 M  +36 -2     configure.in.in  
 M  +1 -1      src/datasources/Makefile.am  
 M  +16 -0     src/libkstapp/kst2dplot.cpp  
 M  +4 -2      src/libkstmath/kstplotdefines.h  


--- branches/work/kst/1.6/kst/configure.in.in #765317:765318
@@ -22,7 +22,7 @@
 AC_ARG_WITH(piolib,
     AC_HELP_STRING([--with-piolib=DIR],[where the root of PIOLib is installed ]),
     [  ac_piolib_includes="-I$withval"
-       ac_piolib_libraries="-L$withval"
+       ac_piolib_libraries="-L$withval/`uname -s`-`uname -m`"
     ])
 
 all_includes_save="$all_includes"
@@ -45,7 +45,41 @@
 
 AM_CONDITIONAL(include_piolib, test -n "$PIOLIBS")
 
+# DMC Test
+ac_dmc_includes=""
+ac_dmc_libraries=""
+AC_ARG_WITH(dmc,
+    AC_HELP_STRING([--with-dmc=DIR],[where the root of DMC is installed ]),
+    [  ac_dmc_includes="-I$withval -I$withval/PioLib"
+       ac_dmc_libraries="-L$withval/`uname -s`-`uname -m`"
+    ])
 
+AC_ARG_WITH(postgres-headers,
+    AC_HELP_STRING([--with-postgres-headers=DIR],[where the PostgreSQL headers are installed ]),
+    [  ac_postgres_includes="-I$withval"
+    ])
+
+all_includes_save="$all_includes"
+all_includes="$all_includes $ac_dmc_includes $ac_postgres_includes"
+KDE_CHECK_HEADER(HL2_DMC/PIODB.h, AC_DEFINE(HAVE_PIODB_H, 1, [If we have dmc headers]) have_piodb_h=yes DMCINCLUDES="$ac_dmc_includes $ac_postgres_includes", , )
+all_includes="$all_includes_save"
+
+ldflags_save="$LDFLAGS"
+LDFLAGS="$LDFLAGS $ac_dmc_libraries"
+KDE_CHECK_LIB(dmc, PIOGetObjectList, DMCLIBS="$ac_dmc_libraries -ldmc -lpq -lxml2 $DMCLIBS", , -lm -lpthread -ldl -lpq -lxml2)
+LDFLAGS="$ldflags_save"
+
+if test "x$ac_cv_lib_dmc_PIOGetObjectList" = "xyes"; then
+  if test "x$have_piodb_h" = "xyes"; then
+    AC_SUBST(DMCLIBS)
+    AC_SUBST(DMCINCLUDES)
+    AC_DEFINE(KST_HAVE_DMC, 1, [If we have the PLANCK DMC I/O libraries.])
+  fi
+fi
+
+AM_CONDITIONAL(include_dmc, test -n "$DMCLIBS")
+
+
 # LIBNAD Test
 ac_nad_includes=""
 ac_nad_libraries=""
@@ -82,7 +116,7 @@
 AC_ARG_WITH(transfunc,
     AC_HELP_STRING([--with-transfunc=DIR],[where the root of libtransfunc is installed ]),
     [  ac_transfunc_includes="-I$withval"
-       ac_transfunc_libraries="-L$withval"
+       ac_transfunc_libraries="-L$withval/`uname -s`-`uname -m`"
     ])
 
 if test "x$ac_cv_lib_piolib_PIOGetObjectList" = "xyes"; then
--- branches/work/kst/1.6/kst/src/datasources/Makefile.am #765317:765318
@@ -26,4 +26,4 @@
 NAD_SUBDIR=nad
 endif
 
-SUBDIRS=ascii qimagesource dirfile frame indirect scuba2 $(PIOLIB_SUBDIR) $(CDF_SUBDIR) $(NETCDF_SUBDIR) $(LFIIO_SUBDIR) $(WMAP_SUBDIR) $(FITSIMAGE_SUBDIR) $(HEALPIX_SUBDIR) $(NAD_SUBDIR)  #$(DMC_SUBDIR)
+SUBDIRS=ascii qimagesource dirfile frame indirect scuba2 $(PIOLIB_SUBDIR) $(CDF_SUBDIR) $(NETCDF_SUBDIR) $(LFIIO_SUBDIR) $(WMAP_SUBDIR) $(FITSIMAGE_SUBDIR) $(HEALPIX_SUBDIR) $(NAD_SUBDIR) #$(DMC_SUBDIR)
--- branches/work/kst/1.6/kst/src/libkstapp/kst2dplot.cpp #765317:765318
@@ -1527,6 +1527,15 @@
       value -= 32.0;
       value /= 24.0 * 60.0 * 60.0;
       value += JD1970;
+    case AXIS_INTERP_AIT_NANO:
+      value /= 1000000000.0;
+      value -= 86400.0 * (365.0 * 12.0 + 3.0);
+      // current difference (seconds) between UTC and AIT
+      // refer to the following for more information:
+      // http://hpiers.obspm.fr/eop-pc/earthor/utc/TAI-UTC_tab.html
+      value /= 24.0 * 60.0 * 60.0;
+      value += JD1970;
+      break;
     default:
       break;
   }
@@ -1552,6 +1561,10 @@
     case AXIS_INTERP_AIT:
       diff /= 24.0 * 60.0 * 60.0;
       break;
+    case AXIS_INTERP_AIT_NANO:
+      diff /= 1000000000.0;
+      diff /= 24.0 * 60.0 * 60.0;
+      break;
     default:
       break;
   }
@@ -1912,6 +1925,9 @@
         break;
       case AXIS_INTERP_AIT:
         break;
+      case AXIS_INTERP_AIT_NANO:
+        range /= 1000000000.0;
+        break;
     }
 
     switch (axisDisplay) {
--- branches/work/kst/1.6/kst/src/libkstmath/kstplotdefines.h #765317:765318
@@ -33,7 +33,8 @@
   AXIS_INTERP_JD,
   AXIS_INTERP_MJD,
   AXIS_INTERP_RJD,
-  AXIS_INTERP_AIT };
+  AXIS_INTERP_AIT,
+  AXIS_INTERP_AIT_NANO };
 
 enum KstAxisDisplay { 
   AXIS_DISPLAY_YEAR,
@@ -74,7 +75,8 @@
   { I18N_NOOP2("Julian Date", "JD"), AXIS_INTERP_JD },
   { I18N_NOOP2("Modified Julian Date", "MJD"), AXIS_INTERP_MJD },
   { I18N_NOOP2("Reduced Julian Date", "RJD"), AXIS_INTERP_RJD },
-  { I18N_NOOP2("Temps Atomique International", "TAI"), AXIS_INTERP_AIT }
+  { I18N_NOOP2("Temps Atomique International", "TAI"), AXIS_INTERP_AIT },
+  { I18N_NOOP2("Temps Atomique International - Nanoseconds", "TAI (ns)"), AXIS_INTERP_AIT_NANO }
 };
 
 const AxisDisplay AxisDisplays[] = {