Fix valueformatter

lcapy/expr.py

@@ -121,7 +121,7 @@ def latex_with_units(self, eng_format=False, show_units=True,
         """Make LaTeX string with optional units.   Units are only
         shown for numerical values."""
 
-        from .value_formatter import value_formatter
+        from .valueformatter import value_formatter
 
         expr = self
 

lcapy/labelmaker.py

@@ -1,6 +1,7 @@
 from .expr import Expr
 from .latex import latex_format_label
 from .valueformatter import value_formatter
+from .valueparser import value_parser
 import sympy as sym
 
 
@@ -55,7 +56,8 @@ def make(self, cpt, label_ports=False, style='SI'):
             units_map = {'V': 'V', 'I': 'A', 'R': '$\Omega$',
                          'C': 'F', 'L': 'H'}
 
-            expr = cpt.args[0]
+            expr = value_parser(cpt.args[0])
+
             if cpt.classname in ('Vstep', 'Istep'):
                 expr = '(%s) * Heaviside(t)' % expr
                 value_label = self._format_expr(expr)

lcapy/mnacpts.py

@@ -20,6 +20,7 @@
 from .current import current
 from .opts import Opts
 from .node import DummyNode
+from .valueparser import value_parser
 import lcapy
 import inspect
 import sys
@@ -142,31 +143,9 @@ def _process_args(self, args):
 
         The suffixes are ignored in expressions such as 10 * 42p."""
 
-        suffixes = {'f': 1e-15, 'p': 1e-12, 'n': 1e-9, 'u': 1e-6,
-                    'm': 1e-3, 'k': 1e3, 'M': 1e6, 'G': 1e9, 'T': 1e12}
-
-        def isfloat(s):
-            try:
-                float(s)
-                return True
-            except ValueError:
-                return False
-
         pargs = []
         for arg in args:
-            if arg is None or len(arg) <  2:
-                pargs.append(arg)
-                continue
-
-            if arg.endswith('Meg'):
-                arg = arg[0:-2] + 'M'
-            elif arg.endswith('K'):
-                arg = arg[0:-1] + 'k'
-
-            if (arg[-1] in suffixes and isfloat(arg[0:-1])):
-                pargs.append(float(arg[0:-1]) * suffixes[arg[-1]])
-            else:
-                pargs.append(arg)
+            pargs.append(value_parser(arg))
 
         return pargs
 

lcapy/schematics/components/cpt.py

@@ -10,6 +10,7 @@
 from ...labels import Labels
 from ...latex import latex_format_label
 from ...config import implicit_default
+from ...valueparser import value_parser
 from ..utils import check_boolean
 
 

lcapy/valueparser.py

@@ -0,0 +1,27 @@
+def value_parser(arg):
+    """Convert args such as 42p to 42e-12.
+
+    The suffixes are ignored in expressions such as 10 * 42p."""
+
+    suffixes = {'f': 1e-15, 'p': 1e-12, 'n': 1e-9, 'u': 1e-6,
+                'm': 1e-3, 'k': 1e3, 'M': 1e6, 'G': 1e9, 'T': 1e12}
+
+    def isfloat(s):
+        try:
+            float(s)
+            return True
+        except ValueError:
+            return False
+
+    if arg is None or len(arg) <  2:
+        return arg
+
+    if arg.endswith('Meg'):
+        arg = arg[0:-2] + 'M'
+    elif arg.endswith('K'):
+        arg = arg[0:-1] + 'k'
+
+    if (arg[-1] in suffixes and isfloat(arg[0:-1])):
+        return float(arg[0:-1]) * suffixes[arg[-1]]
+    else:
+        return arg