From feb8a81843c7034bbde3b64b0f3c69e7823bdf68 Mon Sep 17 00:00:00 2001
From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr>
Date: Wed, 4 Jan 2012 11:47:49 +0000
Subject: [PATCH] SNAPSHOT version for the moment !
---
pom.xml | 16 +++++++++++++++-
src/KeithleySCPIProtocol.cpp | 14 +++++++++-----
2 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index fd7bbb7..b818bae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
</parent>
<groupId>fr.soleil.lib</groupId>
<artifactId>Electrometers-${aol}-${library}-${mode}</artifactId>
- <version>2.5.2</version>
+ <version>2.5.3-SNAPSHOT</version>
<packaging>nar</packaging>
<name>Electrometers library</name>
<description>Electrometers library</description>
@@ -34,4 +34,18 @@
</build>
<dependencies>
</dependencies>
+ <developers>
+ <developer>
+ <id>elattaoui</id>
+ <name>Xavier Elattaoui</name>
+ <email>xavier.elattaoui@synchrotron-soleil.fr</email>
+ <url>http://controle/~hardion/</url>
+ <organization>Synchrotron Soleil</organization>
+ <organizationUrl>http://www.synchrotron-soleil.fr</organizationUrl>
+ <roles>
+ <role>developper</role>
+ </roles>
+ <timezone>1</timezone>
+ </developer>
+ </developers>
</project>
diff --git a/src/KeithleySCPIProtocol.cpp b/src/KeithleySCPIProtocol.cpp
index a9e3a31..b642655 100644
--- a/src/KeithleySCPIProtocol.cpp
+++ b/src/KeithleySCPIProtocol.cpp
@@ -469,12 +469,16 @@ short numberOfData = 0;
//-
posBeg = 0;
posEnd = datalist.find(',', posBeg);
-//-DEBUG std::cout << "\t*****::buildDataList -> argin :\n$" << datalist << "$" << std::endl;
- //- there is just one value
+
+//-DEBUG
+std::cout << "\t*****::buildDataList -> argin :\n$" << datalist << "$" << std::endl;
+
+ //- there is just one value
if(posEnd == std::string::npos)
{
argout.push_back( XString<double>::convertFromString(datalist) );
-//-DEBUG std::cout << "\t*****::buildDataList -> JUST ONE DATA :$" << datalist << "$" << std::endl;
+//-DEBUG
+std::cout << "\t*****::buildDataList -> JUST ONE DATA :$" << datalist << "$" << std::endl;
}
else
{
@@ -486,7 +490,8 @@ short numberOfData = 0;
{
dataStr = datalist.substr(posBeg,posEnd);
argout.push_back( XString<double>::convertFromString(dataStr) );
-//-DEBUG std::cout << "\t*****::buildDataList -> FULL OF DATA : " << i << " -> $" << argout[i] << "$" << std::endl;
+//-DEBUG
+std::cout << "\t*****::buildDataList -> FULL OF DATA : " << i << " -> $" << argout[i] << "$" << std::endl;
posBeg = posEnd+1;
posEnd = datalist.find(',', posBeg);
@@ -497,7 +502,6 @@ short numberOfData = 0;
argout.push_back( XString<double>::convertFromString(dataStr) );
break;
}
-
}
}
--
GitLab