From 0834a0ca871d9e7f99afa49bcba7936b782f069a Mon Sep 17 00:00:00 2001
From: Erik Tollerud <erik.tollerud@gmail.com>
Date: Thu, 8 Oct 2020 13:30:08 -0400
Subject: [PATCH 1/3] add specviz property to cubeviz/mosviz helpers

---
 jdaviz/configs/cubeviz/helper.py | 13 +++++++++++--
 jdaviz/configs/mosviz/helper.py  | 16 ++++++++++++++--
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/jdaviz/configs/cubeviz/helper.py b/jdaviz/configs/cubeviz/helper.py
index 058389d1ce..8362f6fe24 100644
--- a/jdaviz/configs/cubeviz/helper.py
+++ b/jdaviz/configs/cubeviz/helper.py
@@ -1,7 +1,16 @@
 from jdaviz.core.helpers import ConfigHelper
-from ..default.plugins.line_lists.line_list_mixin import LineListMixin
-
+from jdaviz.configs.default.plugins.line_lists.line_list_mixin import LineListMixin
+from jdaviz.configs.specviz import SpecViz
 
 class CubeViz(ConfigHelper, LineListMixin):
     """CubeViz Helper class"""
     _default_configuration = 'cubeviz'
+
+    @property
+    def specviz(self):
+        """
+        A specviz helper for the app this helper wraps
+        """
+        if not hasattr(self, '_specviz'):
+            self._specviz = SpecViz(app=self.app)
+        return self._specviz
diff --git a/jdaviz/configs/mosviz/helper.py b/jdaviz/configs/mosviz/helper.py
index 8f3b44f920..e47936d412 100644
--- a/jdaviz/configs/mosviz/helper.py
+++ b/jdaviz/configs/mosviz/helper.py
@@ -1,11 +1,14 @@
 import numpy as np
 from pathlib import Path
 
-from jdaviz.core.helpers import ConfigHelper
-from jdaviz.core.events import SnackbarMessage
 from astropy.table import QTable
 import astropy.units as u
 
+from jdaviz.core.helpers import ConfigHelper
+from jdaviz.core.events import SnackbarMessage
+from jdaviz.configs.specviz import SpecViz
+
+
 
 class MosViz(ConfigHelper):
     """MosViz Helper class"""
@@ -282,3 +285,12 @@ def to_csv(self, filename="MOS_data.csv", selected=False, overwrite=False):
         table_df = table_df.drop(labels="Pixel Axis 0 [x]", axis=1)
 
         table_df.to_csv(filename, index_label="Table Index")
+
+    @property
+    def specviz(self):
+        """
+        A specviz helper for the app this helper wraps
+        """
+        if not hasattr(self, '_specviz'):
+            self._specviz = SpecViz(app=self.app)
+        return self._specviz

From eba661cf9718c59dd73859d41af57949f3a9f1f9 Mon Sep 17 00:00:00 2001
From: Erik Tollerud <erik.tollerud@gmail.com>
Date: Mon, 12 Apr 2021 10:43:19 -0400
Subject: [PATCH 2/3] clearer doctrings

---
 jdaviz/configs/cubeviz/helper.py | 3 ++-
 jdaviz/configs/mosviz/helper.py  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/jdaviz/configs/cubeviz/helper.py b/jdaviz/configs/cubeviz/helper.py
index 8362f6fe24..6fc3f6b909 100644
--- a/jdaviz/configs/cubeviz/helper.py
+++ b/jdaviz/configs/cubeviz/helper.py
@@ -9,7 +9,8 @@ class CubeViz(ConfigHelper, LineListMixin):
     @property
     def specviz(self):
         """
-        A specviz helper for the app this helper wraps
+        A specviz helper (`~jdaviz.configs.specviz.SpecViz`) for the Jdaviz
+        application that is wrapped by cubeviz
         """
         if not hasattr(self, '_specviz'):
             self._specviz = SpecViz(app=self.app)
diff --git a/jdaviz/configs/mosviz/helper.py b/jdaviz/configs/mosviz/helper.py
index e47936d412..9b030d0cb0 100644
--- a/jdaviz/configs/mosviz/helper.py
+++ b/jdaviz/configs/mosviz/helper.py
@@ -289,7 +289,8 @@ def to_csv(self, filename="MOS_data.csv", selected=False, overwrite=False):
     @property
     def specviz(self):
         """
-        A specviz helper for the app this helper wraps
+        A specviz helper (`~jdaviz.configs.specviz.SpecViz`) for the Jdaviz
+        application that is wrapped by mosviz
         """
         if not hasattr(self, '_specviz'):
             self._specviz = SpecViz(app=self.app)

From 0f0c8ab2e78d83448df2a18962f111f7b04b49b5 Mon Sep 17 00:00:00 2001
From: Ricky O'Steen <39831871+rosteen@users.noreply.github.com>
Date: Mon, 12 Apr 2021 10:48:04 -0400
Subject: [PATCH 3/3] Fix codestyle errors

---
 jdaviz/configs/cubeviz/helper.py | 1 +
 jdaviz/configs/mosviz/helper.py  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/jdaviz/configs/cubeviz/helper.py b/jdaviz/configs/cubeviz/helper.py
index 6fc3f6b909..e4bf813fc9 100644
--- a/jdaviz/configs/cubeviz/helper.py
+++ b/jdaviz/configs/cubeviz/helper.py
@@ -2,6 +2,7 @@
 from jdaviz.configs.default.plugins.line_lists.line_list_mixin import LineListMixin
 from jdaviz.configs.specviz import SpecViz
 
+
 class CubeViz(ConfigHelper, LineListMixin):
     """CubeViz Helper class"""
     _default_configuration = 'cubeviz'
diff --git a/jdaviz/configs/mosviz/helper.py b/jdaviz/configs/mosviz/helper.py
index 9b030d0cb0..a9d5d928c7 100644
--- a/jdaviz/configs/mosviz/helper.py
+++ b/jdaviz/configs/mosviz/helper.py
@@ -9,7 +9,6 @@
 from jdaviz.configs.specviz import SpecViz
 
 
-
 class MosViz(ConfigHelper):
     """MosViz Helper class"""