Merge pull request #459 from mbridak/Fix_ratewindow_count

Fix for #456

Author: mbridak

not1mm/__main__.py

@@ -695,7 +695,9 @@ def __init__(self, splash):
         if self.rotator_window is not None:
             self.rotator_window.set_mygrid(self.station.get("GridSquare", ""))
         self.contact = self.database.empty_contact.copy()
-        self.previous_contact = self.contact  # Keep previous contact, if any, so we can spot it.
+        self.previous_contact = (
+            self.contact
+        )  # Keep previous contact, if any, so we can spot it.
         self.current_op = self.station.get("Call", "")
         self.voice_process.current_op = self.current_op
         self.make_op_dir()
@@ -1258,13 +1260,16 @@ def dockwidget_message(self, msg):
                     except OSError as err:
                         logging.warning("%s", err)
 
-            if msg.get("cmd", "") in ["CONTACTCHANGED", "DELETED"]:
+            # TODO
+            if msg.get("cmd", "") in ["CONTACTCHANGED", "DELETE", "DELETED"]:
                 if self.statistics_window:
                     self.statistics_window.msg_from_main(msg)
                 if self.dxcc_window:
                     self.dxcc_window.msg_from_main(msg)
                 if self.zone_window:
                     self.zone_window.msg_from_main(msg)
+                if self.rate_window:
+                    self.rate_window.msg_from_main(msg)
                 self.check_dupe(self.callsign.text())
 
             if msg.get("cmd", "") == "GETCOLUMNS":
@@ -2626,16 +2631,12 @@ def spot_dx(self):
             freq = self.radio_state.get("vfoa")
             dx = self.callsign.text()
             if freq and dx:
-                cmd = {
-                    "cmd": "SPOTDX",
-                    "dx": dx,
-                    "freq": float(int(freq) / 1000)
-                }
+                cmd = {"cmd": "SPOTDX", "dx": dx, "freq": float(int(freq) / 1000)}
             elif self.previous_contact["Call"] and self.previous_contact["Freq"]:
                 cmd = {
                     "cmd": "SPOTDX",
                     "dx": self.previous_contact["Call"],
-                    "freq": self.previous_contact["Freq"]
+                    "freq": self.previous_contact["Freq"],
                 }
             else:
                 cmd = None
@@ -3164,6 +3165,8 @@ def save_contact(self) -> None:
             self.dxcc_window.msg_from_main(cmd)
         if self.zone_window:
             self.zone_window.msg_from_main(cmd)
+        if self.rate_window:
+            self.rate_window.msg_from_main(cmd)
 
     def update_rtc_xml(self):
         """Update RTC XML"""
@@ -3772,12 +3775,6 @@ def readpreferences(self) -> None:
                 self.pref.get("CAT_ip", "127.0.0.1"),
                 int(self.pref.get("CAT_port", 12345)),
             )
-            # self.rig_control.delta = int(self.pref.get("CAT_polldelta", 555))
-            # self.rig_control.moveToThread(self.radio_thread)
-            # self.radio_thread.started.connect(self.rig_control.run)
-            # self.radio_thread.finished.connect(self.rig_control.deleteLater)
-            # self.rig_control.poll_callback.connect(self.poll_radio)
-            # self.radio_thread.start()
 
         elif self.pref.get("userigctld", False) is True:
             logger.debug(
@@ -3789,12 +3786,7 @@ def readpreferences(self) -> None:
                 self.pref.get("CAT_ip", "127.0.0.1"),
                 int(self.pref.get("CAT_port", 4532)),
             )
-            # self.rig_control.delta = int(self.pref.get("CAT_polldelta", 555))
-            # self.rig_control.moveToThread(self.radio_thread)
-            # self.radio_thread.started.connect(self.rig_control.run)
-            # self.radio_thread.finished.connect(self.rig_control.deleteLater)
-            # self.rig_control.poll_callback.connect(self.poll_radio)
-            # self.radio_thread.start()
+
         else:
             self.rig_control = Radio(
                 "fake",

not1mm/dxcc_tracker.py

@@ -148,7 +148,12 @@ def msg_from_main(self, msg):
         """"""
 
         if self.active is True and self.isVisible():
-            if msg.get("cmd", "") in ("UPDATELOG", "CONTACTCHANGED", "DELETED"):
+            if msg.get("cmd", "") in (
+                "UPDATELOG",
+                "CONTACTCHANGED",
+                "DELETE",
+                "DELETED",
+            ):
                 ...
                 self.get_log()
             if msg.get("cmd", "") == "NEWDB":

not1mm/ratewindow.py

@@ -48,7 +48,7 @@ def __init__(self, action):
         uic.loadUi(fsutils.APP_DATA_PATH / "ratewindow.ui", self)
         self.timer = QTimer()
         self.timer.timeout.connect(self.get_run_and_total_qs)
-        self.timer.start(1000)
+        self.timer.start(10000)
 
     def msg_from_main(self, packet):
         """"""
@@ -61,6 +61,9 @@ def msg_from_main(self, packet):
             self.database = DataBase(self.dbname, fsutils.APP_DATA_PATH)
             self.database.current_contest = self.pref.get("contest", 0)
 
+        if packet.get("cmd", "") in ("CONTACTCHANGED", "UPDATELOG", "DELETE"):
+            self.get_run_and_total_qs()
+
     def setActive(self, mode: bool):
         self.active = bool(mode)
 
@@ -168,6 +171,8 @@ def get_run_and_total_qs(self):
         # Get Run QSO's and S&P QSO's
         query = f"select sum(IsRunQSO) as runs, count(*) as totalqs from dxlog where ContestNR = {self.database.current_contest};"
         result = self.database.exec_sql(query)
+        if result.get("runs") is None:
+            result["runs"] = 0
         try:
             sandp = result.get("totalqs", 0) - result.get("runs", 0)
             self.run_qso.setText(f"{result.get('runs', 0)}")
@@ -178,6 +183,8 @@ def get_run_and_total_qs(self):
         # Get runs for the current hour
         query = f"SELECT strftime('%Y-%m-%d %H:00:00','now') as limit_stamp, sum(IsRunQSO) as runs, count(*) as totalqs FROM DXLOG where ContestNR = {self.database.current_contest} and datetime(TS) > limit_stamp;"
         result = self.database.exec_sql(query)
+        if result.get("runs") is None:
+            result["runs"] = 0
         try:
             sandp = result.get("totalqs", 0) - result.get("runs", 0)
             self.hour_run_qso.setText(f"{result.get('runs', 0)}")

not1mm/statistics.py

@@ -51,7 +51,12 @@ def msg_from_main(self, packet):
         if self.active is False:
             return
 
-        if packet.get("cmd", "") in ("CONTACTCHANGED", "UPDATELOG", "DELETED"):
+        if packet.get("cmd", "") in (
+            "CONTACTCHANGED",
+            "UPDATELOG",
+            "DELETE",
+            "DELETED",
+        ):
             self.get_run_and_total_qs()
             return
 

not1mm/zone_tracker.py

@@ -149,7 +149,12 @@ def load_new_db(self) -> None:
     def msg_from_main(self, msg):
         """"""
         if self.active is True and self.isVisible():
-            if msg.get("cmd", "") in ("UPDATELOG", "CONTACTCHANGED", "DELETED"):
+            if msg.get("cmd", "") in (
+                "UPDATELOG",
+                "CONTACTCHANGED",
+                "DELETE",
+                "DELETED",
+            ):
                 ...
                 self.get_log()
             if msg.get("cmd", "") == "NEWDB":