not1mm 23.5.7__tar.gz → 23.5.8__tar.gz

{not1mm-23.5.7 → not1mm-23.5.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 23.5.7
+Version: 23.5.8
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -28,8 +28,7 @@ License-File: LICENSE
 
 - [Not1MM](#not1mm)
   - [What and why is Not1MM](#what-and-why-is-not1mm)
-  - [What it is not](#what-it-is-not)
-  - [What it probably never will be](#what-it-probably-never-will-be)
+  - [Current state](#current-state)
   - [List of should be working contests](#list-of-should-be-working-contests)
   - [Changes of note](#changes-of-note)
   - [Installing from PyPi](#installing-from-pypi)
@@ -90,15 +89,9 @@ I personally don't. While it may be possible to get N1MM working under Wine, I h
 Something to do in my free time.
 While I'm not watching TV, Right vs Left political 'News' programs, mind numbing 'Reality' TV etc...
 
-## What it is not
+## Current state
 
-Fully working.
-
-The current state is "**BETA**". I've used it for CQ WPX SSB and JIDX CW, and was able to work contacts and submit a cabrillo at the end. I'll add contests as/if I work them.
-
-## What it probably never will be
-
-Feature complete. I'm only one guy, and I'm not what you'd consider to be a contester. So new contests will be sparse.
+The current state is "**BETA**". I've used it for A few contests, and was able to work contacts and submit a cabrillo at the end. I'm not a "Contester". So I'll add contests as/if I work them. I'm only one guy, so if you see a bug let me know. I don't do much of any Data or RTTY operating. This is why you don't see RTTY in the list of working contests. The Lord helps those who burn people at the... I mean who help themselves. Feel free to fill in that hole with a pull request.
 
 ![main screen](https://github.com/mbridak/not1mm/raw/master/pic/main.png)
 
@@ -123,6 +116,7 @@ Feature complete. I'm only one guy, and I'm not what you'd consider to be a cont
 
 ## Changes of note
 
+- [23-5-8] Bandmap zoom in/out now centers scale to RX Freq.
 - [23-5-7] Added bandwidth marker to the bandmap.
 - [23-5-6] Added AR Cluster filter options for the bandmap. Added a station ID to the multicast packets. This will prevent erratic bevahiour if 2 stations are on the same network.
 - [23-5-5] Re-wrote most of the log window code. Added ARRL Sweepstakes.
@@ -163,7 +157,7 @@ Feature complete. I'm only one guy, and I'm not what you'd consider to be a cont
 - [23-3-27] Fix cursor behaviour when editing text in callsign field.
 - [23-3-25] Fix minimum call length. Fix cabrillo tag. Add adif output.
 - [23-3-24] Added dupe checking. Added CAT check for flrig or rigctld. Added online flag for flrig.
-- [23-3-23] Added json_data.get("cmd", "")most of Cabrillo generation. Plan to test it this weekends CQ WPX SSB.
+- [23-3-23] Added most of Cabrillo generation. Plan to test it this weekends CQ WPX SSB.
 - [23-3-22] Add prefill of serial nr. set OP call on startup. Set IsMultiplier1 new unique wpx. Add OP and contest name to window title. and stuff.
 - [23-3-21] Worked on CQ WPX SSB plugin.
 - [23-3-20] Added a contact edit dialog. RightClick to edit contact. Changed placeholder text color in settings dialog. Hooked up CW speedchange widget. PgUp/PgDn to change speed.
@@ -252,8 +246,6 @@ not1mm
 
 ## Various data file locations
 
-json_data.get("cmd", "")
-
 ### Data
 
 If your system has an `XDG_DATA_HOME` environment variable set, the database and CW macro files can be found there. Otherwise they will be found at `yourhome/.local/share/not1mm`

{not1mm-23.5.7 → not1mm-23.5.8}/README.md

@@ -9,8 +9,7 @@
 
 - [Not1MM](#not1mm)
   - [What and why is Not1MM](#what-and-why-is-not1mm)
-  - [What it is not](#what-it-is-not)
-  - [What it probably never will be](#what-it-probably-never-will-be)
+  - [Current state](#current-state)
   - [List of should be working contests](#list-of-should-be-working-contests)
   - [Changes of note](#changes-of-note)
   - [Installing from PyPi](#installing-from-pypi)
@@ -71,15 +70,9 @@ I personally don't. While it may be possible to get N1MM working under Wine, I h
 Something to do in my free time.
 While I'm not watching TV, Right vs Left political 'News' programs, mind numbing 'Reality' TV etc...
 
-## What it is not
+## Current state
 
-Fully working.
-
-The current state is "**BETA**". I've used it for CQ WPX SSB and JIDX CW, and was able to work contacts and submit a cabrillo at the end. I'll add contests as/if I work them.
-
-## What it probably never will be
-
-Feature complete. I'm only one guy, and I'm not what you'd consider to be a contester. So new contests will be sparse.
+The current state is "**BETA**". I've used it for A few contests, and was able to work contacts and submit a cabrillo at the end. I'm not a "Contester". So I'll add contests as/if I work them. I'm only one guy, so if you see a bug let me know. I don't do much of any Data or RTTY operating. This is why you don't see RTTY in the list of working contests. The Lord helps those who burn people at the... I mean who help themselves. Feel free to fill in that hole with a pull request.
 
 ![main screen](https://github.com/mbridak/not1mm/raw/master/pic/main.png)
 
@@ -104,6 +97,7 @@ Feature complete. I'm only one guy, and I'm not what you'd consider to be a cont
 
 ## Changes of note
 
+- [23-5-8] Bandmap zoom in/out now centers scale to RX Freq.
 - [23-5-7] Added bandwidth marker to the bandmap.
 - [23-5-6] Added AR Cluster filter options for the bandmap. Added a station ID to the multicast packets. This will prevent erratic bevahiour if 2 stations are on the same network.
 - [23-5-5] Re-wrote most of the log window code. Added ARRL Sweepstakes.
@@ -144,7 +138,7 @@ Feature complete. I'm only one guy, and I'm not what you'd consider to be a cont
 - [23-3-27] Fix cursor behaviour when editing text in callsign field.
 - [23-3-25] Fix minimum call length. Fix cabrillo tag. Add adif output.
 - [23-3-24] Added dupe checking. Added CAT check for flrig or rigctld. Added online flag for flrig.
-- [23-3-23] Added json_data.get("cmd", "")most of Cabrillo generation. Plan to test it this weekends CQ WPX SSB.
+- [23-3-23] Added most of Cabrillo generation. Plan to test it this weekends CQ WPX SSB.
 - [23-3-22] Add prefill of serial nr. set OP call on startup. Set IsMultiplier1 new unique wpx. Add OP and contest name to window title. and stuff.
 - [23-3-21] Worked on CQ WPX SSB plugin.
 - [23-3-20] Added a contact edit dialog. RightClick to edit contact. Changed placeholder text color in settings dialog. Hooked up CW speedchange widget. PgUp/PgDn to change speed.
@@ -233,8 +227,6 @@ not1mm
 
 ## Various data file locations
 
-json_data.get("cmd", "")
-
 ### Data
 
 If your system has an `XDG_DATA_HOME` environment variable set, the database and CW macro files can be found there. Otherwise they will be found at `yourhome/.local/share/not1mm`

{not1mm-23.5.7 → not1mm-23.5.8}/not1mm/__main__.py

@@ -379,6 +379,8 @@ class MainWindow(QtWidgets.QMainWindow):
     def edit_configuration_settings(self):
         """Configuration Settings was clicked"""
         self.configuration_dialog = Settings(WORKING_PATH, CONFIG_PATH, self.pref)
+        if self.pref.get("dark_mode"):
+            self.configuration_dialog.setStyleSheet(DARK_STYLESHEET)
         self.configuration_dialog.usehamdb_radioButton.hide()
         # self.configuration_dialog.n1mm_tab.hide()
         self.configuration_dialog.show()
@@ -447,6 +449,8 @@ class MainWindow(QtWidgets.QMainWindow):
 
         if contests:
             self.contest_dialog = SelectContest(WORKING_PATH)
+            if self.pref.get("dark_mode"):
+                self.contest_dialog.setStyleSheet(DARK_STYLESHEET)
             self.contest_dialog.contest_list.setRowCount(0)
             self.contest_dialog.contest_list.setColumnCount(4)
             self.contest_dialog.contest_list.verticalHeader().setVisible(False)
@@ -504,6 +508,8 @@ class MainWindow(QtWidgets.QMainWindow):
         if self.contest_settings is None:
             return
         self.contest_dialog = NewContest(WORKING_PATH)
+        if self.pref.get("dark_mode"):
+            self.contest_dialog.setStyleSheet(DARK_STYLESHEET)
         self.contest_dialog.setWindowTitle("Edit Contest")
         self.contest_dialog.title.setText("")
         self.contest_dialog.accepted.connect(self.save_edited_contest)
@@ -615,6 +621,7 @@ class MainWindow(QtWidgets.QMainWindow):
             "RTTY": (self.Band_Mode_Frame_RTTY,),
             "PSK": (self.Band_Mode_Frame_RTTY,),
             "SSB+CW": (self.Band_Mode_Frame_CW, self.Band_Mode_Frame_SSB),
+            "BOTH": (self.Band_Mode_Frame_CW, self.Band_Mode_Frame_SSB),
             "DIGITAL": (self.Band_Mode_Frame_RTTY,),
             "SSB+CW+DIGITAL": (
                 self.Band_Mode_Frame_RTTY,
@@ -1003,6 +1010,8 @@ class MainWindow(QtWidgets.QMainWindow):
         """Show settings dialog"""
         logger.debug("Station Settings selected")
         self.settings_dialog = EditStation(WORKING_PATH)
+        if self.pref.get("dark_mode"):
+            self.settings_dialog.setStyleSheet(DARK_STYLESHEET)
         self.settings_dialog.accepted.connect(self.save_settings)
         # if self.pref.get("dark_mode"):
         #     self.settings_dialog.setStyleSheet(DARK_STYLESHEET)

{not1mm-23.5.7 → not1mm-23.5.8}/not1mm/bandmap.py

@@ -44,6 +44,11 @@ else:
     CONFIG_PATH = str(Path.home() / ".config")
 CONFIG_PATH += "/not1mm"
 
+DARK_STYLESHEET = ""
+
+with open(WORKING_PATH + "/data/Combinear.qss", encoding="utf-8") as stylefile:
+    DARK_STYLESHEET = stylefile.read()
+
 MULTICAST_PORT = 2239
 MULTICAST_GROUP = "224.1.1.1"
 INTERFACE_IP = "0.0.0.0"
@@ -202,6 +207,8 @@ class MainWindow(QtWidgets.QMainWindow):
         self._udpwatch = None
         data_path = WORKING_PATH + "/data/bandmap.ui"
         uic.loadUi(data_path, self)
+        if PREF.get("dark_mode"):
+            self.setStyleSheet(DARK_STYLESHEET)
         self.agetime = self.clear_spot_olderSpinBox.value()
         self.clear_spot_olderSpinBox.valueChanged.connect(self.spot_aging_changed)
         self.clearButton.clicked.connect(self.clear_spots)
@@ -308,7 +315,7 @@ class MainWindow(QtWidgets.QMainWindow):
         steps = int(round((self.currentBand.end - self.currentBand.start) / step))
         self.graphicsView.setFixedSize(330, steps * PIXELSPERSTEP + 30)
         self.graphicsView.setScene(self.bandmap_scene)
-        for i in range(steps):
+        for i in range(steps):  # Draw tickmarks
             length = 10
             if i % 5 == 0:
                 length = 15
@@ -319,7 +326,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 i * PIXELSPERSTEP,
                 QtGui.QPen(QtGui.QColor(192, 192, 192)),
             )
-            if i % 5 == 0:
+            if i % 5 == 0:  # Add Frequency
                 freq = self.currentBand.start + step * i
                 text = f"{freq:.3f}"
                 self.something = self.bandmap_scene.addText(text)
@@ -342,12 +349,14 @@ class MainWindow(QtWidgets.QMainWindow):
         self.zoom += 1
         self.zoom = min(self.zoom, 7)
         self.update()
+        self.center_on_rxfreq()
 
     def dec_zoom(self):
         """doc"""
         self.zoom -= 1
         self.zoom = max(self.zoom, 1)
         self.update()
+        self.center_on_rxfreq()
 
     def drawTXRXMarks(self, step):
         """doc"""
@@ -355,10 +364,10 @@ class MainWindow(QtWidgets.QMainWindow):
             self.clear_freq_mark(self.bandwidth_mark)
             self.clear_freq_mark(self.rxMark)
             self.draw_bandwidth(
-                self.rx_freq, step, QtGui.QColor(30, 30, 180), self.bandwidth_mark
+                self.rx_freq, step, QtGui.QColor(30, 30, 180, 180), self.bandwidth_mark
             )
             self.drawfreqmark(
-                self.rx_freq, step, QtGui.QColor(30, 180, 30), self.rxMark
+                self.rx_freq, step, QtGui.QColor(30, 180, 30, 180), self.rxMark
             )
 
     def Freq2ScenePos(self, freq: float):
@@ -371,6 +380,21 @@ class MainWindow(QtWidgets.QMainWindow):
         )
         return ret
 
+    def center_on_rxfreq(self):
+        """doc"""
+        freq_pos = self.Freq2ScenePos(self.rx_freq).y()
+        self.scrollArea.verticalScrollBar().setValue(
+            int(freq_pos - (self.height() / 2) + 80)
+        )
+        # This does not work... Have no idea why.
+        # anim = QtCore.QPropertyAnimation(
+        #     self.scrollArea.verticalScrollBar(), "value".encode()
+        # )
+        # anim.setDuration(300)
+        # anim.setStartValue(self.scrollArea.verticalScrollBar().value())
+        # anim.setEndValue(int(freq_pos - (self.height() / 2) + 80))
+        # anim.start(QtCore.QAbstractAnimation.DeletionPolicy.DeleteWhenStopped)
+
     def drawfreqmark(self, freq, step, color, currentPolygon):
         """doc"""
 
@@ -397,7 +421,7 @@ class MainWindow(QtWidgets.QMainWindow):
         if freq < self.currentBand.start or freq > self.currentBand.end:
             return
         if freq and self.bandwidth:
-            color = QtGui.QColor(30, 30, 180)
+            # color = QtGui.QColor(30, 30, 180)
             bw_start = freq - ((self.bandwidth / 2) / 1000000)
             bw_end = freq + ((self.bandwidth / 2) / 1000000)
             logger.debug("%s", f"s:{bw_start} e:{bw_end}")
@@ -523,6 +547,12 @@ class MainWindow(QtWidgets.QMainWindow):
             self.send_command("set dx extension Name CTY State Section")
             self.send_command("set dx mode " + PREF.get("cluster_mode", "OPEN"))
             return
+        if "call:" in data:
+            self.send_command(self.callsignField.text())
+            self.send_command(PREF.get("cluster_filter", ""))
+            self.send_command("set dx extension Name CTY State Section")
+            self.send_command("set dx mode " + PREF.get("cluster_mode", "OPEN"))
+            return
         if "DX de" in data:
             parts = data.split()
             spotter = parts[2]

{not1mm-23.5.7 → not1mm-23.5.8}/not1mm/data/main.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1975</width>
-    <height>366</height>
+    <width>1731</width>
+    <height>358</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -645,7 +645,6 @@
                <font>
                 <family>JetBrains Mono</family>
                 <pointsize>20</pointsize>
-                <weight>75</weight>
                 <bold>true</bold>
                </font>
               </property>
@@ -1019,11 +1018,19 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>1975</width>
-     <height>23</height>
+     <width>1731</width>
+     <height>30</height>
     </rect>
    </property>
+   <property name="nativeMenuBar">
+    <bool>true</bool>
+   </property>
    <widget class="QMenu" name="menuFile">
+    <property name="font">
+     <font>
+      <family>JetBrains Mono</family>
+     </font>
+    </property>
     <property name="title">
      <string>File</string>
     </property>

{not1mm-23.5.7 → not1mm-23.5.8}/not1mm/lib/version.py

@@ -1,2 +1,2 @@
 """It's the version"""
-__version__ = "23.5.7"
+__version__ = "23.5.8"

{not1mm-23.5.7 → not1mm-23.5.8}/not1mm/logwindow.py

@@ -45,6 +45,11 @@ else:
     CONFIG_PATH = str(Path.home() / ".config")
 CONFIG_PATH += "/not1mm"
 
+DARK_STYLESHEET = ""
+
+with open(WORKING_PATH + "/data/Combinear.qss", encoding="utf-8") as stylefile:
+    DARK_STYLESHEET = stylefile.read()
+
 MULTICAST_PORT = 2239
 MULTICAST_GROUP = "224.1.1.1"
 INTERFACE_IP = "0.0.0.0"
@@ -92,6 +97,8 @@ class MainWindow(QtWidgets.QMainWindow):
         self._udpwatch = None
         self.udp_fifo = queue.Queue()
         self.load_pref()
+        if self.pref.get("dark_mode"):
+            self.setStyleSheet(DARK_STYLESHEET)
         self.dbname = DATA_PATH + "/" + self.pref.get("current_database", "ham.db")
         self.database = DataBase(self.dbname, WORKING_PATH)
         self.database.current_contest = self.pref.get("contest", 0)
@@ -256,6 +263,8 @@ class MainWindow(QtWidgets.QMainWindow):
         """Show edit contact dialog"""
         logger.debug("Edit: %s", uuid)
         self.edit_contact_dialog = EditContact(WORKING_PATH)
+        if self.pref.get("dark_mode"):
+            self.edit_contact_dialog.setStyleSheet(DARK_STYLESHEET)
         self.edit_contact_dialog.accepted.connect(self.save_edited_contact)
         self.contact = self.database.fetch_contact_by_uuid(uuid)
         self.edit_contact_dialog.delete_2.clicked.connect(self.delete_contact)

{not1mm-23.5.7 → not1mm-23.5.8}/not1mm/plugins/cq_wpx_cw.py

@@ -45,10 +45,8 @@ def interface(self):
     self.field2.show()
     self.field3.show()
     self.field4.show()
-    label = self.field3.findChild(QtWidgets.QLabel)
-    label.setText("SentNR")
-    label = self.field4.findChild(QtWidgets.QLabel)
-    label.setText("RcvNR")
+    self.other_label.setText("SentNR")
+    self.exch_label.setText("RcvNR")
 
 
 def reset_label(self):

{not1mm-23.5.7 → not1mm-23.5.8}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 23.5.7
+Version: 23.5.8
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -28,8 +28,7 @@ License-File: LICENSE
 
 - [Not1MM](#not1mm)
   - [What and why is Not1MM](#what-and-why-is-not1mm)
-  - [What it is not](#what-it-is-not)
-  - [What it probably never will be](#what-it-probably-never-will-be)
+  - [Current state](#current-state)
   - [List of should be working contests](#list-of-should-be-working-contests)
   - [Changes of note](#changes-of-note)
   - [Installing from PyPi](#installing-from-pypi)
@@ -90,15 +89,9 @@ I personally don't. While it may be possible to get N1MM working under Wine, I h
 Something to do in my free time.
 While I'm not watching TV, Right vs Left political 'News' programs, mind numbing 'Reality' TV etc...
 
-## What it is not
+## Current state
 
-Fully working.
-
-The current state is "**BETA**". I've used it for CQ WPX SSB and JIDX CW, and was able to work contacts and submit a cabrillo at the end. I'll add contests as/if I work them.
-
-## What it probably never will be
-
-Feature complete. I'm only one guy, and I'm not what you'd consider to be a contester. So new contests will be sparse.
+The current state is "**BETA**". I've used it for A few contests, and was able to work contacts and submit a cabrillo at the end. I'm not a "Contester". So I'll add contests as/if I work them. I'm only one guy, so if you see a bug let me know. I don't do much of any Data or RTTY operating. This is why you don't see RTTY in the list of working contests. The Lord helps those who burn people at the... I mean who help themselves. Feel free to fill in that hole with a pull request.
 
 ![main screen](https://github.com/mbridak/not1mm/raw/master/pic/main.png)
 
@@ -123,6 +116,7 @@ Feature complete. I'm only one guy, and I'm not what you'd consider to be a cont
 
 ## Changes of note
 
+- [23-5-8] Bandmap zoom in/out now centers scale to RX Freq.
 - [23-5-7] Added bandwidth marker to the bandmap.
 - [23-5-6] Added AR Cluster filter options for the bandmap. Added a station ID to the multicast packets. This will prevent erratic bevahiour if 2 stations are on the same network.
 - [23-5-5] Re-wrote most of the log window code. Added ARRL Sweepstakes.
@@ -163,7 +157,7 @@ Feature complete. I'm only one guy, and I'm not what you'd consider to be a cont
 - [23-3-27] Fix cursor behaviour when editing text in callsign field.
 - [23-3-25] Fix minimum call length. Fix cabrillo tag. Add adif output.
 - [23-3-24] Added dupe checking. Added CAT check for flrig or rigctld. Added online flag for flrig.
-- [23-3-23] Added json_data.get("cmd", "")most of Cabrillo generation. Plan to test it this weekends CQ WPX SSB.
+- [23-3-23] Added most of Cabrillo generation. Plan to test it this weekends CQ WPX SSB.
 - [23-3-22] Add prefill of serial nr. set OP call on startup. Set IsMultiplier1 new unique wpx. Add OP and contest name to window title. and stuff.
 - [23-3-21] Worked on CQ WPX SSB plugin.
 - [23-3-20] Added a contact edit dialog. RightClick to edit contact. Changed placeholder text color in settings dialog. Hooked up CW speedchange widget. PgUp/PgDn to change speed.
@@ -252,8 +246,6 @@ not1mm
 
 ## Various data file locations
 
-json_data.get("cmd", "")
-
 ### Data
 
 If your system has an `XDG_DATA_HOME` environment variable set, the database and CW macro files can be found there. Otherwise they will be found at `yourhome/.local/share/not1mm`

{not1mm-23.5.7 → not1mm-23.5.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "23.5.7"
+version = "23.5.8"
 description = "NOT1MM Logger"
 readme = "README.md"
 requires-python = ">=3.9"