imported version 1.5

diff --git a/HLT/TPCLib/gui/Makefile.am b/HLT/TPCLib/gui/Makefile.am
index 38d7c4b404a5397a10eccfeb19bad531a67eb5a9..e30e8896e3137b84f51bc81689232d3f0adfc1f0 100755 (executable)
--- a/HLT/TPCLib/gui/Makefile.am
+++ b/HLT/TPCLib/gui/Makefile.am
@@ -6,7 +6,8 @@ REAL_SRC                = AliHLTGUI.cxx \
                          AliHLTGUI.h \
                          main.cxx \
                          AliHLTGUIMainForm.ui \
-                         AliceLogo.gif
+                         AliceLogo.gif \
+                         KIPLogo.gif
 
 REAL_SRC_DIR           = $(top_srcdir)/src
 
@@ -60,7 +61,7 @@ $(QT_BUILD_DIR)/AliHLTGUI: $(QT_BUILD_DIR) $(REAL_SRC:%=$(QT_BUILD_DIR)/%) $(QT_
        (cd $(QT_BUILD_DIR)  \
        && export PATH=@QT_DIR@/bin:$(PATH) \
        && export QTDIR=@QT_DIR@ \
-       && $(MAKE) CXXFLAGS="$(CXXFLAGS) -DALIHLTTPCDISPLAY_VERSION=@ALIHLTTPCDISPLAY_VERSION@")
+       && $(MAKE) CXXFLAGS="$(CXXFLAGS) -DALIHLTTPCDISPLAY_VERSION=@ALIHLTTPCDISPLAY_VERSION@ -DPACKAGE_VERSION=\"@PACKAGE_VERSION@\"")
 
 clean-local:
        rm -rf $(QT_BUILD_DIR)

diff --git a/HLT/TPCLib/gui/configure.ac b/HLT/TPCLib/gui/configure.ac
index ba37cbc6ba6c1a429747f477f712a693f1dfb58a..8c13e7c60045b883eb2fb2a49013659c8b0011ae 100755 (executable)
--- a/HLT/TPCLib/gui/configure.ac
+++ b/HLT/TPCLib/gui/configure.ac
@@ -5,7 +5,7 @@ dnl template for the configuration script for the Alice HLT
 dnl Online Monitoring GUI
 dnl 
 dnl ------------------------------------------------------------------
-AC_INIT([Alice HLT Online Monitoring GUI] , [0.2], [thaeder@kip.uni-heidelberg.de], AliHLTGUI)
+AC_INIT([Alice HLT Online Monitoring GUI] , [1.5], [thaeder@kip.uni-heidelberg.de], AliHLTGUI)
 
 dnl ------------------------------------------------------------------
 AC_CANONICAL_SYSTEM
@@ -177,56 +177,90 @@ AC_SUBST([ALIROOT_LIBS])
 
 dnl ------------------------------------------------------------------
 dnl check for the HLT PubSub Framework
-AC_ARG_WITH(pubsub, [  --with-pubsub           top of the HLT PubSub framework],
+AC_MSG_CHECKING([for HLT PubSub Framework])
+AC_ARG_WITH(pubsub, [installation path of the HLT PubSub framework],
                    [],
                    [ test -n $ALIHLT_DC_DIR && with_pubsub=$ALIHLT_DC_DIR ])
 if test -z $with_pubsub || ! test -d $with_pubsub ; then
   with_pubsub=no
 fi
+AC_MSG_RESULT([$with_pubsub])
+HOMER_VERSION=1
+HOMER_LIBS=
 
 AH_TEMPLATE([HAVE_HOMERREADER],[the HLT PubSub Homer Reader interface])
-save_CPPFLAGS=$CPPFLAGS
-save_LDFLAGS=$LDFLAGS
-save_LIBS=$LIBS
 if test "x$with_pubsub" != "xno" ; then
+  save_CPPFLAGS=$CPPFLAGS
+  save_LDFLAGS=$LDFLAGS
+  save_LIBS=$LIBS
   # currently the different versions of the HLT PubSub framework have a different
   # directory layout
-  if test -d ${with_pubsub}/include/Util/HOMER ; then
-    HOMER_INCDIRS="${with_pubsub}/include/Util/HOMER ${with_pubsub}/include/Util/HOMER/reader"
+  if test -d ${with_pubsub}/include/HOMER ; then
+    # the 'early' location of the include files with separated HOMER sub dirs
+    HOMER_INCDIRS="${with_pubsub}/include/HOMER ${with_pubsub}/include/HOMER/reader"
+  elif test -d ${with_pubsub}/include/Util/HOMER ; then
+    # location for HLT Framework versions after Sep 2006
+    HOMER_INCDIRS="${with_pubsub}/include/Util/HOMER"
+  elif test -d ${with_pubsub}/src/Util/HOMER/include ; then
+    # fall back if include files were not installed (versions after Sep 06)
+    HOMER_INCDIRS="${with_pubsub}/src/Util/HOMER/include"
   else
+    # fall back if include files were not installed (versions before Sep 06)
     HOMER_INCDIRS="${with_pubsub}/src/Util/HOMER/reader/include ${with_pubsub}/src/Util/HOMER/data/include"
   fi
-  HOMER_CPPFLAGS=`for i in ${HOMER_INCDIRS}; do echo -I$i ; done`
+  HOMER_CPPFLAGS=`for i in ${HOMER_INCDIRS}; do echo -n "-I$i " ; done`
   HOMER_LIBDIR=${with_pubsub}/lib/`uname -s`-`uname -m`
   HOMER_LDFLAGS="-L$HOMER_LIBDIR"
+  CPPFLAGS="$save_CPPFLAGS $HOMER_CPPFLAGS $ALIROOT_CPPFLAGS"
+  LDFLAGS="$save_LDFLAGS $HOMER_LDFLAGS $ALIROOT_LDFLAGS"
+  LIBS="$save_LIBS $ALIROOT_LIBS"
+  with_homer=no
+  AC_LANG_PUSH(C++)
+  AC_CHECK_HEADER([HOMERReader.h],
+    [ AC_CHECK_LIB([HOMER],[_init],
+      [with_homer=yes
+       HOMER_LIBS="-lHOMER"],
+      [ AC_CHECK_LIB([HOMERReader],[_init],
+                     [with_homer=yes
+                     HOMER_LIBS="-lHOMERReader"])])
+      LIBS="$LIBS $HOMER_LIBS"
+      AC_MSG_CHECKING([version of HOMER library])
+      dnl The Homer library has no versioning, so we do our own
+      dnl version           description
+      dnl ----------------------------------------------------------------------
+      dnl   1          inintial version
+      dnl   2          GetBlockStatusFlags added to the interface
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <HOMERReader.h>],
+                                      [HOMERReader reader("dummy", 0);
+                                      reader.GetBlockStatusFlags(0);])],
+                                      [if test $HOMER_VERSION -lt 2 ; then HOMER_VERSION=2; fi],
+                                     [])
+      AC_MSG_RESULT([$HOMER_VERSION])
+  ]) #AC_CHECK_HEADER([HOMERReader.h])
+  AC_LANG_POP(C++)
+  if test "x$with_homer" = "xno" ; then
+    HOMER_CPPFLAGS=
+    HOMER_LDFLAGS=
+    HOMER_LIBS=
+  else
+    HOMER_CPPFLAGS="$HOMER_CPPFLAGS -DHOMER_VERSION=$HOMER_VERSION"
+    AC_DEFINE(HAVE_HOMERREADER)
+  fi
+  CPPFLAGS="$save_CPPFLAGS"
+  LDFLAGS="$save_LDFLAGS"
+  LIBS="$save_LIBS"  
 fi
-CPPFLAGS="$save_CPPFLAGS $HOMER_CPPFLAGS"
-LDFLAGS="$save_LDFLAGS $HOMER_LDFLAGS"
-LIBS="$save_LIBS -ldl"
-with_homer=no
-AC_LANG_PUSH(C++)
-AC_CHECK_HEADER([HOMERReader.h],
-  [ AC_CHECK_LIB([HOMERReader],[_init],[with_homer=yes
-                                       HOMER_LIBS="-lHOMERReader"])])
-AC_LANG_POP(C++)
-if test "x$with_homer" = "xno" ; then
-  HOMER_INCDIRS=
-  HOMER_LDFLAGS=
-  HOMER_LIBS=
-else
-  AC_DEFINE(HAVE_HOMERREADER)
-fi
-CPPFLAGS="$save_CPPFLAGS"
-LDFLAGS="$save_LDFLAGS"
-LIBS="$save_LIBS"  
-
 test "x$with_homer" != "xyes" && \
      test "x$enable_strict" != "xno" && \
      AC_ERROR([Stop! The package needs the HOMER library.
       Use  --with-pubsub option to point to the HLT PubSub installation])
 AC_SUBST([HOMER_INCDIRS])
 AC_SUBST([HOMER_LIBDIR])
+
+AC_SUBST([HOMER_CPPFLAGS])
 AC_SUBST([HOMER_LDFLAGS])
+AC_SUBST([HOMER_LIBS])
+
 
 dnl ------------------------------------------------------------------
 dnl Check for the AliHLTTPCLibrary
@@ -234,7 +268,6 @@ dnl
 AC_ARG_WITH(alihlt, [  --with-alihlt           top of the AliRoot HLT module],
                    [],
                    [ test -n $ALIHLT_PREFIX && with_alihlt=$ALIHLT_PREFIX])
-AC_MSG_NOTICE([$with_alihlt])
 if ! test -z ${with_alihlt} \
   && test -d ${with_alihlt} \
   && test "x${with_alihlt}" != "x$ALICE_ROOT" ; then

diff --git a/HLT/TPCLib/gui/src/AliHLTGUI.cxx b/HLT/TPCLib/gui/src/AliHLTGUI.cxx
index 61e5e2820dd378c4e822edccfd8f9a33cd4db9b4..fe457a04df675eeafd6f69a7def1d123f6fc679d 100755 (executable)
--- a/HLT/TPCLib/gui/src/AliHLTGUI.cxx
+++ b/HLT/TPCLib/gui/src/AliHLTGUI.cxx
@@ -47,8 +47,8 @@ using namespace std;
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <string.h>
-#include <errno.h>
+#include <cstring>
+#include <cerrno>
 #include <iostream>
 #include <vector>
 
@@ -124,8 +124,6 @@ AliHLTGUI::AliHLTGUI( Int_t argc, Char_t **argv )
 {
   cout << "Creating display" << endl;
 
-  const Float_t fVersion = 1.5;  // CONST XXX INLINE
-  
   // Set Widgets 
   padrowWidget = tQtWidgetPadRow; 
   residualsWidget = tQtWidgetResiduals;
@@ -392,7 +390,7 @@ AliHLTGUI::AliHLTGUI( Int_t argc, Char_t **argv )
     
     // -- Version
     if ( !strcmp( argv[ii], "--version" ) ) {
-      cout << "Version of AliHLTGUI: " << fVersion << endl;
+      cout << "Version of AliHLTGUI: " << PACKAGE_VERSION << endl;
       
       exit (0);
     }
@@ -497,7 +495,7 @@ void AliHLTGUI::connectDisplay() {
   
   strcat(geoPath,"/");
   strcat(geoPath,geometryFile);
-  
+
   // -- Set Hostnames in AliHLTTPCDisplayMain
   // ----------------------------------------
   Int_t cnt = fHostnames.size();
@@ -794,7 +792,7 @@ void AliHLTGUI::redisplay(Bool_t newRawSlice){
 #if ALIHLTTPCDISPLAY_VERSION >= 2
     display->DisplayEvent(newRawSlice);
 #else
-    HLTError("function not available for AliHLTTPCDisplay version < 2");
+    display->DisplayEvent();
 #endif
 
     displayTrackParam();

diff --git a/HLT/TPCLib/gui/src/KIPLogo.gif b/HLT/TPCLib/gui/src/KIPLogo.gif
new file mode 100644 (file)
index 0000000..22fc9bf
Binary files /dev/null and b/HLT/TPCLib/gui/src/KIPLogo.gif differ

diff --git a/HLT/TPCLib/gui/src/flags.in b/HLT/TPCLib/gui/src/flags.in
index cd63736b5a95ed70aa847dcad844c915a26beccc..d8438208250843ad43e0a39de57dfb9f1962aa4e 100644 (file)
--- a/HLT/TPCLib/gui/src/flags.in
+++ b/HLT/TPCLib/gui/src/flags.in
@@ -1,4 +1,4 @@
-LIBS   += @HOMER_LDFLAGS@ -lHOMERReader
+LIBS   += @HOMER_LDFLAGS@ @HOMER_LIBS@
 
 INCLUDEPATH    += @ALIHLT_INCDIRS@ @HOMER_INCDIRS@