Format complex values

lcapy/labelmaker.py

@@ -14,7 +14,7 @@ def _format_expr(self, expr):
     def _format_value_units(self, value, units, style):
 
         expr = Expr(value, cache=False)
-        if not expr.is_constant or units == '':
+        if not expr.is_constant:
             return expr.latex_math()
 
         return value_formatter(style=style).latex_math(expr, units)

lcapy/valueformatter.py

@@ -24,6 +24,18 @@ def __init__(self, trim=True, hundreds=False, fmt=''):
 
     def _do(self, expr, unit, aslatex):
 
+        if expr.is_complex:
+            jstr = '\mathrm{j}' if aslatex else 'j'
+
+            rexpr = expr.real
+            iexpr = expr.imag
+            if rexpr == 0:
+                return jstr + self._do1(iexpr, unit, aslatex)
+            return self._do1(rexpr, '', aslatex) + ' + ' + jstr + self._do1(iexpr, unit, aslatex)
+        return self._do1(expr, unit, aslatex)
+
+    def _do1(self, expr, unit, aslatex):
+
         prefixes = ('f', 'p', 'n', 'u', 'm', '', 'k', 'M', 'G', 'T')
 
         # FIXME for complex values
@@ -143,9 +155,8 @@ def _fmt(self, valstr, unit='', prefix='', aslatex=True):
 
 class SciValueFormatter(ValueFormatter):
 
-    def _do(self, expr, unit, aslatex):
+    def _do1(self, expr, unit, aslatex):
 
-        # FIXME for complex values
         value = expr.value
 
         fmt = '%%.%dE' % (self.num_digits - 1)
@@ -177,7 +188,7 @@ def _do(self, expr, unit, aslatex):
 
 class RatfunValueFormatter(ValueFormatter):
 
-    def _do(self, expr, unit, aslatex):
+    def _do1(self, expr, unit, aslatex):
 
         if not aslatex:
             return str(expr) + ' ' + unit