not1mm 25.2.26__py3-none-any.whl → 25.3.2__py3-none-any.whl

not1mm/__main__.py

@@ -2773,6 +2773,8 @@ class MainWindow(QtWidgets.QMainWindow):
             macro = macro.replace("#", next_serial)
         macro = macro.replace("{MYCALL}", self.station.get("Call", ""))
         macro = macro.replace("{HISCALL}", self.callsign.text())
+        macro = macro.replace("{OTHER1}", self.other_1.text())
+        macro = macro.replace("{OTHER2}", self.other_2.text())
         if self.radio_state.get("mode") == "CW":
             macro = macro.replace("{SNT}", self.sent.text().replace("9", "n"))
         else:

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.2.26"
+__version__ = "25.3.2"

not1mm/plugins/arrl_dx_cw.py

@@ -533,3 +533,25 @@ def just_points(self):
             score = "0"
         return int(score)
     return 0
+
+
+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('Power', '')}, {result.get('UserText','...')}"
+        )
+    else:
+        self.history_info.setText("")
+
+
+def check_call_history(self):
+    """"""
+    result = self.database.fetch_call_history(self.callsign.text())
+    if result:
+        self.history_info.setText(f"{result.get('UserText','')}")
+        if self.other_2.text() == "":
+            if result.get("State", ""):
+                self.other_2.setText(f"{result.get('State', '')}")
+            if result.get("Power", ""):
+                self.other_2.setText(f"{result.get('Power', '')}")

not1mm/plugins/arrl_dx_ssb.py

@@ -532,3 +532,28 @@ def just_points(self):
             score = "0"
         return int(score)
     return 0
+
+
+#!!Order!!,Call,Name,State,Power,UserText,
+
+
+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('Power', '')}, {result.get('UserText','...')}"
+        )
+    else:
+        self.history_info.setText("")
+
+
+def check_call_history(self):
+    """"""
+    result = self.database.fetch_call_history(self.callsign.text())
+    if result:
+        self.history_info.setText(f"{result.get('UserText','')}")
+        if self.other_2.text() == "":
+            if result.get("State", ""):
+                self.other_2.setText(f"{result.get('State', '')}")
+            if result.get("Power", ""):
+                self.other_2.setText(f"{result.get('Power', '')}")

{not1mm-25.2.26.dist-info → not1mm-25.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: not1mm
-Version: 25.2.26
+Version: 25.3.2
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -240,6 +240,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-3-2] Added call history support to ARRL DX, just in time for it to be over.
+- [25-3-1] Add {OTHER1} and {OTHER2} macros.
 - [25-2-26] Switch to a Run state if engaging auto_cq.
 - [25-2-22] Add Auto CQ.
 - [25-2-12] Merged PR from @alduhoo Adding RandomGram event.
@@ -680,6 +682,8 @@ You can include a limited set of substitution instructions.
 | {SNT} | Sends 5nn (cw) or 599 (ssb) |
 | {SENTNR} | Sends whats in the SentNR field. |
 | {EXCH} | Sends what's in the Sent Exchange field when contest is defined. |
+| {OTHER1} | Sends whats in the SentNR/Name field without altering it. |
+| {OTHER2} | Sends whats in the Comment field without altering it. |
 | {LOGIT} | Log the contact after macro pressed. |
 | {MARK} | Mark the current call in the bandmap. |
 | {SPOT} | Spot the current call to the cluster. |

{not1mm-25.2.26.dist-info → not1mm-25.3.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=E-WfACez3mMqu8eFxfZDrOoEMZvaHkCOcxyXejRzmXE,148236
+not1mm/__main__.py,sha256=tg3pyejQnZILEIPLvjEjMWHsLmNDtOgEMVwk_G-hGgI,148362
 not1mm/bandmap.py,sha256=vaOeqv_gW0-K0P3xA9JYcuiFILiKw601tjHQCwuoV-s,31260
 not1mm/checkwindow.py,sha256=VFAcKYTcoWhmIf91chwY6tyao9FQMWPiUkgDDkkWaog,9670
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
@@ -116,7 +116,7 @@ not1mm/lib/plugin_common.py,sha256=M5reDYM-v5IjAa2yTROvZTeTDkXYHb3U52W9mc9GxwA,1
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=mXffn8Xaj5KATPQinNBR0V5DbHWQPsRfh24_axWGYuk,15254
 not1mm/lib/super_check_partial.py,sha256=hwT2NRwobu0PLDyw6ltmbmcAtGBD02CKGFbgGWjXMqA,2334
-not1mm/lib/version.py,sha256=CsDxOYetTMRz8TLoDkHM8RXaIyBr7iEI-N7D9kQVK7E,48
+not1mm/lib/version.py,sha256=-mF3zNQ_0SuY4YjPsNBWWP6ynQSBQBM0qzuBG8dN1ks,47
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=5QUyGMvGBC-HxcY_z9QbfuxSg3f7p6C9K4qhTxgZE7k,14719
 not1mm/plugins/10_10_spring_cw.py,sha256=XjYFM263WYyG6nVQzPObW4YC7Z9L93rixSOcVsxPvH4,14722
@@ -125,8 +125,8 @@ not1mm/plugins/10_10_winter_phone.py,sha256=k4aTQAKqy9SNIKxyueIgRmS5kWwisi-VDg4E
 not1mm/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/plugins/arrl_10m.py,sha256=EzVBMdyVtm4LWH-5YR_s--Z7dA8xXLOVTcnAW4ZmLFQ,18325
 not1mm/plugins/arrl_160m.py,sha256=9SHfxjTX_LECOYDsICnoX_Q133atojsJbmFapehleYE,20236
-not1mm/plugins/arrl_dx_cw.py,sha256=4UMN1HWPNbkz2T6K33GJ0wUkE7yq46C57C6BUwbu5cs,18014
-not1mm/plugins/arrl_dx_ssb.py,sha256=X2C0hPY45_CvA2_97O0NAw3HF4QGgs5o0WVTlwMMme8,18017
+not1mm/plugins/arrl_dx_cw.py,sha256=BgGA5U2Jhy-QD4RLL27BWALnlCJ0HUZHNAY5HtHxUoo,18826
+not1mm/plugins/arrl_dx_ssb.py,sha256=kWFLV84VXFFKn3ThvIUw2RUvqnuNATFsXA_Jb9FD10g,18874
 not1mm/plugins/arrl_field_day.py,sha256=X7BLs87ikQEm1xuh2sSj-8KcFA9pqnut6uFGM2xJe7c,16743
 not1mm/plugins/arrl_rtty_ru.py,sha256=_NQUaIXinlY6gSa_f6J1nUpfZBGgg6SAoi1voDmmB20,20893
 not1mm/plugins/arrl_ss_cw.py,sha256=uv71xstpmBiDTyU5zF8pe6UIS-5v6hi0aMBksbPvCzc,17458
@@ -167,9 +167,9 @@ not1mm/plugins/ref_ssb.py,sha256=Z_XmMpYKcI5dZh4TQqvQDcz-cLpMzpDEKBnb5iHeBLQ,215
 not1mm/plugins/stew_perry_topband.py,sha256=D1hekmMbx-i4BhaP2uzOK3OzaVVMMdgcN3RmfweNqHo,15341
 not1mm/plugins/weekly_rtty.py,sha256=rdlIrsxBeuj-RQc5OStVNF7sGCtBK5t6inN5Z7DI4tw,20066
 not1mm/plugins/winter_field_day.py,sha256=JK4r1vfxs7aADR7ZYbjZniz3f5s3_ipSQDZ0GRNWC7I,15222
-not1mm-25.2.26.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-25.2.26.dist-info/METADATA,sha256=vqrs5zwGpA6J9wfe3FKcjeTNWCv7929AnTVHwaRloq8,36180
-not1mm-25.2.26.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
-not1mm-25.2.26.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-25.2.26.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-25.2.26.dist-info/RECORD,,
+not1mm-25.3.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-25.3.2.dist-info/METADATA,sha256=clCdCTSM3ZTo9WJQG1-tKUyNtX5w8OoPpzcmJHIA4BQ,36448
+not1mm-25.3.2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+not1mm-25.3.2.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-25.3.2.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-25.3.2.dist-info/RECORD,,

{not1mm-25.2.26.dist-info → not1mm-25.3.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.1)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any