codefactor.io cleaning

This commit is contained in:
d 2024-03-24 00:45:20 +01:00
parent edcf84f77f
commit defa2e582b
16 changed files with 11 additions and 965 deletions

View File

@ -1,429 +0,0 @@
/***************************************************************************
adifforfield.cpp - description
-------------------
begin : oct 2021
copyright : (C) 2021 by Jaime Robles
email : jaime@robles.es
***************************************************************************/
/*****************************************************************************
* This file is part of KLog. *
* *
* KLog is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* KLog is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with KLog. If not, see <https://www.gnu.org/licenses/>. *
* *
*****************************************************************************/
#include "adifforfield.h"
ADIFForField::ADIFForField()
{
util = new Utilities;
}
QString ADIFForField::getADIFForQSODate(const QString &_data, ExportMode _em)
{
//qDebug() << Q_FUNC_INFO;
if (_data.length ()<1)
return QString();
QString aux, result;
result.clear ();
QDateTime tDateTime;
tDateTime = util->getDateTimeFromSQLiteString(_data);
if (tDateTime.isValid())
{
aux = util->getADIFDateFromQDateTime(tDateTime);
result = getADIFPair("QSO_DATE", aux);
aux = util->getADIFTimeFromQDateTime(tDateTime);
if (_em == ModeEQSL)
{
aux.chop(2);
}
//qDebug() << Q_FUNC_INFO << ": " << result;
result = result + getADIFPair("TIME_ON", aux);
}
//qDebug() << Q_FUNC_INFO << ": " << result;
return result;
}
QString ADIFForField::getADIFForCall(const QString &_data)
{
//qDebug() << Q_FUNC_INFO << ": " << _data;
QString result;
result.clear ();
if (util->isValidCall(_data))
{
result = getADIFPair("CALL", _data);
}
else
{
if (showInvalidCallMessage(_data))
{
result = getADIFPair("CALL", _data);
}
}
return result;
}
QString ADIFForField::getADIFForRSTSent(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
return getADIFPair("RST_SENT", _data);
}
QString ADIFForField::getADIFForRSTRcvd(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
return getADIFPair("RST_RCVD", _data);
}
QString ADIFForField::getADIFForBand(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
return getADIFPair("BAND", _data);
}
QString ADIFForField::getADIFForMode(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
//if ((aux.length()>1) && (dataProxy->getIdFromModeName(aux)>=0))
return getADIFPair("MODE", _data);
}
QString ADIFForField::getADIFForSubMode(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
return getADIFPair("SUBMODE", _data);
}
QString ADIFForField::getADIFForCQz(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
QString result;
result.clear ();
if ( (0 < _data.toInt()) && (_data.toInt() < CQZones+1) )
{
return getADIFPair("CQZ", _data);
}
return result;
}
QString ADIFForField::getADIFForITUz(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
QString result;
result.clear ();
if ( (0 < _data.toInt()) && (_data.toInt() < ITUZones+1) )
{
return getADIFPair("ITUZ", _data);
}
return result;
}
QString ADIFForField::getADIFForDXCC(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
QString result;
result.clear ();
if ( (0 < _data.toInt()) && (_data.toInt() < DXCCEntities+1) )
{
return getADIFPair("DXCC", _data);
}
return result;
}
QString ADIFForField::getADIFForAddress(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
return getADIFPair("ADDRESS", _data);
}
QString ADIFForField::getADIFForAge(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
bool ok;
float num = _data.toFloat(&ok);
if (!ok)
return QString();
if (!( (num>=0.0) && (num<=120.0) ))
return QString();
return getADIFPair("AGE", _data);
}
QString ADIFForField::getADIFForCNTY(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
return getADIFPair("CNTY", _data);
}
QString ADIFForField::getADIFForComment(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
return getADIFPair("COMMENT", _data);
}
QString ADIFForField::getADIFForA_Index(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
bool ok;
float num = _data.toFloat(&ok);
if (!ok)
return QString();
if (!( (num>=0.0) && (num<=400.0) ))
return QString();
return getADIFPair("A_INDEX", _data);
}
QString ADIFForField::getADIFForAnt_az(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
//TODO: Normalize to 0-360
bool ok;
float num = _data.toFloat(&ok);
if (!ok)
return QString();
return getADIFPair("ANT_AZ", QString::number(num));
}
QString ADIFForField::getADIFForAnt_el(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
//TODO: Normalize to -90 - 90
bool ok;
float num = _data.toFloat(&ok);
if (!ok)
return QString();
if (!((-90.0 <= num) && (90.0>=num)))
return QString();
return getADIFPair("ANT_EL", _data);
}
QString ADIFForField::getADIFForAnt_path(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
QStringList validData;
validData.clear ();
validData << "G" << "O" << "S" << "L";
if (!validData.contains (_data))
return QString();
return getADIFPair("ANT_PATH", _data);
}
QString ADIFForField::getADIFForARRL_sect(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
//TODO: Ensure the exported data is a valid ARRL SECT
return getADIFPair("ARRL_SECT", _data);
}
QString ADIFForField::getADIFForGridSquare(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
//TODO: Ensure the exported data is a valid ARRL SECT
if (!util->isValidGrid (_data))
return QString();
return getADIFPair("GRIDSQUARE", _data);
}
QString ADIFForField::getADIFForMyGridSquare(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
//TODO: Ensure the exported data is a valid ARRL SECT
if (!util->isValidGrid (_data))
return QString();
return getADIFPair("MY_GRIDSQUARE", _data);
}
QString ADIFForField::getADIFForQSODateOff(const QString &_data, ExportMode _em)
{
//qDebug() << Q_FUNC_INFO;
if (_data.length ()<1)
return QString();
QString aux, result;
result.clear ();
QDateTime tDateTime;
tDateTime = util->getDateTimeFromSQLiteString(_data);
if (tDateTime.isValid())
{
aux = util->getADIFDateFromQDateTime(tDateTime);
result = getADIFPair("QSO_DATE_OFF", aux);
aux = util->getADIFTimeFromQDateTime(tDateTime);
if (_em == ModeEQSL)
{
aux.chop(2);
}
//qDebug() << Q_FUNC_INFO << ": " << result;
result = result + getADIFPair("TIME_OFF", aux);
}
//qDebug() << Q_FUNC_INFO << ": " << result;
return result;
}
QString ADIFForField::getADIFForFreq(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
//TODO: Normalize to 0-360
bool ok;
float num = _data.toFloat(&ok);
if (!ok)
return QString();
if (num<0)
{
return QString();
}
return getADIFPair("FREQ", QString::number(num));
}
QString ADIFForField::getADIFForStationCallsign(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
QString result;
result.clear ();
if (util->isValidCall(_data))
{
result = getADIFPair("STATION_CALLSIGN", _data);
}
else
{
if (showInvalidCallMessage(_data))
{
result = getADIFPair("STATION_CALLSIGN", _data);
}
}
return result;
}
QString ADIFForField::getADIFPair(const QString &_field, const QString &_data)
{
//qDebug() << Q_FUNC_INFO << ": " << _field << "/" << _data;
int length = _data.length ();
if (length<1)
{
return QString();
}
if (_field.length ()<1)
{
return QString();
}
return QString("<%1:%2>%3 ").arg(_field).arg(length).arg(_data);
}
bool ADIFForField::showInvalidCallMessage(const QString &_call){
QMessageBox msgBox;
msgBox.setIcon(QMessageBox::Warning);
msgBox.setWindowTitle(tr("KLog - Invalid call detected"));
QString aux = _call;
if (aux.length()<1)
{
aux = QString(tr("An empty callsign has been detected. Do you want to export this QSO anyway (click on Yes) or remove the field from the exported log file?"));
}
else
{
aux = QString(tr("An invalid callsign has been detected %1. Do you want to export this callsign anyway (click on Yes) or remove the call from the exported log file?").arg(aux));
}
msgBox.setText(aux);
msgBox.setInformativeText(tr("Exporting wrong calls may create problems in the applications you are potentially importing this logfile to. It may, however, be a good callsign that is wrongly identified by KLog as not valid. You can, however, edit the ADIF file once the export process is finished."));
msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msgBox.setDefaultButton(QMessageBox::No);
int ret = msgBox.exec();
switch (ret) {
case QMessageBox::Yes:
// Yes was clicked
return true;
case QMessageBox::No:
// No Save was clicked
return false;
default:
// should never be reached
return false;
}
}
QString ADIFForField::getADIFForBandRX(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
return getADIFPair("BAND_RX", _data);
}
QString ADIFForField::getADIFForFreq_rx(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
//TODO: Normalize to 0-360
bool ok;
float num = _data.toFloat(&ok);
if (!ok)
return QString();
if (num<0)
{
return QString();
}
return getADIFPair("FREQ_RX", QString::number(num));
}
QString ADIFForField::getADIFForQSLRDate(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
if (_data.length ()<1)
return QString();
QString aux, result;
result.clear ();
QDate tDate;
tDate = util->getDateFromSQliteString(_data);
if (tDate.isValid())
{
aux = util->getADIFDateFromQDate (tDate);
result = getADIFPair("QSLRDATE", aux);
}
//qDebug() << Q_FUNC_INFO << ": " << result;
return result;
}
QString ADIFForField::getADIFForQSLSDate(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
if (_data.length ()<1)
return QString();
QString aux, result;
result.clear ();
QDate tDate;
tDate = util->getDateFromSQliteString(_data);
if (tDate.isValid())
{
aux = util->getADIFDateFromQDate (tDate);
result = getADIFPair("QSLSDATE", aux);
}
//qDebug() << Q_FUNC_INFO << ": " << result;
return result;
}
QString ADIFForField::getADIFForQSLRcvd(const QString &_data)
{
//qDebug() << Q_FUNC_INFO;
if (!util->isValidQSL_Rcvd (_data, false))
return QString();
return getADIFPair("QSL_RCVD", _data);
}
QString ADIFForField::getADIFForQSLSent(const QString &_data)
{
if (!util->isValidQSL_Sent (_data))
return QString();
return getADIFPair("QSL_SENT", _data);
}

View File

@ -1,203 +0,0 @@
#ifndef ADIFFORFIELD_H
#define ADIFFORFIELD_H
/***************************************************************************
adifforfield.h - description
-------------------
begin : oct 2021
copyright : (C) 2021 by Jaime Robles
email : jaime@robles.es
***************************************************************************/
/*****************************************************************************
* This file is part of KLog. *
* *
* KLog is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* KLog is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with KLog. If not, see <https://www.gnu.org/licenses/>. *
* *
*****************************************************************************/
#include <QObject>
#include <QString>
#include "klogdefinitions.h"
#include "utilities.h"
class ADIFForField: public QObject {
Q_OBJECT
// TODO:
// Add checks for all the data (maybe adding the dataProxy to check helps
// but may slow down the process as queries will be executed.
public:
ADIFForField();
QString getADIFForQSODate(const QString &_data, ExportMode _em = ModeADIF);
QString getADIFForCall(const QString &_data);
QString getADIFForRSTSent(const QString &_data);
QString getADIFForRSTRcvd(const QString &_data);
QString getADIFForBand(const QString &_data);
QString getADIFForMode(const QString &_data);
QString getADIFForSubMode(const QString &_data);
QString getADIFForCQz(const QString &_data);
QString getADIFForITUz(const QString &_data);
QString getADIFForDXCC(const QString &_data);
QString getADIFForAddress(const QString &_data);
QString getADIFForAge(const QString &_data);
QString getADIFForCNTY(const QString &_data);
QString getADIFForComment(const QString &_data);
QString getADIFForA_Index(const QString &_data);
QString getADIFForAnt_az(const QString &_data);
QString getADIFForAnt_el(const QString &_data);
QString getADIFForAnt_path(const QString &_data);
QString getADIFForARRL_sect(const QString &_data);
QString getADIFForGridSquare(const QString &_data);
QString getADIFForMyGridSquare(const QString &_data);
QString getADIFForQSODateOff(const QString &_data, ExportMode _em = ModeADIF);
QString getADIFForFreq(const QString &_data);
QString getADIFForStationCallsign(const QString &_data);
QString getADIFForBandRX(const QString &_data);
QString getADIFForFreq_rx(const QString &_data);
QString getADIFForQSLRDate(const QString &_data);
QString getADIFForQSLSDate(const QString &_data);
QString getADIFForQSLRcvd(const QString &_data);
QString getADIFForQSLSent(const QString &_data);
/*
QString getADIFForLoTWRDate(const QString &_data);
QString getADIFForLoTWSDate(const QString &_data);
QString getADIFForLoTWQSLRcvd(const QString &_data);
QString getADIFForLoTWQSLSent(const QString &_data);
QString getADIFForHRDLogQSOUploadStatus(const QString &_data);
QString getADIFForClubLogQSOUploadDate(const QString &_data);
QString getADIFForClubLogQSOUploadStatus(const QString &_data);
QString getADIFForHRDLogQSOUploadDate(const QString &_data);
QString getADIFForHRDLogQSOUploadStatus(const QString &_data);
QString getADIFForQRZCOMQSOUploadDate(const QString &_data);
QString getADIFForQRZCOMQSOUploadStatus(const QString &_data);
QString getADIFForAward_Submitted(const QString &_data);
QString getADIFForAward_Granted(const QString &_data);
QString getADIFForCheckContest(const QString &_data);
QString getADIFForClass(const QString &_data);
QString getADIFForCont(const QString &_data);
QString getADIFForContactedOp(const QString &_data);
QString getADIFForContestId(const QString &_data);
QString getADIFForCountry(const QString &_data);
QString getADIFForCreditSubmitted(const QString &_data);
QString getADIFForCreditGranted(const QString &_data);
QString getADIFForDark_doc(const QString &_data);
QString getADIFForDistance(const QString &_data);
QString getADIFForEmail(const QString &_data);
QString getADIFForEQ_Call(const QString &_data);
QString getADIFForEQSL_QSLRDate(const QString &_data);
QString getADIFForEQSL_QSLSDate(const QString &_data);
QString getADIFForEQSL_QSLRCVD(const QString &_data);
QString getADIFForEQSL_QSLSent(const QString &_data);
QString getADIFForFists(const QString &_data);
QString getADIFForFist_cc(const QString &_data);
QString getADIFForForce_init(const QString &_data);
QString getADIFForGuest_op(const QString &_data);
QString getADIFForIOTA(const QString &_data);
QString getADIFForIOTAIslandId(const QString &_data);
QString getADIFForMy_IOTA(const QString &_data);
QString getADIFForMy_IOTAIslandId(const QString &_data);
QString getADIFForK_Index(const QString &_data);
QString getADIFForLat(const QString &_data);
QString getADIFForLon(const QString &_data);
QString getADIFForMaxBurst(const QString &_data);
QString getADIFForMultiplier(const QString &_data);
QString getADIFForMS_Shower(const QString &_data);
QString getADIFForMy_Antenna(const QString &_data);
QString getADIFForMy_City(const QString &_data);
QString getADIFForMy_Cnty(const QString &_data);
QString getADIFForMy_Country(const QString &_data);
QString getADIFForMy_CQz(const QString &_data);
QString getADIFForMy_DXCC(const QString &_data);
QString getADIFForMy_Fists(const QString &_data);
QString getADIFForMy_Ituz(const QString &_data);
QString getADIFForMy_Lat(const QString &_data);
QString getADIFForMy_Lon(const QString &_data);
QString getADIFForMy_Name(const QString &_data);
QString getADIFForMy_PostalCode(const QString &_data);
QString getADIFForMy_Rig(const QString &_data);
QString getADIFForSig(const QString &_data);
QString getADIFForSig_info(const QString &_data);
QString getADIFForMy_Sig(const QString &_data);
QString getADIFForMy_Sig_info(const QString &_data);
QString getADIFForMy_SotaRef(const QString &_data);
QString getADIFForSotaRef(const QString &_data);
QString getADIFForMy_State(const QString &_data);
QString getADIFForMy_Street(const QString &_data);
QString getADIFForMy_USACA_Counties(const QString &_data);
QString getADIFForUSACA_Counties(const QString &_data);
QString getADIFForMy_VUCC_Grids(const QString &_data);
QString getADIFForVUCC_Grids(const QString &_data);
QString getADIFForName(const QString &_data);
QString getADIFForNotes(const QString &_data);
QString getADIFForNr_Bursts(const QString &_data);
QString getADIFForNr_pings(const QString &_data);
QString getADIFForOperator(const QString &_data);
QString getADIFForOwner_Callsign(const QString &_data);
QString getADIFForPfx(const QString &_data);
QString getADIFForPoints(const QString &_data);
QString getADIFForPrecedence(const QString &_data);
QString getADIFForProp_Mode(const QString &_data);
QString getADIFForPublic_key(const QString &_data);
QString getADIFForQSLMsg(const QString &_data);
QString getADIFForQSLSentVia(const QString &_data);
QString getADIFForQSLRecVia(const QString &_data);
QString getADIFForQSLVia(const QString &_data);
QString getADIFForQSO_Complete(const QString &_data);
QString getADIFForQSO_Random(const QString &_data);
QString getADIFForQTH(const QString &_data);
QString getADIFForRegion(const QString &_data);
QString getADIFForRig(const QString &_data);
QString getADIFForRX_Pwr(const QString &_data);
QString getADIFForTX_Pwr(const QString &_data);
QString getADIFForSat_Mode(const QString &_data);
QString getADIFForSfi(const QString &_data);
QString getADIFForSilentKey(const QString &_data);
QString getADIFForSKCC(const QString &_data);
QString getADIFForSRx_String(const QString &_data);
QString getADIFForSTx_String(const QString &_data);
QString getADIFForSRx(const QString &_data);
QString getADIFForSTx(const QString &_data);
QString getADIFForState(const QString &_data);
QString getADIFForSWL(const QString &_data);
QString getADIFForUKSMG(const QString &_data);
QString getADIFForVE_Prov(const QString &_data);
QString getADIFForTenTen(const QString &_data);
QString getADIFForWeb(const QString &_data);
QString getADIFForTransmiterId(const QString &_data);
QString getADIFForLogNumber(const QString &_data);
*/
private:
bool showInvalidCallMessage(const QString &_call);
QString getADIFPair(const QString &_field, const QString &_data);
Utilities *util;
};
#endif // ADIFFORFIELD_H

View File

@ -34,7 +34,6 @@ DXMarathon::DXMarathon(DataProxy_SQLite *dp)
//qDebug() << "DXMarathon::DXMarathon - END" ; //qDebug() << "DXMarathon::DXMarathon - END" ;
} }
int DXMarathon::getDXMarathonQSO(const int _year, const int _logNumber) int DXMarathon::getDXMarathonQSO(const int _year, const int _logNumber)
{ {
//qDebug() << "DXMarathon::getDXMarathonQSO: " << QString::number(_year); //qDebug() << "DXMarathon::getDXMarathonQSO: " << QString::number(_year);
@ -58,11 +57,9 @@ int DXMarathon::getDXMarathonScore(const int _year, const int _logNumber)
//qDebug() << "DXMarathon::getDXMarathonScore: " << QString::number(_year); //qDebug() << "DXMarathon::getDXMarathonScore: " << QString::number(_year);
return ( getDXMarathonDXCC(_year, _logNumber) + getDXMarathonCQ(_year, _logNumber)); return ( getDXMarathonDXCC(_year, _logNumber) + getDXMarathonCQ(_year, _logNumber));
} }
bool DXMarathon::neededForDXMarathon(const int _dxcc, const int _cq, const int _year, const int _logNumber) bool DXMarathon::neededForDXMarathon(const int _dxcc, const int _cq, const int _year, const int _logNumber)
{ {
return dataProxy->newDXMarathon(_dxcc, _cq, _year, _logNumber); return dataProxy->newDXMarathon(_dxcc, _cq, _year, _logNumber);
} }

View File

@ -43,7 +43,6 @@ MainWindowInputComment::~MainWindowInputComment(){}
void MainWindowInputComment::createUI() void MainWindowInputComment::createUI()
{ {
QLabel *commentLabel = new QLabel(tr("Comment")); QLabel *commentLabel = new QLabel(tr("Comment"));
commentLabel->setAlignment(Qt::AlignVCenter| Qt::AlignRight); commentLabel->setAlignment(Qt::AlignVCenter| Qt::AlignRight);
commentLineEdit->setToolTip(tr("Add a comment for this QSO.")); commentLineEdit->setToolTip(tr("Add a comment for this QSO."));

View File

@ -67,8 +67,8 @@ public:
signals: signals:
void returnPressed(); void returnPressed();
private slots:
private slots:
void slotQSLViaTextChanged(); void slotQSLViaTextChanged();
void slotQSLSentComboBoxChanged(); void slotQSLSentComboBoxChanged();
void slotQSLRecvComboBoxChanged(); void slotQSLRecvComboBoxChanged();
@ -80,7 +80,6 @@ private slots:
void slotLotwSentComboBoxChanged(); void slotLotwSentComboBoxChanged();
*/ */
private: private:
void createUI(); void createUI();
void setDefaultData(); void setDefaultData();

View File

@ -41,7 +41,6 @@ const double KM_IN_A_MILE = 1.609344;
class Locator class Locator
{ {
public: public:
Locator(); Locator();
~Locator(); ~Locator();

View File

@ -1,183 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** BSD License Usage
** Alternatively, you may use this file under the terms of the BSD license
** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QtWidgets>
#include "logviewsortfilterproxymodel.h"
LogViewSortFilterProxyModel::LogViewSortFilterProxyModel(QObject *parent)
: QSortFilterProxyModel(parent)
{
//setDynamicSortFilter(true);
}
bool LogViewSortFilterProxyModel::lessThan(const QModelIndex &left,
const QModelIndex &right) const
{
QVariant leftData = sourceModel()->data(left);
QVariant rightData = sourceModel()->data(right);
QString leftString = leftData.toString();
QString rightString = rightData.toString();
//qDebug() << "LogViewSortFilterProxyModel::lessThan (leftString): " << leftString << endl;
//qDebug() << "LogViewSortFilterProxyModel::lessThan (rightString): " << rightString << endl;
QDateTime leftDT = QDateTime::fromString((sourceModel()->data(left.siblingAtColumn(1))).toString() + (sourceModel()->data(left.siblingAtColumn(2))).toString(), "yyyy/MM/ddHH:mm:ss");
QDateTime rightDT = QDateTime::fromString((sourceModel()->data(right.siblingAtColumn(1))).toString() + (sourceModel()->data(right.siblingAtColumn(2))).toString(), "yyyy/MM/ddHH:mm:ss");
//qDebug() << "LogViewSortFilterProxyModel::lessThan - DateTime: " << leftDT.toString("yyyy-MM-dd / hh:mm:ss") << endl;
//qDebug() << "LogViewSortFilterProxyModel::lessThan - Columns: " << (sourceModel()->data(left.siblingAtColumn(2))).toString() << endl;
/*
* if (leftData.type() == QVariant::String)
{
//qDebug() << "LogViewSortFilterProxyModel::lessThan - QString" << endl;
}
*/
//qDebug() << "LogViewSortFilterProxyModel::lessThan - Left column: " << QString::number(left.column())<< endl;
//qDebug() << "LogViewSortFilterProxyModel::lessThan - Right column: " << QString::number(right.column())<< endl;
//qDebug() << "LogViewSortFilterProxyModel::lessThan - date: " << leftDT.toString("yyyy-MM-dd--hh:mm:ss") <<"<==>" << rightDT.toString("yyyy-MM-dd--hh:mm:ss") << endl;
if (left.column() == 1)
{
//qDebug() << "LogViewSortFilterProxyModel::lessThan - left: " << (sourceModel()->data(left.siblingAtColumn(1))).toString() << endl;
//QDate leftD = QDate::fromString((sourceModel()->data(left.siblingAtColumn(1))).toString(), "yyyy/MM/dd");
//QDate rightD = QDate::fromString((sourceModel()->data(right.siblingAtColumn(1))).toString(), "yyyy/MM/dd");
if (leftDT.date() == rightDT.date())
{
//qDebug() << "LogViewSortFilterProxyModel::lessThan - SAME" << endl;
if (leftDT.time() < rightDT.time())
{
//qDebug() << "LogViewSortFilterProxyModel::lessThan - SAME - (time) TRUE - Left" << endl;
}
else
{
//qDebug() << "LogViewSortFilterProxyModel::lessThan - SAME - (time) FALSE - Right" << endl;
}
return QString::localeAwareCompare(leftDT.toString("hh:mm:ss"), rightDT.toString("hh:mm:ss")) < 0;
//return leftDT.time() < rightDT.time();
}
else
{
//qDebug() << "LogViewSortFilterProxyModel::lessThan - DIFFERENT: " << endl;
//return leftD < rightD;
if (leftDT.date() < rightDT.date())
{
//qDebug() << "LogViewSortFilterProxyModel::lessThan - DIFFERENT - (date) TRUE - Left" << endl;
}
else
{
//qDebug() << "LogViewSortFilterProxyModel::lessThan - DIFFERENT - (date) FALSE - Right" << endl;
}
//return leftDT.date() < rightDT.date();
return QString::localeAwareCompare(leftString, rightString) < 0;
}
}
else
{
//return leftData < rightData;
//qDebug() << "LogViewSortFilterProxyModel::lessThan - No column 1: " << leftString << " / " << rightString << endl;
return QString::localeAwareCompare(leftString, rightString) < 0;
}
/*
if (rightData.type() == QVariant::DateTime) {
//if (rightData.type() == QVariant::Time) {
//qDebug() << "LogViewSortFilterProxyModel::lessThan - 1" << endl;
return leftData.toDateTime() < rightData.toDateTime();
}
else
{
QString leftString = leftData.toString();
QString rightString = rightData.toString();
if (left.column() == 1)
{
//qDebug() << "LogViewSortFilterProxyModel::lessThan - left Column == 1" << endl;
//qDebug() << "LogViewSortFilterProxyModel::lessThan - leftData/rightData: " << leftString<< "/" << rightString << endl;
if (leftD == rightD)
{
//qDebug() << "LogViewSortFilterProxyModel::lessThan - leftData == rightData: " << leftString<< "/" << rightString << endl;
QString leftN = (sourceModel()->data(left.siblingAtColumn(2))).toString();
QString rightN = (sourceModel()->data(right.siblingAtColumn(2))).toString();
QTime lT = QTime::fromString(leftN, "hh:mm:ss");
QTime rT = QTime::fromString(rightN, "hh:mm:ss");
return lT < rT;
}
else
{
//qDebug() << "LogViewSortFilterProxyModel::lessThan - left != right" << endl;
//qDebug() << "LogViewSortFilterProxyModel::lessThan - leftData != rightData: " << leftString<< "/" << rightString << endl;
return leftD < rightD;
}
}
//qDebug() << "LogViewSortFilterProxyModel::lessThan - 2: " << leftString << "/" << rightString << endl;
return QDate::fromString(leftString, "yyyy/MM/dd") < QDate::fromString(rightString, "yyyy/MM/dd");
//return QString::localeAwareCompare(leftString, rightString) < 0;
}
*/
}

View File

@ -1,83 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the examples of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** BSD License Usage
** Alternatively, you may use this file under the terms of the BSD license
** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef LOGVIEWSORTFILTERPROXYMODEL_H
#define LOGVIEWSORTFILTERPROXYMODEL_H
#include <QDate>
#include <QSortFilterProxyModel>
//! [0]
class LogViewSortFilterProxyModel: public QSortFilterProxyModel
{
Q_OBJECT
public:
LogViewSortFilterProxyModel(QObject *parent = nullptr);
//QDate filterMinimumDate() const { return minDate; }
//void setFilterMinimumDate(const QDate &date);
//QDate filterMaximumDate() const { return maxDate; }
//void setFilterMaximumDate(const QDate &date);
protected:
//bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
private:
//bool dateInRange(const QDate &date) const;
//QDate minDate;
//QDate maxDate;
};
//! [0]
#endif // LOGVIEWSORTFILTERPROXYMODEL_H

View File

@ -70,7 +70,6 @@ signals:
void cancelled(const bool _c); // Cancel button is clicked void cancelled(const bool _c); // Cancel button is clicked
private: private:
//bool isThereAnyNotManagedSat(); //bool isThereAnyNotManagedSat();
void createUI(); void createUI();
void gatherAndSend(); void gatherAndSend();

View File

@ -64,7 +64,6 @@ signals:
void cancelled(const bool _c); // Cancel button is clicked void cancelled(const bool _c); // Cancel button is clicked
private: private:
//bool isThereAnyNotManagedLog(); //bool isThereAnyNotManagedLog();
void createWidget(); void createWidget();
void gatherAndSend(); void gatherAndSend();

View File

@ -30,8 +30,6 @@ ShowErrorDialog::ShowErrorDialog()
{ {
//qDebug() << "ShowErrorDialog::ShowErrorDialog" ; //qDebug() << "ShowErrorDialog::ShowErrorDialog" ;
text.clear(); text.clear();
setWindowTitle(tr("KLog Message")); setWindowTitle(tr("KLog Message"));
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
QVBoxLayout *layout = new QVBoxLayout(this); QVBoxLayout *layout = new QVBoxLayout(this);
@ -67,11 +65,9 @@ ShowErrorDialog::ShowErrorDialog()
void ShowErrorDialog::setText(const QString txt) void ShowErrorDialog::setText(const QString txt)
{ {
//qDebug() << "ShowErrorDialog::setVersion: " << txt; //qDebug() << "ShowErrorDialog::setVersion: " << txt;
text = txt; text = txt;
txtLabel->setText(txt); txtLabel->setText(txt);
//textBrowser->setHtml(text); //textBrowser->setHtml(text);
} }
ShowErrorDialog::~ShowErrorDialog() ShowErrorDialog::~ShowErrorDialog()
@ -85,10 +81,8 @@ void ShowErrorDialog::slotAcceptButtonClicked()
accept(); accept();
} }
void ShowErrorDialog::keyPressEvent(QKeyEvent *event)
{
void ShowErrorDialog::keyPressEvent(QKeyEvent *event){
switch (event->key()) { switch (event->key()) {
break; break;
@ -96,6 +90,5 @@ void ShowErrorDialog::keyPressEvent(QKeyEvent *event){
default: default:
//QFrame::keyPressEvent(event) //QFrame::keyPressEvent(event)
slotAcceptButtonClicked(); slotAcceptButtonClicked();
} }
} }

View File

@ -28,7 +28,6 @@
//#include <QDebug> //#include <QDebug>
SoftwareUpdateDialog::SoftwareUpdateDialog() SoftwareUpdateDialog::SoftwareUpdateDialog()
{ {
//qDebug() << "SoftwareUpdateDialog::SoftwareUpdateDialog" ; //qDebug() << "SoftwareUpdateDialog::SoftwareUpdateDialog" ;
@ -42,16 +41,12 @@ SoftwareUpdateDialog::SoftwareUpdateDialog()
QPushButton *acceptButton = new QPushButton(tr("Ok")); QPushButton *acceptButton = new QPushButton(tr("Ok"));
textBrowser->setOpenExternalLinks(true); textBrowser->setOpenExternalLinks(true);
//textBrowser->setHTML(url); //textBrowser->setHTML(url);
QHBoxLayout *buttonsLayout = new QHBoxLayout; QHBoxLayout *buttonsLayout = new QHBoxLayout;
buttonsLayout->addWidget(acceptButton); buttonsLayout->addWidget(acceptButton);
///
QVBoxLayout *mainLayout = new QVBoxLayout; QVBoxLayout *mainLayout = new QVBoxLayout;
mainLayout->addWidget(textBrowser); mainLayout->addWidget(textBrowser);
mainLayout->addLayout(buttonsLayout); mainLayout->addLayout(buttonsLayout);
@ -60,8 +55,6 @@ SoftwareUpdateDialog::SoftwareUpdateDialog()
setWindowTitle(tr("KLog update")); setWindowTitle(tr("KLog update"));
///
connect(acceptButton, SIGNAL(clicked()), this, SLOT(slotAcceptButtonClicked())); connect(acceptButton, SIGNAL(clicked()), this, SLOT(slotAcceptButtonClicked()));
//qDebug() << "SoftwareUpdateDialog::SoftwareUpdateDialog - END" ; //qDebug() << "SoftwareUpdateDialog::SoftwareUpdateDialog - END" ;
} }
@ -74,7 +67,6 @@ void SoftwareUpdateDialog::setVersion(const QString tversion, const bool updateN
{ {
//text = "<center><h2>KLog new version ("+ tversion + ") is available! </h2></center><br>There is a new version of KLog available.<br><br><b>You can get the new version from:<br><br><center><a href=https://www.klog.xyz>https://www.klog.xyz</a></center>"; //text = "<center><h2>KLog new version ("+ tversion + ") is available! </h2></center><br>There is a new version of KLog available.<br><br><b>You can get the new version from:<br><br><center><a href=https://www.klog.xyz>https://www.klog.xyz</a></center>";
text = tr("<center><h2>KLog new version (%1) is available! </h2></center><br>There is a new version of KLog available.<br><br><b>You can get the new version from:<br><br><center><a href=https://www.klog.xyz>https://www.klog.xyz</a></center>").arg(tversion); text = tr("<center><h2>KLog new version (%1) is available! </h2></center><br>There is a new version of KLog available.<br><br><b>You can get the new version from:<br><br><center><a href=https://www.klog.xyz>https://www.klog.xyz</a></center>").arg(tversion);
} }
else else
{ {
@ -97,8 +89,6 @@ void SoftwareUpdateDialog::slotAcceptButtonClicked()
//qDebug() << "SoftwareUpdateDialog::slotAcceptButtonClicked END" ; //qDebug() << "SoftwareUpdateDialog::slotAcceptButtonClicked END" ;
} }
void SoftwareUpdateDialog::keyPressEvent(QKeyEvent *event) void SoftwareUpdateDialog::keyPressEvent(QKeyEvent *event)
{ {
//qDebug() << "SoftwareUpdateDialog::keyPressEvent" ; //qDebug() << "SoftwareUpdateDialog::keyPressEvent" ;
@ -107,7 +97,5 @@ void SoftwareUpdateDialog::keyPressEvent(QKeyEvent *event)
{ {
slotAcceptButtonClicked(); slotAcceptButtonClicked();
} }
//qDebug() << "SoftwareUpdateDialog::keyPressEvent END" ; //qDebug() << "SoftwareUpdateDialog::keyPressEvent END" ;
} }

View File

@ -59,7 +59,6 @@ class CTYPage;
void slotButtonFinishedClicked(); void slotButtonFinishedClicked();
private: private:
//FileOrMemoryPage *fileOrMemoryPage; //FileOrMemoryPage *fileOrMemoryPage;
CTYPage *ctyPage; CTYPage *ctyPage;
QString version; QString version;

View File

@ -44,8 +44,6 @@ public:
bool satDataFileRead(const QString& tfileName); bool satDataFileRead(const QString& tfileName);
private: private:
Utilities *util; Utilities *util;
DataProxy_SQLite *dataProxy; DataProxy_SQLite *dataProxy;

View File

@ -45,7 +45,6 @@ private slots:
private: private:
HamLibNetworkConfigWidget *netHamLibWidget; HamLibNetworkConfigWidget *netHamLibWidget;
}; };
tst_SetupHamLibNetworkWidget::tst_SetupHamLibNetworkWidget() tst_SetupHamLibNetworkWidget::tst_SetupHamLibNetworkWidget()
@ -54,25 +53,13 @@ tst_SetupHamLibNetworkWidget::tst_SetupHamLibNetworkWidget()
netHamLibWidget->createUI(); netHamLibWidget->createUI();
} }
tst_SetupHamLibNetworkWidget::~tst_SetupHamLibNetworkWidget() tst_SetupHamLibNetworkWidget::~tst_SetupHamLibNetworkWidget(){}
{
} void tst_SetupHamLibNetworkWidget::initTestCase(){}
void tst_SetupHamLibNetworkWidget::initTestCase() void tst_SetupHamLibNetworkWidget::cleanupTestCase(){}
{
} void tst_SetupHamLibNetworkWidget::test_Constructor(){}
void tst_SetupHamLibNetworkWidget::cleanupTestCase()
{
}
void tst_SetupHamLibNetworkWidget::test_Constructor()
{
}
void tst_SetupHamLibNetworkWidget::test_Address() void tst_SetupHamLibNetworkWidget::test_Address()
{ {

View File

@ -47,7 +47,6 @@ private slots:
private: private:
SetupPageELog *page; SetupPageELog *page;
}; };
tst_SetupPageELog::tst_SetupPageELog() tst_SetupPageELog::tst_SetupPageELog()
@ -55,25 +54,13 @@ tst_SetupPageELog::tst_SetupPageELog()
page = new SetupPageELog(); page = new SetupPageELog();
} }
tst_SetupPageELog::~tst_SetupPageELog() tst_SetupPageELog::~tst_SetupPageELog(){}
{
} void tst_SetupPageELog::initTestCase(){}
void tst_SetupPageELog::initTestCase() void tst_SetupPageELog::cleanupTestCase(){}
{
} void tst_SetupPageELog::test_Constructor(){}
void tst_SetupPageELog::cleanupTestCase()
{
}
void tst_SetupPageELog::test_Constructor()
{
}
void tst_SetupPageELog::test_ClubLog() void tst_SetupPageELog::test_ClubLog()
{ {