not1mm 25.3.19__py3-none-any.whl → 25.3.23__py3-none-any.whl

not1mm/__main__.py

@@ -68,6 +68,7 @@ from not1mm.checkwindow import CheckWindow
 from not1mm.bandmap import BandMapWindow
 from not1mm.vfo import VfoWindow
 from not1mm.ratewindow import RateWindow
+from not1mm.statistics import StatsWindow
 from not1mm.radio import Radio
 from not1mm.voice_keying import Voice
 from not1mm.lookupservice import LookupService
@@ -132,6 +133,7 @@ class MainWindow(QtWidgets.QMainWindow):
         "checkwindow": False,
         "vfowindow": False,
         "ratewindow": False,
+        "statisticswindow": False,
         "darkmode": True,
     }
     appstarted = False
@@ -177,6 +179,8 @@ class MainWindow(QtWidgets.QMainWindow):
     bandmap_window = None
     vfo_window = None
     rate_window = None
+    statistics_window = None
+    settings = None
     lookup_service = None
     fldigi_util = None
     rtc_service = None
@@ -238,6 +242,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.actionBandmap.triggered.connect(self.launch_bandmap_window)
         self.actionCheck_Window.triggered.connect(self.launch_check_window)
         self.actionRate_Window.triggered.connect(self.launch_rate_window)
+        self.actionStatistics.triggered.connect(self.launch_stats_window)
         self.actionVFO.triggered.connect(self.launch_vfo)
         self.actionRecalculate_Mults.triggered.connect(self.recalculate_mults)
         self.actionLoad_Call_History_File.triggered.connect(self.load_call_history)
@@ -249,7 +254,7 @@ class MainWindow(QtWidgets.QMainWindow):
             lambda x: self.generate_cabrillo("utf-8")
         )
         self.actionGenerate_ADIF.triggered.connect(self.generate_adif)
-        self. actionGenerate_EDI.triggered.connect(self.generate_edi)
+        self.actionGenerate_EDI.triggered.connect(self.generate_edi)
 
         self.actionConfiguration_Settings.triggered.connect(
             self.edit_configuration_settings
@@ -654,6 +659,17 @@ class MainWindow(QtWidgets.QMainWindow):
         self.rate_window.hide()
         self.rate_window.message.connect(self.dockwidget_message)
 
+        self.show_splash_msg("Setting up StatisticsWindow.")
+        self.statistics_window = StatsWindow()
+        self.statistics_window.setObjectName("statistics-window")
+        if os.environ.get("WAYLAND_DISPLAY") and old_Qt is True:
+            self.statistics_window.setFeatures(dockfeatures)
+        self.addDockWidget(
+            Qt.DockWidgetArea.RightDockWidgetArea, self.statistics_window
+        )
+        self.statistics_window.hide()
+        self.statistics_window.message.connect(self.dockwidget_message)
+
         self.show_splash_msg("Setting up VFOWindow.")
         self.vfo_window = VfoWindow()
         self.vfo_window.setObjectName("vfo-window")
@@ -714,6 +730,15 @@ class MainWindow(QtWidgets.QMainWindow):
             self.rate_window.hide()
             self.rate_window.setActive(False)
 
+        self.actionStatistics.setChecked(self.pref.get("statisticswindow", False))
+        if self.actionStatistics.isChecked():
+            self.statistics_window.show()
+            self.statistics_window.setActive(True)
+            self.statistics_window.get_run_and_total_qs()
+        else:
+            self.statistics_window.hide()
+            self.statistics_window.setActive(False)
+
         self.actionVFO.setChecked(self.pref.get("vfowindow", False))
         if self.actionVFO.isChecked():
             self.vfo_window.show()
@@ -990,6 +1015,8 @@ class MainWindow(QtWidgets.QMainWindow):
             self.vfo_window.msg_from_main(cmd)
         if self.rate_window:
             self.rate_window.msg_from_main(cmd)
+        if self.statistics_window:
+            self.statistics_window.msg_from_main(cmd)
 
         if setdarkmode:
             darkPalette = QPalette()
@@ -1331,6 +1358,9 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.log_window.msg_from_main(cmd)
             if self.rate_window:
                 self.rate_window.msg_from_main(cmd)
+            if self.statistics_window:
+                self.statistics_window.msg_from_main(cmd)
+
             self.clearinputs()
             self.edit_station_settings()
 
@@ -1370,6 +1400,9 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.log_window.msg_from_main(cmd)
             if self.rate_window:
                 self.rate_window.msg_from_main(cmd)
+            if self.statistics_window:
+                self.statistics_window.msg_from_main(cmd)
+
             self.clearinputs()
             self.open_contest()
 
@@ -1662,6 +1695,9 @@ class MainWindow(QtWidgets.QMainWindow):
                     self.log_window.msg_from_main(cmd)
                 if self.rate_window:
                     self.rate_window.msg_from_main(cmd)
+                if self.statistics_window:
+                    self.statistics_window.msg_from_main(cmd)
+
                 if hasattr(self.contest, "columns"):
                     cmd = {}
                     cmd["cmd"] = "SHOWCOLUMNS"
@@ -1884,6 +1920,17 @@ class MainWindow(QtWidgets.QMainWindow):
             self.rate_window.hide()
             self.rate_window.setActive(False)
 
+    def launch_stats_window(self) -> None:
+        """Launch the check window"""
+        self.pref["statisticswindow"] = self.actionStatistics.isChecked()
+        self.write_preference()
+        if self.actionStatistics.isChecked():
+            self.statistics_window.show()
+            self.statistics_window.setActive(True)
+        else:
+            self.statistics_window.hide()
+            self.statistics_window.setActive(False)
+
     def launch_vfo(self) -> None:
         """Launch the VFO window"""
         self.pref["vfowindow"] = self.actionVFO.isChecked()
@@ -2535,6 +2582,8 @@ class MainWindow(QtWidgets.QMainWindow):
             self.log_window.msg_from_main(cmd)
         if self.check_window:
             self.check_window.msg_from_main(cmd)
+        if self.statistics_window:
+            self.statistics_window.msg_from_main(cmd)
 
     def update_rtc_xml(self):
         """Update RTC XML"""
@@ -3332,7 +3381,7 @@ class MainWindow(QtWidgets.QMainWindow):
             if "ARRL Sweepstakes" in self.contest.name:
                 self.contest.parse_exchange(self)
                 return
-            if hasattr(self.contest, "call_parse_exchange_on_edit"):	
+            if hasattr(self.contest, "call_parse_exchange_on_edit"):
                 if self.contest.advance_on_space:
                     self.contest.parse_exchange(self)
             if hasattr(self.contest, "advance_on_space"):

not1mm/data/main.ui

@@ -1511,10 +1511,11 @@
     <property name="title">
      <string>Window</string>
     </property>
-    <addaction name="actionLog_Window"/>
     <addaction name="actionBandmap"/>
     <addaction name="actionCheck_Window"/>
+    <addaction name="actionLog_Window"/>
     <addaction name="actionRate_Window"/>
+    <addaction name="actionStatistics"/>
     <addaction name="actionVFO"/>
    </widget>
    <widget class="QMenu" name="menuOther">
@@ -1780,7 +1781,7 @@
    <property name="shortcutVisibleInContextMenu">
     <bool>false</bool>
    </property>
-  </action>  
+  </action>
   <action name="actionGenerate_EDI">
    <property name="text">
     <string>Generate EDI</string>
@@ -2057,6 +2058,22 @@
     <string>Command Buttons</string>
    </property>
   </action>
+  <action name="actionStatistics">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Statistics</string>
+   </property>
+   <property name="font">
+    <font>
+     <family>JetBrains Mono ExtraLight</family>
+    </font>
+   </property>
+   <property name="shortcut">
+    <string>Alt+S</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>

not1mm/data/new_contest.ui

@@ -332,6 +332,11 @@
        <string>EA MAJISTAD CW</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>EA MAJISTAD SSB</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>EA RTTY</string>

not1mm/data/statistics.ui

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DockWidget</class>
+ <widget class="QDockWidget" name="DockWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>294</width>
+    <height>192</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Stats</string>
+  </property>
+  <widget class="QWidget" name="dockWidgetContents">
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="1" column="2">
+     <widget class="QTableWidget" name="tableWidget">
+      <column>
+       <property name="text">
+        <string>Band</string>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>QSO's</string>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>Calls</string>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>Points</string>
+       </property>
+      </column>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.3.19"
+__version__ = "25.3.23"

not1mm/plugins/darc_vhf.py

@@ -12,7 +12,7 @@
 #   Classes:	Single Op, Multi OP, Trainee
 #   Max power:	100 watts
 #   Exchange:	RST + Locator
-#   Work stations:	Once per band 
+#   Work stations:	Once per band
 #   Points:	1 point per km distance between stations
 #   Multipliers:	no multis
 #   Score Calculation:	Total score = sum of all points
@@ -49,11 +49,11 @@ columns = [
     "SentNr",
     "RcvNr",
     "Exchange1",
-    "PTS"
+    "PTS",
 ]
 cabrillo_name = "DARC VHF"
 
-advance_on_space = [True, True, True,True, False]
+advance_on_space = [True, True, True, True, False]
 call_parse_exchange_on_edit = True
 
 # 1 once per contest, 2 work each band, 3 each band/mode, 4 no dupe checking
@@ -86,6 +86,7 @@ def reset_label(self):
     """reset label after field cleared"""
     self.exch_label.setText("# Grid")
 
+
 def set_tab_next(self):
     """Set TAB Advances"""
     self.tab_next = {
@@ -106,20 +107,20 @@ def set_tab_prev(self):
         self.other_1: self.receive,
         self.other_2: self.other_1,
     }
- 
+
 
 def set_contact_vars(self):
-    """Contest Specific"""    
+    """Contest Specific"""
     sn, grid = parse_exchange(self)
     self.contact["SNT"] = self.sent.text()
     self.contact["RCV"] = self.receive.text()
-    self.contact["SentNr"] = self.other_1.text()    
-    self.contact["NR"]= sn
-    self.contact["Exchange1"] =grid
-    
-    
+    self.contact["SentNr"] = self.other_1.text()
+    self.contact["NR"] = sn
+    self.contact["Exchange1"] = grid
+
+
 def parse_exchange(self):
-    """Parse exchange..."""    
+    """Parse exchange..."""
     exchange = self.other_2.text()
     exchange = exchange.upper()
     sn = ""
@@ -160,9 +161,9 @@ def points(self):
     """Calc point"""
     _points = 1
     _kilometers = 0
-    _their_grid = self.contact["Exchange1"] .upper()
+    _their_grid = self.contact["Exchange1"].upper()
     _kilometers = distance(self.station.get("GridSquare", ""), _their_grid)
-    _points =  max(1,_kilometers)
+    _points = max(1, _kilometers)
     return _points
 
 
@@ -170,7 +171,6 @@ def show_mults(self, rtc=None):
     """Return display string for mults"""
 
 
-
 def show_qso(self):
     """Return qso count"""
     result = self.database.fetch_qso_count()
@@ -187,7 +187,7 @@ def calc_score(self):
         if score is None:
             score = "0"
         contest_points = int(score)
-        return contest_points 
+        return contest_points
     return 0
 
 
@@ -197,8 +197,8 @@ def adif(self):
 
 
 def edi(self):
-    """ Generate an edi file """
-    file_encoding="ascii"
+    """Generate an edi file"""
+    file_encoding = "ascii"
     logger.debug("******EDI*****")
     logger.debug("Station: %s", f"{self.station}")
     logger.debug("Contest: %s", f"{self.contest_settings}")
@@ -212,7 +212,7 @@ def edi(self):
     logger.debug("%s", filename)
     log = self.database.fetch_all_contacts_asc()
     try:
-        with open(filename, "w", encoding=file_encoding) as file_descriptor:
+        with open(filename, "w", encoding=file_encoding, newline="") as file_descriptor:
             output_cabrillo_line(
                 "[REG1TEST;1]",
                 "\r\n",
@@ -229,7 +229,7 @@ def edi(self):
             loggedyear = value[0:4]
             loggedmonth = value[5:7]
             loggedday = value[8:10]
-            loggeddate = loggedyear + loggedmonth +loggedday        
+            loggeddate = loggedyear + loggedmonth + loggedday
             output_cabrillo_line(
                 f"TDate: {loggeddate}",
                 "\r\n",
@@ -271,8 +271,8 @@ def edi(self):
                 "\r\n",
                 file_descriptor,
                 file_encoding,
-            ) 
-            BandInMHz = bandinMHz(self.contest_settings.get('BandCategory',''))
+            )
+            BandInMHz = bandinMHz(self.contest_settings.get("BandCategory", ""))
             output_cabrillo_line(
                 f"PBand:{BandInMHz}",
                 "\r\n",
@@ -320,7 +320,7 @@ def edi(self):
                 "\r\n",
                 file_descriptor,
                 file_encoding,
-            )            
+            )
             output_cabrillo_line(
                 f"RCoun:{self.station.get('Country', '')} ",
                 "\r\n",
@@ -350,7 +350,7 @@ def edi(self):
                 "\r\n",
                 file_descriptor,
                 file_encoding,
-            )            
+            )
             output_cabrillo_line(
                 f"STXEq:{self.station.get('stationtxrx', '')}",
                 "\r\n",
@@ -387,7 +387,7 @@ def edi(self):
                 "\r\n",
                 file_descriptor,
                 file_encoding,
-            )           
+            )
             output_cabrillo_line(
                 f"CQSOP:{calc_score(self)}",
                 "\r\n",
@@ -447,7 +447,7 @@ def edi(self):
                 "\r\n",
                 file_descriptor,
                 file_encoding,
-            )            
+            )
             output_cabrillo_line(
                 f"[QSORecords;{NumberOfQsos}]",
                 "\r\n",
@@ -457,25 +457,25 @@ def edi(self):
             for contact in log:
                 the_date_and_time = contact.get("TS", "")
                 themode = contact.get("Mode", "")
-                modeCode=0
-                if themode == "LSB" or themode == "USB" or themode=="SSB":
+                modeCode = 0
+                if themode == "LSB" or themode == "USB" or themode == "SSB":
                     modeCode = 1
-                if themode == "CW" or themode == "CWL" or themode=="CWU":
+                if themode == "CW" or themode == "CWL" or themode == "CWU":
                     modeCode = 2
-                frequency = str(int(contact.get("Freq", "0"))).rjust(5)                
+                frequency = str(int(contact.get("Freq", "0"))).rjust(5)
                 loggedyear = the_date_and_time[2:4]
                 loggedmonth = the_date_and_time[5:7]
                 loggedday = the_date_and_time[8:10]
-                loggeddate = loggedyear + loggedmonth +loggedday
+                loggeddate = loggedyear + loggedmonth + loggedday
                 loggedtime = the_date_and_time[11:13] + the_date_and_time[14:16]
-                NumberSend = contact.get('SentNr', '')
-                NumberReceived = contact.get('NR', '')
+                NumberSend = contact.get("SentNr", "")
+                NumberReceived = contact.get("NR", "")
                 output_cabrillo_line(
                     f"{loggeddate};"
                     f"{loggedtime};"
                     f"{contact.get('Call', '')};"
                     f"{modeCode};"
-                    f"{str(contact.get('SNT', ''))};"                    
+                    f"{str(contact.get('SNT', ''))};"
                     f"{NumberSend:03d};"
                     f"{str(contact.get('RCV', ''))};"
                     f"{NumberReceived:03d};"
@@ -495,14 +495,14 @@ def edi(self):
 
 
 def bandinMHz(band):
-    switch={
-            "6M": "50 MHz",
-            "4M": "70 MHz",
-            "2M": "144 MHz",
-            "70cm": "432 MHz",
-            "23cm": "1,3 GHz",
-      }
-    return switch.get(band,"Invalid input {band}")
+    switch = {
+        "6M": "50 MHz",
+        "4M": "70 MHz",
+        "2M": "144 MHz",
+        "70cm": "432 MHz",
+        "23cm": "1,3 GHz",
+    }
+    return switch.get(band, "Invalid input {band}")
 
 
 def output_cabrillo_line(line_to_output, ending, file_descriptor, file_encoding):
@@ -530,7 +530,7 @@ def cabrillo(self, file_encoding):
     logger.debug("%s", filename)
     log = self.database.fetch_all_contacts_asc()
     try:
-        with open(filename, "w", encoding=file_encoding) as file_descriptor:
+        with open(filename, "w", encoding=file_encoding, newline="") as file_descriptor:
             output_cabrillo_line(
                 "START-OF-LOG: 3.0",
                 "\r\n",
@@ -714,9 +714,9 @@ def recalculate_mults(self):
     all_contacts = self.database.fetch_all_contacts_asc()
     for contact in all_contacts:
         # recalculate points
-        _their_grid = contact.get("Exchange1") .upper()
+        _their_grid = contact.get("Exchange1").upper()
         _kilometers = distance(self.station.get("GridSquare", ""), _their_grid)
-        _points =  max(1,_kilometers)
+        _points = max(1, _kilometers)
         contact["Points"] = _points
 
         self.database.change_contact(contact)

not1mm/plugins/ea_majistad_cw.py

@@ -582,7 +582,7 @@ def populate_history_info_line(self):
     result = self.database.fetch_call_history(self.callsign.text())
     if result:
         self.history_info.setText(
-            f"{result.get('Call', '')}, {result.get('Name', '')}, {result.get('State', '')}, {result.get('UserText','...')}"
+            f"{result.get('Call', '')}, {result.get('Name', '')}, {result.get('Exch1', '')}, {result.get('UserText','...')}"
         )
     else:
         self.history_info.setText("")
@@ -594,7 +594,7 @@ def check_call_history(self):
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":
-            self.other_2.setText(f"{result.get('State', '')}")
+            self.other_2.setText(f"{result.get('Exch1', '')}")
 
 
 def get_mults(self):