jgrewe/dataservice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

notes

Browse Source
This commit is contained in:
Jan Grewe 2018-09-19 15:06:37 +02:00
parent 4f9d083e0f
commit cc6d96feb6
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dataloader.cpp
View File

@ -9,6 +9,7 @@ DataLoader::DataLoader()
DataResult1D DataLoader::doLoad(const DataRequest &request) { DataResult1D DataLoader::doLoad(const DataRequest &request) {
std::vector<double> x, y; std::vector<double> x, y;
x = request.array.getDimension(1).asSampledDimension().axis(request.count[0], request.start[0]); x = request.array.getDimension(1).asSampledDimension().axis(request.count[0], request.start[0]);
//if (request.start + request.count);
request.array.getData(y, request.count, request.start); request.array.getData(y, request.count, request.start);
DataResult1D res(request.id, request.array.id(), x, y); DataResult1D res(request.id, request.array.id(), x, y);

1
dataqueue.cpp
View File

@ -30,6 +30,7 @@ void DataQueue::requestData(const nix::DataArray &array, const nix::NDSize &coun
requestId = nix::util::createId(); requestId = nix::util::createId();
DataRequest dr(requestId, array, count, offset); DataRequest dr(requestId, array, count, offset);
mutex.lock(); mutex.lock();
// if (requestQueue.)
requestQueue.push(dr); requestQueue.push(dr);
mutex.unlock(); mutex.unlock();
start(); start();