Merge pull request #63 from prismv/master

fix wrong column order in TdmsFile.as_dataframe
adamreeve · Mar 18, 2017 · f107184 · f107184
2 parents 7dce01b + aa3c1f0
commit f107184
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/nptdms/tdms.py b/nptdms/tdms.py
@@ -216,12 +216,12 @@ def as_dataframe(self, time_index=False, absolute_time=False):
 
         import pandas as pd
 
-        temp = {}
+        temp = []
         for key, value in self.objects.items():
             if value.has_data:
                 index = value.time_track(absolute_time) if time_index else None
-                temp[key] = pd.Series(data=value.data, index=index)
-        return pd.DataFrame.from_dict(temp)
+                temp.append((key, pd.Series(data=value.data, index=index)))
+        return pd.DataFrame.from_items(temp)
 
 
 class _TdmsSegment(object):