Proposal: DX Expedition Mode, Dynamic Straight Key, and Italian Localization

README.md

@@ -73,7 +73,7 @@ the commands I used to install the needed packages:
 ```
 git clone https://github.com/w9cf/cwsim.git
 sudo apt-get install python3-matplotlib
-sudo apt-get install python3-pyqt5
+sudo apt-get install python3-pyqt6
 sudo apt-get install libportaudio2
 pip install pip --upgrade --user
 python3 -m pip install numpy==1.23 --user

cwsim.txt

@@ -0,0 +1,22 @@
+P55L Report cwsim (DX Expedition) 24/06/2026 20:04:46
+Durata 00:09:41
+Durata (QSO) 36
+Velocità CW 32 WPM
+Condizioni QSY Difficoltà 
+Attività 14
+Durata 15
+Punti totali 36
+Prefissi totali 34
+Punteggio totale 1224
+Punti verificati 34
+Prefissi verificati 32
+Punteggio verificato 1088
+Percentuale d'errore 5.6
+QSO per ora, suddiviso in intervalli da 5 minuti
+0-4   216
+5-9   216
+10-14   0
+Nominativi copiati male
+N1QEY PD9RW
+Stazioni che hanno abbandonato senza terminare il QSO
+SE6N W3PRL

plan.md

@@ -0,0 +1,14 @@
+# Piano di Sviluppo Cwsim - Prossime Versioni
+
+## UI & Accessibilità
+- [ ] **Revisione Grid Layout Parametri**: Verificare il posizionamento dei nuovi parametri DX (Straight Key, My RST Speed-up, ecc.). Attualmente NVDA li riporta in fondo alla lista.
+- [ ] **Tab Order**: Ottimizzare l'ordine dei tab affinché ogni Label sia seguita immediatamente dalla sua SpinBox, migliorando l'esperienza per utenti con screen reader.
+- [ ] **Verifica Visiva**: Confermare se il layout è corretto anche visivamente o se i nuovi widget sono stati accodati in modo disordinato.
+
+## Report & Logica DX
+- [ ] **Pulizia Report in Modalità Expedition**: In modalità DX Expedition, rimuovere o nascondere i riferimenti ai "progressivi" (numeri seriali) nel report finale (`cwsim.txt`), dato che lo scambio prevede solo l'RST.
+- [ ] **RST Validation**: Assicurarsi che la validazione dei dati nel report rifletta correttamente lo scambio 5NN unico della modalità DX.
+
+## Manutenzione
+- [ ] **Compilazione Traduzioni**: Produrre il file `.qm` aggiornato non appena l'ambiente dispone di `lrelease` o caricarlo manualmente.
+- [ ] **Sincronizzazione Versioning**: Coordinarsi con Kevin per la numerazione ufficiale post-1.0.2.

python/Makefile

@@ -1,11 +1,8 @@
-.PHONY: pyqt6 pyqt5 cwsim.exe
+.PHONY: pyqt6 cwsim.exe
 
 cwsimgui.py: cwsimgui.ui
 	pyuic6 -i 3 -o cwsimgui.py cwsimgui.ui
 
-pyqt5:
-	pyuic5 -i 3 -o cwsimgui.py cwsimgui.ui
-
 pyqt6:
 	pyuic6 -i 3 -o cwsimgui.py cwsimgui.ui
 

python/audioprocess.py

@@ -14,7 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
-import sys
 import numpy as np
 
 class movavg():

python/contest.py

@@ -26,8 +26,6 @@
 from mystation import MyStation
 from dxoper import Os
 import queue
-import wave
-import time
 import sys
 import os
 import errno
@@ -86,6 +84,11 @@ def __init__(self,rng,inifile=None):
          self.savewave = 0
          self.saveini = 1
          self.savesummary = 1
+         self.isDxExpedition = False
+         self.straightKeyProb = 0.25
+         self.myRstSpeedUp = 0.20
+         self.dxRstSpeedUp = 0.15
+         self.dxRstProb = 0.15
          self.fontsize = 12 # not used
 
       self._qskdecayfactor = 1.0/(self._rate*self.qskdecaytime)
@@ -98,7 +101,7 @@ def __init__(self,rng,inifile=None):
       self._callList = calllist.CallList(rng)
       self.stations = []
       self.me = MyStation(self._rng,self._keyer,self,self.call,self.pitch
-         ,self.wpm,bufsize=self._bufsize,rate=self._rate)
+         ,self.wpm,bufsize=self._bufsize,rate=self._rate,isDxExpedition=self.isDxExpedition)
       self.bufcount = 0
       self._rfg0 = 1.0
       self._rfg = np.zeros(self._bufsize+1,dtype=np.float64)
@@ -137,7 +140,7 @@ def bandwidth(self):
    def bandwidth(self,bandwidth):
       self._bandwidth = np.max([np.min([round(bandwidth/50)*50,600]),100])
       navg = int(np.rint(0.7*self._rate/self._bandwidth))
-      self._fgain = np.sqrt(500/self._bandwidth);
+      self._fgain = np.sqrt(500/self._bandwidth)
       self._m1 = movavg(self._bufsize,navg,dtype=np.complex128)
       self._m2 = movavg(self._bufsize,navg,dtype=np.complex128)
       self._m3 = movavg(self._bufsize,navg,dtype=np.complex128)
@@ -231,7 +234,7 @@ def getAudio(self,outdata,nf,tinfo,status):
             if (self.qsy and isinstance(s,DxStation) and
                s.oper.state != Os.Done and s.called):
                self.q.put(s.myCall)
-               if not (self.me.app is None):
+               if self.me.app is not None:
                   self.me.app.qsy()
             self.stations.remove(s)
          elif s.state == StationState.Sending:
@@ -271,7 +274,7 @@ def getAudio(self,outdata,nf,tinfo,status):
          if isinstance(s,DxStation):
             if (s.oper.state == Os.Done):
                self.q.put(s.dataToLastQso())
-               if not (self.me.app is None):
+               if self.me.app is not None:
                   self.me.app.lastQso()
 #               (trueCall, trueRst, trueNr) = s.dataToLastQso()
 #               print("contest Correct Info ",trueCall,trueRst,trueNr)
@@ -283,10 +286,13 @@ def getAudio(self,outdata,nf,tinfo,status):
                lidRstProb=self.lidRstProb,qsb=self.qsb,
                flutterProb=self.flutterProb,
                rptProb=self.rptProb,fast=self.fast,slow=self.slow,
-               isSingle=True,bufsize=self._bufsize,rate=self._rate)
+               straightKeyProb=self.straightKeyProb,
+               isSingle=True,isDxExpedition=self.isDxExpedition,
+               dxRstSpeedUp=self.dxRstSpeedUp, dxRstProb=self.dxRstProb,
+               bufsize=self._bufsize,rate=self._rate)
             self.stations.append(s)
             s.processEvent(StationEvent.MeFinished)
-         
+
 #      np.savetxt(self.ef,audio)
 #      self.wf.writeframesraw((audio*30000).astype(np.int16))
 
@@ -328,7 +334,10 @@ def onMeFinishedSending(self):
                   lidRstProb=self.lidRstProb,qsb=self.qsb,
                   flutterProb=self.flutterProb,
                   rptProb=self.rptProb,fast=self.fast,slow=self.slow,
-                  isSingle=False,bufsize=self._bufsize,rate=self._rate))
+                  straightKeyProb=self.straightKeyProb,
+                  isSingle=False,isDxExpedition=self.isDxExpedition,
+                  dxRstSpeedUp=self.dxRstSpeedUp, dxRstProb=self.dxRstProb,
+                  bufsize=self._bufsize,rate=self._rate))
       for s in self.stations:
          s.processEvent(StationEvent.MeFinished)
 
@@ -401,16 +410,21 @@ def readConfig(self,filename):
       self.flutter = int(conditionsdict['flutter'])
       self.flutterProb = float(conditionsdict['flutterprob'])
       self.lids = int(conditionsdict['lids'])
+      self.straightKeyProb = float(conditionsdict.get('straightkeyprob', '0.25'))
       self.activity = int(conditionsdict['activity'])
       self.lidRstProb = float(conditionsdict['lidrstprob'])
       self.lidNrProb = float(conditionsdict['lidnrprob'])
       self.rptProb = float(conditionsdict['rptprob'])
+      self.myRstSpeedUp = float(conditionsdict.get('myrstspeedup', '0.20'))
+      self.dxRstSpeedUp = float(conditionsdict.get('dxrstspeedup', '0.15'))
+      self.dxRstProb = float(conditionsdict.get('dxrstprob', '0.15'))
       contestdict = dict(p['Contest'])
       self.duration = int(contestdict['duration'])
       self.mode = eval(contestdict['mode'])
       self.savewave = int(contestdict['savewave'])
       self.saveini = int(contestdict['saveini'])
       self.savesummary = int(contestdict['savesummary'])
+      self.isDxExpedition = contestdict.get('isdxexpedition', 'False') == 'True'
 
    def writeConfig(self,filename):
       with open(filename,'w') as f:
@@ -426,10 +440,10 @@ def writeConfig(self,filename):
             ,'qskdecaytime', 'cwreverse', 'rit', 'monitor']:
             p.set('Station',i,str(eval('self.'+i)))
          p.add_section('Conditions')
-         for i in ['qrn','qrm','tqrm','qsb','flutter','qsy','lids','activity'
-            ,'lidRstProb','lidNrProb','rptProb','flutterProb']:
+         for i in ['qrn','qrm','tqrm','qsb','flutter','qsy','lids','straightKeyProb','activity'
+            ,'lidRstProb','lidNrProb','rptProb','flutterProb','myRstSpeedUp','dxRstSpeedUp','dxRstProb']:
             p.set('Conditions',i,str(eval('self.'+i)))
          p.add_section('Contest')
-         for i in ['duration','mode','savewave','saveini','savesummary']:
+         for i in ['duration','mode','savewave','saveini','savesummary','isDxExpedition']:
             p.set('Contest',i,str(eval('self.'+i)))
          p.write(f)