Move related unit and converter code together

chahak13 · chahak13 · commit 9b0fd09c79a3 · 2022-10-19T21:28:33.000-05:00
Add other suggestions mentioned in the PR.
diff --git a/lib/matplotlib/backends/qt_editor/figureoptions.py b/lib/matplotlib/backends/qt_editor/figureoptions.py
@@ -40,10 +40,6 @@ def convert_limits(lim, converter):
         return map(float, lim)
 
     axis_map = axes._axis_map
-    axis_converter = {
-        name: axis.converter
-        for name, axis in axis_map.items()
-    }
     axis_limits = {
         name: tuple(convert_limits(
             getattr(axes, f'get_{name}lim')(), axis.converter
@@ -68,7 +64,11 @@ def convert_limits(lim, converter):
         ('(Re-)Generate automatic legend', False),
     ]
 
-    # Save the unit data
+    # Save the converter and unit data
+    axis_converter = {
+        name: axis.converter
+        for name, axis in axis_map.items()
+    }
     axis_units = {
         name: axis.get_units()
         for name, axis in axis_map.items()
@@ -196,11 +196,13 @@ def apply_callback(data):
             axis_max = general[4*i + 1]
             axis_label = general[4*i + 2]
             axis_scale = general[4*i + 3]
-            if getattr(axes, f"get_{name}scale")() != axis_scale:
+            if axis.get_scale() != axis_scale:
                 getattr(axes, f"set_{name}scale")(axis_scale)
 
             getattr(axes, f"set_{name}lim")(axis_min, axis_max)
             axis.set_label_text(axis_label)
+
+            # Restore the unit data
             axis.converter = axis_converter[name]
             axis.set_units(axis_units[name])
             axis._update_axisinfo()
