Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions omodsim/formmodsim.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ FormModSim::FormModSim(int id, ModbusMultiServer& server, QSharedPointer<DataSim
connect(_dataSimulator.get(), &DataSimulator::simulationStarted, this, &FormModSim::on_simulationStarted);
connect(_dataSimulator.get(), &DataSimulator::simulationStopped, this, &FormModSim::on_simulationStopped);
connect(_dataSimulator.get(), &DataSimulator::dataSimulated, this, &FormModSim::on_dataSimulated);

ui->frameDataDefinition->installEventFilter(this);
}

///
Expand Down Expand Up @@ -115,21 +113,17 @@ void FormModSim::closeEvent(QCloseEvent* event)
}

///
/// \brief FormModSim::eventFilter
/// \param watched
/// \brief FormModSim::mouseDoubleClickEvent
/// \param event
/// \return
///
bool FormModSim::eventFilter(QObject* watched, QEvent* event)
void FormModSim::mouseDoubleClickEvent(QMouseEvent* event)
{
if (watched == ui->frameDataDefinition && event->type() == QEvent::MouseButtonDblClick) {
auto* me = static_cast<QMouseEvent*>(event);
if(me->pos().x() > ui->statisticWidget->geometry().right()) {
emit doubleClicked();
return true;
}
if(ui->frameDataDefinition->geometry().contains(event->pos())) {
emit doubleClicked();
}
return QWidget::eventFilter(watched, event);

return QWidget::mouseDoubleClickEvent(event);
}

///
Expand Down
2 changes: 1 addition & 1 deletion omodsim/formmodsim.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ class FormModSim : public QWidget
protected:
void changeEvent(QEvent* event) override;
void closeEvent(QCloseEvent* event) override;
bool eventFilter(QObject* watched, QEvent* event) override;
void mouseDoubleClickEvent(QMouseEvent* event) override;

public slots:
void show();
Expand Down