Skip to content

Commit

Permalink
Fixing resampling options
Browse files Browse the repository at this point in the history
  • Loading branch information
mistercrunch committed Jan 6, 2016
1 parent 51e9cb3 commit 3fa3ce1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions panoramix/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,11 @@ def __init__(self, viz):
"column in the table editor")),
'resample_rule': FreeFormSelectField(
'Resample Rule', default='',
choices=self.choicify(('1M', '1H', '1D', '7D', '1M', '1Y')),
choices=self.choicify(('1T', '1H', '1D', '7D', '1M', '1AS')),
description=("Pandas resample rule")),
'resample_how': FreeFormSelectField(
'Resample How', default='',
choices=self.choicify(('', 'avg', 'sum',)),
choices=self.choicify(('', 'mean', 'sum', 'median')),
description=("Pandas resample how")),
'resample_fillmethod': FreeFormSelectField(
'Resample Fill Method', default='',
Expand Down

0 comments on commit 3fa3ce1

Please sign in to comment.