kopia lustrzana https://gitlab.com/eliggett/wfview
Disable click/drag tuning by default
rodzic
f4e25d2273
commit
e15496e0b6
17
wfmain.cpp
17
wfmain.cpp
|
@ -1473,6 +1473,8 @@ void wfmain::loadSettings()
|
||||||
prefs.confirmExit = settings->value("ConfirmExit", defPrefs.confirmExit).toBool();
|
prefs.confirmExit = settings->value("ConfirmExit", defPrefs.confirmExit).toBool();
|
||||||
prefs.confirmPowerOff = settings->value("ConfirmPowerOff", defPrefs.confirmPowerOff).toBool();
|
prefs.confirmPowerOff = settings->value("ConfirmPowerOff", defPrefs.confirmPowerOff).toBool();
|
||||||
prefs.meter2Type = static_cast<meterKind>(settings->value("Meter2Type", defPrefs.meter2Type).toInt());
|
prefs.meter2Type = static_cast<meterKind>(settings->value("Meter2Type", defPrefs.meter2Type).toInt());
|
||||||
|
prefs.clickDragTuningEnable = settings->value("ClickDragTuning", false).toBool();
|
||||||
|
ui->clickDragTuningEnableChk->setChecked(prefs.clickDragTuningEnable);
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
|
|
||||||
// Load in the color presets. The default values are already loaded.
|
// Load in the color presets. The default values are already loaded.
|
||||||
|
@ -2112,6 +2114,8 @@ void wfmain::saveSettings()
|
||||||
settings->setValue("ConfirmExit", prefs.confirmExit);
|
settings->setValue("ConfirmExit", prefs.confirmExit);
|
||||||
settings->setValue("ConfirmPowerOff", prefs.confirmPowerOff);
|
settings->setValue("ConfirmPowerOff", prefs.confirmPowerOff);
|
||||||
settings->setValue("Meter2Type", (int)prefs.meter2Type);
|
settings->setValue("Meter2Type", (int)prefs.meter2Type);
|
||||||
|
settings->setValue("ClickDragTuning", prefs.clickDragTuningEnable);
|
||||||
|
|
||||||
settings->endGroup();
|
settings->endGroup();
|
||||||
|
|
||||||
// Radio and Comms: C-IV addr, port to use
|
// Radio and Comms: C-IV addr, port to use
|
||||||
|
@ -4165,7 +4169,7 @@ void wfmain::handlePlotClick(QMouseEvent* me)
|
||||||
issueCmdUniquePriority(cmdSetFreq, freqGo);
|
issueCmdUniquePriority(cmdSetFreq, freqGo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else if (prefs.clickDragTuningEnable)
|
||||||
{
|
{
|
||||||
double x = plot->xAxis->pixelToCoord(me->pos().x());
|
double x = plot->xAxis->pixelToCoord(me->pos().x());
|
||||||
showStatusBarText(QString("Selected %1 MHz").arg(x));
|
showStatusBarText(QString("Selected %1 MHz").arg(x));
|
||||||
|
@ -4178,7 +4182,7 @@ void wfmain::handlePlotMouseRelease(QMouseEvent* me)
|
||||||
QCPAbstractItem* item = plot->itemAt(me->pos(), true);
|
QCPAbstractItem* item = plot->itemAt(me->pos(), true);
|
||||||
QCPItemText* textItem = dynamic_cast<QCPItemText*> (item);
|
QCPItemText* textItem = dynamic_cast<QCPItemText*> (item);
|
||||||
|
|
||||||
if (textItem == nullptr) {
|
if (textItem == nullptr && prefs.clickDragTuningEnable) {
|
||||||
this->mouseReleaseFreq = plot->xAxis->pixelToCoord(me->pos().x());
|
this->mouseReleaseFreq = plot->xAxis->pixelToCoord(me->pos().x());
|
||||||
double delta = mouseReleaseFreq - mousePressFreq;
|
double delta = mouseReleaseFreq - mousePressFreq;
|
||||||
qInfo(logGui()) << "Mouse release delta: " << delta;
|
qInfo(logGui()) << "Mouse release delta: " << delta;
|
||||||
|
@ -4190,7 +4194,7 @@ void wfmain::handlePlotMouseMove(QMouseEvent *me)
|
||||||
{
|
{
|
||||||
QCPAbstractItem* item = plot->itemAt(me->pos(), true);
|
QCPAbstractItem* item = plot->itemAt(me->pos(), true);
|
||||||
QCPItemText* textItem = dynamic_cast<QCPItemText*> (item);
|
QCPItemText* textItem = dynamic_cast<QCPItemText*> (item);
|
||||||
if(me->buttons() == Qt::LeftButton && textItem==nullptr)
|
if(me->buttons() == Qt::LeftButton && textItem==nullptr && prefs.clickDragTuningEnable)
|
||||||
{
|
{
|
||||||
double delta = plot->xAxis->pixelToCoord(me->pos().x()) - mousePressFreq;
|
double delta = plot->xAxis->pixelToCoord(me->pos().x()) - mousePressFreq;
|
||||||
qInfo(logGui()) << "Mouse moving delta: " << delta;
|
qInfo(logGui()) << "Mouse moving delta: " << delta;
|
||||||
|
@ -7815,3 +7819,10 @@ void wfmain::on_clusterPopOutBtn_clicked()
|
||||||
settingsTabisAttached = true;
|
settingsTabisAttached = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wfmain::on_clickDragTuningEnableChk_clicked(bool checked)
|
||||||
|
{
|
||||||
|
prefs.clickDragTuningEnable = checked;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
2
wfmain.h
2
wfmain.h
|
@ -677,6 +677,7 @@ private slots:
|
||||||
void on_clusterTimeoutLineEdit_editingFinished();
|
void on_clusterTimeoutLineEdit_editingFinished();
|
||||||
void on_clusterPopOutBtn_clicked();
|
void on_clusterPopOutBtn_clicked();
|
||||||
|
|
||||||
|
void on_clickDragTuningEnableChk_clicked(bool checked);
|
||||||
|
|
||||||
void receiveClusterOutput(QString text);
|
void receiveClusterOutput(QString text);
|
||||||
void receiveSpots(QList<spotData> spots);
|
void receiveSpots(QList<spotData> spots);
|
||||||
|
@ -940,6 +941,7 @@ private:
|
||||||
QString clusterTcpUserName;
|
QString clusterTcpUserName;
|
||||||
QString clusterTcpPassword;
|
QString clusterTcpPassword;
|
||||||
int clusterTimeout;
|
int clusterTimeout;
|
||||||
|
bool clickDragTuningEnable;
|
||||||
} prefs;
|
} prefs;
|
||||||
|
|
||||||
preferences defPrefs;
|
preferences defPrefs;
|
||||||
|
|
11
wfmain.ui
11
wfmain.ui
|
@ -2223,7 +2223,7 @@
|
||||||
<item>
|
<item>
|
||||||
<widget class="QStackedWidget" name="settingsStack">
|
<widget class="QStackedWidget" name="settingsStack">
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>5</number>
|
<number>1</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="radioAccess">
|
<widget class="QWidget" name="radioAccess">
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_21">
|
<layout class="QVBoxLayout" name="verticalLayout_21">
|
||||||
|
@ -2915,6 +2915,13 @@
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="clickDragTuningEnableChk">
|
||||||
|
<property name="text">
|
||||||
|
<string>Allow tuning via click and drag (experimental)</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="horizontalSpacer_10">
|
<spacer name="horizontalSpacer_10">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
|
@ -5283,7 +5290,7 @@
|
||||||
<resources/>
|
<resources/>
|
||||||
<connections/>
|
<connections/>
|
||||||
<buttongroups>
|
<buttongroups>
|
||||||
<buttongroup name="buttonGroup"/>
|
|
||||||
<buttongroup name="underlayButtonGroup"/>
|
<buttongroup name="underlayButtonGroup"/>
|
||||||
|
<buttongroup name="buttonGroup"/>
|
||||||
</buttongroups>
|
</buttongroups>
|
||||||
</ui>
|
</ui>
|
||||||
|
|
Ładowanie…
Reference in New Issue