kopia lustrzana https://gitlab.com/eliggett/wfview
Lots more changes!
rodzic
07baed4704
commit
67b6b21754
|
@ -4,6 +4,8 @@
|
|||
#include <QColor>
|
||||
#include <QString>
|
||||
|
||||
#define numColorPresetsTotal (5)
|
||||
|
||||
struct colorPrefsType{
|
||||
int presetNum = -1;
|
||||
QString *presetName = Q_NULLPTR;
|
||||
|
@ -32,6 +34,7 @@ struct colorPrefsType{
|
|||
QColor meterAverage;
|
||||
QColor meterPeakLevel;
|
||||
QColor meterPeakScale;
|
||||
QColor meterScale;
|
||||
QColor meterLowerLine;
|
||||
QColor meterLowText;
|
||||
|
||||
|
|
61
prefs.h
61
prefs.h
|
@ -4,6 +4,7 @@
|
|||
#include <QString>
|
||||
#include <QColor>
|
||||
#include <QMap>
|
||||
#include "audioconverter.h"
|
||||
#include "rigidentities.h"
|
||||
#include "wfviewtypes.h"
|
||||
|
||||
|
@ -25,7 +26,8 @@ enum prefIfItem {
|
|||
if_meter2Type = 1 << 14,
|
||||
if_clickDragTuningEnable = 1 << 15,
|
||||
if_currentColorPresetNumber = 1 << 16,
|
||||
if_all = 1 << 17
|
||||
if_rigCreatorEnable = 1 << 17,
|
||||
if_all = 1 << 18
|
||||
};
|
||||
|
||||
enum prefColItem {
|
||||
|
@ -69,12 +71,13 @@ enum prefRaItem {
|
|||
ra_CIVisRadioModel = 1 << 1,
|
||||
ra_forceRTSasPTT = 1 << 2,
|
||||
ra_polling_ms = 1 << 3,
|
||||
ra_serialPortRadio = 1 << 4,
|
||||
ra_serialPortBaud = 1 << 5,
|
||||
ra_virtualSerialPort = 1 << 6,
|
||||
ra_localAFgain = 1 << 7,
|
||||
ra_audioSystem = 1 << 8,
|
||||
ra_all = 1 << 9
|
||||
ra_serialEnabled = 1 << 4,
|
||||
ra_serialPortRadio = 1 << 5,
|
||||
ra_serialPortBaud = 1 << 6,
|
||||
ra_virtualSerialPort = 1 << 7,
|
||||
ra_localAFgain = 1 << 8,
|
||||
ra_audioSystem = 1 << 9,
|
||||
ra_all = 1 << 10
|
||||
};
|
||||
|
||||
enum prefCtItem {
|
||||
|
@ -109,6 +112,26 @@ enum prefClusterItem {
|
|||
cl_all = 1 << 9
|
||||
};
|
||||
|
||||
enum udpPrefsItem {
|
||||
u_enabled = 1 << 0,
|
||||
u_ipAddress = 1 << 1,
|
||||
u_controlLANPort = 1 << 2,
|
||||
u_serialLANPort = 1 << 3,
|
||||
u_audioLANPort = 1 << 4,
|
||||
u_username = 1 << 5,
|
||||
u_password = 1 << 6,
|
||||
u_clientName = 1 << 7,
|
||||
u_waterfallFormat = 1 << 8,
|
||||
u_halfDuplex = 1 << 9,
|
||||
u_sampleRate = 1 << 10,
|
||||
u_rxCodec = 1 << 11,
|
||||
u_txCodec = 1 << 12,
|
||||
u_rxLatency = 1 << 13,
|
||||
u_txLatency = 1 << 14,
|
||||
u_audioInput = 1 << 15,
|
||||
u_audioOutput = 1 << 16,
|
||||
u_all = 1 << 17
|
||||
};
|
||||
|
||||
|
||||
struct preferences {
|
||||
|
@ -117,6 +140,7 @@ struct preferences {
|
|||
int majorVersion = 0;
|
||||
int minorVersion = 0;
|
||||
QString gitShort;
|
||||
bool settingsChanged = false;
|
||||
|
||||
// Interface:
|
||||
bool useFullScreen;
|
||||
|
@ -137,7 +161,7 @@ struct preferences {
|
|||
meter_t meter2Type;
|
||||
bool clickDragTuningEnable;
|
||||
int currentColorPresetNumber = 0;
|
||||
|
||||
bool rigCreatorEnable = false;
|
||||
|
||||
// Radio:
|
||||
unsigned char radioCIVAddr;
|
||||
|
@ -150,12 +174,6 @@ struct preferences {
|
|||
unsigned char localAFgain;
|
||||
audioType audioSystem;
|
||||
|
||||
// Radio settings:
|
||||
inputTypes inputDataOff=inputNone;
|
||||
inputTypes inputData1=inputNone;
|
||||
inputTypes inputData2=inputNone;
|
||||
inputTypes inputData3=inputNone;
|
||||
|
||||
// Controls:
|
||||
bool enablePTT;
|
||||
bool niceTS;
|
||||
|
@ -173,12 +191,21 @@ struct preferences {
|
|||
bool clusterUdpEnable;
|
||||
bool clusterTcpEnable;
|
||||
int clusterUdpPort;
|
||||
QString clusterTcpServerName;
|
||||
QString clusterTcpUserName;
|
||||
QString clusterTcpPassword;
|
||||
int clusterTcpPort = 7300;
|
||||
int clusterTimeout; // used?
|
||||
bool clusterSkimmerSpotsEnable; // where is this used?
|
||||
QString clusterTcpServerName;
|
||||
QString clusterTcpUserName;
|
||||
QString clusterTcpPassword;
|
||||
|
||||
// Temporary settings
|
||||
inputTypes inputDataOff=inputNone;
|
||||
inputTypes inputData1=inputNone;
|
||||
inputTypes inputData2=inputNone;
|
||||
inputTypes inputData3=inputNone;
|
||||
|
||||
audioSetup rxSetup;
|
||||
audioSetup txSetup;
|
||||
};
|
||||
|
||||
#endif // PREFS_H
|
||||
|
|
|
@ -337,8 +337,42 @@ void rigCreator::loadRigFile(QString file)
|
|||
|
||||
settings->endGroup();
|
||||
delete settings;
|
||||
|
||||
// Connect signals to find out if changed.
|
||||
connect(ui->antennas,SIGNAL(cellChanged(int,int)),SLOT(changed()));
|
||||
connect(ui->attenuators,SIGNAL(cellChanged(int,int)),SLOT(changed()));
|
||||
connect(ui->bands,SIGNAL(cellChanged(int,int)),SLOT(changed()));
|
||||
connect(ui->commands,SIGNAL(cellChanged(int,int)),SLOT(changed()));
|
||||
connect(ui->filters,SIGNAL(cellChanged(int,int)),SLOT(changed()));
|
||||
connect(ui->inputs,SIGNAL(cellChanged(int,int)),SLOT(changed()));
|
||||
connect(ui->modes,SIGNAL(cellChanged(int,int)),SLOT(changed()));
|
||||
connect(ui->preamps,SIGNAL(cellChanged(int,int)),SLOT(changed()));
|
||||
connect(ui->spans,SIGNAL(cellChanged(int,int)),SLOT(changed()));
|
||||
connect(ui->hasCommand29,SIGNAL(stateChanged(int)),SLOT(changed()));
|
||||
connect(ui->hasEthernet,SIGNAL(stateChanged(int)),SLOT(changed()));
|
||||
connect(ui->hasFDComms,SIGNAL(stateChanged(int)),SLOT(changed()));
|
||||
connect(ui->hasLAN,SIGNAL(stateChanged(int)),SLOT(changed()));
|
||||
connect(ui->hasSpectrum,SIGNAL(stateChanged(int)),SLOT(changed()));
|
||||
connect(ui->hasTransmit,SIGNAL(stateChanged(int)),SLOT(changed()));
|
||||
connect(ui->hasWifi,SIGNAL(stateChanged(int)),SLOT(changed()));
|
||||
connect(ui->civAddress,SIGNAL(editingFinished()),SLOT(changed()));
|
||||
connect(ui->rigctldModel,SIGNAL(editingFinished()),SLOT(changed()));
|
||||
connect(ui->model,SIGNAL(editingFinished()),SLOT(changed()));
|
||||
// connect(ui->manufacturer,SIGNAL(editingFinished()),SLOT(changed()));
|
||||
connect(ui->memGroups,SIGNAL(editingFinished()),SLOT(changed()));
|
||||
connect(ui->memStart,SIGNAL(editingFinished()),SLOT(changed()));
|
||||
connect(ui->memories,SIGNAL(editingFinished()),SLOT(changed()));
|
||||
connect(ui->memoryFormat,SIGNAL(editingFinished()),SLOT(changed()));
|
||||
connect(ui->satMemories,SIGNAL(editingFinished()),SLOT(changed()));
|
||||
connect(ui->satelliteFormat,SIGNAL(editingFinished()),SLOT(changed()));
|
||||
|
||||
settingsChanged = false;
|
||||
}
|
||||
|
||||
void rigCreator::changed()
|
||||
{
|
||||
settingsChanged = true;
|
||||
}
|
||||
void rigCreator::on_saveFile_clicked(bool clicked)
|
||||
{
|
||||
Q_UNUSED(clicked)
|
||||
|
@ -527,6 +561,9 @@ void rigCreator::saveRigFile(QString file)
|
|||
settings->sync();
|
||||
|
||||
delete settings;
|
||||
|
||||
settingsChanged = false;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -558,3 +595,19 @@ void rigCreator::on_hasCommand29_toggled(bool checked)
|
|||
{
|
||||
ui->commands->setColumnHidden(4,!checked);
|
||||
}
|
||||
|
||||
|
||||
void rigCreator::closeEvent(QCloseEvent *event)
|
||||
{
|
||||
|
||||
if (settingsChanged)
|
||||
{
|
||||
// Settings have changed since last save
|
||||
qInfo() << "Settings have changed since last save";
|
||||
int reply = QMessageBox::question(this,"rig creator","Changes will be lost!",QMessageBox::Cancel |QMessageBox::Ok);
|
||||
if (reply == QMessageBox::Cancel)
|
||||
{
|
||||
event->ignore();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -34,16 +34,19 @@ private slots:
|
|||
void loadRigFile(QString filename);
|
||||
void saveRigFile(QString filename);
|
||||
void commandRowAdded(int row);
|
||||
void changed();
|
||||
|
||||
|
||||
private:
|
||||
Ui::rigCreator *ui;
|
||||
void closeEvent(QCloseEvent *event);
|
||||
QMenu* context;
|
||||
tableCombobox* commandsList;
|
||||
QStandardItemModel* commandsModel;
|
||||
QStandardItemModel* command36Model;
|
||||
QStandardItemModel* createModel(QStandardItemModel* model, QString strings[]);
|
||||
QString currentFile;
|
||||
bool settingsChanged=false;
|
||||
|
||||
};
|
||||
|
||||
|
|
|
@ -19,40 +19,12 @@
|
|||
<property name="windowTitle">
|
||||
<string>Rig Creator</string>
|
||||
</property>
|
||||
<widget class="QWidget" name="horizontalLayoutWidget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>900</x>
|
||||
<y>10</y>
|
||||
<width>81</width>
|
||||
<height>41</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QDialogButtonBox" name="buttonBox">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="standardButtons">
|
||||
<set>QDialogButtonBox::Ok</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="verticalLayoutWidget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>7</x>
|
||||
<x>10</x>
|
||||
<y>10</y>
|
||||
<width>861</width>
|
||||
<width>961</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
@ -1074,10 +1046,10 @@
|
|||
<widget class="QWidget" name="formLayoutWidget_2">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<x>8</x>
|
||||
<y>30</y>
|
||||
<width>119</width>
|
||||
<height>111</height>
|
||||
<width>101</width>
|
||||
<height>101</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QFormLayout" name="formLayout">
|
||||
|
@ -1197,38 +1169,5 @@
|
|||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>rigCreator</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>248</x>
|
||||
<y>254</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>rigCreator</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>316</x>
|
||||
<y>260</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>286</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
|
1064
settingswidget.cpp
1064
settingswidget.cpp
Plik diff jest za duży
Load Diff
|
@ -20,6 +20,8 @@
|
|||
#include "cluster.h" // for clusterSettings
|
||||
#include "rigidentities.h" // for rigInputs
|
||||
#include "udpserver.h" // for SERVERCONFIG
|
||||
#include "qledlabel.h" // For color swatches
|
||||
#include "audiodevices.h"
|
||||
|
||||
namespace Ui {
|
||||
class settingswidget;
|
||||
|
@ -38,6 +40,7 @@ public slots:
|
|||
void acceptPreferencesPtr(preferences *pptr);
|
||||
void acceptUdpPreferencesPtr(udpPreferences *upptr);
|
||||
void acceptServerConfig(SERVERCONFIG *serverConfig);
|
||||
void acceptColorPresetPtr(colorPrefsType *cp);
|
||||
|
||||
void copyClusterList(QList<clusterSettings> c);
|
||||
void insertClusterOutputText(QString text);
|
||||
|
@ -72,9 +75,11 @@ public slots:
|
|||
void updateVSPList(QStringList deviceList, QVector<int> data);
|
||||
|
||||
void updateModSourceList(uchar num, QVector<rigInput> data);
|
||||
void setAudioDevicesUI();
|
||||
|
||||
signals:
|
||||
void changedIfPrefs(quint64 items);
|
||||
void changedColPrefs(quint64 items);
|
||||
void changedRaPrefs(quint64 items);
|
||||
void changedRsPrefs(quint64 items);
|
||||
void changedCtPrefs(quint64 items);
|
||||
|
@ -89,6 +94,7 @@ signals:
|
|||
void changedServerRXAudioInputCombo(int index);
|
||||
|
||||
void changedIfPref(prefIfItem i);
|
||||
void changedColPref(prefColItem i);
|
||||
void changedRaPref(prefRaItem i);
|
||||
void changedRsPref(prefRsItem i);
|
||||
void changedCtPref(prefCtItem i);
|
||||
|
@ -128,6 +134,7 @@ private slots:
|
|||
void on_underlayBufferSlider_valueChanged(int value);
|
||||
void on_pttEnableChk_clicked(bool checked);
|
||||
void on_clickDragTuningEnableChk_clicked(bool checked);
|
||||
void on_rigCreatorChk_clicked(bool checked);
|
||||
void on_serialEnableBtn_clicked(bool checked);
|
||||
void on_enableRigctldChk_clicked(bool checked);
|
||||
void on_rigctldPortTxt_editingFinished();
|
||||
|
@ -155,6 +162,12 @@ private slots:
|
|||
void on_serverTXAudioOutputCombo_currentIndexChanged(int index);
|
||||
void on_serverEnableCheckbox_clicked(bool checked);
|
||||
|
||||
void on_rxLatencySlider_valueChanged(int value);
|
||||
void on_txLatencySlider_valueChanged(int value);
|
||||
void on_audioRXCodecCombo_currentIndexChanged(int value);
|
||||
void on_audioTXCodecCombo_currentIndexChanged(int value);
|
||||
void on_audioSampleRateCombo_currentIndexChanged(int value);
|
||||
|
||||
void on_serverAddUserBtn_clicked();
|
||||
|
||||
void on_modInputCombo_activated(int index);
|
||||
|
@ -162,6 +175,56 @@ private slots:
|
|||
void on_modInputData2Combo_activated(int index);
|
||||
void on_modInputData3Combo_activated(int index);
|
||||
|
||||
// Color slots
|
||||
void on_colorPresetCombo_currentIndexChanged(int index);
|
||||
void on_colorSavePresetBtn_clicked();
|
||||
|
||||
void on_colorSetBtnPlotBackground_clicked();
|
||||
void on_colorEditPlotBackground_editingFinished();
|
||||
void on_colorSetBtnSpecLine_clicked();
|
||||
void on_colorEditSpecLine_editingFinished();
|
||||
void on_colorSetBtnGrid_clicked();
|
||||
void on_colorEditGrid_editingFinished();
|
||||
void on_colorSetBtnText_clicked();
|
||||
void on_colorEditText_editingFinished();
|
||||
void on_colorSetBtnSpecFill_clicked();
|
||||
void on_colorEditSpecFill_editingFinished();
|
||||
void on_colorSetBtnAxis_clicked();
|
||||
void on_colorEditAxis_editingFinished();
|
||||
void on_colorSetBtnUnderlayLine_clicked();
|
||||
void on_colorEditUnderlayLine_editingFinished();
|
||||
void on_colorSetBtnUnderlayFill_clicked();
|
||||
void on_colorEditUnderlayFill_editingFinished();
|
||||
void on_colorSetBtnwfBackground_clicked();
|
||||
void on_colorEditWfBackground_editingFinished();
|
||||
void on_colorSetBtnWfGrid_clicked();
|
||||
void on_colorEditWfGrid_editingFinished();
|
||||
void on_colorSetBtnWfAxis_clicked();
|
||||
void on_colorEditWfAxis_editingFinished();
|
||||
void on_colorSetBtnWfText_clicked();
|
||||
void on_colorEditWfText_editingFinished();
|
||||
void on_colorSetBtnTuningLine_clicked();
|
||||
void on_colorEditTuningLine_editingFinished();
|
||||
void on_colorSetBtnPassband_clicked();
|
||||
void on_colorEditPassband_editingFinished();
|
||||
void on_colorSetBtnPBT_clicked();
|
||||
void on_colorEditPBT_editingFinished();
|
||||
void on_colorSetBtnMeterLevel_clicked();
|
||||
void on_colorEditMeterLevel_editingFinished();
|
||||
void on_colorSetBtnMeterAvg_clicked();
|
||||
void on_colorEditMeterAvg_editingFinished();
|
||||
void on_colorSetBtnMeterScale_clicked();
|
||||
void on_colorEditMeterScale_editingFinished();
|
||||
void on_colorSetBtnMeterText_clicked();
|
||||
void on_colorEditMeterText_editingFinished();
|
||||
void on_colorSetBtnClusterSpots_clicked();
|
||||
void on_colorEditClusterSpots_editingFinished();
|
||||
void on_colorRenamePresetBtn_clicked();
|
||||
void on_colorRevertPresetBtn_clicked();
|
||||
void on_colorSetBtnMeterPeakLevel_clicked();
|
||||
void on_colorEditMeterPeakLevel_editingFinished();
|
||||
void on_colorSetBtnMeterPeakScale_clicked();
|
||||
void on_colorEditMeterPeakScale_editingFinished();
|
||||
|
||||
private:
|
||||
Ui::settingswidget *ui;
|
||||
|
@ -175,15 +238,30 @@ private:
|
|||
void quietlyUpdateSlider(QSlider* sl, int val);
|
||||
void quietlyUpdateCombobox(QComboBox *cb, int index);
|
||||
void quietlyUpdateCombobox(QComboBox *cb, QVariant val);
|
||||
void quietlyUpdateCombobox(QComboBox *cb, QString val);
|
||||
void quietlyUpdateSpinbox(QSpinBox *sb, int val);
|
||||
void quietlyUpdateCheckbox(QCheckBox *cb, bool isChecked);
|
||||
void quietlyUpdateRadiobutton(QRadioButton *rb, bool isChecked);
|
||||
void quietlyUpdateLineEdit(QLineEdit *le, const QString text);
|
||||
|
||||
// Colors (helper functions)
|
||||
void setEditAndLedFromColor(QColor c, QLineEdit *e, QLedLabel *d);
|
||||
void setColorButtonOperations(QColor *colorStore, QLineEdit *e, QLedLabel *d);
|
||||
void setColorLineEditOperations(QColor *colorStore, QLineEdit *e, QLedLabel *d);
|
||||
void loadColorPresetToUIandPlots(int presetNumber);
|
||||
void setColorElement(QColor color, QLedLabel *led, QLabel *label);
|
||||
void setColorElement(QColor color, QLedLabel *led, QLineEdit *lineText);
|
||||
void setColorElement(QColor color, QLedLabel *led, QLabel *label, QLineEdit *lineText);
|
||||
QColor getColorFromPicker(QColor initialColor);
|
||||
void getSetColor(QLedLabel *led, QLabel *label);
|
||||
void getSetColor(QLedLabel *led, QLineEdit *line);
|
||||
QString setColorFromString(QString aarrggbb, QLedLabel *led);
|
||||
|
||||
void populateServerUsers();
|
||||
void serverAddUserLine(const QString& user, const QString& pass, const int& type);
|
||||
|
||||
preferences *prefs = NULL;
|
||||
colorPrefsType *colorPreset;
|
||||
udpPreferences *udpPrefs = NULL;
|
||||
SERVERCONFIG *serverConfig = NULL;
|
||||
bool havePrefs = false;
|
||||
|
@ -200,6 +278,8 @@ private:
|
|||
|
||||
QList<clusterSettings> clusters;
|
||||
|
||||
audioDevices* audioDev = Q_NULLPTR;
|
||||
|
||||
};
|
||||
|
||||
#endif // SETTINGSWIDGET_H
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
<item>
|
||||
<widget class="QStackedWidget" name="settingsStack">
|
||||
<property name="currentIndex">
|
||||
<number>2</number>
|
||||
<number>0</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="radioAccess">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_21">
|
||||
|
@ -154,17 +154,38 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
<widget class="QGroupBox" name="groupBox_11">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
<property name="title">
|
||||
<string>Information</string>
|
||||
</property>
|
||||
</spacer>
|
||||
<property name="checkable">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_19">
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_22">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_53">
|
||||
<property name="text">
|
||||
<string>Audio controls on this page are ONLY for network radios
|
||||
Please use the "Radio Server" page to select server audio.
|
||||
ONLY use Manual CI-V when Transceive mode is not supported</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
|
@ -174,7 +195,10 @@
|
|||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="groupBox_6">
|
||||
<widget class="QGroupBox" name="groupSerial">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Serial Connected Radios</string>
|
||||
</property>
|
||||
|
@ -271,7 +295,7 @@
|
|||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="groupBox_7">
|
||||
<widget class="QGroupBox" name="groupNetwork">
|
||||
<property name="title">
|
||||
<string>Network Connected Radios</string>
|
||||
</property>
|
||||
|
@ -772,6 +796,16 @@
|
|||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="rigCreatorChk">
|
||||
<property name="toolTip">
|
||||
<string>Rig creator allows changing of all rig features and adding new rig profiles</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Enable Rig Creator Feature (use with care)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_10">
|
||||
<property name="orientation">
|
||||
|
@ -1211,8 +1245,8 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>925</width>
|
||||
<height>332</height>
|
||||
<width>453</width>
|
||||
<height>235</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_2">
|
||||
|
|
14
udpbase.h
14
udpbase.h
|
@ -24,20 +24,6 @@
|
|||
|
||||
#include "packettypes.h"
|
||||
|
||||
enum udpPrefsItem {
|
||||
u_ipAddress = 1 << 0,
|
||||
u_controlLANPort = 1 << 1,
|
||||
u_serialLANPort = 1 << 2,
|
||||
u_audioLANPort = 1 << 3,
|
||||
u_username = 1 << 4,
|
||||
u_password = 1 << 5,
|
||||
u_clientName = 1 << 6,
|
||||
u_waterfallFormat = 1 << 7,
|
||||
u_halfDuplex = 1 << 8,
|
||||
u_all = 1 << 9
|
||||
};
|
||||
|
||||
|
||||
struct udpPreferences {
|
||||
QString ipAddress;
|
||||
quint16 controlLANPort;
|
||||
|
|
1334
wfmain.cpp
1334
wfmain.cpp
Plik diff jest za duży
Load Diff
95
wfmain.h
95
wfmain.h
|
@ -81,8 +81,6 @@
|
|||
#endif
|
||||
#endif
|
||||
|
||||
#define numColorPresetsTotal (5)
|
||||
|
||||
namespace Ui {
|
||||
class wfmain;
|
||||
}
|
||||
|
@ -484,23 +482,14 @@ private slots:
|
|||
void on_pttOffBtn_clicked();
|
||||
void on_saveSettingsBtn_clicked();
|
||||
void on_debugBtn_clicked();
|
||||
void on_lanEnableBtn_clicked(bool checked);
|
||||
void on_ipAddressTxt_textChanged(QString text);
|
||||
void on_controlPortTxt_textChanged(QString text);
|
||||
void on_usernameTxt_textChanged(QString text);
|
||||
void on_passwordTxt_textChanged(QString text);
|
||||
void on_audioDuplexCombo_currentIndexChanged(int value);
|
||||
void changedAudioInput(int value);
|
||||
void changedAudioOutput(int value);
|
||||
|
||||
void on_toFixedBtn_clicked();
|
||||
void on_connectBtn_clicked();
|
||||
void on_rxLatencySlider_valueChanged(int value);
|
||||
void on_txLatencySlider_valueChanged(int value);
|
||||
void on_audioRXCodecCombo_currentIndexChanged(int value);
|
||||
void on_audioTXCodecCombo_currentIndexChanged(int value);
|
||||
void on_audioSampleRateCombo_currentIndexChanged(int value);
|
||||
|
||||
|
||||
void on_scopeEnableWFBtn_stateChanged(int state);
|
||||
void on_sqlSlider_valueChanged(int value);
|
||||
|
||||
void on_modeFilterCombo_activated(int index);
|
||||
|
||||
void on_datamodeCombo_activated(int index);
|
||||
|
@ -517,7 +506,6 @@ private slots:
|
|||
|
||||
void on_spectrumModeCombo_currentIndexChanged(int index);
|
||||
|
||||
void on_serialEnableBtn_clicked(bool checked);
|
||||
void on_tuningStepCombo_currentIndexChanged(int index);
|
||||
void on_serialDeviceListCombo_textActivated(const QString &arg1);
|
||||
void on_rptSetupBtn_clicked();
|
||||
|
@ -551,14 +539,12 @@ private slots:
|
|||
void on_serverCivPortText_textChanged(QString text);
|
||||
void on_serverAudioPortText_textChanged(QString text);
|
||||
|
||||
void changedServerTXAudioOutput(int value);
|
||||
void changedServerRXAudioInput(int value);
|
||||
void onServerUserFieldChanged();
|
||||
void changedModInput(uchar val, inputTypes type);
|
||||
|
||||
void on_serverAddUserBtn_clicked();
|
||||
void on_radioStatusBtn_clicked();
|
||||
void on_audioSystemCombo_currentIndexChanged(int value);
|
||||
|
||||
void on_topLevelSlider_valueChanged(int value);
|
||||
void on_botLevelSlider_valueChanged(int value);
|
||||
void on_underlayBufferSlider_valueChanged(int value);
|
||||
|
@ -567,60 +553,8 @@ private slots:
|
|||
void on_underlayPeakBuffer_toggled(bool checked);
|
||||
void on_underlayAverageBuffer_toggled(bool checked);
|
||||
|
||||
void on_colorSetBtnGrid_clicked();
|
||||
void on_colorSetBtnPlotBackground_clicked();
|
||||
void on_colorSetBtnText_clicked();
|
||||
void on_colorSetBtnSpecLine_clicked();
|
||||
void on_colorSetBtnSpecFill_clicked();
|
||||
void on_colorEditPlotBackground_editingFinished();
|
||||
void on_colorPopOutBtn_clicked();
|
||||
void on_colorPresetCombo_currentIndexChanged(int index);
|
||||
void on_colorEditSpecLine_editingFinished();
|
||||
void on_colorEditGrid_editingFinished();
|
||||
void on_colorEditText_editingFinished();
|
||||
void on_colorEditSpecFill_editingFinished();
|
||||
void on_colorSetBtnAxis_clicked();
|
||||
void on_colorEditAxis_editingFinished();
|
||||
void on_colorSetBtnUnderlayLine_clicked();
|
||||
void on_colorEditUnderlayLine_editingFinished();
|
||||
void on_colorSetBtnUnderlayFill_clicked();
|
||||
void on_colorEditUnderlayFill_editingFinished();
|
||||
void on_colorSetBtnwfBackground_clicked();
|
||||
void on_colorEditWfBackground_editingFinished();
|
||||
void on_colorSetBtnWfGrid_clicked();
|
||||
void on_colorEditWfGrid_editingFinished();
|
||||
void on_colorSetBtnWfAxis_clicked();
|
||||
void on_colorEditWfAxis_editingFinished();
|
||||
void on_colorSetBtnWfText_clicked();
|
||||
void on_colorEditWfText_editingFinished();
|
||||
void on_colorSetBtnTuningLine_clicked();
|
||||
void on_colorEditTuningLine_editingFinished();
|
||||
void on_colorSetBtnPassband_clicked();
|
||||
void on_colorEditPassband_editingFinished();
|
||||
void on_colorSetBtnPBT_clicked();
|
||||
void on_colorEditPBT_editingFinished();
|
||||
void on_colorSetBtnMeterLevel_clicked();
|
||||
void on_colorEditMeterLevel_editingFinished();
|
||||
void on_colorSetBtnMeterAvg_clicked();
|
||||
void on_colorEditMeterAvg_editingFinished();
|
||||
void on_colorSetBtnMeterScale_clicked();
|
||||
void on_colorEditMeterScale_editingFinished();
|
||||
void on_colorSetBtnMeterText_clicked();
|
||||
void on_colorEditMeterText_editingFinished();
|
||||
void on_colorSetBtnClusterSpots_clicked();
|
||||
void on_colorEditClusterSpots_editingFinished();
|
||||
void on_colorRenamePresetBtn_clicked();
|
||||
void on_colorRevertPresetBtn_clicked();
|
||||
void on_colorSetBtnMeterPeakLevel_clicked();
|
||||
void on_colorEditMeterPeakLevel_editingFinished();
|
||||
void on_colorSetBtnMeterPeakScale_clicked();
|
||||
void on_colorEditMeterPeakScale_editingFinished();
|
||||
void on_colorSavePresetBtn_clicked();
|
||||
|
||||
void on_showLogBtn_clicked();
|
||||
|
||||
void on_audioSystemServerCombo_currentIndexChanged(int index);
|
||||
|
||||
void on_customEdgeBtn_clicked();
|
||||
|
||||
void on_clusterUdpEnable_clicked(bool enable);
|
||||
|
@ -844,29 +778,14 @@ private:
|
|||
udpPreferences udpPrefs;
|
||||
udpPreferences udpDefPrefs;
|
||||
|
||||
// Configuration for audio output and input.
|
||||
audioSetup rxSetup;
|
||||
audioSetup txSetup;
|
||||
|
||||
void setDefaultColors(int presetNumber); // populate with default values
|
||||
void setDefaultColorPresets();
|
||||
void useColorPreset(colorPrefsType *cp);
|
||||
|
||||
void useColors(); // set the plot up
|
||||
void setDefPrefs(); // populate default values to default prefs
|
||||
void setTuningSteps();
|
||||
void setColorElement(QColor color, QLedLabel *led, QLabel *label);
|
||||
void setColorElement(QColor color, QLedLabel *led, QLineEdit *lineText);
|
||||
void setColorElement(QColor color, QLedLabel *led, QLabel *label, QLineEdit *lineText);
|
||||
QColor getColorFromPicker(QColor initialColor);
|
||||
void getSetColor(QLedLabel *led, QLabel *label);
|
||||
void getSetColor(QLedLabel *led, QLineEdit *line);
|
||||
QString setColorFromString(QString aarrggbb, QLedLabel *led);
|
||||
void setDefaultColorPresets();
|
||||
void loadColorPresetToUIandPlots(int presetNumber);
|
||||
void useColorPreset(colorPrefsType *cp);
|
||||
void useCurrentColorPreset();
|
||||
void setEditAndLedFromColor(QColor c, QLineEdit *e, QLedLabel *d);
|
||||
void setColorButtonOperations(QColor *colorStore, QLineEdit *e, QLedLabel *d);
|
||||
void setColorLineEditOperations(QColor *colorStore, QLineEdit *e, QLedLabel *d);
|
||||
|
||||
void calculateTimingParameters();
|
||||
void initPeriodicCommands();
|
||||
|
|
Ładowanie…
Reference in New Issue