Merge pull request #34 from pdunc/master

Allow variable length channels when using 'as_dataframe'
adamreeve · Sep 3, 2015 · 548e668 · 548e668
2 parents 140452b + 5fdebdc
commit 548e668
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/nptdms/tdms.py b/nptdms/tdms.py
@@ -309,7 +309,7 @@ def as_dataframe(self):
 
         temp = {}
         for key, value in self.objects.items():
-            temp[key] = value.data
+            temp[key] = pd.Series(data=value.data)
         return pd.DataFrame.from_dict(temp)
 
     def as_dataframe_withtimeindex(self):
@@ -325,7 +325,7 @@ def as_dataframe_withtimeindex(self):
         for key, value in self.objects.items():
             if value.has_data:
                 temp[key] = pd.Series(data=value.data, index=value.time_track())
-        return pd.DataFrame.from_dict(temp)        
+        return pd.DataFrame.from_dict(temp)
 
 
 class _TdmsSegment(object):