Changeset 229 for tools


Ignore:
Timestamp:
06/24/10 07:51:15 (15 years ago)
Author:
ogrimm
Message:
Config requests non-blocking if not made from main thread, adapted all servers to GetConfig() returning std::string, workaround for erroneous SERVICE_LIST
Location:
tools
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • tools/ListenToArduino/ListenToArduino.cc

    r225 r229  
    117117        Data.updateService();
    118118
    119         usleep(atoi(Srv.GetConfig("Period", "10")) * 1000000); 
     119        usleep(atoi(Srv.GetConfig("Period", "10").c_str()) * 1000000); 
    120120  } // while()
    121121       
  • tools/Scripts/Logon

    r195 r229  
    77export DIM_HOST_NODE=$HOST.ethz.ch
    88if [ -z "$DIMDIR" ]; then export DIMDIR=/usr/local/dim/; fi
     9if [ -z "$QWTDIR" ]; then export QWTDIR=/usr/local/qwt/; fi
    910
    10 export LD_LIBRARY_PATH=/usr/local/qwt-5.2.0/lib:$DIMDIR/linux:$LD_LIBRARY_PATH
     11export LD_LIBRARY_PATH=$QWTDIR/lib:$DIMDIR/linux:$LD_LIBRARY_PATH
    1112export PATH=$DIMDIR/linux:$REPOS_DIR/tools/Scripts:/usr/local/Trolltech/Qt-4.4.3/bin:.:$PATH
    1213
  • tools/SkyQualityMonitor/sqm.cpp

    r217 r229  
    3434  // Start server and request configuration data
    3535  EvidenceServer Srv(SERVER_NAME);
    36   char *Address = Srv.GetConfig("address");
    37   unsigned int Port = atoi(Srv.GetConfig("port"));
     36  const char *Address = Srv.GetConfig("address").c_str();
     37  unsigned int Port = atoi(Srv.GetConfig("port").c_str());
    3838   
    3939  // Open socket descriptor
     
    6969  while(!Srv.ExitRequest) {
    7070        // Request measurement period 
    71     Period = atoi(Srv.GetConfig("period"));
     71    Period = atoi(Srv.GetConfig("period").c_str());
    7272
    7373    // Write read command to socket
  • tools/ddd/ddd.pro

    r45 r229  
    66TARGET =
    77DEPENDPATH += .
    8 INCLUDEPATH += . /usr/local/qwt-5.2.0/include
     8INCLUDEPATH += . /ihp/local/qwt-5.2.1/include
    99
    1010# Input
    1111HEADERS += GUI.h ../../pixelmap/Pixel.h ../../pixelmap/PixelMap.h ../../drsdaq/RawDataCTX.h
    1212SOURCES += Functions.cpp GUI.cpp ../../pixelmap/Pixel.cc ../../pixelmap/PixelMap.cc ../../drsdaq/RawDataCTX.cc
    13 LIBS += -L/usr/local/qwt-5.2.0/lib -lqwt
     13LIBS += -L/ihp/local/qwt-5.2.1/lib -lqwt
    1414QT += network
Note: See TracChangeset for help on using the changeset viewer.