mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Feature plugins: general GUI updates

pull/648/head
f4exb 2020-09-28 00:20:37 +02:00
rodzic 6209010420
commit c1ca3ec54b
4 zmienionych plików z 105 dodań i 35 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

81
sdrgui/gui/basicfeaturesettingsdialog.cpp
Wyświetl plik

@ -61,8 +61,89 @@ void BasicFeatureSettingsDialog::on_title_editingFinished()
m_title = ui->title->text();
}
void BasicFeatureSettingsDialog::on_reverseAPI_toggled(bool checked)
{
m_useReverseAPI = checked;
}
void BasicFeatureSettingsDialog::on_reverseAPIAddress_editingFinished()
{
m_reverseAPIAddress = ui->reverseAPIAddress->text();
}
void BasicFeatureSettingsDialog::on_reverseAPIPort_editingFinished()
{
bool dataOk;
int reverseAPIPort = ui->reverseAPIPort->text().toInt(&dataOk);
if((!dataOk) || (reverseAPIPort < 1024) || (reverseAPIPort > 65535)) {
return;
} else {
m_reverseAPIPort = reverseAPIPort;
}
}
void BasicFeatureSettingsDialog::on_reverseAPIFeatureSetIndex_editingFinished()
{
bool dataOk;
int reverseAPIFeatureSetIndex = ui->reverseAPIFeatureSetIndex->text().toInt(&dataOk);
if ((!dataOk) || (reverseAPIFeatureSetIndex < 0)) {
return;
} else {
m_reverseAPIFeatureSetIndex = reverseAPIFeatureSetIndex;
}
}
void BasicFeatureSettingsDialog::on_reverseAPIFeatureIndex_editingFinished()
{
bool dataOk;
int reverseAPIFeatureIndex = ui->reverseAPIFeatureIndex->text().toInt(&dataOk);
if ((!dataOk) || (reverseAPIFeatureIndex < 0)) {
return;
} else {
m_reverseAPIFeatureIndex = reverseAPIFeatureIndex;
}
}
void BasicFeatureSettingsDialog::accept()
{
m_hasChanged = true;
QDialog::accept();
}
void BasicFeatureSettingsDialog::setUseReverseAPI(bool useReverseAPI)
{
m_useReverseAPI = useReverseAPI;
ui->reverseAPI->setChecked(m_useReverseAPI);
}
void BasicFeatureSettingsDialog::setReverseAPIAddress(const QString& address)
{
m_reverseAPIAddress = address;
ui->reverseAPIAddress->setText(m_reverseAPIAddress);
}
void BasicFeatureSettingsDialog::setReverseAPIPort(uint16_t port)
{
if (port < 1024) {
return;
} else {
m_reverseAPIPort = port;
}
ui->reverseAPIPort->setText(tr("%1").arg(m_reverseAPIPort));
}
void BasicFeatureSettingsDialog::setReverseAPIFeatureSetIndex(uint16_t featureSetIndex)
{
m_reverseAPIFeatureSetIndex = featureSetIndex > 99 ? 99 : featureSetIndex;
ui->reverseAPIFeatureSetIndex->setText(tr("%1").arg(m_reverseAPIFeatureSetIndex));
}
void BasicFeatureSettingsDialog::setReverseAPIFeatureIndex(uint16_t featureIndex)
{
m_reverseAPIFeatureIndex = featureIndex > 99 ? 99 : featureIndex;
ui->reverseAPIFeatureIndex->setText(tr("%1").arg(m_reverseAPIFeatureIndex));
}

17
sdrgui/gui/basicfeaturesettingsdialog.h
Wyświetl plik

@ -40,18 +40,23 @@ public:
bool useReverseAPI() const { return m_useReverseAPI; }
const QString& getReverseAPIAddress() const { return m_reverseAPIAddress; }
uint16_t getReverseAPIPort() const { return m_reverseAPIPort; }
uint16_t getReverseAPIDeviceIndex() const { return m_reverseAPIDeviceIndex; }
uint16_t getReverseAPIChannelIndex() const { return m_reverseAPIChannelIndex; }
uint16_t getReverseAPIFeatureSetIndex() const { return m_reverseAPIFeatureSetIndex; }
uint16_t getReverseAPIFeatureIndex() const { return m_reverseAPIFeatureIndex; }
void setUseReverseAPI(bool useReverseAPI);
void setReverseAPIAddress(const QString& address);
void setReverseAPIPort(uint16_t port);
void setReverseAPIDeviceIndex(uint16_t deviceIndex);
void setReverseAPIChannelIndex(uint16_t channelIndex);
void setReverseAPIFeatureSetIndex(uint16_t featureSetIndex);
void setReverseAPIFeatureIndex(uint16_t featureIndex);
bool hasChanged() const { return m_hasChanged; }
private slots:
void on_colorBtn_clicked();
void on_title_editingFinished();
void on_reverseAPI_toggled(bool checked);
void on_reverseAPIAddress_editingFinished();
void on_reverseAPIPort_editingFinished();
void on_reverseAPIFeatureSetIndex_editingFinished();
void on_reverseAPIFeatureIndex_editingFinished();
void accept();
private:
@ -61,8 +66,8 @@ private:
bool m_useReverseAPI;
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
uint16_t m_reverseAPIChannelIndex;
uint16_t m_reverseAPIFeatureSetIndex;
uint16_t m_reverseAPIFeatureIndex;
bool m_hasChanged;
void paintColor();

38
sdrgui/gui/basicfeaturesettingsdialog.ui
Wyświetl plik

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<width>456</width>
<height>158</height>
</rect>
</property>
@ -133,16 +133,10 @@
<widget class="QLineEdit" name="reverseAPIPort">
<property name="minimumSize">
<size>
<width>45</width>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>45</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Reverse API port</string>
</property>
@ -155,28 +149,22 @@
</widget>
</item>
<item>
<widget class="QLabel" name="reverseAPIDeviceLabel">
<widget class="QLabel" name="reverseAPIFeatureSetLabel">
<property name="text">
<string>D</string>
<string>Set</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="reverseAPIDeviceIndex">
<widget class="QLineEdit" name="reverseAPIFeatureSetIndex">
<property name="minimumSize">
<size>
<width>22</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>22</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Reverse API destination device index</string>
<string>Reverse API destination feature set index</string>
</property>
<property name="inputMask">
<string>00</string>
@ -190,28 +178,22 @@
</widget>
</item>
<item>
<widget class="QLabel" name="reverseAPIChannelLabel">
<widget class="QLabel" name="reverseAPIFeatureLabel">
<property name="text">
<string>C</string>
<string>Feat</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="reverseAPIChannelIndex">
<widget class="QLineEdit" name="reverseAPIFeatureIndex">
<property name="minimumSize">
<size>
<width>22</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>22</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Reverse API destination channel index</string>
<string>Reverse API destination feature index</string>
</property>
<property name="inputMask">
<string>00</string>

4
sdrgui/mainwindow.cpp
Wyświetl plik

@ -226,6 +226,7 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse
qDebug() << "MainWindow::MainWindow: load current preset settings...";
loadPresetSettings(m_settings.getWorkingPreset(), 0);
m_apiAdapter = new WebAPIAdapterGUI(*this);
loadFeatureSetPresetSettings(m_settings.getWorkingFeatureSetPreset(), 0);
splash->showStatusMessage("update preset controls...", Qt::white);
@ -250,7 +251,6 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse
}
#endif
m_apiAdapter = new WebAPIAdapterGUI(*this);
ui->featureDock->setWebAPIAdapter(m_apiAdapter);
m_requestMapper = new WebAPIRequestMapper(this);
m_requestMapper->setAdapter(m_apiAdapter);
@ -759,6 +759,7 @@ void MainWindow::loadFeatureSetPresetSettings(const FeatureSetPreset* preset, in
if (featureSetIndex >= 0)
{
FeatureUISet *featureSetUI = m_featureUIs[featureSetIndex];
qDebug("MainWindow::loadFeatureSetPresetSettings: m_apiAdapter: %p", m_apiAdapter);
featureSetUI->loadFeatureSetSettings(preset, m_pluginManager->getPluginAPI(), m_apiAdapter);
}
}
@ -1965,6 +1966,7 @@ void MainWindow::featureAddClicked(int featureIndex)
if (currentFeatureTabIndex >= 0)
{
FeatureUISet *featureUISet = m_featureUIs[currentFeatureTabIndex];
qDebug("MainWindow::featureAddClicked: m_apiAdapter: %p", m_apiAdapter);
m_pluginManager->createFeatureInstance(featureIndex, featureUISet, m_apiAdapter);
}
}