Merge 92824e4 into de60b72

hyperspy · Aug 3, 2016 · d1721ab · d1721ab
2 parents de60b72 + 92824e4
commit d1721ab
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/hyperspy/_signals/eds.py b/hyperspy/_signals/eds.py
@@ -1012,8 +1012,10 @@ def add_xray_lines_markers(self, xray_lines):
             line = markers.vertical_line_segment(
                 x=line_energy[i], y1=None, y2=intensity[i] * 0.8)
             self.add_marker(line)
+            string = (r'$\mathrm{%s}_{\mathrm{%s}}$' %
+                      utils_eds._get_element_and_line(xray_lines[i]))
             text = markers.text(
-                x=line_energy[i], y=intensity[i] * 1.1, text=xray_lines[i],
+                x=line_energy[i], y=intensity[i] * 1.1, text=string,
                 rotation=90)
             self.add_marker(text)
             self._xray_markers[xray_lines[i]] = [line, text]

diff --git a/hyperspy/models/edsmodel.py b/hyperspy/models/edsmodel.py
@@ -24,6 +24,7 @@
 import logging
 
 from hyperspy.misc.utils import stash_active_state
+from hyperspy.misc.eds.utils import _get_element_and_line
 
 from hyperspy.models.model1d import Model1D
 from hyperspy._signals.eds import EDSSpectrum
@@ -131,6 +132,7 @@ def __init__(self, spectrum,
                  *args, **kwargs):
         Model1D.__init__(self, spectrum, *args, **kwargs)
         self.xray_lines = list()
+        self.family_lines = list()
         end_energy = self.axes_manager.signal_axes[0].high_value
         self.end_energy = min(end_energy, self.signal._get_beam_energy())
         self.start_energy = self.axes_manager.signal_axes[0].low_value
@@ -266,6 +268,7 @@ def add_family_lines(self, xray_lines='from_elements'):
                             element, li)
                         component_sub.A.twin = component.A
                         self.append(component_sub)
+                        self.family_lines.append(component_sub)
             self.fetch_stored_values()
 
     @property
@@ -318,6 +321,15 @@ def disable_xray_lines(self):
         for component in self._active_xray_lines:
             component.active = False
 
+    def _make_position_adjuster(self, component, fix_it, show_label):
+        # Override to ensure formatting of labels of xray lines
+        super(EDSModel, self)._make_position_adjuster(
+            component, fix_it, show_label)
+        if show_label and component in (self.xray_lines + self.family_lines):
+            label = self._position_widgets[component._position][1]
+            label.string = (r"$\mathrm{%s}_{\mathrm{%s}}$" %
+                            _get_element_and_line(component.name))
+
     def fit_background(self,
                        start_energy=None,
                        end_energy=None,