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

Add the ability to enable and disable actors from the ui

Browse source 
add safe and timeout to the regulator actor
This commit is contained in:
uvos 2024-12-03 00:24:35 +01:00
parent d8471789b7
commit 271330d5fd
7 changed files with 176 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/actors/regulator.cpp
View file

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

26
src/actors/regulator.h
View file

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

19
src/ui/actorsettingsdialog.cpp
View file

@ -83,14 +83,20 @@ void ActorSettingsDialog::init()
connect(ui->comboBox_action, SIGNAL(currentIndexChanged(int)), this, SLOT(changeAction(int)));
connect(ui->spinBox, SIGNAL(valueChanged(int)), this, SLOT(valueChanged(int)));
connect(ui->pushButton_editItem, &QPushButton::clicked, this, &ActorSettingsDialog::editAsItem);
connect(ui->pushButton_enable, &QPushButton::clicked, this, &ActorSettingsDialog::setEnabled);
ui->spinBox->hide();
ui->spinBox->setValue(actor_->getTriggerValue());
if(actor_->getTriggerValue() == 0) ui->comboBox_action->setCurrentIndex(0);
else if(actor_->getTriggerValue() == 1) ui->comboBox_action->setCurrentIndex(1);
else ui->comboBox_action->setCurrentIndex(2);
if(actor_->getTriggerValue() == 0)
ui->comboBox_action->setCurrentIndex(0);
else if(actor_->getTriggerValue() == 1)
ui->comboBox_action->setCurrentIndex(1);
else
ui->comboBox_action->setCurrentIndex(2);
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()
@ -104,6 +110,13 @@ void ActorSettingsDialog::editAsItem()
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)
{
actor_->setTriggerValue(value);

1
src/ui/actorsettingsdialog.h
View file

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

57
src/ui/actorsettingsdialog.ui
View file

@ -85,6 +85,63 @@
</property>
</widget>
</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>
</item>
<item>

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

@ -24,12 +24,17 @@ RegulatorWdiget::RegulatorWdiget(std::shared_ptr<Regulator> regulator, SensorSto
}
ui->doubleSpinBox_setPoint->setValue(regulator->getSetPoint());
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->doubleSpinBox_setPoint, SIGNAL(valueChanged(double)), this, SLOT(setPoint(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)
{
regulator_->setPoint(in);

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

@ -38,15 +38,8 @@
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Set Point</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="doubleSpinBox_setPoint">
<property name="minimum">
<double>-9999.989999999999782</double>
@ -56,7 +49,7 @@
</property>
</widget>
</item>
<item>
<item row="0" column="2">
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
@ -69,9 +62,46 @@
</property>
</widget>
</item>
<item>
<item row="1" column="2">
<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"/>
</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>
</item>
</layout>