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

Add delay ability to sensor actor

Browse source
This commit is contained in:
Carl Philipp Klemm 2026-06-25 08:53:39 +02:00
parent 8db0ac7290
commit 8e33897d29
4 changed files with 94 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/actors/sensoractor.cpp
View file

@ -108,6 +108,9 @@ QString SensorActor::getName() const
else if (sloap_ == SLOPE_BOTH) string.append(" passes "); else if (sloap_ == SLOPE_BOTH) string.append(" passes ");
string.append(QString::number(threshold_) + " "); string.append(QString::number(threshold_) + " ");
if(delayMs_ > 0) string.append("(+" + QString::number(delayMs_) + "ms) ");
return string; return string;
} }
} }

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

@ -26,9 +26,12 @@ SensorActorWidget::SensorActorWidget(std::shared_ptr<SensorActor> sensorActor, S
ui->doubleSpinBox_threshold->setValue(sensorActor_->getThreshold()); ui->doubleSpinBox_threshold->setValue(sensorActor_->getThreshold());
ui->spinBox_delay->setValue(sensorActor_->getDelayMs());
connect(ui->listView, &SensorListWidget::clicked, this, &SensorActorWidget::setSensor); connect(ui->listView, &SensorListWidget::clicked, this, &SensorActorWidget::setSensor);
connect(ui->doubleSpinBox_threshold, SIGNAL(valueChanged(double)), this, SLOT(setThreshold(double))); connect(ui->doubleSpinBox_threshold, SIGNAL(valueChanged(double)), this, SLOT(setThreshold(double)));
connect(ui->comboBox_slope, SIGNAL(currentIndexChanged(int)), this, SLOT(setSlope(int))); connect(ui->comboBox_slope, SIGNAL(currentIndexChanged(int)), this, SLOT(setSlope(int)));
connect(ui->spinBox_delay, SIGNAL(valueChanged(int)), this, SLOT(setDelay(int)));
} }
SensorActorWidget::~SensorActorWidget() SensorActorWidget::~SensorActorWidget()
@ -52,3 +55,8 @@ void SensorActorWidget::setSensor(const QModelIndex &index)
{ {
sensorActor_->setSensor(ui->listView->getSensorForIndex(index)); sensorActor_->setSensor(ui->listView->getSensorForIndex(index));
} }
void SensorActorWidget::setDelay(int ms)
{
sensorActor_->setDelayMs(ms);
}

1
src/ui/actorwidgets/sensoractorwidget.h
View file

@ -27,6 +27,7 @@ private slots:
void setThreshold(double in); void setThreshold(double in);
void setSlope(int index); void setSlope(int index);
void setSensor(const QModelIndex &index); void setSensor(const QModelIndex &index);
void setDelay(int ms);
private: private:
Ui::SensorActorWidget *ui; Ui::SensorActorWidget *ui;

125
src/ui/actorwidgets/sensoractorwidget.ui
View file

@ -13,8 +13,8 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QGridLayout" name="gridLayout">
<item> <item row="0" column="0" colspan="2">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@ -27,7 +27,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="1" column="0" colspan="4">
<widget class="SensorListWidget" name="listView"> <widget class="SensorListWidget" name="listView">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@ -37,51 +37,90 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout"> <widget class="QLabel" name="label_3">
<property name="text">
<string>Threshold</string>
</property>
</widget>
</item>
<item row="2" column="1">
<spacer name="horizontalSpacer_threshold">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="2">
<widget class="QComboBox" name="comboBox_slope">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item> <item>
<widget class="QLabel" name="label_3"> <property name="text">
<property name="text"> <string>&gt; =</string>
<string>Threshold</string> </property>
</property>
</widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="comboBox_slope"> <property name="text">
<property name="sizePolicy"> <string>&lt; =</string>
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> </property>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>&gt; =</string>
</property>
</item>
<item>
<property name="text">
<string>&lt; =</string>
</property>
</item>
<item>
<property name="text">
<string>Passes</string>
</property>
</item>
</widget>
</item> </item>
<item> <item>
<widget class="QDoubleSpinBox" name="doubleSpinBox_threshold"> <property name="text">
<property name="minimum"> <string>Passes</string>
<double>-9999.989999999999782</double> </property>
</property>
<property name="maximum">
<double>9999.989999999999782</double>
</property>
</widget>
</item> </item>
</layout> </widget>
</item>
<item row="2" column="3">
<widget class="QDoubleSpinBox" name="doubleSpinBox_threshold">
<property name="minimum">
<double>-9999.989999999999782</double>
</property>
<property name="maximum">
<double>9999.989999999999782</double>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_delay">
<property name="text">
<string>Delay</string>
</property>
</widget>
</item>
<item row="3" column="1">
<spacer name="horizontalSpacer_delay">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="3">
<widget class="QSpinBox" name="spinBox_delay">
<property name="suffix">
<string> ms</string>
</property>
<property name="maximum">
<number>9999999</number>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -89,7 +128,7 @@
<customwidget> <customwidget>
<class>SensorListWidget</class> <class>SensorListWidget</class>
<extends>QListView</extends> <extends>QListView</extends>
<header location="local">ui/sensorlistwidget.h</header> <header>ui/sensorlistwidget.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources/>