Skip to content

Commit

Permalink
Include optimalization
Browse files Browse the repository at this point in the history
Do not export internal includes for Rig drivers
foldynl committed Feb 8, 2024
1 parent b5b1557 commit bcf4c87
Showing 6 changed files with 31 additions and 27 deletions.
22 changes: 22 additions & 0 deletions rig/Rig.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
#include "Rig.h"
#include "core/debug.h"
#include "macros.h"
#include "rig/drivers/HamlibDrv.h"
#ifdef Q_OS_WIN
#include "rig/drivers/OmnirigDrv.h"
#include "rig/drivers/Omnirigv2Drv.h"
#endif

MODULE_IDENTIFICATION("qlog.rig.rig");

@@ -18,6 +23,23 @@ Rig::Rig(QObject *parent)
{
FCT_IDENTIFICATION;

drvMapping[HAMLIB_DRIVER] = DrvParams(HAMLIB_DRIVER,
"Hamlib",
&HamlibDrv::getModelList,
&HamlibDrv::getCaps);
#ifdef Q_OS_WIN
drvMapping[OMNIRIG_DRIVER] = DrvParams(OMNIRIG_DRIVER,
"Omnirig v1",
&OmnirigDrv::getModelList,
&OmnirigDrv::getCaps);

drvMapping[OMNIRIGV2_DRIVER] = DrvParams(OMNIRIGV2_DRIVER,
"Omnirig v2",
&OmnirigV2Drv::getModelList,
&OmnirigV2Drv::getCaps);
#endif


}

Rig* Rig::instance()
26 changes: 2 additions & 24 deletions rig/Rig.h
Original file line number Diff line number Diff line change
@@ -4,14 +4,8 @@
#include <QObject>
#include <QTimer>
#include <QMutex>
#include <QHash>
#include "rig/drivers/GenericDrv.h"
#include "rig/drivers/HamlibDrv.h"
#ifdef Q_OS_WIN
#include "rig/drivers/OmnirigDrv.h"
#include "rig/drivers/Omnirigv2Drv.h"
#endif

#include "macros.h"
#include "RigCaps.h"

enum VFOID
@@ -119,23 +113,7 @@ private slots:
RigCaps (*getCapsFunction)(int);
};

QMap<int, DrvParams> drvMapping =
{
{HAMLIB_DRIVER, DrvParams(HAMLIB_DRIVER,
"Hamlib",
&HamlibDrv::getModelList,
&HamlibDrv::getCaps) },
#ifdef Q_OS_WIN
{OMNIRIG_DRIVER, DrvParams(OMNIRIG_DRIVER,
"Omnirig v1",
&OmnirigDrv::getModelList,
&OmnirigDrv::getCaps) },
{OMNIRIGV2_DRIVER, DrvParams(OMNIRIGV2_DRIVER,
"Omnirig v2",
&OmnirigV2Drv::getModelList,
&OmnirigV2Drv::getCaps) },
#endif
};
QMap<int, DrvParams> drvMapping;

void __closeRig();
void __openRig();
1 change: 1 addition & 0 deletions rig/macros.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef RIG_MACROS_H
#define RIG_MACROS_H

#define BANDWIDTH_UNKNOWN 0
#define QSTRING_FREQ(f) (QString::number((f), 'f', 5))
#define Hz2MHz(f) ((double)((f)/1e6))
#define mW2W(f) ((double)((f)/1000.0))
1 change: 1 addition & 0 deletions ui/BandmapWidget.cpp
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
#include "data/Data.h"
#include "data/BandPlan.h"
#include "core/debug.h"
#include "rig/macros.h"

MODULE_IDENTIFICATION("qlog.ui.bandmapwidget");

7 changes: 4 additions & 3 deletions ui/NewContactWidget.cpp
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@
#include <QKeyEvent>

#include "rig/Rig.h"
#include "rig/macros.h"
#include "core/Rotator.h"
#include "NewContactWidget.h"
#include "ui_NewContactWidget.h"
@@ -40,7 +41,7 @@ NewContactWidget::NewContactWidget(QWidget *parent) :
uiDynamic(new NewContactDynamicWidgets(true, this)),
prop_cond(nullptr),
QSOFreq(0.0),
bandwidthFilter(RIG_PASSBAND_NORMAL),
bandwidthFilter(BANDWIDTH_UNKNOWN),
rigOnline(false),
isManualEnterMode(false)
{
@@ -1303,7 +1304,7 @@ void NewContactWidget::QSYContactWiping(double newFreq)
return;
}

if ( QSYWipingWidth <= RIG_PASSBAND_NORMAL )
if ( QSYWipingWidth <= BANDWIDTH_UNKNOWN )
{
QSYWipingWidth = Rig::getNormalBandwidth(ui->modeEdit->currentText(),
ui->submodeEdit->currentText());
@@ -1323,7 +1324,7 @@ void NewContactWidget::QSYContactWiping(double newFreq)
&& rigOnline // only if Rig is connected
&& QSOFreq > 0.0 // it means that Form is "dirty" and contain freq when it got dirty
&& !isQSOTimeStarted() // operator is not in QSO
&& QSYWipingWidth != RIG_PASSBAND_NORMAL
&& QSYWipingWidth != BANDWIDTH_UNKNOWN
&& qAbs(QSOFreq - newFreq) > Hz2MHz(QSYWipingWidth) / 1.5 ) //1.5 is a magic constant - determined experimentally
{
resetContact();
1 change: 1 addition & 0 deletions ui/WsjtxWidget.cpp
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@
#include "data/Data.h"
#include "core/debug.h"
#include "rig/Rig.h"
#include "rig/macros.h"
#include "data/StationProfile.h"
#include "ui/ColumnSettingDialog.h"
#include "ui/WsjtxFilterDialog.h"

0 comments on commit bcf4c87

Please sign in to comment.