Remove pixel offset from ginga widget

Author: mwcraig

astrowidgets/ginga.py

@@ -77,8 +77,6 @@ def __init__(self, logger=None, image_width=500, image_height=500,
             self._jup_img.max_width = '100%'
             self._jup_img.height = 'auto'
 
-        self._pixel_offset = pixel_coords_offset
-
         # Set the width of the box containing the image to the desired width
         # Note: We are NOT setting the height. That is because the height
         # is automatically set by the image aspect ratio.
@@ -196,8 +194,8 @@ def _mouse_move_cb(self, viewer, button, data_x, data_y):
             except Exception:
                 imval = 'N/A'
 
-            val = (f'X: {data_x + self._pixel_offset:.2f}, '
-                   f'Y: {data_y + self._pixel_offset:.2f}')
+            val = (f'X: {data_x:.2f}, '
+                   f'Y: {data_y:.2f}')
 
             if image.wcs.wcs is not None:
                 try:
@@ -239,8 +237,8 @@ def _mouse_click_cb(self, viewer, event, data_x, data_y):
 
             # For debugging.
             with self.print_out:
-                print(f'Centered on X={data_x + self._pixel_offset} '
-                      f'Y={data_y + self._pixel_offset}')
+                print(f'Centered on X={data_x} '
+                      f'Y={data_y}')
 
     def load_fits(self, filename, numhdu=None, memmap=None):
         """Load a FITS file or HDU into the viewer.
@@ -320,7 +318,7 @@ def center_on(self, point):
         if isinstance(point, SkyCoord):
             self._viewer.set_pan(point.ra.deg, point.dec.deg, coord='wcs')
         else:
-            self._viewer.set_pan(*(np.asarray(point) - self._pixel_offset))
+            self._viewer.set_pan(*(np.asarray(point)))
 
     @deprecated('0.3', alternative='offset_by')
     def offset_to(self, dx, dy, skycoord_offset=False):
@@ -570,10 +568,6 @@ def get_markers_by_name(self, marker_name, x_colname='x', y_colname='y',
 
             sky_col = SkyCoord(radec_col[:, 0], radec_col[:, 1], unit='deg')
 
-        # Convert X,Y from 0-indexed to 1-indexed
-        if self._pixel_offset != 0:
-            xy_col += self._pixel_offset
-
         # Build table
         if include_skycoord:
             markers_table = Table(
@@ -667,12 +661,6 @@ def add_markers(self, table, x_colname='x', y_colname='y',
         else:  # Use X,Y
             coord_x = table[x_colname].data
             coord_y = table[y_colname].data
-            # Convert data coordinates from 1-indexed to 0-indexed
-            if self._pixel_offset != 0:
-                # Don't use the in-place operator -= here that modifies
-                # the input table.
-                coord_x = coord_x - self._pixel_offset
-                coord_y = coord_y - self._pixel_offset
 
         # Prepare canvas and retain existing marks
         try:

astrowidgets/tests/test_ginga_widget.py

@@ -97,38 +97,6 @@ def test_adding_markers_as_world_recovers_with_get_markers():
                                mark_coord_table['coord'].dec.deg)
 
 
-def test_can_set_pixel_offset_at_object_level():
-    # The pixel offset below is nonsensical. It is chosen simply
-    # to make it easy to check for.
-    offset = 3
-    image = ImageWidget(image_width=300, image_height=300,
-                        pixel_coords_offset=offset)
-    assert image._pixel_offset == offset
-
-
-def test_move_callback_includes_offset():
-    # The pixel offset below is nonsensical. It is chosen simply
-    # to make it easy to check for.
-    offset = 3
-    image = ImageWidget(image_width=300, image_height=300,
-                        pixel_coords_offset=offset)
-    data = np.random.random([300, 300])
-    image.load_array(data)
-    # Send a fake move to the callback. What gets put in the cursor
-    # value should be the event we sent in plus the offset.
-    image.click_center = True
-    data_x = 100
-    data_y = 200
-    image._mouse_move_cb(image._viewer, None, data_x, data_y)
-    output_contents = image._jup_coord.value
-    x_out = re.search(r'X: ([\d\.\d]+)', output_contents)
-    x_out = x_out.groups(1)[0]
-    y_out = re.search(r'Y: ([\d\.\d]+)', output_contents)
-    y_out = y_out.groups(1)[0]
-    assert float(x_out) == data_x + offset
-    assert float(y_out) == data_y + offset
-
-
 def test_can_add_markers_with_names():
     """
     Test a few things related to naming marker sets