Commit 9c096894 authored by Vitaly Lipatov's avatar Vitaly Lipatov

iocalibr: cleanup code

parent 72b69799
...@@ -12,9 +12,11 @@ ...@@ -12,9 +12,11 @@
#include <comedilib.h> #include <comedilib.h>
#include <UniXML.h> #include <UniXML.h>
#include <UniSetTypes.h>
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
using namespace std; using namespace std;
using namespace UniSetTypes;
struct equals struct equals
{ {
...@@ -410,9 +412,9 @@ void openXML() ...@@ -410,9 +412,9 @@ void openXML()
int ndat, ncal; int ndat, ncal;
for(;it;it.goNext()) for(;it;it.goNext())
{ {
ndat = atoi(it.getProp("x").c_str()); ndat = it.getIntProp("x");
ncal = atoi(it.getProp("y").c_str()); ncal = it.getIntProp("y");
massDat[ndat]=ncal; massDat[ndat] = ncal;
} }
uxml.close(); uxml.close();
...@@ -420,7 +422,7 @@ void openXML() ...@@ -420,7 +422,7 @@ void openXML()
} }
catch( ... ) catch( ... )
{ {
cout<<"File "<<openFileXml<<"can not be opened"<<endl; cout << "File " << openFileXml << "can not be opened" << endl;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment