Added json broadcasting
This commit is contained in:
parent
df27b622a0
commit
3cbe947408
37 changed files with 514 additions and 487 deletions
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include "itemsettingsdialog.h"
|
||||
|
||||
MainWindow::MainWindow(Microcontroller *micro, PowerItem* powerItem, ItemStore* itemStore, SensorStore *sensorStore, QWidget *parent) :
|
||||
MainWindow::MainWindow(Microcontroller *micro, PowerItem* powerItem, ItemStore* itemStore, SensorStore *sensorStore, bool master, QWidget *parent) :
|
||||
QMainWindow(parent),
|
||||
ui(new Ui::MainWindow),
|
||||
colorChooser(this),
|
||||
|
|
@ -13,6 +13,9 @@ MainWindow::MainWindow(Microcontroller *micro, PowerItem* powerItem, ItemStore*
|
|||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
if(!master) connect(ui->pushButton_broadcast, &QPushButton::clicked, this, &MainWindow::sigBrodcast);
|
||||
else ui->pushButton_broadcast->hide();
|
||||
|
||||
connect(ui->pushButton_power, SIGNAL(clicked()), this, SLOT(showPowerItemDialog()));
|
||||
|
||||
//Relays
|
||||
|
|
@ -20,6 +23,11 @@ MainWindow::MainWindow(Microcontroller *micro, PowerItem* powerItem, ItemStore*
|
|||
connect(itemStore, &ItemStore::itemAdded, ui->relayList, &ItemScrollBox::addItem);
|
||||
connect(itemStore, &ItemStore::itemDeleted, ui->relayList, &ItemScrollBox::removeItem);
|
||||
|
||||
for(size_t i = 0; i < itemStore->getItems()->size(); ++i)
|
||||
{
|
||||
ui->relayList->addItem(itemStore->getItems()->at(i));
|
||||
}
|
||||
|
||||
//Sensors
|
||||
|
||||
ui->sensorListView->sensorsChanged(*(sensorStore->getSensors()));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue