Simplified the dflowdata command line tool.

Fixes issue #84.

Author: moorepants

bin/dflowdata

@@ -16,9 +16,6 @@ if __name__ == "__main__":
     parser.add_argument('-y', '--metadatafile', type=str,
         help="The path to a meta data yaml file.", default=None)
 
-    parser.add_argument('-i', '--interpolate', type=bool,
-        help="Interpolate the marker data.", default=False)
-
     parser.add_argument('outputfile', type=str,
                         help="The path to the output file.")
 
@@ -27,5 +24,5 @@ if __name__ == "__main__":
     data = DFlowData(mocap_tsv_path=args.mocapfile,
                      record_tsv_path=args.recordfile,
                      meta_yml_path=args.metadatafile)
-    data.clean_data(interpolate_markers=args.interpolate)
+    data.clean_data()
     data.write_dflow_tsv(args.outputfile)

gaitanalysis/motek.py

@@ -1513,7 +1513,8 @@ def _merge_mocap_record(self):
 
         return data
 
-    def extract_processed_data(self, event=None, index_col=None, isb_coordinates=False):
+    def extract_processed_data(self, event=None, index_col=None,
+                               isb_coordinates=False):
         """Returns the processed data in a data frame. If an event name is
         provided, then a data frame with only that event is returned.
 
@@ -1571,9 +1572,8 @@ def extract_processed_data(self, event=None, index_col=None, isb_coordinates=Fal
 
     def write_dflow_tsv(self, filename, na_rep='NA'):
 
-        # This must preserve the mocap column order and can only append the
-        # record to the right most columns.
+        # TODO: This must preserve the mocap column order and can only
+        # append the record to the right most columns.
 
         self.data.to_csv(filename, sep='\t', float_format='%1.6f',
-                         na_rep=na_rep, index=False,
-                         cols=self.mocap_column_labels)
+                         na_rep=na_rep, index=False)