From a1691ec176bc96d45b5f90d8fcd14908948b01cc Mon Sep 17 00:00:00 2001
From: Aaron Cuevas Lopez <aacuelo@teleco.upv.es>
Date: Mon, 6 Nov 2017 03:01:09 +0100
Subject: [PATCH] Fix bitVolts not read properly by kwik file source
---
.../KWIKFormat/FileSource/KwikFileSource.cpp | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/Source/Plugins/KWIKFormat/FileSource/KwikFileSource.cpp b/Source/Plugins/KWIKFormat/FileSource/KwikFileSource.cpp
index 29c08bd3b..4ca543b52 100644
--- a/Source/Plugins/KWIKFormat/FileSource/KwikFileSource.cpp
+++ b/Source/Plugins/KWIKFormat/FileSource/KwikFileSource.cpp
@@ -117,9 +117,22 @@ void KWIKFileSource::fillRecordInfo()
try
{
recordN = recordings.openGroup((String(i) + "/application_data").toUTF8());
- attr=recordN.openAttribute("channel_bit_volts");
- attr.read(ArrayType(PredType::NATIVE_FLOAT,1,&dims[1]),bitVoltArray);
- foundBitVoltArray = true;
+ try
+ {
+ DataSet bV = recordN.openDataSet("channel_bit_volts");
+ bV.read(bitVoltArray.getData(), PredType::NATIVE_FLOAT);
+ foundBitVoltArray = true;
+ }
+ catch (GroupIException)
+ { }
+ catch (DataSetIException)
+ { }
+ if (!foundBitVoltArray)
+ {
+ attr = recordN.openAttribute("channel_bit_volts");
+ attr.read(ArrayType(PredType::NATIVE_FLOAT, 1, &dims[1]), bitVoltArray);
+ foundBitVoltArray = true;
+ }
} catch (GroupIException)
{
} catch (AttributeIException)
--
GitLab