diff options
Diffstat (limited to 'megapixels/commands')
| -rw-r--r-- | megapixels/commands/datasets/citations_to_csv.py | 7 | ||||
| -rw-r--r-- | megapixels/commands/misc/obj2ply.py | 13 | ||||
| -rw-r--r-- | megapixels/commands/msc/summarize.py | 12 |
3 files changed, 26 insertions, 6 deletions
diff --git a/megapixels/commands/datasets/citations_to_csv.py b/megapixels/commands/datasets/citations_to_csv.py index f3277d7e..2aa33af2 100644 --- a/megapixels/commands/datasets/citations_to_csv.py +++ b/megapixels/commands/datasets/citations_to_csv.py @@ -6,10 +6,13 @@ from app.models.citations import Paper log = Logger.getLogger() +fp_in_default = '../site/datasets/verified/' +fp_out_default = '../site/datasets/verified/' + @click.command() -@click.option('-i', '--input', 'opt_fp_in', required=True, +@click.option('-i', '--input', 'opt_fp_in', default=fp_in_default, help='Input citation data file or folder') -@click.option('-o', '--output', 'opt_dir_out', +@click.option('-o', '--output', 'opt_dir_out', default=fp_out_default, help='Output directory') @click.pass_context def cli(ctx, opt_fp_in, opt_dir_out): diff --git a/megapixels/commands/misc/obj2ply.py b/megapixels/commands/misc/obj2ply.py index 61fdefbd..cd956365 100644 --- a/megapixels/commands/misc/obj2ply.py +++ b/megapixels/commands/misc/obj2ply.py @@ -11,11 +11,12 @@ import click @click.option('-u', '--unwind/--wind', 'unwind', default=False, help='pass to reverse winding order on faces (if surface normals are upside down)') @click.option('-y', '--flip_y/--no_flip_y', 'flip_y', default=False, help='flip Y axis') @click.option('-z', '--flip_z/--no_flip_z', 'flip_z', default=False, help='flip Z axis') -@click.option('-s', '--swap_xy/--no_swap_xy', 'swap_xy', default=False, help='swap axes so things rotate correctly') +@click.option('-s', '--swap_xy/--no_swap_xy', 'swap_xy', default=False, help='swap x/y axes so things rotate correctly') +@click.option('-z', '--swap_xz/--no_swap_xz', 'swap_xz', default=False, help='swap x/z axes so things rotate correctly') @click.option('-i', '--input_fn', required=True, help='input OBJ filename') @click.option('-o', '--output_fn', help='output PLY filename') @click.pass_context -def cli(ctx, float_colors, unwind, flip_y, flip_z, swap_xy, input_fn, output_fn): +def cli(ctx, float_colors, unwind, flip_y, flip_z, swap_xy, swap_xz, input_fn, output_fn): """ click command for converting OBJ to PLY """ @@ -44,12 +45,16 @@ def cli(ctx, float_colors, unwind, flip_y, flip_z, swap_xy, input_fn, output_fn) for line in f.readlines(): N = line.strip().split(' ') if N[0] == 'v': - if flip_y: - N[2] = str(float(N[2]) * -1) if swap_xy: tmp = N[2] N[2] = N[1] N[1] = tmp + if flip_y: + N[2] = str(float(N[2]) * -1) + if swap_xz: + tmp = N[3] + N[3] = N[1] + N[1] = tmp if flip_z: N[2] = str(float(N[2]) * -1) if float_colors: diff --git a/megapixels/commands/msc/summarize.py b/megapixels/commands/msc/summarize.py index 045e3b69..762cddc2 100644 --- a/megapixels/commands/msc/summarize.py +++ b/megapixels/commands/msc/summarize.py @@ -43,6 +43,18 @@ def cli(ctx, opt_fp_in, opt_fp_out): df.to_csv(fp_out, index=False) + # Print outputs by year + results_year = [] + year_groups = df.groupby('year') + for year, group in year_groups: + if int(year) > 0: + results_year.append({'year': year, 'count': len(group)}) + + fp_out = opt_fp_out.replace('.csv', '_years.csv') + df_years = pd.DataFrame.from_dict(results_year) + df_years.to_csv(fp_out, index=False) + pprint(df_years) + # create country summary fp_out = opt_fp_out.replace('.csv', '_countries.csv') country_groups = df.groupby('country') |