uvos/UvosSmartHomeInterface
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: uvos:d30c9546b108af0e4ac4cff81f608c67454c7dec
Branches Tags
uvos:master
..
compare: uvos:d8471789b72d6d032dab129d536b605a5ca55e65
Branches Tags
uvos:master

No commits in common. "d30c9546b108af0e4ac4cff81f608c67454c7dec" and "d8471789b72d6d032dab129d536b605a5ca55e65" have entirely different histories.
d30c9546b1 ... d8471789b7

13 changed files with 37 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SHinterface.pro
View file

@ -4,7 +4,7 @@
# #
#------------------------------------------------- #-------------------------------------------------
QT += core gui widgets network multimedia QT += core gui widgets network multimedia
QT += serialport QT += serialport

36
src/actors/regulator.cpp
View file

@ -4,16 +4,12 @@
Regulator::Regulator(const Sensor sensor, QObject* parent): Actor(parent), sensor_(sensor) Regulator::Regulator(const Sensor sensor, QObject* parent): Actor(parent), sensor_(sensor)
{ {
timer.setSingleShot(true);
timer.start(timeout_*1000);
connect(&timer, &QTimer::timeout, this, &Regulator::timeout);
} }
Regulator::Regulator(QObject* parent): Actor(parent) Regulator::Regulator(QObject* parent): Actor(parent)
{ {
timer.setSingleShot(true);
timer.start(timeout_*1000);
connect(&timer, &QTimer::timeout, this, &Regulator::timeout);
} }
void Regulator::setSensor(const Sensor sensor) void Regulator::setSensor(const Sensor sensor)
@ -25,7 +21,6 @@ void Regulator::sensorEvent(Sensor sensor)
{ {
if(active && sensor == sensor_) if(active && sensor == sensor_)
{ {
timer.start(timeout_*1000);
if( sensor.field < setPoint_-band_ && (sensor.field < sensor_.field || sensor_.field > setPoint_-band_ || first) ) if( sensor.field < setPoint_-band_ && (sensor.field < sensor_.field || sensor_.field > setPoint_-band_ || first) )
{ {
sigValue(triggerValue); sigValue(triggerValue);
@ -44,15 +39,9 @@ void Regulator::makeInactive()
first = true; first = true;
if(active) if(active)
sigValue(!triggerValue); sigValue(!triggerValue);
timer.stop();
Actor::makeInactive(); Actor::makeInactive();
} }
void Regulator::timeout()
{
sigValue(safeValue_);
}
void Regulator::setPoint(float setPoint) void Regulator::setPoint(float setPoint)
{ {
setPoint_ = setPoint; setPoint_ = setPoint;
@ -68,25 +57,12 @@ void Regulator::setInvert( bool invert )
invert_ = invert; invert_ = invert;
} }
void Regulator::setSafeValue(int value)
{
safeValue_ = value;
}
void Regulator::setTimeout(int value)
{
timeout_ = value;
timer.start(timeout_*1000);
}
void Regulator::store(QJsonObject& json) void Regulator::store(QJsonObject& json)
{ {
json["Type"] = "Regulator"; json["Type"] = "Regulator";
Actor::store(json); Actor::store(json);
json["Band"] = band_; json["Band"] = band_;
json["SetPoint"] = setPoint_; json["SetPoint"] = setPoint_;
json["SafeValue"] = safeValue_;
json["Timeout"] = timeout_;
json["SensorType"] = static_cast<int>(sensor_.type); json["SensorType"] = static_cast<int>(sensor_.type);
json["SensorId"] = static_cast<int>(sensor_.id); json["SensorId"] = static_cast<int>(sensor_.id);
json["SensorField"] = sensor_.field; json["SensorField"] = sensor_.field;
@ -98,21 +74,15 @@ void Regulator::load(const QJsonObject& json, bool preserve)
Actor::load(json, preserve); Actor::load(json, preserve);
band_ = json["Band"].toDouble(1); band_ = json["Band"].toDouble(1);
setPoint_ = json["SetPoint"].toDouble(22); setPoint_ = json["SetPoint"].toDouble(22);
safeValue_ = json["SafeValue"].toDouble(0);
timeout_ = json["Timeout"].toDouble(1800);
sensor_.type = json["SensorType"].toInt(0); sensor_.type = json["SensorType"].toInt(0);
sensor_.id = json["SensorId"].toInt(0); sensor_.id = json["SensorId"].toInt(0);
sensor_.field = json["SensorField"].toInt(0); sensor_.field = json["SensorField"].toInt(0);
sensor_.name = json["SensorName"].toString("Sensor"); sensor_.name = json["SensorName"].toString("Sensor");
timer.start(timeout_*1000);
} }
QString Regulator::getName() const QString Regulator::getName() const
{ {
if(name_.size() > 0) if(name_.size() > 0) return name_;
{
return name_;
}
else else
{ {
QString string; QString string;

26
src/actors/regulator.h
View file

@ -1,7 +1,4 @@
#pragma once #pragma once
#include <QTimer>
#include "actor.h" #include "actor.h"
#include "../sensors/sensor.h" #include "../sensors/sensor.h"
@ -14,26 +11,17 @@ private:
float setPoint_ = 0; float setPoint_ = 0;
float band_ = 1; float band_ = 1;
bool invert_ = false; bool invert_ = false;
int timeout_ = 1800;
int safeValue_ = 0;
QTimer timer;
bool first = true; bool first = true;
private slots:
void timeout();
public slots: public slots:
void sensorEvent(Sensor sensor); void sensorEvent(Sensor sensor);
void setSensor(const Sensor sensor); void setSensor(const Sensor sensor);
void setPoint(float setPoint ); void setPoint( float setPoint );
void setBand (float band ); void setBand ( float band );
void setInvert(bool invert ); void setInvert( bool invert );
void setSafeValue(int value);
void setTimeout(int value);
virtual void makeInactive() override; virtual void makeInactive() override;
public: public:
@ -46,14 +34,6 @@ public:
{ {
return setPoint_; return setPoint_;
} }
int getSafeValue()
{
return safeValue_;
}
int getTimeout()
{
return timeout_;
}
Regulator(const Sensor sensor, QObject* parent = nullptr); Regulator(const Sensor sensor, QObject* parent = nullptr);
Regulator(QObject* parent = nullptr); Regulator(QObject* parent = nullptr);
Sensor getSensor() Sensor getSensor()

15
src/microcontroller.cpp
View file

@ -127,16 +127,11 @@ std::shared_ptr<Relay> Microcontroller::processRelayLine(const QString& buffer)
if(bufferList.size() >= 9 && buffer.startsWith("ITEM NUMBER:")) if(bufferList.size() >= 9 && buffer.startsWith("ITEM NUMBER:"))
{ {
QString name; QString name;
for(int i = 10; i < bufferList.size(); i++) for(int i = 10; i < bufferList.size(); i++) name.append(bufferList[i] + ' ');
name.append(bufferList[i] + ' '); if(name.size() > 1)name.remove(name.size()-1, 1);
if(name.size() > 1) else name = "Relay " + QString::number(bufferList[1].toInt(nullptr, 2));
name.remove(name.size()-1, 1); return std::shared_ptr<Relay>( new Relay(bufferList[2].toInt(), name, bufferList[4].toInt(nullptr, 2),
else bufferList[8].toInt()));
name = "Relay " + QString::number(bufferList[1].toInt(nullptr, 2));
return std::shared_ptr<Relay>(new Relay(bufferList[2].toInt(),
name,
bufferList[6].toInt(nullptr, 2),
bufferList[8].toInt()));
} }
return nullptr; return nullptr;
} }

19
src/ui/actorsettingsdialog.cpp
View file

@ -83,20 +83,14 @@ void ActorSettingsDialog::init()
connect(ui->comboBox_action, SIGNAL(currentIndexChanged(int)), this, SLOT(changeAction(int))); connect(ui->comboBox_action, SIGNAL(currentIndexChanged(int)), this, SLOT(changeAction(int)));
connect(ui->spinBox, SIGNAL(valueChanged(int)), this, SLOT(valueChanged(int))); connect(ui->spinBox, SIGNAL(valueChanged(int)), this, SLOT(valueChanged(int)));
connect(ui->pushButton_editItem, &QPushButton::clicked, this, &ActorSettingsDialog::editAsItem); connect(ui->pushButton_editItem, &QPushButton::clicked, this, &ActorSettingsDialog::editAsItem);
connect(ui->pushButton_enable, &QPushButton::clicked, this, &ActorSettingsDialog::setEnabled);
ui->spinBox->hide(); ui->spinBox->hide();
ui->spinBox->setValue(actor_->getTriggerValue()); ui->spinBox->setValue(actor_->getTriggerValue());
if(actor_->getTriggerValue() == 0) if(actor_->getTriggerValue() == 0) ui->comboBox_action->setCurrentIndex(0);
ui->comboBox_action->setCurrentIndex(0); else if(actor_->getTriggerValue() == 1) ui->comboBox_action->setCurrentIndex(1);
else if(actor_->getTriggerValue() == 1) else ui->comboBox_action->setCurrentIndex(2);
ui->comboBox_action->setCurrentIndex(1);
else
ui->comboBox_action->setCurrentIndex(2);
ui->label_Exausted->setText(actor_->isExausted() ? "True" : "False"); ui->label_Exausted->setText(actor_->isExausted() ? "True" : "False");
ui->label_Enabled->setText(actor_->isActive() ? "True" : "False");
ui->pushButton_enable->setText(actor_->isActive() ? "Disable" : "Enable");
} }
ActorSettingsDialog::~ActorSettingsDialog() ActorSettingsDialog::~ActorSettingsDialog()
@ -110,13 +104,6 @@ void ActorSettingsDialog::editAsItem()
itemSettingsDiag.exec(); itemSettingsDiag.exec();
} }
void ActorSettingsDialog::setEnabled()
{
actor_->setActive(!actor_->isActive());
ui->label_Enabled->setText(actor_->isActive() ? "True" : "False");
ui->pushButton_enable->setText(actor_->isActive() ? "Disable" : "Enable");
}
void ActorSettingsDialog::valueChanged(int value) void ActorSettingsDialog::valueChanged(int value)
{ {
actor_->setTriggerValue(value); actor_->setTriggerValue(value);

1
src/ui/actorsettingsdialog.h
View file

@ -41,7 +41,6 @@ private slots:
void changeAction(int index); void changeAction(int index);
void valueChanged(int value); void valueChanged(int value);
void editAsItem(); void editAsItem();
void setEnabled();
private: private:

57
src/ui/actorsettingsdialog.ui
View file

@ -85,63 +85,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Enabled:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_Enabled">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>True</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="pushButton_enable">
<property name="text">
<string>Enable</string>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>

2
src/ui/actorwidgets/polynomalactorwidget.cpp
View file

@ -46,5 +46,5 @@ void PolynomalActorWidget::setPow()
void PolynomalActorWidget::setSensor(const QModelIndex &index) void PolynomalActorWidget::setSensor(const QModelIndex &index)
{ {
actor_->setSensor(ui->listView->getSensorForIndex(index)); actor_->setSensor(sensors_->getSensors()->at(index.row()));
} }

11
src/ui/actorwidgets/regulatorwdiget.cpp
View file

@ -24,17 +24,12 @@ RegulatorWdiget::RegulatorWdiget(std::shared_ptr<Regulator> regulator, SensorSto
} }
ui->doubleSpinBox_setPoint->setValue(regulator->getSetPoint()); ui->doubleSpinBox_setPoint->setValue(regulator->getSetPoint());
ui->doubleSpinBox_band->setValue(regulator->getBand()); ui->doubleSpinBox_band->setValue(regulator->getBand());
ui->spinBox_safe->setValue(regulator_->getSafeValue());
ui->spinBox_timeout->setValue(regulator_->getTimeout());
connect(ui->listView, &SensorListWidget::clicked, this, &RegulatorWdiget::setSensor); connect(ui->listView, &SensorListWidget::clicked, this, &RegulatorWdiget::setSensor);
connect(ui->doubleSpinBox_setPoint, SIGNAL(valueChanged(double)), this, SLOT(setPoint(double))); connect(ui->doubleSpinBox_setPoint, SIGNAL(valueChanged(double)), this, SLOT(setPoint(double)));
connect(ui->doubleSpinBox_band, SIGNAL(valueChanged(double)), this, SLOT(setBand(double))); connect(ui->doubleSpinBox_band, SIGNAL(valueChanged(double)), this, SLOT(setBand(double)));
connect(ui->spinBox_safe, SIGNAL(valueChanged(int)), regulator_.get(), SLOT(setSafeValue(int)));
connect(ui->spinBox_timeout, SIGNAL(valueChanged(int)), regulator_.get(), SLOT(setTimeout(int)));
} }
void RegulatorWdiget::setPoint(double in) void RegulatorWdiget::setPoint(double in)
{ {
regulator_->setPoint(in); regulator_->setPoint(in);
@ -47,7 +42,7 @@ void RegulatorWdiget::setBand(double band)
void RegulatorWdiget::setSensor(const QModelIndex &index) void RegulatorWdiget::setSensor(const QModelIndex &index)
{ {
regulator_->setSensor(ui->listView->getSensorForIndex(index)); regulator_->setSensor(sensors_->getSensors()->at(index.row()));
setPoint(ui->listView->getSensorForIndex(index).field); setPoint(sensors_->getSensors()->at(index.row()).field);
ui->doubleSpinBox_setPoint->setValue(ui->listView->getSensorForIndex(index).field); ui->doubleSpinBox_setPoint->setValue(sensors_->getSensors()->at(index.row()).field);
} }

52
src/ui/actorwidgets/regulatorwdiget.ui
View file

@ -38,8 +38,15 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QGridLayout" name="gridLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item row="0" column="1"> <item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Set Point</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="doubleSpinBox_setPoint"> <widget class="QDoubleSpinBox" name="doubleSpinBox_setPoint">
<property name="minimum"> <property name="minimum">
<double>-9999.989999999999782</double> <double>-9999.989999999999782</double>
@ -49,7 +56,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@ -62,46 +69,9 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>Timeout</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Set Point</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QDoubleSpinBox" name="doubleSpinBox_band"/> <widget class="QDoubleSpinBox" name="doubleSpinBox_band"/>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Safety Value</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="spinBox_safe"/>
</item>
<item row="1" column="3">
<widget class="QSpinBox" name="spinBox_timeout">
<property name="suffix">
<string> s</string>
</property>
<property name="maximum">
<number>999999999</number>
</property>
<property name="value">
<number>1800</number>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>

12
src/ui/actorwidgets/sensoractorwidget.cpp
View file

@ -17,12 +17,9 @@ SensorActorWidget::SensorActorWidget(std::shared_ptr<SensorActor> sensorActor, S
ui->label->hide(); ui->label->hide();
} }
if(sensorActor_->getSloap() == SensorActor::SLOPE_UP) if(sensorActor_->getSloap() == SensorActor::SLOPE_UP) ui->comboBox_slope->setCurrentIndex(0);
ui->comboBox_slope->setCurrentIndex(0); else if(sensorActor_->getSloap() == SensorActor::SLOPE_DOWN) ui->comboBox_slope->setCurrentIndex(1);
else if(sensorActor_->getSloap() == SensorActor::SLOPE_DOWN) else if(sensorActor_->getSloap() == SensorActor::SLOPE_BOTH) ui->comboBox_slope->setCurrentIndex(2);
ui->comboBox_slope->setCurrentIndex(1);
else if(sensorActor_->getSloap() == SensorActor::SLOPE_BOTH)
ui->comboBox_slope->setCurrentIndex(2);
ui->doubleSpinBox_threshold->setValue(sensorActor_->getThreshold()); ui->doubleSpinBox_threshold->setValue(sensorActor_->getThreshold());
@ -50,5 +47,6 @@ void SensorActorWidget::setSlope(int index)
void SensorActorWidget::setSensor(const QModelIndex &index) void SensorActorWidget::setSensor(const QModelIndex &index)
{ {
sensorActor_->setSensor(ui->listView->getSensorForIndex(index)); sensorActor_->setSensor(sensors_->getSensors()->at(index.row()));
qDebug()<<"Selected "<<sensors_->getSensors()->at(index.row()).name;
} }

17
src/ui/sensorlistwidget.cpp
View file

@ -56,7 +56,7 @@ void SensorListWidget::sensorsChanged(std::vector<Sensor> sensors)
else itemString.append("\"Silent\""); else itemString.append("\"Silent\"");
} }
setItem(static_cast<int>(row), 0, new SensorListItem(sensors[i].name + (sensors[i].hidden ? " (H)" : ""), sensors[i])); setItem(static_cast<int>(row), 0, new QTableWidgetItem(sensors[i].name + (sensors[i].hidden ? " (H)" : "")));
setItem(static_cast<int>(row), 1, new QTableWidgetItem(itemString)); setItem(static_cast<int>(row), 1, new QTableWidgetItem(itemString));
if(sensors[i].type <= 128) if(sensors[i].type <= 128)
setItem(static_cast<int>(row), 2, new QTableWidgetItem(sensors[i].lastSeen.time().toString("hh:mm"))); setItem(static_cast<int>(row), 2, new QTableWidgetItem(sensors[i].lastSeen.time().toString("hh:mm")));
@ -67,23 +67,8 @@ void SensorListWidget::sensorsChanged(std::vector<Sensor> sensors)
resizeColumnsToContents(); resizeColumnsToContents();
} }
const Sensor& SensorListWidget::getSensorForIndex(const QModelIndex &index)
{
return static_cast<SensorListItem*>(item(index.row(), 0))->getSensor();
}
void SensorListWidget::setShowHidden(const bool showHidden) void SensorListWidget::setShowHidden(const bool showHidden)
{ {
showHidden_=showHidden; showHidden_=showHidden;
} }
const Sensor& SensorListItem::getSensor()
{
return sensor;
}
SensorListItem::SensorListItem(const QString& text, const Sensor& sensor):
QTableWidgetItem(text, 1001), sensor(sensor)
{
}

12
src/ui/sensorlistwidget.h
View file

@ -3,15 +3,6 @@
#include <vector> #include <vector>
#include "../sensors/sensor.h" #include "../sensors/sensor.h"
class SensorListItem : public QTableWidgetItem
{
Sensor sensor;
public:
const Sensor& getSensor();
SensorListItem(const QString& text, const Sensor& sensor);
};
class SensorListWidget : public QTableWidget class SensorListWidget : public QTableWidget
{ {
Q_OBJECT Q_OBJECT
@ -20,11 +11,10 @@ class SensorListWidget : public QTableWidget
public: public:
SensorListWidget(const bool showHidden = true, QWidget* parent = nullptr); SensorListWidget(const bool showHidden = true, QWidget *parent = nullptr);
SensorListWidget(SensorStore& sensorStore, const bool showHidden = true, QWidget* parent = nullptr); SensorListWidget(SensorStore& sensorStore, const bool showHidden = true, QWidget* parent = nullptr);
virtual ~SensorListWidget() {} virtual ~SensorListWidget() {}
void setShowHidden(const bool showHidden); void setShowHidden(const bool showHidden);
const Sensor& getSensorForIndex(const QModelIndex &index);
public slots: public slots: