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

Fix crash when clicking on a knob.

qcpfix
Phil Taylor 2023-03-25 16:58:28 +00:00
rodzic ac58289188
commit 03c45663dc
2 zmienionych plików z 17 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

29
controllersetup.cpp
Wyświetl plik

@ -20,11 +20,18 @@ controllerSetup::~controllerSetup()
delete ui; delete ui;
} }
void controllerSetup::hideEvent(QHideEvent *event)
{
qDebug(logUsbControl()) << "Controller window hiding";
updateDialog->hide();
}
void controllerSetup::init() void controllerSetup::init()
{ {
updateDialog = new QDialog(this); updateDialog = new QDialog(this);
//updateDialog->setModal(true); // Not sure if I like it Frameless or not?
updateDialog->setWindowFlags(Qt::FramelessWindowHint | Qt::Dialog);
QGridLayout* udLayout = new QGridLayout; QGridLayout* udLayout = new QGridLayout;
updateDialog->setLayout(udLayout); updateDialog->setLayout(udLayout);
@ -72,19 +79,14 @@ void controllerSetup::mousePressed(controllerScene* scene, QPoint p)
Q_UNUSED (scene) // We might want it in the future? Q_UNUSED (scene) // We might want it in the future?
// Receive mouse event from the scene // Receive mouse event from the scene
qDebug() << "Looking for button Point x=" << p.x() << " y=" << p.y(); qDebug() << "Looking for knob or button at Point x=" << p.x() << " y=" << p.y();
if (onEvent == Q_NULLPTR|| offEvent == Q_NULLPTR|| knobEvent == Q_NULLPTR)
{
qInfo(logUsbControl()) << "Event missing, cannot continue...";
return;
}
bool found = false; bool found = false;
QPoint gp = this->mapToGlobal(p); QPoint gp = this->mapToGlobal(p);
for (auto b = buttons->begin(); b != buttons->end(); b++) for (auto b = buttons->begin(); b != buttons->end(); b++)
{ {
if (b->page == b->parent->currentPage && ui->tabWidget->currentWidget()->objectName() == b->path && b->pos.contains(p)) if (b->parent != Q_NULLPTR && b->parent != Q_NULLPTR && b->pos.contains(p) && b->page == b->parent->currentPage && ui->tabWidget->currentWidget()->objectName() == b->path)
{ {
found = true; found = true;
currentButton = b; currentButton = b;
@ -112,7 +114,7 @@ void controllerSetup::mousePressed(controllerScene* scene, QPoint p)
buttonLatch->show(); buttonLatch->show();
buttonColor->show(); buttonColor->show();
currentKnob = Q_NULLPTR; //currentKnob = Q_NULLPTR;
break; break;
} }
} }
@ -120,7 +122,7 @@ void controllerSetup::mousePressed(controllerScene* scene, QPoint p)
if (!found) { if (!found) {
for (auto k = knobs->begin(); k != knobs->end(); k++) for (auto k = knobs->begin(); k != knobs->end(); k++)
{ {
if (k->page == k->parent->currentPage && ui->tabWidget->currentWidget()->objectName() == k->path && k->pos.contains(p)) if (k->parent != Q_NULLPTR && k->pos.contains(p) && k->page == k->parent->currentPage && ui->tabWidget->currentWidget()->objectName() == k->path)
{ {
found = true; found = true;
currentKnob = k; currentKnob = k;
@ -139,7 +141,7 @@ void controllerSetup::mousePressed(controllerScene* scene, QPoint p)
offLabel->hide(); offLabel->hide();
buttonLatch->hide(); buttonLatch->hide();
buttonColor->hide(); buttonColor->hide();
currentButton = Q_NULLPTR; //currentButton = Q_NULLPTR;
break; break;
} }
} }
@ -150,12 +152,13 @@ void controllerSetup::mousePressed(controllerScene* scene, QPoint p)
updateDialog->show(); updateDialog->show();
updateDialog->move(gp); updateDialog->move(gp);
updateDialog->adjustSize(); updateDialog->adjustSize();
updateDialog->raise();
} }
else else
{ {
updateDialog->hide(); updateDialog->hide();
currentButton = Q_NULLPTR; // currentButton = Q_NULLPTR;
currentKnob = Q_NULLPTR; //currentKnob = Q_NULLPTR;
} }
} }

1
controllersetup.h
Wyświetl plik

@ -90,6 +90,7 @@ public slots:
void pagesChanged(USBDEVICE* dev, int val); void pagesChanged(USBDEVICE* dev, int val);
void disableClicked(USBDEVICE* dev, bool clicked, QWidget* widget); void disableClicked(USBDEVICE* dev, bool clicked, QWidget* widget);
void setConnected(USBDEVICE* dev); void setConnected(USBDEVICE* dev);
void hideEvent(QHideEvent *event);
private: private: