Masking boundaries

hexrd/ui/hexrd_config.py

@@ -874,7 +874,8 @@ def raw_masks_dict(self):
                 for det, mask in data:
                     if det == name:
                         final_mask = np.logical_and(final_mask, mask)
-            if self.threshold_mask_status:
+            if (self.threshold_mask_status and
+                    self.threshold_masks.get(name, None) is not None):
                 idx = self.current_imageseries_idx
                 thresh_mask = self.threshold_masks[name][idx]
                 final_mask = np.logical_and(final_mask, thresh_mask)

hexrd/ui/interactive_template.py

@@ -8,17 +8,13 @@
 
 from skimage.draw import polygon
 
-from hexrd.ui.create_hedm_instrument import create_hedm_instrument
-from hexrd.ui import resource_loader
 from hexrd.ui.hexrd_config import HexrdConfig
 from hexrd.ui.utils import has_nan
 
 
 class InteractiveTemplate:
-    def __init__(self, parent=None):
-        self.parent = parent.image_tab_widget.image_canvases[0]
-        self.ax = self.parent.axes_images[0]
-        self.panels = create_hedm_instrument().detectors
+    def __init__(self, parent, detector, instrument=None):
+        self.image_tab_widget = parent.image_tab_widget
         self.img = None
         self.shape = None
         self.press = None
@@ -27,11 +23,48 @@ def __init__(self, parent=None):
         self.translation = [0, 0]
         self.complete = False
         self.event_key = None
-        self.parent.setFocusPolicy(Qt.ClickFocus)
+        self.detector = detector
+        self.instrument = instrument
+        self._static = True
+
+        for canvas in self.image_tab_widget.active_canvases:
+            canvas.setFocusPolicy(Qt.ClickFocus)
+
+    @property
+    def current_canvas(self):
+        idx = self.image_tab_widget.current_index
+        return self.image_tab_widget.active_canvases[idx]
+
+    @property
+    def ax(self):
+        idx = HexrdConfig().current_imageseries_idx
+        return self.current_canvas.axes_images[idx]
 
     @property
     def raw_axes(self):
-        return list(self.parent.raw_axes.values())[0]
+        if not self.current_canvas.raw_axes:
+            return self.current_canvas.axis
+
+        for axes in self.current_canvas.raw_axes.values():
+            if axes.get_title() == self.detector:
+                return axes
+
+        return list(self.current_canvas.raw_axes.values())[0]
+
+    @property
+    def static_mode(self):
+        return self._static
+
+    @static_mode.setter
+    def static_mode(self, mode):
+        if mode == self._static:
+            return
+
+        if mode:
+            self.disconnect()
+        else:
+            self.connect_translate_rotate()
+        self._static = mode
 
     def update_image(self, img):
         self.img = img
@@ -41,20 +74,17 @@ def rotate_shape(self, angle):
         self.rotate_template(self.shape.xy, angle)
         self.redraw()
 
-    def create_shape(self, module, file_name, det, instr):
+    def create_polygon(self, verts, **kwargs):
         self.complete = False
-        with resource_loader.resource_path(module, file_name) as f:
-            data = np.loadtxt(f)
-        verts = self.panels['default'].cartToPixel(data)
-        verts[:, [0, 1]] = verts[:, [1, 0]]
-        self.shape = patches.Polygon(verts, fill=False, lw=1, color='cyan')
+        self.shape = patches.Polygon(verts, **kwargs)
         if has_nan(verts):
             # This template contains more than one polygon and the last point
             # should not be connected to the first. See Tardis IP for example.
             self.shape.set_closed(False)
-        self.shape_styles.append({'line': '-', 'width': 1, 'color': 'cyan'})
-        self.update_position(instr, det)
-        self.connect_translate_rotate()
+        self.shape_styles.append(kwargs)
+        self.update_position()
+        if not self.static_mode:
+            self.connect_translate_rotate()
         self.raw_axes.add_patch(self.shape)
         self.redraw()
 
@@ -63,10 +93,13 @@ def update_style(self, style, width, color):
         self.shape.set_linestyle(style)
         self.shape.set_linewidth(width)
         self.shape.set_edgecolor(color)
+        self.shape.set_fill(False)
         self.redraw()
 
-    def update_position(self, instr, det):
-        pos = HexrdConfig().boundary_position(instr, det)
+    def update_position(self):
+        pos = None
+        if self.instrument is not None:
+            pos = HexrdConfig().boundary_position(self.instrument, self.detector)
         if pos is None:
             self.center = self.get_midpoint()
         else:
@@ -75,7 +108,7 @@ def update_position(self, instr, det):
             self.translate_template(dx, dy)
             self.total_rotation = pos['angle']
             self.rotate_template(self.shape.xy, pos['angle'])
-        if instr == 'PXRDIP':
+        if self.instrument == 'PXRDIP':
             self.rotate_shape(angle=90)
 
     @property
@@ -140,7 +173,8 @@ def toggle_boundaries(self, show):
                 self.shape.remove()
                 self.shape.set_linestyle(self.shape_styles[-1]['line'])
                 self.raw_axes.add_patch(self.shape)
-                self.connect_translate_rotate()
+                if not self.static_mode:
+                    self.connect_translate_rotate()
             self.redraw()
         else:
             if self.shape:
@@ -149,11 +183,11 @@ def toggle_boundaries(self, show):
         self.redraw()
 
     def disconnect(self):
-        self.parent.mpl_disconnect(self.button_press_cid)
-        self.parent.mpl_disconnect(self.button_release_cid)
-        self.parent.mpl_disconnect(self.motion_cid)
-        self.parent.mpl_disconnect(self.key_press_cid)
-        self.parent.mpl_disconnect(self.button_drag_cid)
+        self.current_canvas.mpl_disconnect(self.button_press_cid)
+        self.current_canvas.mpl_disconnect(self.button_release_cid)
+        self.current_canvas.mpl_disconnect(self.motion_cid)
+        self.current_canvas.mpl_disconnect(self.key_press_cid)
+        self.current_canvas.mpl_disconnect(self.button_drag_cid)
 
     def completed(self):
         self.disconnect()
@@ -199,7 +233,7 @@ def get_paths(self):
         return all_paths
 
     def redraw(self):
-        self.parent.draw_idle()
+        self.current_canvas.draw_idle()
 
     def scale_template(self, sx=1, sy=1):
         xy = self.shape.xy
@@ -233,17 +267,17 @@ def on_key(self, event):
             self.on_key_translate(event)
 
     def connect_translate_rotate(self):
-        self.button_press_cid = self.parent.mpl_connect(
+        self.button_press_cid = self.current_canvas.mpl_connect(
             'button_press_event', self.on_press)
-        self.button_release_cid = self.parent.mpl_connect(
+        self.button_release_cid = self.current_canvas.mpl_connect(
             'button_release_event', self.on_release)
-        self.motion_cid = self.parent.mpl_connect(
+        self.motion_cid = self.current_canvas.mpl_connect(
             'motion_notify_event', self.on_translate)
-        self.key_press_cid = self.parent.mpl_connect(
+        self.key_press_cid = self.current_canvas.mpl_connect(
             'key_press_event', self.on_key)
-        self.button_drag_cid = self.parent.mpl_connect(
+        self.button_drag_cid = self.current_canvas.mpl_connect(
             'motion_notify_event', self.on_rotate)
-        self.parent.setFocus()
+        self.current_canvas.setFocus()
 
     def translate_template(self, dx, dy):
         self.shape.set_xy(self.shape.xy + np.array([dx, dy]))

hexrd/ui/llnl_import_tool_dialog.py

@@ -1,4 +1,5 @@
 import os
+import numpy as np
 import yaml
 import tempfile
 import h5py
@@ -18,6 +19,7 @@
 from hexrd.ui.image_load_manager import ImageLoadManager
 from hexrd.ui.interactive_template import InteractiveTemplate
 from hexrd.ui import resource_loader
+from hexrd.ui.create_hedm_instrument import create_hedm_instrument
 from hexrd.ui.ui_loader import UiLoader
 from hexrd.ui.constants import (
     UI_TRANS_INDEX_ROTATE_90, YAML_EXTS, LLNLTransform, ViewType)
@@ -273,7 +275,9 @@ def load_images(self):
             # the QProgressDialog.
             ImageLoadManager().read_data(files, ui_parent=self.ui.parent())
             self.cmap.block_updates(False)
-            self.it = InteractiveTemplate(self.parent())
+            self.it = InteractiveTemplate(self.parent(), self.detector, self.instrument)
+            # We should be able to immediately interact with the template
+            self.it.static_mode = False
 
             file_names = [os.path.split(f[0])[1] for f in files]
             self.ui.files_label.setText(', '.join(file_names))
@@ -319,6 +323,14 @@ def display_bounds(self):
         self.ui.bb_height.blockSignals(False)
         self.ui.bb_width.blockSignals(False)
 
+    def read_in_template_bounds(self, module, file_name):
+        with resource_loader.resource_path(module, file_name) as f:
+            data = np.loadtxt(f)
+        panels = create_hedm_instrument().detectors
+        verts = panels['default'].cartToPixel(data)
+        verts[:, [0, 1]] = verts[:, [1, 0]]
+        return verts
+
     def add_template(self):
         if self.it is None or self.instrument is None or not self.detector:
             return
@@ -330,11 +342,12 @@ def add_template(self):
             return
 
         self.it.clear()
-        self.it.create_shape(
+        verts = self.read_in_template_bounds(
             module=hexrd_resources,
-            file_name=f'{self.instrument}_{self.detector}_bnd.txt',
-            det=self.detector,
-            instr=self.instrument)
+            file_name=f'{self.instrument}_{self.detector}_bnd.txt'
+        )
+        kwargs = {'fill': False, 'lw': 1, 'linestyle': '-'}
+        self.it.create_polygon(verts, **kwargs)
         self.it.update_image(HexrdConfig().image('default', 0))
         self.update_template_style()
 
@@ -380,14 +393,14 @@ def save_boundary_position(self):
     def swap_bounds_for_cropped(self):
         self.it.clear()
         line, width, color = self.it.shape_styles[-1].values()
-        self.it.create_shape(
+        verts = self.read_in_template_bounds(
             module=hexrd_resources,
-            file_name=f'TARDIS_IMAGE-PLATE-3_bnd_cropped.txt',
-            det=self.detector,
-            instr=self.instrument)
+            file_name=f'TARDIS_IMAGE-PLATE-3_bnd_cropped.txt'
+        )
+        kwargs = {'fill': False, 'lw': width, 'color': color, 'linestyle': '--'}
+        self.it.create_polygon(verts, **kwargs)
         self.update_bbox_width(1330)
         self.update_bbox_height(238)
-        self.it.update_style('--', width, color)
 
     def crop_and_mask(self):
         self.save_boundary_position()