hamradio/klog
1
0
Fork 0
mirror of https://github.com/ea4k/klog.git synced 2024-09-21 10:28:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

hamlib bug fix

Browse Source
This commit is contained in:
ea4k 2022-01-13 18:14:49 +01:00
parent e536d6c4c0
commit 718cb757b8
13 changed files with 342 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Changelog
View File

@ -2,6 +2,9 @@ TBD - 1.8.7
- Bugfix: Removed the hamlib test from the KLog start that was causing big delays.
- Bugfix: Serial speed was not saved to config file.
- Bugfix: eQSL Uploads problem solved (Closes #406).
- Bugfix: Connection to the radios were not being done properly (Closes #407) (Closes #379).
TBD: - LoTW was asking for a station callsign even if LoTW was not activated.
Jan 2022 - 1.8.6
- Bugfix: Net rig & FLRig hamlib connections were not working propertly. (Closes #339) (TNX W5PNY)

315
src/hamlibclass.cpp
View File

@ -34,29 +34,32 @@
HamLibClass::HamLibClass(QObject *parent) : QObject(parent)
{
qDebug() << Q_FUNC_INFO << QT_ENDL;
//qDebug() << Q_FUNC_INFO;
timer = new QTimer(this);
//my_rig = rig_init (RIG_DUMMY);
//my_rig = rig_init (RIG_MODEL_DUMMY);
my_rig = rig_init (RIG_MODEL_DUMMY);
retcode = -1;
qDebug() << Q_FUNC_INFO << " - END" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << " - END";
}
HamLibClass::~HamLibClass()
{
//qDebug() << Q_FUNC_INFO;
if (rigLaunched)
{
rig_close(my_rig);
rig_cleanup(my_rig);
rigLaunched = false;
}
//qDebug() << Q_FUNC_INFO << " - END";
}
void HamLibClass::initClass()
{
//qDebug() << Q_FUNC_INFO ;
//showDebugLog(Q_FUNC_INFO, "Start");
strings.clear();
fillRigsList();
retcode = -1;
rigLaunched = false;
pollInterval = 300;
@ -67,12 +70,13 @@ void HamLibClass::initClass()
freq_old = 0.0;
connect(timer, SIGNAL(timeout()), this, SLOT(slotTimer()) );
clean();
//qDebug() << Q_FUNC_INFO << " - END";
}
void HamLibClass::clean()
{
//showDebugLog(Q_FUNC_INFO, "Start");
//qDebug() << Q_FUNC_INFO << QT_ENDL;
//qDebug() << Q_FUNC_INFO ;
myrig_model = 1; //Dummy equipment
bauds = 9600;
dataBits = 8;
@ -85,7 +89,7 @@ void HamLibClass::clean()
networkPort = 4532;
networkAddress = "127.0.0.1";
rigLaunched = false;
//qDebug() << Q_FUNC_INFO << " - END" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << " - END" ;
}
void HamLibClass::setPoll(const int _milsecs)
@ -100,25 +104,25 @@ void HamLibClass::setPoll(const int _milsecs)
double HamLibClass::getFrequency()
{
//showDebugLog(Q_FUNC_INFO, "Start");
qDebug() << Q_FUNC_INFO << QT_ENDL;
//qDebug() << Q_FUNC_INFO << QT_ENDL;
if (!isRunning())
{
qDebug() << Q_FUNC_INFO << ": isn't running" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": isn't running" << QT_ENDL;
return 0.0;
}
if (reading)
{
qDebug() << Q_FUNC_INFO << ": Exiting, I was already reading ... " << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": Exiting, I was already reading ... " << QT_ENDL;
return 0.0;
}
reading = true;
qDebug() << Q_FUNC_INFO << ": Reading ... " << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": Reading ... " << QT_ENDL;
//retcode = rig_get_freq(my_rig, RIG_VFO_CURR, &freq);
retcode = rig_get_freq(my_rig, RIG_VFO_CURR, &freq);
if (retcode == RIG_OK)
{
qDebug() << Q_FUNC_INFO << ": RIG OK for Freq: " << QString::number(freq) << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": RIG OK for Freq: " << QString::number(freq) << QT_ENDL;
errorCount = 0;
reading = false;
return freq/1000000;
@ -126,7 +130,7 @@ double HamLibClass::getFrequency()
else
{
reading = false;
qDebug() << Q_FUNC_INFO << " error on readFreq - END";
//qDebug() << Q_FUNC_INFO << " error on readFreq - END";
return 0.0;
}
}
@ -140,68 +144,69 @@ bool HamLibClass::readRadio(bool _forceRead)
bool HamLibClass::readRadioInternal(bool _forceRead)
{
//showDebugLog(Q_FUNC_INFO, "Start");
qDebug() << Q_FUNC_INFO << QT_ENDL;
//qDebug() << Q_FUNC_INFO << QT_ENDL;
if (!isRunning())
{
qDebug() << Q_FUNC_INFO << ": isn't running" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": isn't running" << QT_ENDL;
return false;
}
if (reading)
{
qDebug() << Q_FUNC_INFO << ": Exiting, I was already reading ... " << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": Exiting, I was already reading ... " << QT_ENDL;
return false;
}
reading = true;
qDebug() << Q_FUNC_INFO << ": Reading ... " << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": Reading ... " << QT_ENDL;
retcode = rig_get_freq(my_rig, RIG_VFO_CURR, &freq);
if (retcode == RIG_OK)
{
qDebug() << Q_FUNC_INFO << ": RIG OK for Freq" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": RIG OK for Freq" << QT_ENDL;
errorCount = 0;
qDebug() << Q_FUNC_INFO << ": Freq: " << QString::number(freq) << QT_ENDL;
//if ((freq_old > freq) || (freq_old < freq) || (_forceRead == true))
//{
//qDebug() << Q_FUNC_INFO << ": Freq: " << QString::number(freq) << QT_ENDL;
if ((freq_old > freq) || (freq_old < freq) || (_forceRead == true))
{
emit freqChanged(freq/1000000);
freq_old = freq;
qDebug() << Q_FUNC_INFO << ": EMITING; " << QString::number(freq) << QT_ENDL;
//}
qDebug() << Q_FUNC_INFO << ": read: " << QString::number(freq) << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": EMITING; " << QString::number(freq) << QT_ENDL;
}
//qDebug() << Q_FUNC_INFO << ": read: " << QString::number(freq) << QT_ENDL;
}
else
{
reading = false;
qDebug() << Q_FUNC_INFO << " error on readFreq - END";
//qDebug() << Q_FUNC_INFO << " error on readFreq - END";
return errorManage(Q_FUNC_INFO, retcode);
}
retcode = rig_get_mode(my_rig, RIG_VFO_CURR, &rmode, &width);
if (retcode == RIG_OK)
{
qDebug() << Q_FUNC_INFO << ": RIG OK for Mode" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": RIG OK for Mode" << QT_ENDL;
errorCount = 0;
qDebug() << Q_FUNC_INFO << ": Mode: " << hamlibMode2Mode(rmode) << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": Mode: " << hamlibMode2Mode(rmode) << QT_ENDL;
if ((mode_old != rmode) || (_forceRead == true))
{
if (justEmitted)
{
justEmitted = false;
reading = false;
qDebug() << Q_FUNC_INFO << " - justEmitted END";
//qDebug() << Q_FUNC_INFO << " - justEmitted END";
return true;
}
mode_old = rmode;
//qDebug() << Q_FUNC_INFO << " - Emmiting mode: " << hamlibMode2Mode(rmode) ;
emit modeChanged(hamlibMode2Mode(rmode));
justEmitted = true;
}
}
else
{
qDebug() << Q_FUNC_INFO << " - Error on readMode END";
//qDebug() << Q_FUNC_INFO << " - Error on readMode END";
reading = false;
return errorManage(Q_FUNC_INFO, retcode);
}
qDebug() << Q_FUNC_INFO << " - END";
//qDebug() << Q_FUNC_INFO << " - END";
reading = false;
return true;
}
@ -222,9 +227,10 @@ void HamLibClass::slotTimer()
void HamLibClass::setMode(const QString &_m)
{
//showDebugLog(Q_FUNC_INFO, "Start");
//qDebug() << "HamLibClass::setMode: " << _m << QT_ENDL;
//qDebug() << "HamLibClass::setMode: " << _m ;
if ((!isRunning()) || (readOnlyMode))
{
//qDebug() << Q_FUNC_INFO << ": Not running or RO";
return;
}
@ -238,119 +244,24 @@ void HamLibClass::setMode(const QString &_m)
QString currentMode = hamlibMode2Mode(rmode);
if (_m == currentMode)
{
//qDebug() << "HamLibClass::setMode: ERROR: Same mode";
return;
}
retcode = rig_set_mode(my_rig, RIG_VFO_CURR, rig_parse_mode(_m.toLocal8Bit()), rig_passband_normal(my_rig, rig_parse_mode(_m.toLocal8Bit())));
retcode = rig_set_mode(my_rig, RIG_VFO_CURR, mode2HamlibMode (_m), rig_passband_normal(my_rig, rig_parse_mode(_m.toLocal8Bit())));
//retcode = rig_set_mode(my_rig, RIG_VFO_CURR, rig_parse_mode(_m.toLocal8Bit()), rig_passband_normal(my_rig, rig_parse_mode(_m.toLocal8Bit())));
if (RIG_OK != retcode)
{
//qDebug() << "HamLibClass::setMode: ERROR: Could not set mode: " << _m << QT_ENDL;
errorManage(Q_FUNC_INFO, retcode);
return;
}
errorCount = 0;
//qDebug() << "HamLibClass::setMode - END true " << QT_ENDL;
//qDebug() << "HamLibClass::setMode - END true " << QT_ENDL;
return;
}
/*
rmode_t HamLibClass::mode2HamlibMode(const QString &_m)
{
if (_m == "USB")
{
return RIG_MODE_USB;
}
else if (_m == "LSB")
{
return RIG_MODE_LSB;
}
else if (_m == "CW")
{
return RIG_MODE_CW;
}
else if (_m == "FM")
{
return RIG_MODE_FM;
}
else if (_m == "")
{
return RIG_MODE_;
}
else if (_m == "")
{
return RIG_MODE_;
}
else if (_m == "")
{
return RIG_MODE_;
}
else if (_m == "")
{
return RIG_MODE_;
}
else if (_m == "")
{
return RIG_MODE_;
}
else if (_m == "")
{
return RIG_MODE_;
}
else if (_m == "")
{
return RIG_MODE_;
}
else if (_m == "")
{
return RIG_MODE_;
}
else if (_m == "")
{
return RIG_MODE_;
}
else if (_m == "")
{
return RIG_MODE_;
}
else if (_m == "")
{
return RIG_MODE_;
}
else if (_m == "")
{
return RIG_MODE_;
}
else if (_m == "")
{
return RIG_MODE_;
}
else if (_m == "")
{
return RIG_MODE_;
}
else if (_m == "")
{
return RIG_MODE_;
}
else if (_m == "")
{
return RIG_MODE_;
}
else if (_m == "")
{
return RIG_MODE_;
}
else if (_m == "")
{
return RIG_MODE_;
}
return RIG_MODE_NONE;
}
*/
bool HamLibClass::isModeADIFMode(const QString &_m)
{
@ -423,6 +334,47 @@ QString HamLibClass::hamlibMode2Mode(rmode_t _rmode)
}
}
rmode_t HamLibClass::mode2HamlibMode (const QString &_mode)
{
//showDebugLog(Q_FUNC_INFO, "Start");
//qDebug() << Q_FUNC_INFO << ": " << _mode;
if (_mode == "USB")
{
return RIG_MODE_USB;
}
else if (_mode == "LSB")
{
return RIG_MODE_LSB;
}
else if (_mode == "CW")
{
return RIG_MODE_CW;
}
else if (_mode == "AM")
{
return RIG_MODE_AM;
}
else if (_mode == "FM")
{
return RIG_MODE_FM;
}
else if (_mode == "SSB")
{
if (freq_old < 10.0)
{
return RIG_MODE_LSB;
}
else
{
return RIG_MODE_USB;
}
}
else
{
return RIG_MODE_NONE;
}
}
bool HamLibClass::stop()
{
//qDebug() << Q_FUNC_INFO << QT_ENDL;
@ -466,44 +418,44 @@ bool HamLibClass::stop()
bool HamLibClass::init(bool _active)
{
qDebug()<< Q_FUNC_INFO << ": " << getNameFromModelId(myrig_model) << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": " << getNameFromModelId(myrig_model) << QT_ENDL;
if (!_active)
{
qDebug()<< Q_FUNC_INFO << ": not active, exiting" << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": not active, exiting" << QT_ENDL;
rigLaunched = false;
stop();
return false;
}
if ((getNameFromModelId(myrig_model)).length ()<1)
{
qDebug()<< Q_FUNC_INFO << ": no rig model!" << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": no rig model!" << QT_ENDL;
rigLaunched = false;
return false;
}
if (rigLaunched)
{
qDebug()<< Q_FUNC_INFO << ": Already init" << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": Already init" << QT_ENDL;
return true;
}
rig_set_debug(RIG_DEBUG_NONE);
qDebug()<< Q_FUNC_INFO << ": set Debug NONE" << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": set Debug NONE" << QT_ENDL;
my_rig = rig_init(myrig_model);
qDebug()<< Q_FUNC_INFO << ": set after init" << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": set after init" << QT_ENDL;
if (my_rig == nullptr)
{
qDebug()<< Q_FUNC_INFO << ": Init failed, hamlib returned fail!" << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": Init failed, hamlib returned fail!" << QT_ENDL;
return false;
}
else
{
qDebug()<< Q_FUNC_INFO << ": rig_init went OK!" << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": rig_init went OK!" << QT_ENDL;
}
// Code of DG1VS (Thank you!)
if (myrig_model == RIG_MODEL_NETRIGCTL)
{
qDebug()<< Q_FUNC_INFO << ": RIG_PORT_NETWORK" << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": RIG_PORT_NETWORK" << QT_ENDL;
// network based communication
my_rig->state.rigport.type.rig = RIG_PORT_NETWORK;
QString netAddPort = QString("%1:%2").arg (networkAddress).arg(networkPort);
@ -512,7 +464,7 @@ bool HamLibClass::init(bool _active)
}
else if (myrig_model == RIG_MODEL_FLRIG)
{
qDebug()<< Q_FUNC_INFO << ": RIG_PORT_RPC" << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": RIG_PORT_RPC" << QT_ENDL;
my_rig->state.rigport.type.rig = RIG_PORT_RPC;
//my_rig->state.rigport.type.rig = RIG_PORT_NETWORK;
QString netAddPort = QString("%1:%2").arg (networkAddress).arg(networkPort);
@ -521,46 +473,49 @@ bool HamLibClass::init(bool _active)
}
else
{
qDebug()<< Q_FUNC_INFO << ": !RIG_PORT_NETWORK" << QT_ENDL;
qDebug()<< Q_FUNC_INFO << ": serialport2: " << serialPort.toLocal8Bit() << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": !RIG_PORT_NETWORK" << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": serialport2: " << serialPort.toLocal8Bit() << QT_ENDL;
my_rig->state.rigport.type.rig = RIG_PORT_SERIAL;
//strncpy (my_rig->state.rigport.pathname, serialPort.toLocal8Bit().constData(), FILPATHLEN);
qstrncpy (my_rig->state.rigport.pathname, serialPort.toLocal8Bit().constData(), FILPATHLEN);
//qstrncpy (my_rig->state.rigport.pathname, serialPort.toLocal8Bit().constData(), FILPATHLEN);
QVariant aux = QVariant(serialPort);
QByteArray portStr = aux.toByteArray();
const char* port = portStr.constData();
strncpy(my_rig->state.rigport.pathname, port, FILPATHLEN - 1);
qDebug()<< Q_FUNC_INFO << ": rigport: " << my_rig->state.rigport.pathname << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": rigport: " << my_rig->state.rigport.pathname ;
my_rig->state.rigport.parm.serial.rate = bauds;
qDebug()<< Q_FUNC_INFO << ": serial rate: " << QString::number(my_rig->state.rigport.parm.serial.rate) << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": serial rate: " << QString::number(my_rig->state.rigport.parm.serial.rate) ;
my_rig->state.rigport.parm.serial.data_bits = dataBits;
qDebug()<< Q_FUNC_INFO << ": data bits: " << QString::number(my_rig->state.rigport.parm.serial.data_bits) << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": data bits: " << QString::number(my_rig->state.rigport.parm.serial.data_bits) ;
my_rig->state.rigport.parm.serial.stop_bits = stopBits;
qDebug()<< Q_FUNC_INFO << ": stop bits: " << QString::number(my_rig->state.rigport.parm.serial.stop_bits) << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": stop bits: " << QString::number(my_rig->state.rigport.parm.serial.stop_bits);
my_rig->state.rigport.parm.serial.parity = sparity;
qDebug()<< Q_FUNC_INFO << ": handshake before" << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": handshake before" << QT_ENDL;
my_rig->state.rigport.parm.serial.handshake = shandshake;
qDebug()<< Q_FUNC_INFO << ": after handshake " << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": after handshake " << QT_ENDL;
// Config done
}
qDebug()<< Q_FUNC_INFO << ": Rig model config " << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": Rig model config " << QT_ENDL;
// Config done
retcode = rig_open(my_rig);
qDebug()<< Q_FUNC_INFO << ": retcode: " << QString::number(retcode) << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": retcode: " << QString::number(retcode) << QT_ENDL;
if (retcode != RIG_OK)
{
qDebug()<< Q_FUNC_INFO << ": Can't open: " << rigerror(retcode) << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": Can't open: " << rigerror(retcode) << QT_ENDL;
rig_cleanup(my_rig);
return errorManage(Q_FUNC_INFO, retcode);
}
qDebug()<< Q_FUNC_INFO << ": Rig open!" << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": Rig open!" << QT_ENDL;
errorCount = 0;
rigLaunched = true;
freq_old = 0.0;
timer->start(pollInterval);
qDebug()<< Q_FUNC_INFO << ": END TRUE" << QT_ENDL;
//qDebug()<< Q_FUNC_INFO << ": END TRUE" << QT_ENDL;
return true;
}
@ -570,7 +525,7 @@ bool HamLibClass::isRunning()
return rigLaunched;
}
QStringList HamLibClass::getRigList ()
void HamLibClass::fillRigsList()
{
//showDebugLog(Q_FUNC_INFO, "Start");
//qDebug()<< "HamLibClass::getRigList: StringsList before filling it: " << QT_ENDL;
@ -587,10 +542,18 @@ QStringList HamLibClass::getRigList ()
//qDebug() << "HamLibClass::getRigList-10" << QT_ENDL;
rig_list_foreach (addRigToList, this);
//qDebug() << "HamLibClass::getRigList-11" << QT_ENDL;
strings.sort();
//qDebug()<< "HamLibClass::getRigList-12 - Strings length: " << QString::number(strings.length()) << QT_ENDL;
return strings;
}
QStringList HamLibClass::getRigList ()
{
//showDebugLog(Q_FUNC_INFO, "Start");
//qDebug()<< "HamLibClass::getRigList: StringsList before filling it: " << QT_ENDL;
//fillRigsList ();
//strings.sort();
//qDebug()<< "HamLibClass::getRigList-12 - Strings length: " << QString::number(strings.length()) << QT_ENDL;
return strings;
}
int HamLibClass::addRigToList (const struct rig_caps *caps, void *data)
@ -601,14 +564,13 @@ int HamLibClass::addRigToList (const struct rig_caps *caps, void *data)
//qDebug()<< "HamLibClass::addRigToList-10" << QT_ENDL;
//HamLibClass *r = (HamLibClass *) data;
HamLibClass *r = static_cast<HamLibClass *> (data);
//qDebug()<< "HamLibClass::addRigToList-11" << QT_ENDL;
name = caps->model_name;
//qDebug()<< "HamLibClass::addRigToList-12" << QT_ENDL;
r->rigName2RigId[name] = caps->rig_model; // We fill the equivalences between name & Id
//qDebug()<< "HamLibClass::addRigToList-13" << QT_ENDL;
//qDebug()<< "HamLibClass::addRigToList-13: " << caps->rig_model;
r->rigId2RigName[caps->rig_model] = name;
//qDebug()<< "HamLibClass::addRigToList-14" << QT_ENDL;
//qDebug()<< "HamLibClass::addRigToList-14: " << name;
r->strings << name;
//qDebug()<< "HamLibClass::addRigToList-END" << QT_ENDL;
return -1; // not 0 --> we want all rigs
@ -620,13 +582,14 @@ int HamLibClass::getModelIdFromName (const QString &_name)
//HamLibClass *r (HamLibClass *) data;
int i = -1;
i = rigName2RigId[_name];
//qDebug() << Q_FUNC_INFO << "Name: " << _name << " = " << QString::number(i);
return i;
}
QString HamLibClass::getNameFromModelId(const int _id)
{
//showDebugLog(Q_FUNC_INFO, "Start");
//qDebug() << "HamLibClass::getNameFromModelId: " << QString::number(_id) << "/" << rigId2RigName.value(_id)<< QT_ENDL;
//qDebug() << "HamLibClass::getNameFromModelId: " << QString::number(_id) << "/" << rigId2RigName.value(_id) ;
return rigId2RigName.value(_id);
}
@ -651,6 +614,7 @@ void HamLibClass::setPort(const QString &_port)
void HamLibClass::setSpeed(const int _speed)
{
//showDebugLog(Q_FUNC_INFO, "Start");
//TODO: Check that it is a valid speed
bauds = _speed;
rigLaunched = false;
//qDebug() << Q_FUNC_INFO << ": " << QString::number(bauds);
@ -672,13 +636,26 @@ void HamLibClass::setDataBits(const int _data)
//qDebug() << Q_FUNC_INFO << ": final: " << QString::number(dataBits);
}
void HamLibClass::setStop(const int _stop)
void HamLibClass::setStop(const QString &_stop)
{
//showDebugLog(Q_FUNC_INFO, "Start");
//qDebug() << Q_FUNC_INFO << ": " << QString::number(stopBits);
if (_stop>0)
//qDebug() << Q_FUNC_INFO << ": " << _stop;
if (_stop == "OneStop")
{
stopBits = _stop;
stopBits = 1;
}
else if (_stop == "OneAndHalfStop")
{
stopBits = 3;
}
else if (_stop == "TwoStop")
{
stopBits = 2;
}
else
{
stopBits = -1;
}
rigLaunched = false;
}
@ -911,12 +888,12 @@ bool HamLibClass::errorManage(const QString &_func, const int _errorcode)
if (errorCount<10)
{
errorCount++;
//qDebug() << Q_FUNC_INFO << ": RIG NOK for Mode: - " << QString::number(errorCount) << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": RIG NOK for Mode: - " << QString::number(errorCount) << QT_ENDL;
return false;
}
else
{
//qDebug() << Q_FUNC_INFO << ": RIG NOK for Mode" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": RIG NOK for Mode" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": Calling stop";
stop();
return false;

4
src/hamlibclass.h
View File

@ -63,7 +63,7 @@ public:
void setPoll(const int _milsecs);
void setDataBits(const int data);
void setStop(const int _stop);
void setStop(const QString &_stop);
void setFlow(const QString &_flow);
void setParity(const QString &_parity);
void setSpeed(const int _speed);
@ -100,8 +100,10 @@ public slots:
private:
bool readRadioInternal(bool _forceRead);
void fillRigsList();
static int addRigToList(const struct rig_caps* caps, void* data);
QString hamlibMode2Mode(rmode_t _rmode);
rmode_t mode2HamlibMode (const QString &_mode);
bool errorManage(const QString &_func, const int _errorcode);
//rmode_t mode2HamlibMode(const QString &_m);
QStringList strings;

12
src/main.cpp
View File

@ -397,21 +397,21 @@ int main(int argc, char *argv[])
//qDebug() << "KLog Main-100" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
splash.showMessage ("Creating window...");
MainWindow mw(klogDir, version);
qDebug() << "KLog Main-101" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "KLog Main-101" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
splash.showMessage ("Initializing window...");
mw.init();
qDebug() << "KLog Main-102" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "KLog Main-102" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
splash.showMessage ("Cheching for new versions...");
mw.checkIfNewVersion();
splash.showMessage ("Checking if backup is needed...");
qDebug() << "KLog Main-103" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "KLog Main-103" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
mw.recommendBackupIfNeeded();
splash.showMessage ("Showing window...");
qDebug() << "KLog Main-104" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "KLog Main-104" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
mw.show();
qDebug() << "KLog Main-105" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "KLog Main-105" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
splash.finish(&mw);
qDebug() << "KLog Main-106" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "KLog Main-106" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
return app.exec();
//qDebug() << "KLog Main-107" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
}

8
src/mainqsoentrywidget.cpp
View File

@ -186,12 +186,10 @@ void MainQSOEntryWidget::slotManualModeCheckBoxClicked()
{
slotClearButtonClicked();
emit hamlibSetActiveSignal(false);
//hamlib->stop();
//stop hamlib and wsjt-x communication;
}
else
{
//hamlib->initClass();
emit hamlibSetActiveSignal(true);
//start hamlib and wsjt-x communication;
}
@ -610,17 +608,19 @@ bool MainQSOEntryWidget::setBand(const QString &_band)
bool MainQSOEntryWidget::setMode(const QString &_mode)
{
emit debugLog(Q_FUNC_INFO, "Start", Debug);
//qDebug() << "MainQSOEntryWidget::setMode: " << _mode << QT_ENDL;
//qDebug() << "MainQSOEntryWidget::setMode: " << _mode;
if (modeComboBox->findText(_mode, Qt::MatchCaseSensitive) < 0)
{
//qDebug() << "MainQSOEntryWidget::setMode NOT found";
emit debugLog(Q_FUNC_INFO, "END-1", Debug);
return false;
}
else
{
//qDebug() << "MainQSOEntryWidget::setMode Updated";
modeComboBox->setCurrentIndex(modeComboBox->findText(_mode, Qt::MatchCaseSensitive));
emit debugLog(Q_FUNC_INFO, "END", Debug);
return true;
return true;
}
}

233
src/mainwindow.cpp
View File

@ -32,14 +32,10 @@
#include <QNetworkRequest>
#include "database.h"
#include "mainwindow.h"
//using namespace G_callsignCheck;
//#include <qDebug>
//extern bool g_callsignCheck;
MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
{
qDebug() << Q_FUNC_INFO << ": " << _klogDir << " Ver: " << tversion << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": " << _klogDir << " Ver: " << tversion << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
g_callsignCheck = true;
showKLogLogWidget = new ShowKLogLogWidget;
@ -57,15 +53,13 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
upAndRunning = false; // To define some actions that can only be run when starting the software
QRZCOMAutoCheckAct = new QAction(tr("Check always the current callsign in QRZ.com"), this);
QRZCOMAutoCheckAct->setCheckable(true);
QRZCOMAutoCheckAct->setChecked(false);
qDebug() << "MainWindow::MainWindow: Debug File: "<< util->getDebugLogFile() << QT_ENDL;
//qDebug() << "MainWindow::MainWindow: Debug File: "<< util->getDebugLogFile() << QT_ENDL;
debugFile = new QFile(util->getDebugLogFile());
qDebug() << Q_FUNC_INFO << ": BEFORE HAMLIB " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": BEFORE HAMLIB " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
hamlib = new HamLibClass();
qDebug() << Q_FUNC_INFO << ": AFTER HAMLIB " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": AFTER HAMLIB " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
dataProxy = new DataProxy_SQLite(Q_FUNC_INFO, softwareVersion);
lotwUtilities = new LoTWUtilities(klogDir, softwareVersion, Q_FUNC_INFO, dataProxy);
@ -73,35 +67,35 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
//qDebug() << Q_FUNC_INFO << ": Before DXCCStatusWidget " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
dxccStatusWidget = new DXCCStatusWidget(dataProxy, Q_FUNC_INFO);
qDebug() << Q_FUNC_INFO << ": After DXCCStatusWidget " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": After DXCCStatusWidget " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
elogClublog = new eLogClubLog();
qDebug() << Q_FUNC_INFO << ": 00082: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 00082: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
elogQRZcom = new eLogQrzLog(dataProxy, Q_FUNC_INFO, softwareVersion);
qDebug() << Q_FUNC_INFO << ": 00083: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 00083: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
updateSatsData = new UpdateSatsData(dataProxy);
qDebug() << Q_FUNC_INFO << ": 00084: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 00084: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
statsWidget = new StatisticsWidget(dataProxy);
qDebug() << Q_FUNC_INFO << ": 00085: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 00085: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
infoLabel1 = new QLabel(tr("Status bar ..."));
infoLabel2 = new QLabel(tr("DX Entity"));
qDebug() << "MainWindow::MainWindow: 00086" << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::MainWindow: 00086" << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
logWindow = new LogWindow(dataProxy, this);
qDebug() << Q_FUNC_INFO << ": 00087: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 00087: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
searchWidget = new SearchWidget(dataProxy, this);
qDebug() << Q_FUNC_INFO << ": 00087.1: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 00087.1: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//advancedSearchWidget = new AdvancedSearchWidget(dataProxy, this);
qDebug() << "MainWindow::MainWindow: 00087.2" << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::MainWindow: 00087.2" << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
infoWidget = new InfoWidget(dataProxy, this);
qDebug() << Q_FUNC_INFO << ": 00088: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 00088: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
logEvent(Q_FUNC_INFO, "Creating AwardsWidget", Debug);
awardsWidget = new AwardsWidget(dataProxy, this);
qDebug() << Q_FUNC_INFO << ": 0009: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 0009: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
aboutDialog = new AboutDialog(softwareVersion);
tipsDialog = new TipsDialog();
@ -118,36 +112,35 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
}
}
qDebug() << Q_FUNC_INFO << ": 40: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 40: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
world = new World(dataProxy, klogDir, softwareVersion, Q_FUNC_INFO);
qDebug() << Q_FUNC_INFO << ": 50: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 50: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
configFileName = util->getCfgFile();
qDebug() << Q_FUNC_INFO << ": 51: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 51: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
setupDialog = new SetupDialog(dataProxy, configFileName, softwareVersion, 0, !configured, this);
qDebug() << Q_FUNC_INFO << ": satTabWidget to be created " << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": satTabWidget to be created " << QT_ENDL;
satTabWidget = new MainWindowSatTab(dataProxy);
qDebug() << Q_FUNC_INFO << ": 52: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 52: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
QSOTabWidget = new MainWindowInputQSO(dataProxy);
qDebug() << Q_FUNC_INFO << ": 53: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 53: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
myDataTabWidget = new MainWindowMyDataTab();
qDebug() << Q_FUNC_INFO << ": 54: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 54: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
commentTabWidget = new MainWindowInputComment();
qDebug() << Q_FUNC_INFO << ": 55: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 55: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
othersTabWidget = new MainWindowInputOthers(dataProxy);
qDebug() << Q_FUNC_INFO << ": 56: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 56: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
eQSLTabWidget = new MainWindowInputEQSL(dataProxy);
qDebug() << Q_FUNC_INFO << ": 57: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 57: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
QSLTabWidget = new MainWindowInputQSL(dataProxy);
qDebug() << Q_FUNC_INFO << ": 58: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 58: " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
mainQSOEntryWidget = new MainQSOEntryWidget(dataProxy);
qDebug() << Q_FUNC_INFO << ": locator to be created 59" << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": locator to be created 59" << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
locator = new Locator();
mainWidget = new QWidget(this);
setCentralWidget(mainWidget);
qDebug() << Q_FUNC_INFO << ": 60 " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 60 " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
dateTime = new QDateTime();
dateTimeTemp = new QDateTime();
@ -155,11 +148,11 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
infoLabel2 = new QLabel(tr("DX Entity"));
loggWinAct = new QAction(tr("&Log Window"), this);
qDebug() << Q_FUNC_INFO << ": dxclusterwidget to be created " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": dxclusterwidget to be created " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
dxClusterWidget = new DXClusterWidget(dataProxy, dxclusterServerToConnect , dxclusterServerPort, this);
qDebug() << Q_FUNC_INFO << ": Awards to be created " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": Awards to be created " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
awards = new Awards(dataProxy, Q_FUNC_INFO);
qDebug() << Q_FUNC_INFO << ": Awards created " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": Awards created " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
// </UI>
@ -170,13 +163,13 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
//qDebug() << Q_FUNC_INFO << ": Software update to be created " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
softUpdate = new SoftwareUpdate(softwareVersion);
qDebug() << Q_FUNC_INFO << ": FileManager to be created " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": FileManager to be created " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
filemanager = new FileManager(dataProxy, klogDir, softwareVersion);
qDebug() << Q_FUNC_INFO << ": FileAwardManager to be created " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": FileAwardManager to be created " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
fileAwardManager = new FileAwardManager(dataProxy, Q_FUNC_INFO);
lotwCallTQSL = new QAction(tr("Upload the queued QSOs to LoTW"), this);
qDebug() << Q_FUNC_INFO << ": AdifLoTWExportWidget to be created " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": AdifLoTWExportWidget to be created " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
adifLoTWExportWidget = new AdifLoTWExportWidget(dataProxy, Q_FUNC_INFO);
//qDebug() << Q_FUNC_INFO << ": ShowAdifImportWidget to be created " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
showAdifImportWidget = new ShowAdifImportWidget(dataProxy, Q_FUNC_INFO);
@ -184,7 +177,7 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
logEvent(Q_FUNC_INFO, "END", logSeverity);
qDebug() << Q_FUNC_INFO << ": END " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": END " << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
}
MainWindow::~MainWindow()
@ -249,7 +242,7 @@ void MainWindow::setWindowSize(const QSize &_size)
void MainWindow::init()
{
qDebug() << "MainWindow::init: START " << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::init: START " << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
if (!debugFile->open(QIODevice::WriteOnly | QIODevice::Text)) /* Flawfinder: ignore */
{
debugFileOpen = false;
@ -269,7 +262,6 @@ void MainWindow::init()
}
logEvents = true;
hamlib->initClass();
util->setCallValidation (true);
infoLabel1T = QString();
@ -279,7 +271,7 @@ void MainWindow::init()
//Default band/modes
bands << "10M" << "15M" << "20M" << "40M" << "80M" << "160M";
modes << "SSB" << "CW" << "RTTY";
qDebug() << "MainWindow::init - 00" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::init - 00" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
hamlibActive = false;
hamlibModeNotADIFSupported = false;
@ -389,10 +381,6 @@ void MainWindow::init()
palRed.setColor(QPalette::Text, Qt::red);
palBlack.setColor(QPalette::Text, Qt::black);
// Check date & time and set them in the UI at the begining
//dateTime->currentDateTime();
clublogAnswer = -1;
defaultColor.setNamedColor("slategrey");
@ -405,13 +393,13 @@ void MainWindow::init()
ctyDatFile = util->getCTYFile();
if (!existingData)
{
qDebug() << "MainWindow::init - 61" << QT_ENDL;
//qDebug() << "MainWindow::init - 61" << QT_ENDL;
world->create(ctyDatFile);
//qDebug() << "MainWindow::init - 62" << QT_ENDL;
}
else if (!world->hasSpecialEntities())
{
qDebug() << "MainWindow::init - 63" << QT_ENDL;
//qDebug() << "MainWindow::init - 63" << QT_ENDL;
QMessageBox msgBox;
msgBox.setIcon(QMessageBox::Question);
@ -431,23 +419,23 @@ void MainWindow::init()
default:
break;
}
qDebug() << "MainWindow::init - 69" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::init - 69" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
}
qDebug() << "MainWindow::init - 70" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::init - 70" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
readConfigData();
qDebug() << "MainWindow::init - 71" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::init - 71" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
logWindow->createlogPanel(currentLog);
qDebug() << "MainWindow::init - 72" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::init - 72" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
awards->setManageModes(manageMode);
qDebug() << "MainWindow::init - 73" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::init - 73" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
if (dataProxy->getNumberOfManagedLogs()<1)
{
//qDebug() << "MainWindow::init - 73.1" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
openSetup(6);
//qDebug() << "MainWindow::init - 73.2" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
}
qDebug() << "MainWindow::init - 74" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::init - 74" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//checkIfNewBandOrMode();
//qDebug() << "MainWindow::init - 75" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
awardsWidget->fillOperatingYears();
@ -455,7 +443,7 @@ void MainWindow::init()
awardsWidget->setManageDXMarathon(manageDxMarathon);
dxClusterWidget->setCurrentLog(currentLog);
qDebug() << "MainWindow::init - 80" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::init - 80" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::Init: calling Software update ..." << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
if (checkNewVersions)
{//reportInfo
@ -467,7 +455,7 @@ void MainWindow::init()
}
//qDebug() << "MainWindow::init - 90" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
currentBandShown = dataProxy->getIdFromBandName(mainQSOEntryWidget->getBand());
qDebug() << "MainWindow::init - 91" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::init - 91" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
currentModeShown = dataProxy->getIdFromModeName(mainQSOEntryWidget->getMode());
//qDebug() << "MainWindow::init - 92" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
currentBand = currentBandShown;
@ -475,22 +463,21 @@ void MainWindow::init()
timerInfoBars = new QTimer(this);
qDebug() << "MainWindow::init: Calling createUI" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::init: Calling createUI" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
createUI();
//qDebug() << "MainWindow::init: Calling slotClearButtonClicked" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
qDebug() << Q_FUNC_INFO << " - 100";
//qDebug() << Q_FUNC_INFO << " - 100";
slotClearButtonClicked();
qDebug() << Q_FUNC_INFO << " - 110";
//qDebug() << Q_FUNC_INFO << " - 110";
infoWidget->showInfo(-1);
qDebug() << Q_FUNC_INFO << " - 120";
//qDebug() << Q_FUNC_INFO << " - 120";
//lotwTQSLpath = util->getTQSLsPath() + util->getTQSLsFileName();
upAndRunning = true;
mainQSOEntryWidget->setUpAndRunning(upAndRunning);
qDebug() << Q_FUNC_INFO << " - 130";
//qDebug() << Q_FUNC_INFO << " - 130";
startServices();
qDebug() << "MainWindow::init: END" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::init: END" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
}
@ -654,7 +641,7 @@ void MainWindow::createActionsCommon(){
void MainWindow::recommendBackupIfNeeded()
{
qDebug() << "MainWindow::recommendBackupIfNeeded" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::recommendBackupIfNeeded" << (QTime::currentTime()).toString("HH:mm:ss") << QT_ENDL;
if (dataProxy->getHowManyQSOInLog(-1)<1)
{
return;
@ -662,7 +649,7 @@ void MainWindow::recommendBackupIfNeeded()
QDateTime lastBackupDate;
lastBackupDate = QDateTime();
lastBackupDate = filemanager->getDateTimeOfLastBackup();
qDebug() << "MainWindow::recommendBackupIfNeeded lastDate: " << util->getDateTimeSQLiteStringFromDateTime(lastBackupDate) << (QTime::currentTime()).toString(" HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::recommendBackupIfNeeded lastDate: " << util->getDateTimeSQLiteStringFromDateTime(lastBackupDate) << (QTime::currentTime()).toString(" HH:mm:ss") << QT_ENDL;
bool backupNeeded = false;
QString msg;
if (lastBackupDate == QDateTime())
@ -672,14 +659,14 @@ void MainWindow::recommendBackupIfNeeded()
}
else if (lastBackupDate.addMonths(1) < QDateTime::currentDateTime())
{
qDebug() << "MainWindow::recommendBackupIfNeeded More than a month" << (QTime::currentTime()).toString(" HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::recommendBackupIfNeeded More than a month" << (QTime::currentTime()).toString(" HH:mm:ss") << QT_ENDL;
backupNeeded = true;
msg = tr("It seems that the latest backup you did is older than one month.");
}
if (backupNeeded)
{
qDebug() << "MainWindow::recommendBackupIfNeeded We need to backup" << (QTime::currentTime()).toString(" HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::recommendBackupIfNeeded We need to backup" << (QTime::currentTime()).toString(" HH:mm:ss") << QT_ENDL;
QMessageBox msgBox;
msgBox.setIcon(QMessageBox::Warning);
@ -700,7 +687,7 @@ void MainWindow::recommendBackupIfNeeded()
{
case QMessageBox::Yes:
QString filename = util->getBackupADIFile();
qDebug() << "MainWindow::recommendBackupIfNeeded: Backup to: " << filename << (QTime::currentTime()).toString(" HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::recommendBackupIfNeeded: Backup to: " << filename << (QTime::currentTime()).toString(" HH:mm:ss") << QT_ENDL;
QMessageBox msgBox;
msgBox.setWindowTitle(tr("KLog - Backup"));
if (filemanager->adifLogExport(filename, 0)) // 0 will save ALL the logs)
@ -719,7 +706,7 @@ void MainWindow::recommendBackupIfNeeded()
break;
}
}
qDebug() << "MainWindow::recommendBackupIfNeeded - END" << (QTime::currentTime()).toString(" HH:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::recommendBackupIfNeeded - END" << (QTime::currentTime()).toString(" HH:mm:ss") << QT_ENDL;
}
void MainWindow::checkIfNewVersion()
@ -891,27 +878,31 @@ void MainWindow::slotModeChanged (const QString &_m)
{
return;
}
//qDebug() << "MainWindow::slotModeChanged: " << _m << QT_ENDL;
//qDebug() << "MainWindow::slotModeChanged: " << _m << QT_ENDL;
currentBandShown = dataProxy->getIdFromBandName(mainQSOEntryWidget->getBand());
//qDebug() << "MainWindow::slotModeComboBoxChanged: currentBandShown2: " << QString::number(currentBandShown) << QT_ENDL;
//qDebug() << "MainWindow::slotModeComboBoxChanged: currentBandShown2: " << QString::number(currentBandShown) << QT_ENDL;
currentModeShown = dataProxy->getIdFromModeName(_m);
currentBand = currentBandShown;
currentMode = currentModeShown;
QStringList _qs; //for the showStatusOfDXCC(const QStringList _qs)
_qs.clear();
//qDebug() << "MainWindow:: - calling showStatusOfDXCC-01 " << QT_ENDL;
//qDebug() << "MainWindow:: - calling showStatusOfDXCC-01 " << QT_ENDL;
_qs << QString::number(currentEntity) << QString::number(currentBandShown) << QString::number(currentModeShown) << QString::number(currentLog);
showStatusOfDXCC(_qs);
QSOTabWidget->setRSTToMode(mainQSOEntryWidget->getMode(), readingTheUI);
QString _modeSeen = mainQSOEntryWidget->getMode();
if (_modeSeen == "SSB")
//QString _modeSeen = mainQSOEntryWidget->getMode();
if (hamlibActive)
{
hamlib->setMode (mainQSOEntryWidget->getMode());
}
/* if (_modeSeen == "SSB")
{
setModeFromFreq();
}
*/
logEvent(Q_FUNC_INFO, "END", logSeverity);
//qDebug() << "MainWindow::slotModeComboBoxChanged2: " << mainQSOEntryWidget->getMode() << QT_ENDL;
}
@ -3906,6 +3897,8 @@ void MainWindow::createMenusCommon()
connect(QRZCOMCheckThisCallAct, SIGNAL(triggered()), this, SLOT( slotElogQRZCOMCheckThisCall()));
QRZCOMCheckThisCallAct->setToolTip("Checks the current callsign in QRZ.com.");
QRZCOMAutoCheckAct->setCheckable(true);
QRZCOMAutoCheckAct->setChecked(false);
QRZCOMAutoCheckAct->setText(tr("Check always the current callsign in QRZ.com"));
QRZCOMToolMenu->addAction(QRZCOMAutoCheckAct);
connect(QRZCOMAutoCheckAct, SIGNAL(triggered()), this, SLOT( slotElogQRZCOMAutoCheck()));
@ -4635,16 +4628,16 @@ void MainWindow::slotUpdateStatusBar(const QString &statusm)
}
bool MainWindow::readCtyFile()
{
logEvent(Q_FUNC_INFO, "Start", logSeverity);
logEvent(Q_FUNC_INFO, "END", logSeverity);
return false;
}
//bool MainWindow::readCtyFile()
//{
// logEvent(Q_FUNC_INFO, "Start", logSeverity);
// logEvent(Q_FUNC_INFO, "END", logSeverity);
// return false;
//}
void MainWindow::slotDoubleClickLog(const int _qsoID)
{
//qDebug() << "MainWindow::slotDoubleClickLog: QSOid: " << QString::number(_qsoID) << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": QSOid: " << QString::number(_qsoID) << QT_ENDL;
logEvent(Q_FUNC_INFO, "Start", logSeverity);
//int row = _qsoID.row();
//qsoToEdit((logModel->index(row, 0)).data(0).toInt());
@ -4729,7 +4722,7 @@ bool MainWindow::setHamlib(const bool _b)
else
{
//qDebug() << Q_FUNC_INFO << ": Hamlib NOT active";
hamlib->stop();
hamlib->init(false);
return false;
}
}
@ -4738,7 +4731,7 @@ void MainWindow::showEvent(QShowEvent *event)
{
//qDebug() << Q_FUNC_INFO << QT_ENDL;
setWindowSize(windowSize);
setHamlib (hamlibActive);
//setHamlib (hamlibActive);
}
void MainWindow::keyPressEvent(QKeyEvent *event){
@ -4842,7 +4835,6 @@ void MainWindow::readConfigData()
}
//qDebug() << Q_FUNC_INFO << ": 01" << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
infoWidget->setImperialSystem(imperialSystem);
infoLabel2->setText(world->getEntityName(currentEntity));
//qDebug() << "MainWindow::readConfigData-89" << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
infoWidget->showEntityInfo(currentEntity);
@ -4857,24 +4849,13 @@ void MainWindow::readConfigData()
//qDebug() << Q_FUNC_INFO << ": 97" << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
checkIfNewBandOrMode();
//qDebug() << Q_FUNC_INFO << ": 98" << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//initialContestModeConfiguration();
//qDebug() << "MainWindow::readConfigData: 99" << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
/*
if (upAndRunning)
{ // Next actions will not be executed in the first run
slotClearButtonClicked();
}
*/
// I need to init the CLUBLOG
if (clublogActive)
{
elogClublog->setCredentials(clublogEmail, clublogPass, stationCallsign);
}
else
{
//qDebug() << "MainWindow::readConfigData: NOT Setting ClublogCredentials" << QT_ENDL;
}
//qDebug() << Q_FUNC_INFO << ": QRZcom active????" << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
if (qrzcomActive)
{
@ -4886,9 +4867,7 @@ void MainWindow::readConfigData()
//elogQRZcom->login();
//qDebug() << "MainWindow::readConfigData: after login" << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
}
//qDebug() << "MainWindow::readConfigData: calling checkIfNewBandOrMode" << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::readConfigData: 100" << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
//qDebug() << "MainWindow::readConfigData: 100" << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
util->setVersion(softwareVersion);
//qDebug() << "MainWindow::readConfigData: 101" << QTime::currentTime().toString("hh:mm:ss") << QT_ENDL;
searchWidget->setVersion(softwareVersion);
@ -5215,9 +5194,9 @@ bool MainWindow::processConfigLine(const QString &_line){
}
else if (field == "HAMLIBRIGTYPE" )
{
//qDebug() << "MainWindow::processConfigLine: HAMLIBRIGTYPE: " << value << QT_ENDL;
//qDebug() << "MainWindow::processConfigLine: HAMLIBRIGTYPE: " << value << QT_ENDL;
hamlib->setModelId(value.toInt());
//qDebug() << "MainWindow::processConfigLine: HAMLIBRIGTYPE: " << value << QT_ENDL;
}
else if(field == "HAMLIBSERIALPORT")
{
@ -5227,16 +5206,16 @@ bool MainWindow::processConfigLine(const QString &_line){
}
else if (field == "HAMLIBSERIALBAUDS")
{
//qDebug() << "MainWindow::processConfigLine: HAMLIBSERIALBAUDS: " << value << QT_ENDL;
//qDebug() << "MainWindow::processConfigLine: HAMLIBSERIALBAUDS: " << value << QT_ENDL;
hamlib->setSpeed(value.toInt());
//qDebug() << "MainWindow::processConfigLine: HAMLIBSERIALBAUDS: " << value << QT_ENDL;
//qDebug() << "MainWindow::processConfigLine: HAMLIBSERIALBAUDS: " << value << QT_ENDL;
}else if(field =="HAMLIBSERIALDATABITS"){
//qDebug() << "SetupDialog::processConfigLine: HAMLIBSERIALDATABITS: " << value << QT_ENDL;
hamlib->setDataBits(value.toInt());
//qDebug() << "SetupDialog::processConfigLine: HAMLIBSERIALDATABITS: " << value << QT_ENDL;
}else if(field =="HAMLIBSERIALSTOPBITS"){
//qDebug() << "SetupDialog::processConfigLine: HAMLIBSERIALSTOPBITS: " << value << QT_ENDL;
hamlib->setStop(value.toInt ());
hamlib->setStop(value);
//qDebug() << "SetupDialog::processConfigLine: HAMLIBSERIALSTOPBITS: " << value << QT_ENDL;
}else if(field =="HAMLIBSERIALFLOWCONTROL"){
//qDebug() << "SetupDialog::processConfigLine: HAMLIBSERIALFLOWCONTROL: " << value << QT_ENDL;
@ -5809,6 +5788,7 @@ void MainWindow::createUIDX()
infoLabel1->setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
infoLabel2->setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
#endif
setCentralWidget(mainWidget);
logEvent(Q_FUNC_INFO, "END", logSeverity);
//qDebug() << "MainWindow::createUIDX-END" << QT_ENDL;
}
@ -7582,12 +7562,16 @@ void MainWindow::defineStationCallsign(const QString &_call)
}
//qDebug() << "MainWindow::defineStationCallsign: " << stationCallsign << QT_ENDL;
filemanager->setStationCallSign(stationCallsign);
//qDebug() << "MainWindow::defineStationCallsign: AFTER" << QT_ENDL;
myDataTabWidget->setData(myPower, stationCallsign, operatorQRZ, myDataTabWidget->getMyLocator());
dxccStatusWidget->setMyLocator(myDataTabWidget->getMyLocator());
searchWidget->setStationCallsign(stationCallsign);
lotwUtilities->setStationCallSign(stationCallsign);
if (lotwActive)
{
lotwUtilities->setStationCallSign(stationCallsign);
}
adifLoTWExportWidget->setDefaultStationCallsign(stationCallsign);
logEvent(Q_FUNC_INFO, "END", logSeverity);
@ -7800,6 +7784,26 @@ void MainWindow::slotFreqTXChanged(const double _fr)
{
hamlib->setFreq(_fr);
}
//qDebug() << Q_FUNC_INFO << " - Freq: " << QString::number (_fr);
if (_fr<10.0)
{
//qDebug() << Q_FUNC_INFO << " - Lower and mode: " << mainQSOEntryWidget->getMode ();
if (mainQSOEntryWidget->getMode() == "USB")
{
//qDebug() << Q_FUNC_INFO << " - We need to change";
mainQSOEntryWidget->setMode ("LSB");
}
}
else
{
//qDebug() << Q_FUNC_INFO << " - Higher and mode: " << mainQSOEntryWidget->getMode ();
if (mainQSOEntryWidget->getMode() == "LSB")
{
//qDebug() << Q_FUNC_INFO << " - We need to change";
mainQSOEntryWidget->setMode ("USB");
}
}
logEvent(Q_FUNC_INFO, "END", logSeverity);
//qDebug() << "MainWindow::slotFreqTXChanged - END" << QT_ENDL;
@ -8241,25 +8245,25 @@ void MainWindow::slotDefineNewBands (const QStringList _bands)
void MainWindow::slotHamlibTXFreqChanged(const double _f)
{
qDebug() << Q_FUNC_INFO << ": " << QString::number(_f) << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": " << QString::number(_f) << QT_ENDL;
logEvent(Q_FUNC_INFO, "Start", logSeverity);
if (upAndRunning)
{
if (!util->isSameFreq (_f, QSOTabWidget->getTXFreq ()))
{
qDebug() << Q_FUNC_INFO << ": Updating the freq... " << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": Updating the freq... " << QT_ENDL;
QSOTabWidget->setTXFreq (_f);
}
else
{
qDebug() << "MainWindow::slotHamlibTXFreqChanged - Not updating Freq" << QT_ENDL;
//qDebug() << "MainWindow::slotHamlibTXFreqChanged - Not updating Freq" << QT_ENDL;
}
}
else
{
qDebug() << "MainWindow::slotHamlibTXFreqChanged - Not Up&Running" << QT_ENDL;
//qDebug() << "MainWindow::slotHamlibTXFreqChanged - Not Up&Running" << QT_ENDL;
}
qDebug() << "MainWindow::slotHamlibTXFreqChanged - END " << QT_ENDL;
//qDebug() << "MainWindow::slotHamlibTXFreqChanged - END " << QT_ENDL;
logEvent(Q_FUNC_INFO, "END", logSeverity);
}
@ -8341,6 +8345,7 @@ void MainWindow::slotAwardsWidgetSetYear()
void MainWindow::slotActiveHamlib(bool _enable)
{
//qDebug() << Q_FUNC_INFO << ": " << util->boolToQString (_enable);
hamlib->init(_enable);
/*
if (_enable)

2
src/mainwindow.h
View File

@ -379,7 +379,7 @@ private:
bool readCtyFile();
//bool readCtyFile();
//bool isQSLReceived(const int _qsoId);
//bool isQSLSent(const int _qsoId);

48
src/setupdialog.cpp
View File

@ -35,7 +35,7 @@ This class calls all the othet "Setup..." to manage the configuration
SetupDialog::SetupDialog(DataProxy_SQLite *dp, const QString &_configFile, const QString &_softwareVersion, const int _page, const bool _firstTime, QWidget *parent)
{
qDebug() << Q_FUNC_INFO << ": " << _configFile << "/" << _softwareVersion << "/" << QString::number(_page) << util->boolToQString(_firstTime) << endl ;
//qDebug() << Q_FUNC_INFO << ": " << _configFile << "/" << _softwareVersion << "/" << QString::number(_page) << util->boolToQString(_firstTime);
logSeverity = Info;
constrid = 2;
@ -47,36 +47,36 @@ SetupDialog::SetupDialog(DataProxy_SQLite *dp, const QString &_configFile, const
version = _softwareVersion;
pageRequested = _page;
int logsPageTabN=-1;
qDebug() << Q_FUNC_INFO << ": 01" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 01" << QT_ENDL;
locator = new Locator();
tabWidget = new QTabWidget;
qDebug() << Q_FUNC_INFO << ": 01.0" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 01.0" << QT_ENDL;
userDataPage = new SetupPageUserDataPage(dataProxy);
qDebug() << Q_FUNC_INFO << ": 01.10" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 01.10" << QT_ENDL;
bandModePage = new SetupPageBandMode(dataProxy, this);
qDebug() << Q_FUNC_INFO << ": 01.20" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 01.20" << QT_ENDL;
dxClusterPage = new SetupPageDxCluster(this);
qDebug() << Q_FUNC_INFO << ": 01.30" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 01.30" << QT_ENDL;
colorsPage = new SetupPageColors(this);
qDebug() << Q_FUNC_INFO << ": 01.40" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 01.40" << QT_ENDL;
miscPage = new SetupPageMisc(this);
qDebug() << Q_FUNC_INFO << ": 01.50" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 01.50" << QT_ENDL;
worldEditorPage = new SetupPageWorldEditor (dataProxy, this);
qDebug() << Q_FUNC_INFO << ": 01.60" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 01.60" << QT_ENDL;
logsPage = new SetupPageLogs(dataProxy, this);
qDebug() << Q_FUNC_INFO << ": 01.70" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 01.70" << QT_ENDL;
eLogPage = new SetupPageELog(this);
qDebug() << Q_FUNC_INFO << ": 01.80" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 01.80" << QT_ENDL;
UDPPage = new SetupPageUDP(this);
qDebug() << Q_FUNC_INFO << ": 01.90" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 01.90" << QT_ENDL;
satsPage = new SetupPageSats(dataProxy, this);
qDebug() << Q_FUNC_INFO << ": 01.100" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 01.100" << QT_ENDL;
hamlibPage = new SetupPageHamLib(dataProxy, this);
qDebug() << Q_FUNC_INFO << ": 01.101" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 01.101" << QT_ENDL;
logViewPage = new SetupPageLogView(dataProxy, this);
qDebug() << Q_FUNC_INFO << ": 02" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 02" << QT_ENDL;
tabWidget->addTab(userDataPage, tr("User data"));
tabWidget->addTab(bandModePage, tr("Bands/Modes"));
@ -89,9 +89,9 @@ SetupDialog::SetupDialog(DataProxy_SQLite *dp, const QString &_configFile, const
tabWidget->addTab(eLogPage, tr("eLog"));
tabWidget->addTab(UDPPage, tr("WSJT-X"));
tabWidget->addTab(satsPage , tr("Satellites"));
qDebug() << Q_FUNC_INFO << ": 02.100" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 02.100" << QT_ENDL;
tabWidget->addTab(hamlibPage, tr ("HamLib"));
qDebug() << "SetupDialog::SetupDialog 03" << QT_ENDL;
//qDebug() << "SetupDialog::SetupDialog 03" << QT_ENDL;
QPushButton *closeButton = new QPushButton(tr("Cancel"));
okButton = new QPushButton(tr("OK"));
@ -108,28 +108,28 @@ SetupDialog::SetupDialog(DataProxy_SQLite *dp, const QString &_configFile, const
mainLayout->addLayout(horizontalLayout);
mainLayout->addLayout(buttonsLayout);
qDebug() << Q_FUNC_INFO << ": 04" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 04" << QT_ENDL;
setLayout(mainLayout);
setWindowTitle(tr("Settings"));
qDebug() << Q_FUNC_INFO << ": 05" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 05" << QT_ENDL;
slotReadConfigData();
qDebug() << Q_FUNC_INFO << ": 05.1" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 05.1" << QT_ENDL;
if ((pageRequested==6) && (logsPageTabN>0))// The user is opening a new log
{
qDebug() << Q_FUNC_INFO << ": 5.2" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 5.2" << QT_ENDL;
tabWidget->setCurrentIndex(logsPageTabN);
}
qDebug() << Q_FUNC_INFO << ": 5.3" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << ": 5.3" << QT_ENDL;
nolog = !(haveAtleastOneLog());
//hamlibPage->slotTestHamlib ();
connect(closeButton, SIGNAL(clicked()), this, SLOT(slotCancelButtonClicked()));
connect(okButton, SIGNAL(clicked()), this, SLOT(slotOkButtonClicked()));
connectActions();
qDebug() << Q_FUNC_INFO << " - END" << QT_ENDL;
//qDebug() << Q_FUNC_INFO << " - END" << QT_ENDL;
}
SetupDialog::~SetupDialog()
@ -1420,7 +1420,7 @@ void SetupDialog::slotFocusOK()
void SetupDialog::showEvent(QShowEvent *event)
{
qDebug() << Q_FUNC_INFO << QT_ENDL;
//qDebug() << Q_FUNC_INFO << QT_ENDL;
//qDebug() << Q_FUNC_INFO << " - selectedLog: " << QString::number(logsPage->getSelectedLog()) << QT_ENDL;
QWidget::showEvent(event);
userDataPage->setStationFocus();

35
src/setuppages/hamlibserialconfigwidget.cpp
View File

@ -77,8 +77,8 @@ void HamLibSerialConfigWidget::createUI()
//qDebug() << Q_FUNC_INFO << " - 90";
strings.clear();
//strings << tr("1 bit") << tr("1.5 bits") << tr("2 bits");
strings << tr("Default") << tr("1 bit") << tr("2 bits");
strings << tr("1 bit") << tr("1.5 bits") << tr("2 bits");
stopBitsComboBox->addItems(strings);
QLabel *stopBitsLabel = new QLabel(tr("Stop bits"));
stopBitsLabel->setBuddy(stopBitsComboBox);
@ -263,41 +263,52 @@ void HamLibSerialConfigWidget::setParity(const QString &_st)
}
//StopBits { OneStop, OneAndHalfStop, TwoStop, UnknownStopBits }
int HamLibSerialConfigWidget::getStopBits()
QString HamLibSerialConfigWidget::getStopBits()
{
int ret = stopBitsComboBox->currentIndex();
int ret = stopBitsComboBox->currentIndex();
switch (ret)
{
case 0:
return 0;
return "OneStop";
//return QSerialPort::OneStop;
break;
case 1:
return 1;
return "OneAndHalfStop";
//return QSerialPort::OneAndHalfStop;
break;
case 2:
return 2;
return "TwoStop";
//return QSerialPort::TwoStop;
break;
default:
default:
// should never be reached
return 2;
return "UnknownStopBits";
break;
}
}
void HamLibSerialConfigWidget::setStopBits(const QString &_st)
{
if (_st == "Default")
if (_st == "OneStop")
{
stopBitsComboBox->setCurrentIndex(0);
}
else if (_st == "1")
else if (_st == "OneAndHalfStop")
{
stopBitsComboBox->setCurrentIndex(1);
}
else
else if (_st == "TwoStop")
{
stopBitsComboBox->setCurrentIndex(2);
}
else
{
stopBitsComboBox->setCurrentIndex(0);
}
}
bool HamLibSerialConfigWidget::setSerialPort(const QString &_port)

2
src/setuppages/hamlibserialconfigwidget.h
View File

@ -20,7 +20,7 @@ public:
void setParity(const QString &_st);
QString getParity();
void setStopBits(const QString &_st);
int getStopBits();
QString getStopBits();
bool setSerialBauds(const int _speed );
bool setSerialPort(const QString &_port);

9
src/setuppages/setuppagehamlib.cpp
View File

@ -29,6 +29,7 @@ SetupPageHamLib::SetupPageHamLib(DataProxy_SQLite *dp, QWidget *parent) : QWidge
//qDebug() << Q_FUNC_INFO ;
hamlibTestOK = false;
hamlib = new HamLibClass();
activateHamlibCheckBox = new QCheckBox();
readOnlyModeCheckBox = new QCheckBox();
@ -227,6 +228,7 @@ void SetupPageHamLib::setRig()
QStringList rigs;
rigs.clear();
//qDebug() << Q_FUNC_INFO << " - 10" << QT_ENDL;
hamlib->initClass();
rigs << hamlib->getRigList();
//qDebug() << Q_FUNC_INFO << " - rigs: " << QString::number(rigs.length())<< QT_ENDL;
rigTypeComboBox->clear ();
@ -284,7 +286,7 @@ QString SetupPageHamLib::getData()
_output = _output + "HamlibSerialPort=" + _serialPort + ";\n";
_output = _output + "HamlibSerialBauds=" + QString::number(serialConfigWidget->getSerialBauds ()) + ";\n";
_output = _output + "HamLibSerialDataBits=" + QString::number(getDataBits()) + ";\n";
_output = _output + "HamLibSerialStopBits=" + QString::number(getStopBits()) + ";\n";
_output = _output + "HamLibSerialStopBits=" + serialConfigWidget->getStopBits() + ";\n";
_output = _output + getFlowControl() + ";\n";
_output = _output + getParity() + ";\n";
@ -379,11 +381,6 @@ void SetupPageHamLib::setParity(const QString &_st)
serialConfigWidget->setParity(_st);
}
int SetupPageHamLib::getStopBits()
{
return serialConfigWidget->getStopBits ();
}
void SetupPageHamLib::setStopBits(const QString &_st)
{
serialConfigWidget->setStopBits (_st);

2
src/setuppages/setuppagehamlib.h
View File

@ -74,7 +74,7 @@ private:
int getDataBits();
QString getFlowControl();
QString getParity();
int getStopBits();
//int getStopBits();
QTabWidget *tabWidget;

14
tests/mainqsoentrywidget/tst_mainqsoentrywidget.cpp
View File

@ -96,8 +96,10 @@ void tst_MainQSOEntryWidget::test_InitialData()
modes.clear();
bands.clear();
bands << "10M" << "15M" << "20M" << "40M" << "80M" << "160M";
modes << "SSB" << "CW" << "RTTY";
QVERIFY(mainQSOEntryWidget->getModes().length ()== modes.length ());
modes << "SSB" << "CW" << "RTTY" << "USB" << "LSB";
mainQSOEntryWidget->setModes (modes);
mainQSOEntryWidget->setBands (bands);
QVERIFY(mainQSOEntryWidget->getModes().length() == modes.length ());
QVERIFY(mainQSOEntryWidget->getDate()== QDate::currentDate());
//qDebug() << mainQSOEntryWidget->getBand(-1) << endl;
//QVERIFY(mainQSOEntryWidget->getBand(-1) == "20M");
@ -110,9 +112,10 @@ void tst_MainQSOEntryWidget::test_InitialData()
//QVERIFY(mainQSOEntryWidget->getBand(6) == "");
QVERIFY(mainQSOEntryWidget->getMode(-1) == mode);
QVERIFY(mainQSOEntryWidget->getMode(0) == "CW");
QVERIFY(mainQSOEntryWidget->getMode(1) == "RTTY");
QVERIFY(mainQSOEntryWidget->getMode(2) == "SSB");
QVERIFY(mainQSOEntryWidget->getMode(3) == "");
QVERIFY(mainQSOEntryWidget->getMode(1) == "LSB");
QVERIFY(mainQSOEntryWidget->getMode(2) == "RTTY");
QVERIFY(mainQSOEntryWidget->getMode(3) == "SSB");
QVERIFY(mainQSOEntryWidget->getMode(4) == "USB");
}
@ -151,7 +154,6 @@ void tst_MainQSOEntryWidget::test_Modes()
QVERIFY (mainQSOEntryWidget->isModeExisting ("PSK") == false);
}
QTEST_MAIN(tst_MainQSOEntryWidget)
#include "tst_mainqsoentrywidget.moc"