mirror
/
wfview
kopia lustrzana https://gitlab.com/eliggett/wfview
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Hopefully fix building with QCP < 2.0.0

half-duplex
Phil Taylor 2023-01-15 12:27:23 +00:00
rodzic 794a8b71c8
commit 8fca384135
1 zmienionych plików z 15 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

17
wfmain.cpp
Wyświetl plik

@ -4592,8 +4592,13 @@ void wfmain::handlePlotClick(QMouseEvent* me)
QCPAbstractItem* item = plot->itemAt(me->pos(), true);
QCPItemText* textItem = dynamic_cast<QCPItemText*> (item);
QCPItemRect* rectItem = dynamic_cast<QCPItemRect*> (item);
#if QCUSTOMPLOT_VERSION < 0x020000
int leftPix = (int)passbandIndicator->left->pixelPoint().x();
int rightPix = (int)passbandIndicator->right->pixelPoint().x();
#else
int leftPix = (int)passbandIndicator->left->pixelPosition().x();
int rightPix = (int)passbandIndicator->right->pixelPosition().x();
#endif
if (me->button() == Qt::LeftButton && rectItem != nullptr && (me->pos().x() <= leftPix || me->pos().x() >= rightPix)) {
resizingPassband = true;
}
@ -4663,8 +4668,13 @@ void wfmain::handlePlotMouseMove(QMouseEvent *me)
QCPAbstractItem* item = plot->itemAt(me->pos(), true);
QCPItemText* textItem = dynamic_cast<QCPItemText*> (item);
QCPItemRect* rectItem = dynamic_cast<QCPItemRect*> (item);
#if QCUSTOMPLOT_VERSION < 0x020000
int leftPix = (int)passbandIndicator->left->pixelPoint().x();
int rightPix = (int)passbandIndicator->right->pixelPoint().x();
#else
int leftPix = (int)passbandIndicator->left->pixelPosition().x();
int rightPix = (int)passbandIndicator->right->pixelPosition().x();
#endif
if (rectItem != nullptr && (me->pos().x() <= leftPix || me->pos().x() >= rightPix)) {
setCursor(Qt::SizeHorCursor);
}
@ -7989,14 +7999,17 @@ void wfmain::receiveSpots(QList<spotData> spots)
sp->text->position->setCoords(left, top);
sp->text->setVisible(false);
while (conflict) {
#if QCUSTOMPLOT_VERSION < 0x020000
QCPAbstractItem* item = plot->itemAt(sp->text->position->pixelPoint(), true);
#else
QCPAbstractItem* item = plot->itemAt(sp->text->position->pixelPosition(), true);
#endif
QCPItemText* textItem = dynamic_cast<QCPItemText*> (item);
if (textItem != nullptr && sp->text != textItem) {
//qInfo(logGui()) << "CONFLICT:" << textItem->text() << "SAME POSITION AS" << sp->dxcall << sp->text->position->pixelPosition();
top = top - 5.0;
}
else {
//qInfo(logGui()) << "OK:" << sp->dxcall << sp->text->position->pixelPosition();
conflict = false;
}
sp->text->position->setCoords(left, top);