# HG changeset patch # User Jeff Hammel # Date 1426461813 25200 # Node ID 7578313b9fbffa2e4232690bd5b29d080ff8ea25 # Parent c4d26ef63d8ef08d85fbb298a50f65b4e6d44751 hook up basic plumbing diff -r c4d26ef63d8e -r 7578313b9fbf numerics/bar.py --- a/numerics/bar.py Sun Mar 15 15:38:12 2015 -0700 +++ b/numerics/bar.py Sun Mar 15 16:23:33 2015 -0700 @@ -10,14 +10,12 @@ # imports import argparse -import csv -import os #import pandas as pd import sys -from .read import CSVParser +from .manipulate import ManipulationParser +#from .read import CSVParser from bokeh.charts import Bar from bokeh.plotting import * -from collections import OrderedDict __all__ = ['bar_chart', 'BarChartParser', 'main'] @@ -30,14 +28,13 @@ bar.show() -class BarChartParser(CSVParser): +class BarChartParser(ManipulationParser): """command line options parser for bar charts""" # TODO: upstream to PlotParser def __init__(self, **kwargs): - kwargs.setdefault('formatter_class', argparse.RawTextHelpFormatter) kwargs.setdefault('description', __doc__) - CSVParser.__init__(self, **kwargs) + ManipulationParser.__init__(self, **kwargs) self.add_argument('-t', '--title', dest='title', help="plot title") @@ -49,6 +46,9 @@ parser = BarChartParser() options = parser.parse_args(args) + # process data + data = parser.typed_data() + # parse file # data = pd.read_csv(options.input, header=None, names=options.columns, index_col=0) diff -r c4d26ef63d8e -r 7578313b9fbf numerics/convert.py --- a/numerics/convert.py Sun Mar 15 15:38:12 2015 -0700 +++ b/numerics/convert.py Sun Mar 15 16:23:33 2015 -0700 @@ -51,6 +51,7 @@ return cast(float, *values) # convenience function ; do we need this? + def column_type(values, types=default_cast): """determine the type of a column""" for t in types: diff -r c4d26ef63d8e -r 7578313b9fbf numerics/read.py --- a/numerics/read.py Sun Mar 15 15:38:12 2015 -0700 +++ b/numerics/read.py Sun Mar 15 16:23:33 2015 -0700 @@ -93,6 +93,7 @@ def __init__(self, **kwargs): kwargs.setdefault('description', __doc__) + kwargs.setdefault('formatter_class', argparse.RawTextHelpFormatter) argparse.ArgumentParser.__init__(self, **kwargs) self.add_argument('csv', nargs='*', help="CSV files to read, or read from stdin")