emit DynamicReadableConnectionData from FunctionEditor

This commit is contained in:
Jussi Kuokkanen 2023-08-24 18:08:45 +03:00
parent 02d9001497
commit 8245ba3489
3 changed files with 14 additions and 6 deletions

View File

@ -10,6 +10,7 @@ class DynamicReadableProxy : public QObject {
public:
DynamicReadableProxy(QString path, QDBusConnection conn, QObject *parent = nullptr);
std::optional<QString> unit();
QString dbusPath() { return m_iface.path(); }
signals:
void valueChanged(TuxClocker::Device::ReadResult val);
private:

View File

@ -12,7 +12,8 @@ moc_files = qt5.preprocess(moc_headers: ['MainWindow.hpp',
'data/DynamicReadableConnection.hpp',
'data/DynamicReadableProxy.hpp',
'widgets/AbstractAssignableEditor.hpp',
'widgets/DragChartView.hpp'],
'widgets/DragChartView.hpp',
'widgets/FunctionEditor.hpp'],
qresources : ['resources/resources.qrc'],
dependencies: qt5_dep)

View File

@ -79,14 +79,16 @@ public:
connect(m_applyButton, &QPushButton::clicked, [this] {
auto proxy = m_latestNodeIndex.data(DeviceModel::DynamicReadableProxyRole)
.value<DynamicReadableProxy *>();
// qDebug() << proxy;
auto points = m_dragView->vector();
if (points.length() < 2)
return;
// qDebug() << points;
auto conn =
std::make_shared<DynamicReadableConnection<int>>(*proxy, points);
assignableConnectionChanged(conn);
auto data = DynamicReadableConnectionData{
.points = points,
.dynamicReadablePath = proxy->dbusPath(),
};
emit connectionDataChanged(data);
this->close();
});
m_dragView->yAxis().setTitleText(nodeName);
@ -102,7 +104,11 @@ public:
}
boost::signals2::signal<void(std::shared_ptr<AssignableConnection>)>
assignableConnectionChanged;
signals:
void connectionDataChanged(DynamicReadableConnectionData);
private:
Q_OBJECT
AssignableProxy &m_assignableProxy;
DeviceModel &m_model;
DeviceProxyModel m_proxyModel;