diff --git a/hyo2/ssm2/__init__.py b/hyo2/ssm2/__init__.py index abcdef2f..fd474a9a 100644 --- a/hyo2/ssm2/__init__.py +++ b/hyo2/ssm2/__init__.py @@ -1,10 +1,11 @@ """ Hydro-Package -Sound Speed 2 +Sound Speed Manager 2 """ -import os import logging +import os + from hyo2.abc2.lib.package.pkg_info import PkgInfo logger = logging.getLogger(__name__) @@ -29,7 +30,7 @@ deps_dict={ "hyo2.abc2": "hyo2.abc2", "hyo2.ssm2": "hyo2.ssm2", - "hyo2.sdm2": "hyo2.sdm2", + "hyo2.sdm3": "hyo2.sdm3", "gsw": "gsw", "netCDF4": "netCDF4", "gdal": "osgeo", diff --git a/hyo2/ssm2/app/gui/soundspeedmanager/gui.py b/hyo2/ssm2/app/gui/soundspeedmanager/gui.py index 983768a8..0740ec73 100644 --- a/hyo2/ssm2/app/gui/soundspeedmanager/gui.py +++ b/hyo2/ssm2/app/gui/soundspeedmanager/gui.py @@ -43,6 +43,7 @@ def gui(): msg_box.setWindowTitle("Multiple Instances of Sound Speed Manager") msg_box.setIconPixmap(QtGui.QPixmap(app_info.app_icon_path).scaled(QtCore.QSize(36, 36))) msg_box.setText('%s\n\nDo you want to continue? This might create issues.' % txt) + # noinspection PyUnresolvedReferences msg_box.setStandardButtons(QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No) msg_box.setDefaultButton(QtWidgets.QMessageBox.No) reply = msg_box.exec_() diff --git a/hyo2/ssm2/app/gui/soundspeedmanager/mainwin.py b/hyo2/ssm2/app/gui/soundspeedmanager/mainwin.py index 8c2763f9..93a37061 100644 --- a/hyo2/ssm2/app/gui/soundspeedmanager/mainwin.py +++ b/hyo2/ssm2/app/gui/soundspeedmanager/mainwin.py @@ -123,7 +123,7 @@ def __init__(self): self.has_sdm_support = True try: # try.. except to make SSM working also without SDM # noinspection PyUnresolvedReferences - from hyo2.surveydatamonitor.app.widgets.monitor import SurveyDataMonitor + from hyo2.sdm3.app.gui.surveydatamonitor.widgets.monitor import SurveyDataMonitor self.tab_monitor = SurveyDataMonitor(lib=self.lib, main_win=self) # noinspection PyArgumentList self.idx_monitor = self.tabs.insertTab(3, self.tab_monitor,