From 6f699028924b503b1b4515a71ba7c36f925eeb22 Mon Sep 17 00:00:00 2001
From: Grant Sanderson <grant@3blue1brown.com>
Date: Sat, 6 Feb 2021 11:06:38 -0800
Subject: [PATCH] Changed how configuration for labels on a NumberLine, and
 hence also on Axes, so that it takes in DecimalNumber configuration directly
 rather than as a separte dict.

---
 docs/source/getting_started/example_scenes.rst |  2 +-
 example_scenes.py                              |  3 +--
 manimlib/mobject/coordinate_systems.py         | 18 +++++++++---------
 manimlib/mobject/number_line.py                |  6 ++----
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/docs/source/getting_started/example_scenes.rst b/docs/source/getting_started/example_scenes.rst
index 3f3d51df..e33efd0b 100644
--- a/docs/source/getting_started/example_scenes.rst
+++ b/docs/source/getting_started/example_scenes.rst
@@ -475,7 +475,7 @@ OpeningManimExample
             moving_c_grid = c_grid.copy()
             moving_c_grid.prepare_for_nonlinear_transform()
             c_grid.set_stroke(BLUE_E, 1)
-            c_grid.add_coordinate_labels(number_config={"font_size": 36})
+            c_grid.add_coordinate_labels(font_size=24)
             complex_map_words = TexText("""
                 Or thinking of the plane as $\\mathds{C}$,\\\\
                 this is the map $z \\rightarrow z^2$
diff --git a/example_scenes.py b/example_scenes.py
index 11b55dd4..666faa42 100644
--- a/example_scenes.py
+++ b/example_scenes.py
@@ -45,7 +45,7 @@ class OpeningManimExample(Scene):
         moving_c_grid = c_grid.copy()
         moving_c_grid.prepare_for_nonlinear_transform()
         c_grid.set_stroke(BLUE_E, 1)
-        c_grid.add_coordinate_labels(number_config={"font_size": 36})
+        c_grid.add_coordinate_labels(font_size=24)
         complex_map_words = TexText("""
             Or thinking of the plane as $\\mathds{C}$,\\\\
             this is the map $z \\rightarrow z^2$
@@ -109,7 +109,6 @@ class InteractiveDevlopment(Scene):
         always(circle.move_to, self.mouse_point)
 
 
-
 class AnimatingMethods(Scene):
     def construct(self):
         grid = Tex(r"\pi").get_grid(10, 10, height=4)
diff --git a/manimlib/mobject/coordinate_systems.py b/manimlib/mobject/coordinate_systems.py
index 04601289..e03ea6d0 100644
--- a/manimlib/mobject/coordinate_systems.py
+++ b/manimlib/mobject/coordinate_systems.py
@@ -297,11 +297,17 @@ class Axes(VGroup, CoordinateSystem):
     def get_axes(self):
         return self.axes
 
-    def add_coordinate_labels(self, x_values=None, y_values=None):
+    def add_coordinate_labels(self,
+                              x_values=None,
+                              y_values=None,
+                              excluding=[0],
+                              **kwargs):
         axes = self.get_axes()
         self.coordinate_labels = VGroup()
         for axis, values in zip(axes, [x_values, y_values]):
-            numbers = axis.add_numbers(values, excluding=[0])
+            numbers = axis.add_numbers(
+                values, excluding=excluding, **kwargs
+            )
             self.coordinate_labels.add(numbers)
         return self.coordinate_labels
 
@@ -350,9 +356,6 @@ class NumberPlane(Axes):
             "include_tip": False,
             "line_to_number_buff": SMALL_BUFF,
             "line_to_number_direction": DL,
-            "decimal_number_config": {
-                "height": 0.2,
-            }
         },
         "y_axis_config": {
             "line_to_number_direction": DL,
@@ -477,10 +480,7 @@ class ComplexPlane(NumberPlane):
             if abs(z.imag) > abs(z.real):
                 axis = self.get_y_axis()
                 value = z.imag
-                kwargs = merge_dicts_recursively(
-                    kwargs,
-                    {"number_config": {"unit": "i"}},
-                )
+                kwargs["unit"] = "i"
             else:
                 axis = self.get_x_axis()
                 value = z.real
diff --git a/manimlib/mobject/number_line.py b/manimlib/mobject/number_line.py
index ed6a1ede..a8fefb01 100644
--- a/manimlib/mobject/number_line.py
+++ b/manimlib/mobject/number_line.py
@@ -127,11 +127,9 @@ class NumberLine(Line):
         return self.get_length() / (self.x_max - self.x_min)
 
     def get_number_mobject(self, x,
-                           number_config=None,
                            direction=None,
-                           buff=None):
-        if number_config is None:
-            number_config = {}
+                           buff=None,
+                           **number_config):
         number_config = merge_dicts_recursively(
             self.decimal_number_config, number_config
         )