Apple-2-SW
/
ii-pix
mirror of https://github.com/KrisKennaway/ii-pix.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10 from KrisKennaway/fix-lookahead 

Fix --lookahead parsing
This commit is contained in:
KrisKennaway 2023-01-31 21:32:02 +00:00 committed by GitHub
parent 055851aa9c 0560409717
commit 6573bad509
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
convert.py
View File

@ -10,6 +10,7 @@ import image as image_py
import palette as palette_py import palette as palette_py
import screen as screen_py import screen as screen_py
# TODO: # TODO:
# - support additional graphics modes (easiest --> hardest): # - support additional graphics modes (easiest --> hardest):
# - LR/DLR # - LR/DLR
@ -52,10 +53,12 @@ def main():
def validate_lookahead(arg: int) -> int: def validate_lookahead(arg: int) -> int:
try: try:
int_arg = int(arg) int_arg = int(arg)
if int_arg < 1:
return int_arg
except Exception: except Exception:
raise argparse.ArgumentTypeError("--lookahead must be an integer")
if int_arg < 1:
raise argparse.ArgumentTypeError("--lookahead must be at least 1") raise argparse.ArgumentTypeError("--lookahead must be at least 1")
return int_arg
dhr_parser.add_argument( dhr_parser.add_argument(
"--lookahead", type=validate_lookahead, default=8, "--lookahead", type=validate_lookahead, default=8,
help=("How many pixels to look ahead to compensate for NTSC colour " help=("How many pixels to look ahead to compensate for NTSC colour "
@ -115,23 +118,26 @@ def prepare_image(image_filename: str, show_input: bool, screen,
return image_py.resize(image, screen.X_RES, screen.Y_RES, return image_py.resize(image, screen.X_RES, screen.Y_RES,
gamma=gamma_correct) gamma=gamma_correct)
def convert_dhr(args): def convert_dhr(args):
palette = palette_py.PALETTES[args.palette]() palette = palette_py.PALETTES[args.palette]()
screen = screen_py.DHGRNTSCScreen(palette) screen = screen_py.DHGRNTSCScreen(palette)
image = prepare_image(args.input, args.show_input, screen, image = prepare_image(args.input, args.show_input, screen,
args.gamma_correct) args.gamma_correct)
convert_dhr_py.convert(screen, image, args) convert_dhr_py.convert(screen, image, args)
def convert_dhr_mono(args): def convert_dhr_mono(args):
screen = screen_py.DHGRScreen() screen = screen_py.DHGRScreen()
image = prepare_image(args.input, args.show_input, screen, args.gamma_correct) image = prepare_image(args.input, args.show_input, screen,
args.gamma_correct)
convert_dhr_py.convert_mono(screen, image, args) convert_dhr_py.convert_mono(screen, image, args)
def convert_shr(args): def convert_shr(args):
screen = screen_py.SHR320Screen() screen = screen_py.SHR320Screen()
image = prepare_image(args.input, args.show_input, screen, args.gamma_correct) image = prepare_image(args.input, args.show_input, screen,
args.gamma_correct)
convert_shr_py.convert(screen, image, args) convert_shr_py.convert(screen, image, args)