more restructuring

README.rst

@@ -2,7 +2,7 @@ HydrOffice Sound Speed
 ======================
 
 ..
-    .. image:: https://img.shields.io/pypi/v/hyo2.soundspeed.svg
+    .. image:: https://img.shields.io/pypi/v/hyo2.ssm2.lib.svg
         :target: https://pypi.python.org/pypi/hyo2.soundspeed
         :alt: PyPi version
 

docs/license.rst

@@ -2,7 +2,7 @@
 License
 *******
 
-Copyright Notice and License Terms for: hyo2.soundspeed - Sound Speed package for HydrOffice
+Copyright Notice and License Terms for: hyo2.ssm2.lib - Sound Speed package for HydrOffice
 Copyright (c) 2019, University of New Hampshire, Center for Coastal and Ocean Mapping. All rights reserved.
 Portions of this project were developed under a cooperative agreement with NOAA Coast Survey Development 
 Laboratory, and contain NOAA-developed code in the public domain.

examples/soundspeed/atlas/ex_atlases_auto_query.py

@@ -6,12 +6,12 @@
 
 from hyo2.abc.app.qt_progress import QtProgress
 from hyo2.abc.lib.logging import set_logging
-from hyo2.soundspeedmanager import app_info
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
-from hyo2.soundspeedmanager.qt_callbacks import QtCallbacks
+from hyo2.ssm2.app.gui.soundspeedmanager import app_info
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
+from hyo2.ssm2.app.gui.soundspeedmanager.qt_callbacks import QtCallbacks
 
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/atlas/ex_atlases_interactive.py

@@ -3,12 +3,12 @@
 from PySide6 import QtWidgets
 
 from hyo2.abc.app.qt_progress import QtProgress
-from hyo2.soundspeedmanager import app_info
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
-from hyo2.soundspeedmanager.qt_callbacks import QtCallbacks
+from hyo2.ssm2.app.gui.soundspeedmanager import app_info
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
+from hyo2.ssm2.app.gui.soundspeedmanager.qt_callbacks import QtCallbacks
 from hyo2.abc.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/atlas/ex_atlases_offline.py

@@ -6,12 +6,12 @@
 from hyo2.abc.lib.testing import Testing
 from hyo2.abc.lib.logging import set_logging
 from hyo2.abc.app.qt_progress import QtProgress
-from hyo2.soundspeedmanager import app_info
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
-from hyo2.soundspeedmanager.qt_callbacks import QtCallbacks
+from hyo2.ssm2.app.gui.soundspeedmanager import app_info
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
+from hyo2.ssm2.app.gui.soundspeedmanager.qt_callbacks import QtCallbacks
 
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/base/callbacks/ex_test_callbacks.py

@@ -1,9 +1,9 @@
 import logging
 
-from hyo2.soundspeed.base.callbacks.fake_callbacks import FakeCallbacks
+from hyo2.ssm2.lib.base.callbacks.fake_callbacks import FakeCallbacks
 from hyo2.abc2.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/ex_init.py

@@ -1,10 +1,10 @@
 import logging
 
-from hyo2.soundspeedmanager import app_info
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
+from hyo2.ssm2.app.gui.soundspeedmanager import app_info
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
 from hyo2.abc2.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/ex_new_project.py

@@ -1,10 +1,10 @@
 import logging
 
-from hyo2.soundspeedmanager import app_info
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
+from hyo2.ssm2.app.gui.soundspeedmanager import app_info
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
 from hyo2.abc2.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/ex_plot_export_metadata.py

@@ -4,10 +4,10 @@
 from hyo2.abc.lib.gdal_aux import GdalAux
 from hyo2.abc.lib.logging import set_logging
 # noinspection PyUnresolvedReferences
-from hyo2.soundspeedmanager import app_info
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
+from hyo2.ssm2.app.gui.soundspeedmanager import app_info
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
 
-set_logging(ns_list=["hyo2.abc", "hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"])
+set_logging(ns_list=["hyo2.abc", "hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"])
 logger = logging.getLogger(__name__)
 
 # create a project

examples/soundspeed/ex_read_and_store.py

@@ -3,13 +3,13 @@
 from PySide6 import QtWidgets
 from matplotlib import pyplot as plt
 
-from hyo2.soundspeedmanager import app_info
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
-from hyo2.soundspeed.base.testing import SoundSpeedTesting
-from hyo2.soundspeed.base.callbacks.fake_callbacks import FakeCallbacks
+from hyo2.ssm2.app.gui.soundspeedmanager import app_info
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
+from hyo2.ssm2.lib.base.testing import SoundSpeedTesting
+from hyo2.ssm2.lib.base.callbacks.fake_callbacks import FakeCallbacks
 from hyo2.abc2.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/ex_read_and_write.py

@@ -1,13 +1,13 @@
 import os
 import logging
 
-from hyo2.soundspeedmanager import app_info
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
-from hyo2.soundspeed.base.testing import SoundSpeedTesting
-from hyo2.soundspeed.base.callbacks.fake_callbacks import FakeCallbacks
+from hyo2.ssm2.app.gui.soundspeedmanager import app_info
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
+from hyo2.ssm2.lib.base.testing import SoundSpeedTesting
+from hyo2.ssm2.lib.base.callbacks.fake_callbacks import FakeCallbacks
 from hyo2.abc.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/ex_read_and_write_abs_files.py

@@ -1,13 +1,13 @@
 import os
 import logging
 
-from hyo2.soundspeedmanager import AppInfo
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
-from hyo2.soundspeed.base.testing import SoundSpeedTesting
-from hyo2.soundspeed.base.callbacks.fake_callbacks import FakeCallbacks
+from hyo2.ssm2.app.gui.soundspeedmanager import AppInfo
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
+from hyo2.ssm2.lib.base.testing import SoundSpeedTesting
+from hyo2.ssm2.lib.base.callbacks.fake_callbacks import FakeCallbacks
 from hyo2.abc.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/formats/ex_formats.py

@@ -1,9 +1,9 @@
 import logging
 
-from hyo2.soundspeed.formats import readers, writers
+from hyo2.ssm2.lib.formats import readers, writers
 from hyo2.abc.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/listener/ex_seacat_capture.py

@@ -1,9 +1,9 @@
 import logging
 
-from hyo2.soundspeed.listener.seacat.seacat_emulator import respond
+from hyo2.ssm2.lib.listener.seacat.seacat_emulator import respond
 from hyo2.abc.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/listener/ex_seacat_respond.py

@@ -1,10 +1,10 @@
 import os
 import logging
 
-from hyo2.soundspeed.listener.seacat.seacat_emulator import raw_capture
+from hyo2.ssm2.lib.listener.seacat.seacat_emulator import raw_capture
 from hyo2.abc.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/profile/ex_oc_dyn_height.py

@@ -2,10 +2,10 @@
 
 import numpy as np
 
-from hyo2.soundspeed.profile.oceanography import Oceanography as Oc
+from hyo2.ssm2.lib.profile.oceanography import Oceanography as Oc
 from hyo2.abc.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/profile/ex_oc_others.py

@@ -1,9 +1,9 @@
 import logging
 
-from hyo2.soundspeed.profile.oceanography import Oceanography as Oc
+from hyo2.ssm2.lib.profile.oceanography import Oceanography as Oc
 from hyo2.abc.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/profile/ex_oc_p_d.py

@@ -1,9 +1,9 @@
 import logging
 
-from hyo2.soundspeed.profile.oceanography import Oceanography as Oc
+from hyo2.ssm2.lib.profile.oceanography import Oceanography as Oc
 from hyo2.abc.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/profile/ex_oc_vs_s.py

@@ -1,9 +1,9 @@
 import logging
 
-from hyo2.soundspeed.profile.oceanography import Oceanography as Oc
+from hyo2.ssm2.lib.profile.oceanography import Oceanography as Oc
 from hyo2.abc.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/profile/ex_plot_bias_tracedprofile.py

@@ -3,14 +3,14 @@
 
 import numpy as np
 
-from hyo2.soundspeed.profile.profile import Profile
-from hyo2.soundspeed.profile.profilelist import ProfileList
-from hyo2.soundspeed.profile.ray_tracing.tracedprofile import TracedProfile
-from hyo2.soundspeed.profile.ray_tracing.diff_tracedprofiles import DiffTracedProfiles
-from hyo2.soundspeed.profile.ray_tracing.plot_tracedprofiles import PlotTracedProfiles
+from hyo2.ssm2.lib.profile.profile import Profile
+from hyo2.ssm2.lib.profile.profilelist import ProfileList
+from hyo2.ssm2.lib.profile.ray_tracing.tracedprofile import TracedProfile
+from hyo2.ssm2.lib.profile.ray_tracing.diff_tracedprofiles import DiffTracedProfiles
+from hyo2.ssm2.lib.profile.ray_tracing.plot_tracedprofiles import PlotTracedProfiles
 from hyo2.abc.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/profile/ex_plot_compare_tracedprofiles.py

@@ -3,14 +3,14 @@
 
 import numpy as np
 
-from hyo2.soundspeed.profile.profile import Profile
-from hyo2.soundspeed.profile.profilelist import ProfileList
-from hyo2.soundspeed.profile.ray_tracing.tracedprofile import TracedProfile
-from hyo2.soundspeed.profile.ray_tracing.diff_tracedprofiles import DiffTracedProfiles
-from hyo2.soundspeed.profile.ray_tracing.plot_tracedprofiles import PlotTracedProfiles
+from hyo2.ssm2.lib.profile.profile import Profile
+from hyo2.ssm2.lib.profile.profilelist import ProfileList
+from hyo2.ssm2.lib.profile.ray_tracing.tracedprofile import TracedProfile
+from hyo2.ssm2.lib.profile.ray_tracing.diff_tracedprofiles import DiffTracedProfiles
+from hyo2.ssm2.lib.profile.ray_tracing.plot_tracedprofiles import PlotTracedProfiles
 from hyo2.abc.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/profile/ex_profile_ops.py

@@ -4,10 +4,10 @@
 from PySide6 import QtWidgets
 from matplotlib import pyplot as plt
 
-from hyo2.soundspeed.profile.profile import Profile
+from hyo2.ssm2.lib.profile.profile import Profile
 from hyo2.abc.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/profile/ex_profile_stats.py

@@ -4,10 +4,10 @@
 
 import numpy as np
 
-from hyo2.soundspeed.profile.profile import Profile
+from hyo2.ssm2.lib.profile.profile import Profile
 from hyo2.abc.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/profile/ex_tracedprofile.py

@@ -9,13 +9,13 @@
 import numpy as np
 from matplotlib import pyplot as plt
 
-from hyo2.soundspeed.profile.profile import Profile
-from hyo2.soundspeed.profile.dicts import Dicts
-from hyo2.soundspeed.profile.profilelist import ProfileList
-from hyo2.soundspeed.profile.ray_tracing.tracedprofile import TracedProfile
+from hyo2.ssm2.lib.profile.profile import Profile
+from hyo2.ssm2.lib.profile.dicts import Dicts
+from hyo2.ssm2.lib.profile.profilelist import ProfileList
+from hyo2.ssm2.lib.profile.ray_tracing.tracedprofile import TracedProfile
 from hyo2.abc.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeed/server/ex_server.py

@@ -1,12 +1,12 @@
 import time
 import logging
 
-from hyo2.soundspeedmanager import app_info
-from hyo2.soundspeed.soundspeed import SoundSpeedLibrary
-from hyo2.soundspeed.server.server import Server
+from hyo2.ssm2.app.gui.soundspeedmanager import app_info
+from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
+from hyo2.ssm2.lib.server.server import Server
 from hyo2.abc.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeedmanager/dialogs/ex_flaggable_input_dialog.py

@@ -1,10 +1,10 @@
 import logging
 from PySide6 import QtWidgets
 
-from hyo2.soundspeedmanager.dialogs.flaggable_input_dialog import FlaggableInputDialog
+from hyo2.ssm2.app.gui.soundspeedmanager.dialogs.flaggable_input_dialog import FlaggableInputDialog
 from hyo2.abc.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)

examples/soundspeedmanager/dialogs/ex_formatted_input_dialog.py

@@ -2,10 +2,10 @@
 
 import logging
 
-from hyo2.soundspeedmanager.dialogs.formatted_input_dialog import FormattedInputDialog
+from hyo2.ssm2.app.gui.soundspeedmanager.dialogs.formatted_input_dialog import FormattedInputDialog
 from hyo2.abc.lib.logging import set_logging
 
-ns_list = ["hyo2.soundspeed", "hyo2.soundspeedmanager", "hyo2.soundspeedsettings"]
+ns_list = ["hyo2.soundspeed", "hyo2.ssm2.app.gui.soundspeedmanager", "hyo2.soundspeedsettings"]
 set_logging(ns_list=ns_list)
 
 logger = logging.getLogger(__name__)