Changeset 229 for tools

Timestamp:

06/24/10 07:51:15 (14 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:

• ListenToArduino/ListenToArduino.cc (modified) (1 diff)
• Scripts/Logon (modified) (1 diff)
• SkyQualityMonitor/sqm.cpp (modified) (2 diffs)
• ddd/ddd.pro (modified) (1 diff)

tools/ListenToArduino/ListenToArduino.cc

@@ -117 +117 @@
         Data.updateService();
 
-        usleep(atoi(Srv.GetConfig("Period", "10")) * 1000000);  
+        usleep(atoi(Srv.GetConfig("Period", "10").c_str()) * 1000000);  
   } // while()
        

tools/Scripts/Logon

@@ -7 +7 @@
 export DIM_HOST_NODE=$HOST.ethz.ch
 if [ -z "$DIMDIR" ]; then export DIMDIR=/usr/local/dim/; fi
+if [ -z "$QWTDIR" ]; then export QWTDIR=/usr/local/qwt/; fi
 
-export LD_LIBRARY_PATH=/usr/local/qwt-5.2.0/lib:$DIMDIR/linux:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$QWTDIR/lib:$DIMDIR/linux:$LD_LIBRARY_PATH
 export PATH=$DIMDIR/linux:$REPOS_DIR/tools/Scripts:/usr/local/Trolltech/Qt-4.4.3/bin:.:$PATH
 

tools/SkyQualityMonitor/sqm.cpp

@@ -34 +34 @@
   // Start server and request configuration data
   EvidenceServer Srv(SERVER_NAME);
-  char *Address = Srv.GetConfig("address");
-  unsigned int Port = atoi(Srv.GetConfig("port"));
+  const char *Address = Srv.GetConfig("address").c_str();
+  unsigned int Port = atoi(Srv.GetConfig("port").c_str());
     
   // Open socket descriptor
@@ -69 +69 @@
   while(!Srv.ExitRequest) {
         // Request measurement period  
-    Period = atoi(Srv.GetConfig("period"));
+    Period = atoi(Srv.GetConfig("period").c_str());
 
     // Write read command to socket

tools/ddd/ddd.pro

@@ -6 +6 @@
 TARGET = 
 DEPENDPATH += .
-INCLUDEPATH += . /usr/local/qwt-5.2.0/include
+INCLUDEPATH += . /ihp/local/qwt-5.2.1/include
 
 # Input
 HEADERS += GUI.h ../../pixelmap/Pixel.h ../../pixelmap/PixelMap.h ../../drsdaq/RawDataCTX.h
 SOURCES += Functions.cpp GUI.cpp ../../pixelmap/Pixel.cc ../../pixelmap/PixelMap.cc ../../drsdaq/RawDataCTX.cc
-LIBS += -L/usr/local/qwt-5.2.0/lib -lqwt
+LIBS += -L/ihp/local/qwt-5.2.1/lib -lqwt
 QT += network