bumped version

hydroffice · Jan 14, 2025 · b77b3ef · b77b3ef
1 parent 3620987
commit b77b3ef
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2025.0'
+version = '2025.1'
 # The full version, including alpha/beta/rc tags.
-release = '2025.0.0'
+release = '2025.1.0'
 
 numfig = True
 

diff --git a/hyo2/ssm2/__init__.py b/hyo2/ssm2/__init__.py
@@ -12,7 +12,7 @@
 logger.addHandler(logging.NullHandler())
 
 name = "Sound Speed"
-__version__ = '2025.0.1'
+__version__ = '2025.1.0'
 __copyright__ = 'Copyright 2025 University of New Hampshire, Center for Coastal and Ocean Mapping'
 
 pkg_info = PkgInfo(

diff --git a/hyo2/ssm2/app/gui/soundspeedsettings/widgets/output.py b/hyo2/ssm2/app/gui/soundspeedsettings/widgets/output.py
@@ -249,11 +249,9 @@ def new_client(self):
         # protocol
         while True:
             # noinspection PyCallByClass
-            protocol, ok = QtWidgets.QInputDialog.getText(self, "New client",
-                                                          "Input the protocol (" \
-                                                          "SIS, KCTRL, EA440, HYPACK, PDS2000, or QINSY)",
-                                                          QtWidgets.QLineEdit.Normal,
-                                                          "SIS")
+            protocol, ok = QtWidgets.QInputDialog.getText(
+                self, "New client", "Input the protocol (SIS, KCTRL, EA440, HYPACK, PDS2000, or QINSY)",
+                QtWidgets.QLineEdit.EchoMode.Normal, "SIS")
             if not ok:
                 return
 

diff --git a/hyo2/ssm2/lib/client/client.py b/hyo2/ssm2/lib/client/client.py
@@ -7,6 +7,7 @@
 from hyo2.ssm2.lib.profile.dicts import Dicts
 from hyo2.ssm2.lib.formats.writers.asvp import Asvp
 from hyo2.ssm2.lib.formats.writers.calc import Calc
+
 if TYPE_CHECKING:
     from hyo2.ssm2.lib.soundspeed import SoundSpeedLibrary
 
@@ -33,7 +34,7 @@ def send_cast(self, prj: 'SoundSpeedLibrary', server_mode: bool = False) -> bool
 
         logger.info("transmitting to %s: [%s:%s:%s]" % (self.name, self.ip, self.port, self.protocol))
 
-        if (self.protocol == "HYPACK"):
+        if self.protocol == "HYPACK":
             success = self.send_hyp_format(prj=prj)
         else:
             success = self.send_kng_format(prj=prj, server_mode=server_mode)
@@ -51,21 +52,17 @@ def send_kng_format(self, prj: 'SoundSpeedLibrary', server_mode: bool = False) -
         if (self.protocol == "QINSY") or (self.protocol == "PDS2000"):
             kng_fmt = Dicts.kng_formats['S12']
             logger.info("forcing S12 format")
-        if (self.protocol == "EA440"):
+        if self.protocol == "EA440":
             kng_fmt = Dicts.kng_formats['S01']
             logger.info("forcing S01 format")
 
         apply_thin = True
         apply_12k = True
+        if self.protocol in ["EA440", "PDS2000", "QINSY"]:
+            apply_12k = False
         tolerances = [0.01, 0.03, 0.06, 0.1, 0.5]
         if self.protocol == "QINSY":
-            apply_12k = False
             tolerances = [0.001, 0.005, 0.01, 0.05, 0.1, 0.5]
-        elif self.protocol == "PDS2000":
-            apply_12k = False
-        elif self.protocol == "EA440":
-            apply_12k = False
-            logger.info("bypassing the 12k meter depth extension")
 
         tx_data = None
         for tolerance in tolerances: