A community-maintained Python framework for creating mathematical animations.
remove unnecessary _QUAL and move its contents to constants.QUALITIES
leotrs6d08e4d4c4f7
diff --git a/manim/config/main_utils.py b/manim/config/main_utils.pyindex faa5ecc9a..6f2f0bc6f 100644--- a/manim/config/main_utils.py+++ b/manim/config/main_utils.py@@ -306,7 +306,7 @@ def _parse_args_no_subcmd(args):parser.add_argument("-q","--quality",- choices=constants.QUALITIES.values(),+ choices=[constants.QUALITIES[q]["flag"] for q in constants.QUALITIES],default=constants.DEFAULT_QUALITY_SHORT,help="Render at specific quality, short form of the --*_quality flags",)diff --git a/manim/config/utils.py b/manim/config/utils.pyindex 73e0c3956..b345490d5 100644--- a/manim/config/utils.py+++ b/manim/config/utils.py@@ -74,7 +74,7 @@ def determine_quality(args):# Skip so we prioritize anything that overwrites the default quality.passelif getattr(args, quality, None) or (- hasattr(args, "quality") and args.quality == constants.QUALITIES[quality]+ hasattr(args, "quality") and args.quality == constants.QUALITIES[quality]["flag"]):return quality@@ -88,15 +88,6 @@ def determine_quality(args):return constants.DEFAULT_QUALITY-_QUAL = {- "low_quality": {"pixel_height": 480, "pixel_width": 854, "frame_rate": 15},- "medium_quality": {"pixel_height": 720, "pixel_width": 1280, "frame_rate": 30},- "high_quality": {"pixel_height": 1080, "pixel_width": 1920, "frame_rate": 60},- "production_quality": {"pixel_height": 1440, "pixel_width": 2560, "frame_rate": 60},- "4k_quality": {"pixel_height": 2160, "pixel_width": 3840, "frame_rate": 60},-}--class ManimConfig(MutableMapping):_OPTS = {@@ -689,23 +680,21 @@ class ManimConfig(MutableMapping):@propertydef quality(self):"""Video quality."""- q = {- "pixel_width": self.pixel_width,- "pixel_height": self.pixel_height,- "frame_rate": self.frame_rate,- }- for qual in _QUAL:- if q == _QUAL[qual]:+ keys = ["pixel_width", "pixel_height", "frame_rate"]+ q = {k: self[k] for k in keys}+ for qual in constants.QUALITIES:+ if all([q[k] == constants.QUALITIES[qual][k] for k in keys]):return qualelse:return None@quality.setterdef quality(self, qual):- if qual not in _QUAL:- raise KeyError(f"quality must be one of {list(_QUAL.keys())}")- self.frame_size = _QUAL[qual]["pixel_width"], _QUAL[qual]["pixel_height"]- self.frame_rate = _QUAL[qual]["frame_rate"]+ if qual not in constants.QUALITIES:+ raise KeyError(f"quality must be one of {list(constants.QUALITIES.keys())}")+ q = constants.QUALITIES[qual]+ self.frame_size = q["pixel_width"], q["pixel_height"]+ self.frame_rate = q["frame_rate"]@propertydef transparent(self):diff --git a/manim/constants.py b/manim/constants.pyindex 2d1a9b34c..ec78076db 100644--- a/manim/constants.py+++ b/manim/constants.py@@ -141,12 +141,37 @@ JS_RENDERER_INFO = (# Video qualitiesQUALITIES = {- "fourk_quality": "k",- "production_quality": "p",- "high_quality": "h",- "medium_quality": "m",- "low_quality": "l",+ "fourk_quality": {+ "flag": "k",+ "pixel_height": 2160,+ "pixel_width": 3840,+ "frame_rate": 60,+ },+ "production_quality": {+ "flag": "p",+ "pixel_height": 1440,+ "pixel_width": 2560,+ "frame_rate": 60,+ },+ "high_quality": {+ "flag": "h",+ "pixel_height": 1080,+ "pixel_width": 1920,+ "frame_rate": 60,+ },+ "medium_quality": {+ "flag": "m",+ "pixel_height": 720,+ "pixel_width": 1280,+ "frame_rate": 30,+ },+ "low_quality": {+ "flag": "l",+ "pixel_height": 480,+ "pixel_width": 854,+ "frame_rate": 15,+ },}DEFAULT_QUALITY = "high_quality"-DEFAULT_QUALITY_SHORT = QUALITIES[DEFAULT_QUALITY]+DEFAULT_QUALITY_SHORT = QUALITIES[DEFAULT_QUALITY]["flag"]diff --git a/tests/test_cli_flags.py b/tests/test_quality_flags.pysimilarity index 74%rename from tests/test_cli_flags.pyrename to tests/test_quality_flags.pyindex c77b94ac1..30ca6b430 100644--- a/tests/test_cli_flags.py+++ b/tests/test_quality_flags.py@@ -12,26 +12,26 @@ def test_quality_flags():for quality in constants.QUALITIES.keys():# Assert that quality is properly set when using -q*- arguments = f"manim -q{constants.QUALITIES[quality]} dummy_filename".split()+ arguments = f'manim -q{constants.QUALITIES[quality]["flag"]} dummy_filename'.split()parsed = parse_args(arguments)- assert parsed.quality == constants.QUALITIES[quality]+ assert parsed.quality == constants.QUALITIES[quality]["flag"]assert quality == determine_quality(parsed)# Assert that quality is properly set when using -q *- arguments = f"manim -q {constants.QUALITIES[quality]} dummy_filename".split()+ arguments = f'manim -q {constants.QUALITIES[quality]["flag"]} dummy_filename'.split()parsed = parse_args(arguments)- assert parsed.quality == constants.QUALITIES[quality]+ assert parsed.quality == constants.QUALITIES[quality]["flag"]assert quality == determine_quality(parsed)# Assert that quality is properly set when using --quality *arguments = (- f"manim --quality {constants.QUALITIES[quality]} dummy_filename".split()+ f'manim --quality {constants.QUALITIES[quality]["flag"]} dummy_filename'.split())parsed = parse_args(arguments)- assert parsed.quality == constants.QUALITIES[quality]+ assert parsed.quality == constants.QUALITIES[quality]["flag"]assert quality == determine_quality(parsed)# Assert that quality is properly set when using -*_quality