Added device filter.
This commit is contained in:
@@ -46,11 +46,21 @@ void BCDevicePanel::setHeaderText( const QString& headerText)
|
|||||||
_headerLabel->setText( headerText );
|
_headerLabel->setText( headerText );
|
||||||
}
|
}
|
||||||
|
|
||||||
QString BCDevicePanel::getHeaderText()
|
QString BCDevicePanel::getHeaderText() const
|
||||||
{
|
{
|
||||||
return _headerLabel->text();
|
return _headerLabel->text();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void BCDevicePanel::setDeviceID( BCDevice::ID deviceID )
|
||||||
|
{
|
||||||
|
_devideID = deviceID;
|
||||||
|
}
|
||||||
|
BCDevice::ID BCDevicePanel::getDeviceID() const
|
||||||
|
{
|
||||||
|
return _devideID;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
QTableView* BCDevicePanel::getValueView()
|
QTableView* BCDevicePanel::getValueView()
|
||||||
{
|
{
|
||||||
//valueModel;
|
//valueModel;
|
||||||
@@ -73,14 +83,10 @@ QTableView* BCDevicePanel::getValueView()
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
BCValueList& BCDevicePanel::exposeValueList()
|
|
||||||
{
|
|
||||||
return _myTmpList;
|
|
||||||
}
|
|
||||||
|
|
||||||
void BCDevicePanel::onValueListReady( BCDevice::ID deviceID, BCValueList valueList )
|
void BCDevicePanel::onValueListReady( BCDevice::ID deviceID, BCValueList valueList )
|
||||||
{
|
{
|
||||||
qDebug() << " --- onValueListReady: " << getHeaderText() <<" : " << deviceID << ": " << valueList.size();
|
qDebug() << " --- onValueListReady: " << getHeaderText() <<" : " << deviceID << ": " << valueList.size();
|
||||||
|
if(_devideID == deviceID)
|
||||||
_valueModel.setValueList( valueList );
|
_valueModel.setValueList( valueList );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -46,7 +46,10 @@ public:
|
|||||||
explicit BCDevicePanel(QWidget *parent = nullptr);
|
explicit BCDevicePanel(QWidget *parent = nullptr);
|
||||||
|
|
||||||
void setHeaderText( const QString& headerText);
|
void setHeaderText( const QString& headerText);
|
||||||
QString getHeaderText();
|
QString getHeaderText() const;
|
||||||
|
|
||||||
|
void setDeviceID( BCDevice::ID deviceID );
|
||||||
|
BCDevice::ID getDeviceID() const;
|
||||||
|
|
||||||
BCValueList& exposeValueList();
|
BCValueList& exposeValueList();
|
||||||
|
|
||||||
@@ -58,8 +61,9 @@ public slots:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
||||||
|
BCDevice::ID _devideID{BCDevice::ID::Invalid};
|
||||||
BCValueModel _valueModel;
|
BCValueModel _valueModel;
|
||||||
BCValueList _myTmpList;
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -97,7 +97,8 @@ void BCMainWindow::initData()
|
|||||||
BCDevicePanel* currentPanel = _devicePanels[deviceID];
|
BCDevicePanel* currentPanel = _devicePanels[deviceID];
|
||||||
// den Panels ihren title geben
|
// den Panels ihren title geben
|
||||||
currentPanel->setHeaderText( panelTitle );
|
currentPanel->setHeaderText( panelTitle );
|
||||||
|
// ... und ihre device ID
|
||||||
|
currentPanel->setDeviceID( deviceID );
|
||||||
// Wenn ein Device (entspricht einem Datenmodel) fertig eingelesen wurde,
|
// Wenn ein Device (entspricht einem Datenmodel) fertig eingelesen wurde,
|
||||||
// wird es weitergereicht.
|
// wird es weitergereicht.
|
||||||
// Problem: alle Panels bekommen alle Datenmodelle angeboten.
|
// Problem: alle Panels bekommen alle Datenmodelle angeboten.
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
<string notr="true">background-color: grey;</string>
|
<string notr="true">background-color: grey;</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||||
<item>
|
<item alignment="Qt::AlignmentFlag::AlignHCenter">
|
||||||
<widget class="BCToolButton" name="_motorButton">
|
<widget class="BCToolButton" name="_motorButton">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
@@ -40,7 +40,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item alignment="Qt::AlignmentFlag::AlignHCenter">
|
||||||
<widget class="BCToolButton" name="_batteryButton">
|
<widget class="BCToolButton" name="_batteryButton">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
@@ -59,7 +59,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item alignment="Qt::AlignmentFlag::AlignHCenter">
|
||||||
<widget class="BCToolButton" name="_consoleButton">
|
<widget class="BCToolButton" name="_consoleButton">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
@@ -78,7 +78,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item alignment="Qt::AlignmentFlag::AlignHCenter">
|
||||||
<widget class="BCToolButton" name="_pimpButton">
|
<widget class="BCToolButton" name="_pimpButton">
|
||||||
<property name="minimumSize">
|
<property name="minimumSize">
|
||||||
<size>
|
<size>
|
||||||
@@ -110,14 +110,14 @@
|
|||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item alignment="Qt::AlignmentFlag::AlignHCenter">
|
||||||
<widget class="QPushButton" name="_syncButton">
|
<widget class="QPushButton" name="_syncButton">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Sync</string>
|
<string>Sync</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item alignment="Qt::AlignmentFlag::AlignHCenter">
|
||||||
<widget class="QPushButton" name="_connectButton">
|
<widget class="QPushButton" name="_connectButton">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Connect</string>
|
<string>Connect</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user