From 4b9a3b23d8df5ae7f961f226ed51c23100030991 Mon Sep 17 00:00:00 2001
From: Thomas Robitaille <thomas.robitaille@gmail.com>
Date: Thu, 22 Apr 2021 15:15:50 +0100
Subject: [PATCH 01/10] Move coordinates overlay to toolbar

---
 jdaviz/app.py                                 |  3 ++
 jdaviz/configs/imviz/imviz.yaml               |  1 +
 jdaviz/configs/imviz/plugins/__init__.py      |  1 +
 .../imviz/plugins/coords_info/__init__.py     |  1 +
 .../imviz/plugins/coords_info/coords_info.py  | 15 ++++++++
 .../imviz/plugins/coords_info/coords_info.vue |  7 ++++
 jdaviz/configs/imviz/plugins/viewers.py       | 35 +++++++++++--------
 7 files changed, 49 insertions(+), 14 deletions(-)
 create mode 100644 jdaviz/configs/imviz/plugins/coords_info/__init__.py
 create mode 100644 jdaviz/configs/imviz/plugins/coords_info/coords_info.py
 create mode 100644 jdaviz/configs/imviz/plugins/coords_info/coords_info.vue

diff --git a/jdaviz/app.py b/jdaviz/app.py
index 94f09479d7..18b8a43aeb 100644
--- a/jdaviz/app.py
+++ b/jdaviz/app.py
@@ -1195,6 +1195,8 @@ def compose_viewer_area(viewer_area_items):
                 'widget': "IPY_MODEL_" + tool.model_id
             })
 
+            self._application_handler._tools[name] = tool
+
         for name in config.get('tray', []):
             tray = tray_registry.members.get(name)
             tray_item_instance = tray.get('cls')(app=self)
@@ -1210,6 +1212,7 @@ def _reset_state(self):
         """ Resets the application state """
         self.state = ApplicationState()
         self.state.add_callback('stack_items', self.vue_relayout)
+        self._application_handler._tools = {}
 
     def get_configuration(self, path=None, section=None):
         """ Returns a copy of the application configuration
diff --git a/jdaviz/configs/imviz/imviz.yaml b/jdaviz/configs/imviz/imviz.yaml
index 0e5f5063a8..70190a28bf 100644
--- a/jdaviz/configs/imviz/imviz.yaml
+++ b/jdaviz/configs/imviz/imviz.yaml
@@ -15,6 +15,7 @@ toolbar:
   - g-data-tools
   - g-subset-tools
   - g-image-viewer-creator
+  - g-coords-info
 viewer_area:
   - container: col
     children:
diff --git a/jdaviz/configs/imviz/plugins/__init__.py b/jdaviz/configs/imviz/plugins/__init__.py
index 6d796de9f7..b55503e340 100644
--- a/jdaviz/configs/imviz/plugins/__init__.py
+++ b/jdaviz/configs/imviz/plugins/__init__.py
@@ -2,3 +2,4 @@
 from .viewers import *  # noqa
 from .image_viewer_creator import *  # noqa
 from .parsers import *  # noqa
+from .coords_info import *  # noqa
diff --git a/jdaviz/configs/imviz/plugins/coords_info/__init__.py b/jdaviz/configs/imviz/plugins/coords_info/__init__.py
new file mode 100644
index 0000000000..70e5767700
--- /dev/null
+++ b/jdaviz/configs/imviz/plugins/coords_info/__init__.py
@@ -0,0 +1 @@
+from .coords_info import *  # noqa
diff --git a/jdaviz/configs/imviz/plugins/coords_info/coords_info.py b/jdaviz/configs/imviz/plugins/coords_info/coords_info.py
new file mode 100644
index 0000000000..6b18c84a4b
--- /dev/null
+++ b/jdaviz/configs/imviz/plugins/coords_info/coords_info.py
@@ -0,0 +1,15 @@
+from traitlets import Unicode
+
+from jdaviz.core.registries import tool_registry
+from jdaviz.core.template_mixin import TemplateMixin
+from jdaviz.utils import load_template
+
+__all__ = ['CoordsInfo']
+
+
+@tool_registry('g-coords-info')
+class CoordsInfo(TemplateMixin):
+    template = load_template("coords_info.vue", __file__).tag(sync=True)
+    pixel = Unicode("").tag(sync=True)
+    world = Unicode("").tag(sync=True)
+    data = Unicode("").tag(sync=True)
diff --git a/jdaviz/configs/imviz/plugins/coords_info/coords_info.vue b/jdaviz/configs/imviz/plugins/coords_info/coords_info.vue
new file mode 100644
index 0000000000..5ea55503a8
--- /dev/null
+++ b/jdaviz/configs/imviz/plugins/coords_info/coords_info.vue
@@ -0,0 +1,7 @@
+<template>
+    <div>
+        <b>Pixel: </b>{{ pixel }}<br>
+        <b>World: </b>{{ world }}<br>
+        <b>Data: </b>{{ data }}
+    </div>
+</template>
\ No newline at end of file
diff --git a/jdaviz/configs/imviz/plugins/viewers.py b/jdaviz/configs/imviz/plugins/viewers.py
index edf8aac87d..23d7431e85 100644
--- a/jdaviz/configs/imviz/plugins/viewers.py
+++ b/jdaviz/configs/imviz/plugins/viewers.py
@@ -3,8 +3,6 @@
 from glue.core import BaseData
 from glue_jupyter.bqplot.image import BqplotImageView
 
-from bqplot import Label
-
 from jdaviz.core.registries import viewer_registry
 
 __all__ = ['ImvizImageView']
@@ -21,9 +19,7 @@ def __init__(self, *args, **kwargs):
 
         super().__init__(*args, **kwargs)
 
-        self.label_mouseover = Label(x=[0.05], y=[0.05], text=[''],
-                                     default_size=12, colors=['orange'])
-        self.figure.marks = self.figure.marks + [self.label_mouseover]
+        self.label_mouseover = None
 
         self.add_event_callback(self.on_mouse_or_key_event, events=['mousemove', 'keydown'])
 
@@ -34,6 +30,12 @@ def on_mouse_or_key_event(self, data):
         if len(self.state.layers) == 0:
             return
 
+        if self.label_mouseover is None:
+            if 'g-coords-info' in self.session.application._tools:
+                self.label_mouseover = self.session.application._tools['g-coords-info']
+            else:
+                return
+
         if data['event'] == 'mousemove':
 
             # Display the current cursor coordinates (both pixel and world) as
@@ -44,31 +46,36 @@ def on_mouse_or_key_event(self, data):
             x = data['domain']['x']
             y = data['domain']['y']
 
-            overlay = f'x={x:.1f} y={y:.1f}'
+            self.label_mouseover.pixel = f'x={x:5.1f} y={y:5.1f}'
 
             image = self.state.layers[0].layer
 
             if isinstance(image.coords, BaseHighLevelWCS):
-
                 # Convert these to a SkyCoord via WCS - note that for other datasets
                 # we aren't actually guaranteed to get a SkyCoord out, just for images
                 # with valid celestial WCS
                 try:
-                    celestial_coordinates = image.coords.pixel_to_world(x, y).icrs.to_string('hmsdms')  # noqa: E501
-                    overlay += f' ICRS={celestial_coordinates}'
+                    celestial_coordinates = (image.coords.pixel_to_world(x, y).icrs
+                                             .to_string('hmsdms', precision=4, pad=True))
                 except Exception:
-                    overlay += ' ICRS=unknown'
+                    self.label_mouseover.world = ''
+                else:
+                    self.label_mouseover.world = f'ICRS={celestial_coordinates:32s}'
+            else:
+                self.label_mouseover.world = ''
 
             # Extract data values at this position
             if x > -0.5 and y > -0.5 and x < image.shape[1] - 0.5 and y < image.shape[0] - 0.5:
                 value = image.get_data(image.main_components[0])[int(round(y)), int(round(x))]
-                overlay += f' data={value:.2g}'
-
-            self.label_mouseover.text = [overlay]
+                self.label_mouseover.data += f'data={value:10.2g}'
+            else:
+                self.label_mouseover.data = ''
 
         elif data['event'] == 'mouseleave' or data['event'] == 'mouseenter':
 
-            self.label_mouseover.text = ""
+            self.label_mouseover.pixel = ""
+            self.label_mouseover.world = ""
+            self.label_mouseover.data = ""
 
         if data['event'] == 'keydown' and data['key'] == 'b':
 

From 68ac3cef78708abf5efd0af7ed98839b75b99d60 Mon Sep 17 00:00:00 2001
From: Thomas Robitaille <thomas.robitaille@gmail.com>
Date: Thu, 22 Apr 2021 16:06:45 +0100
Subject: [PATCH 02/10] Fix layout

---
 jdaviz/app.vue                                     |  2 +-
 .../imviz/plugins/coords_info/coords_info.py       |  2 +-
 .../imviz/plugins/coords_info/coords_info.vue      |  2 +-
 jdaviz/configs/imviz/plugins/viewers.py            | 14 ++++++++------
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/jdaviz/app.vue b/jdaviz/app.vue
index 0b8df86e7c..33b834719f 100644
--- a/jdaviz/app.vue
+++ b/jdaviz/app.vue
@@ -1,6 +1,6 @@
 <template>
   <v-app id="web-app" class="jdaviz">
-    <v-app-bar color="primary" dark dense flat app absolute clipped-right>
+    <v-app-bar color="primary" dark short flat app absolute clipped-right>
       <jupyter-widget :widget="item.widget" v-for="item in state.tool_items" :key="item.name"></jupyter-widget>
       <v-spacer></v-spacer>
       <v-toolbar-items>
diff --git a/jdaviz/configs/imviz/plugins/coords_info/coords_info.py b/jdaviz/configs/imviz/plugins/coords_info/coords_info.py
index 6b18c84a4b..0c0f6e2be8 100644
--- a/jdaviz/configs/imviz/plugins/coords_info/coords_info.py
+++ b/jdaviz/configs/imviz/plugins/coords_info/coords_info.py
@@ -12,4 +12,4 @@ class CoordsInfo(TemplateMixin):
     template = load_template("coords_info.vue", __file__).tag(sync=True)
     pixel = Unicode("").tag(sync=True)
     world = Unicode("").tag(sync=True)
-    data = Unicode("").tag(sync=True)
+    value = Unicode("").tag(sync=True)
diff --git a/jdaviz/configs/imviz/plugins/coords_info/coords_info.vue b/jdaviz/configs/imviz/plugins/coords_info/coords_info.vue
index 5ea55503a8..aaf6194580 100644
--- a/jdaviz/configs/imviz/plugins/coords_info/coords_info.vue
+++ b/jdaviz/configs/imviz/plugins/coords_info/coords_info.vue
@@ -2,6 +2,6 @@
     <div>
         <b>Pixel: </b>{{ pixel }}<br>
         <b>World: </b>{{ world }}<br>
-        <b>Data: </b>{{ data }}
+        <b>Value: </b>{{ value }}
     </div>
 </template>
\ No newline at end of file
diff --git a/jdaviz/configs/imviz/plugins/viewers.py b/jdaviz/configs/imviz/plugins/viewers.py
index 23d7431e85..5c1a47c99c 100644
--- a/jdaviz/configs/imviz/plugins/viewers.py
+++ b/jdaviz/configs/imviz/plugins/viewers.py
@@ -21,7 +21,8 @@ def __init__(self, *args, **kwargs):
 
         self.label_mouseover = None
 
-        self.add_event_callback(self.on_mouse_or_key_event, events=['mousemove', 'keydown'])
+        self.add_event_callback(self.on_mouse_or_key_event, events=['mousemove', 'mouseenter',
+                                                                    'mouseleave', 'keydown'])
 
         self.state.show_axes = False
 
@@ -34,6 +35,7 @@ def on_mouse_or_key_event(self, data):
             if 'g-coords-info' in self.session.application._tools:
                 self.label_mouseover = self.session.application._tools['g-coords-info']
             else:
+                print('tool not found in ', self.session.application._tools)
                 return
 
         if data['event'] == 'mousemove':
@@ -56,26 +58,26 @@ def on_mouse_or_key_event(self, data):
                 # with valid celestial WCS
                 try:
                     celestial_coordinates = (image.coords.pixel_to_world(x, y).icrs
-                                             .to_string('hmsdms', precision=4, pad=True))
+                                            .to_string('hmsdms', precision=4, pad=True))
                 except Exception:
                     self.label_mouseover.world = ''
                 else:
-                    self.label_mouseover.world = f'ICRS={celestial_coordinates:32s}'
+                    self.label_mouseover.world = f'{celestial_coordinates:32s} (ICRS)'
             else:
                 self.label_mouseover.world = ''
 
             # Extract data values at this position
             if x > -0.5 and y > -0.5 and x < image.shape[1] - 0.5 and y < image.shape[0] - 0.5:
                 value = image.get_data(image.main_components[0])[int(round(y)), int(round(x))]
-                self.label_mouseover.data += f'data={value:10.2g}'
+                self.label_mouseover.value = f'{value:10.2g}'
             else:
-                self.label_mouseover.data = ''
+                self.label_mouseover.value = ''
 
         elif data['event'] == 'mouseleave' or data['event'] == 'mouseenter':
 
             self.label_mouseover.pixel = ""
             self.label_mouseover.world = ""
-            self.label_mouseover.data = ""
+            self.label_mouseover.value = ""
 
         if data['event'] == 'keydown' and data['key'] == 'b':
 

From 6e393b27cf30026d747a6c22ac6b336dea8d7cd4 Mon Sep 17 00:00:00 2001
From: Thomas Robitaille <thomas.robitaille@gmail.com>
Date: Thu, 22 Apr 2021 16:12:22 +0100
Subject: [PATCH 03/10] Use default app bar height

---
 jdaviz/app.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdaviz/app.vue b/jdaviz/app.vue
index 33b834719f..8c0df5ccf3 100644
--- a/jdaviz/app.vue
+++ b/jdaviz/app.vue
@@ -1,6 +1,6 @@
 <template>
   <v-app id="web-app" class="jdaviz">
-    <v-app-bar color="primary" dark short flat app absolute clipped-right>
+    <v-app-bar color="primary" dark flat app absolute clipped-right>
       <jupyter-widget :widget="item.widget" v-for="item in state.tool_items" :key="item.name"></jupyter-widget>
       <v-spacer></v-spacer>
       <v-toolbar-items>

From 71d5d8abb914ad87cf960e52a0b43f35619721b3 Mon Sep 17 00:00:00 2001
From: Thomas Robitaille <thomas.robitaille@gmail.com>
Date: Thu, 22 Apr 2021 16:44:19 +0100
Subject: [PATCH 04/10] Don't use dense toolbar for Imviz

---
 jdaviz/app.py                   | 3 +++
 jdaviz/app.vue                  | 2 +-
 jdaviz/configs/imviz/imviz.yaml | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/jdaviz/app.py b/jdaviz/app.py
index 18b8a43aeb..1dc4343ac4 100644
--- a/jdaviz/app.py
+++ b/jdaviz/app.py
@@ -83,6 +83,7 @@ class ApplicationState(State):
             'tray': True,
             'tab_headers': True,
         },
+        'dense_toolbar': True,
         'context': {
             'notebook': {
                 'max_height': '600px'
@@ -1152,6 +1153,8 @@ def load_configuration(self, path=None, config=None):
 
         self.state.settings.update(config.get('settings'))
 
+        print(dict(self.state.settings))
+
         def compose_viewer_area(viewer_area_items):
             stack_items = []
 
diff --git a/jdaviz/app.vue b/jdaviz/app.vue
index 8c0df5ccf3..022fbe9995 100644
--- a/jdaviz/app.vue
+++ b/jdaviz/app.vue
@@ -1,6 +1,6 @@
 <template>
   <v-app id="web-app" class="jdaviz">
-    <v-app-bar color="primary" dark flat app absolute clipped-right>
+    <v-app-bar color="primary" dark :dense="state.settings.dense_toolbar" flat app absolute clipped-right>
       <jupyter-widget :widget="item.widget" v-for="item in state.tool_items" :key="item.name"></jupyter-widget>
       <v-spacer></v-spacer>
       <v-toolbar-items>
diff --git a/jdaviz/configs/imviz/imviz.yaml b/jdaviz/configs/imviz/imviz.yaml
index 70190a28bf..665817043f 100644
--- a/jdaviz/configs/imviz/imviz.yaml
+++ b/jdaviz/configs/imviz/imviz.yaml
@@ -8,6 +8,7 @@ settings:
     toolbar: true
     tray: true
     tab_headers: true
+  dense_toolbar: false
   context:
     notebook:
       max_height: 600px

From f4355e3388ec1867c3d0ad9e0e5dc1669614c0ba Mon Sep 17 00:00:00 2001
From: Thomas Robitaille <thomas.robitaille@gmail.com>
Date: Thu, 22 Apr 2021 16:46:07 +0100
Subject: [PATCH 05/10] Cleanup

---
 jdaviz/app.py                           | 2 --
 jdaviz/configs/imviz/plugins/viewers.py | 1 -
 2 files changed, 3 deletions(-)

diff --git a/jdaviz/app.py b/jdaviz/app.py
index 1dc4343ac4..72ad1a149f 100644
--- a/jdaviz/app.py
+++ b/jdaviz/app.py
@@ -1153,8 +1153,6 @@ def load_configuration(self, path=None, config=None):
 
         self.state.settings.update(config.get('settings'))
 
-        print(dict(self.state.settings))
-
         def compose_viewer_area(viewer_area_items):
             stack_items = []
 
diff --git a/jdaviz/configs/imviz/plugins/viewers.py b/jdaviz/configs/imviz/plugins/viewers.py
index 5c1a47c99c..74b95eb440 100644
--- a/jdaviz/configs/imviz/plugins/viewers.py
+++ b/jdaviz/configs/imviz/plugins/viewers.py
@@ -35,7 +35,6 @@ def on_mouse_or_key_event(self, data):
             if 'g-coords-info' in self.session.application._tools:
                 self.label_mouseover = self.session.application._tools['g-coords-info']
             else:
-                print('tool not found in ', self.session.application._tools)
                 return
 
         if data['event'] == 'mousemove':

From 3abc0ff0ec5422d05ca411e94874a88d49c6bf02 Mon Sep 17 00:00:00 2001
From: Thomas Robitaille <thomas.robitaille@gmail.com>
Date: Tue, 27 Apr 2021 10:26:21 +0100
Subject: [PATCH 06/10] Improve layout of mouse-over info

---
 jdaviz/configs/imviz/plugins/coords_info/coords_info.vue | 7 +++----
 jdaviz/configs/imviz/plugins/viewers.py                  | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/jdaviz/configs/imviz/plugins/coords_info/coords_info.vue b/jdaviz/configs/imviz/plugins/coords_info/coords_info.vue
index aaf6194580..963b2bb5e7 100644
--- a/jdaviz/configs/imviz/plugins/coords_info/coords_info.vue
+++ b/jdaviz/configs/imviz/plugins/coords_info/coords_info.vue
@@ -1,7 +1,6 @@
 <template>
-    <div>
-        <b>Pixel: </b>{{ pixel }}<br>
-        <b>World: </b>{{ world }}<br>
-        <b>Value: </b>{{ value }}
+    <div v-if="pixel" style="white-space: nowrap;">
+        <b>Pixel </b>{{ pixel }}&nbsp;&nbsp;<b>Value </b>{{ value }}<br>
+        <b>World </b>{{ world }}<br>
     </div>
 </template>
\ No newline at end of file
diff --git a/jdaviz/configs/imviz/plugins/viewers.py b/jdaviz/configs/imviz/plugins/viewers.py
index 74b95eb440..4582d390b7 100644
--- a/jdaviz/configs/imviz/plugins/viewers.py
+++ b/jdaviz/configs/imviz/plugins/viewers.py
@@ -47,7 +47,7 @@ def on_mouse_or_key_event(self, data):
             x = data['domain']['x']
             y = data['domain']['y']
 
-            self.label_mouseover.pixel = f'x={x:5.1f} y={y:5.1f}'
+            self.label_mouseover.pixel = f'x={x:05.1f} y={y:05.1f}'
 
             image = self.state.layers[0].layer
 
@@ -68,7 +68,7 @@ def on_mouse_or_key_event(self, data):
             # Extract data values at this position
             if x > -0.5 and y > -0.5 and x < image.shape[1] - 0.5 and y < image.shape[0] - 0.5:
                 value = image.get_data(image.main_components[0])[int(round(y)), int(round(x))]
-                self.label_mouseover.value = f'{value:10.2g}'
+                self.label_mouseover.value = f'{value:10.5g}'
             else:
                 self.label_mouseover.value = ''
 

From 14d632978abf87ae97709505cf24a7f63cc9b2ab Mon Sep 17 00:00:00 2001
From: Thomas Robitaille <thomas.robitaille@gmail.com>
Date: Tue, 27 Apr 2021 10:41:35 +0100
Subject: [PATCH 07/10] Show units for value when present

---
 jdaviz/configs/imviz/plugins/viewers.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/jdaviz/configs/imviz/plugins/viewers.py b/jdaviz/configs/imviz/plugins/viewers.py
index 4582d390b7..6b6bc0a549 100644
--- a/jdaviz/configs/imviz/plugins/viewers.py
+++ b/jdaviz/configs/imviz/plugins/viewers.py
@@ -28,7 +28,10 @@ def __init__(self, *args, **kwargs):
 
     def on_mouse_or_key_event(self, data):
 
-        if len(self.state.layers) == 0:
+        # Find visible layers
+        visible_layers = [layer for layer in self.state.layers if layer.visible]
+
+        if len(visible_layers) == 0:
             return
 
         if self.label_mouseover is None:
@@ -49,7 +52,9 @@ def on_mouse_or_key_event(self, data):
 
             self.label_mouseover.pixel = f'x={x:05.1f} y={y:05.1f}'
 
-            image = self.state.layers[0].layer
+            # Extract first dataset from visible layers and use this for coordinates - the choice
+            # of dataset shouldn't matter if the datasets are linked correctly
+            image = visible_layers[0].layer
 
             if isinstance(image.coords, BaseHighLevelWCS):
                 # Convert these to a SkyCoord via WCS - note that for other datasets
@@ -65,10 +70,14 @@ def on_mouse_or_key_event(self, data):
             else:
                 self.label_mouseover.world = ''
 
-            # Extract data values at this position
+            # Extract data values at this position.
+            # TODO: for now we just use the first visible layer but we should think
+            # of how to display values when multiple datasets are present.
             if x > -0.5 and y > -0.5 and x < image.shape[1] - 0.5 and y < image.shape[0] - 0.5:
-                value = image.get_data(image.main_components[0])[int(round(y)), int(round(x))]
-                self.label_mouseover.value = f'{value:10.5g}'
+                attribute = visible_layers[0].attribute
+                value = image.get_data(attribute)[int(round(y)), int(round(x))]
+                unit = image.get_component(attribute).units
+                self.label_mouseover.value = f'{value:10.5g} {unit}'
             else:
                 self.label_mouseover.value = ''
 

From 0db7ed2a04eed45cc01d04e8b20f4283cc6c3d41 Mon Sep 17 00:00:00 2001
From: Thomas Robitaille <thomas.robitaille@gmail.com>
Date: Thu, 29 Apr 2021 16:22:25 +0100
Subject: [PATCH 08/10] Prevent values from jumping around

---
 jdaviz/configs/imviz/plugins/viewers.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/jdaviz/configs/imviz/plugins/viewers.py b/jdaviz/configs/imviz/plugins/viewers.py
index 6b6bc0a549..42c735ae2e 100644
--- a/jdaviz/configs/imviz/plugins/viewers.py
+++ b/jdaviz/configs/imviz/plugins/viewers.py
@@ -1,3 +1,5 @@
+import numpy as np
+
 from astropy.wcs.wcsapi import BaseHighLevelWCS
 
 from glue.core import BaseData
@@ -46,15 +48,19 @@ def on_mouse_or_key_event(self, data):
             # well as data values. For now we use the first dataset in the
             # viewer for the data values.
 
+            # Extract first dataset from visible layers and use this for coordinates - the choice
+            # of dataset shouldn't matter if the datasets are linked correctly
+            image = visible_layers[0].layer
+
             # Extract data coordinates - these are pixels in the image
             x = data['domain']['x']
             y = data['domain']['y']
 
-            self.label_mouseover.pixel = f'x={x:05.1f} y={y:05.1f}'
+            maxsize = int(np.ceil(np.log10(np.max(image.shape)))) + 3
 
-            # Extract first dataset from visible layers and use this for coordinates - the choice
-            # of dataset shouldn't matter if the datasets are linked correctly
-            image = visible_layers[0].layer
+            fmt = 'x={0:0' + str(maxsize) + '.1f} y={1:0' + str(maxsize) + '.1f}'
+
+            self.label_mouseover.pixel = (fmt.format(x, y))
 
             if isinstance(image.coords, BaseHighLevelWCS):
                 # Convert these to a SkyCoord via WCS - note that for other datasets
@@ -77,7 +83,7 @@ def on_mouse_or_key_event(self, data):
                 attribute = visible_layers[0].attribute
                 value = image.get_data(attribute)[int(round(y)), int(round(x))]
                 unit = image.get_component(attribute).units
-                self.label_mouseover.value = f'{value:10.5g} {unit}'
+                self.label_mouseover.value = f'{value:+10.5e} {unit}'
             else:
                 self.label_mouseover.value = ''
 

From bf5e4e3049800405f811834a1dbe71df9efd8530 Mon Sep 17 00:00:00 2001
From: Thomas Robitaille <thomas.robitaille@gmail.com>
Date: Thu, 29 Apr 2021 16:23:04 +0100
Subject: [PATCH 09/10] Fix code style

---
 jdaviz/configs/imviz/plugins/viewers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdaviz/configs/imviz/plugins/viewers.py b/jdaviz/configs/imviz/plugins/viewers.py
index 42c735ae2e..1a4e7134a9 100644
--- a/jdaviz/configs/imviz/plugins/viewers.py
+++ b/jdaviz/configs/imviz/plugins/viewers.py
@@ -68,7 +68,7 @@ def on_mouse_or_key_event(self, data):
                 # with valid celestial WCS
                 try:
                     celestial_coordinates = (image.coords.pixel_to_world(x, y).icrs
-                                            .to_string('hmsdms', precision=4, pad=True))
+                                             .to_string('hmsdms', precision=4, pad=True))
                 except Exception:
                     self.label_mouseover.world = ''
                 else:

From 507d96c2d670f92e42962fc66a46ff51bc0af544 Mon Sep 17 00:00:00 2001
From: Thomas Robitaille <thomas.robitaille@gmail.com>
Date: Tue, 4 May 2021 15:55:28 +0100
Subject: [PATCH 10/10] Hide labels if values are empty

---
 jdaviz/configs/imviz/plugins/coords_info/coords_info.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jdaviz/configs/imviz/plugins/coords_info/coords_info.vue b/jdaviz/configs/imviz/plugins/coords_info/coords_info.vue
index 963b2bb5e7..0fcd6652ff 100644
--- a/jdaviz/configs/imviz/plugins/coords_info/coords_info.vue
+++ b/jdaviz/configs/imviz/plugins/coords_info/coords_info.vue
@@ -1,6 +1,6 @@
 <template>
     <div v-if="pixel" style="white-space: nowrap;">
-        <b>Pixel </b>{{ pixel }}&nbsp;&nbsp;<b>Value </b>{{ value }}<br>
-        <b>World </b>{{ world }}<br>
+        <b v-if="pixel">Pixel </b>{{ pixel }}&nbsp;&nbsp;<b v-if="value">Value </b>{{ value }}<br>
+        <b v-if="world">World </b>{{ world }}<br>
     </div>
-</template>
\ No newline at end of file
+</template>