diff --git a/SHinterface.pro b/SHinterface.pro index 054b25e..55a7b33 100644 --- a/SHinterface.pro +++ b/SHinterface.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT += core gui widgets network multimedia +QT += core gui widgets network multimedia httpserver QT += serialport diff --git a/src/actors/actor.h b/src/actors/actor.h index 2e99f4c..4cdb048 100644 --- a/src/actors/actor.h +++ b/src/actors/actor.h @@ -5,7 +5,7 @@ #include #include -#include "../items/item.h" +#include "src/items/item.h" class Actor : public Item { diff --git a/src/actors/polynomalactor.h b/src/actors/polynomalactor.h index d91f2ba..9c4d64f 100644 --- a/src/actors/polynomalactor.h +++ b/src/actors/polynomalactor.h @@ -1,7 +1,7 @@ #ifndef POLYNOMALACTOR_H #define POLYNOMALACTOR_H #include "actor.h" -#include "../sensors/sensor.h" +#include "src/sensors/sensor.h" class PolynomalActor: public Actor { diff --git a/src/actors/regulator.h b/src/actors/regulator.h index 733d643..f4588b2 100644 --- a/src/actors/regulator.h +++ b/src/actors/regulator.h @@ -3,7 +3,7 @@ #include #include "actor.h" -#include "../sensors/sensor.h" +#include "src/sensors/sensor.h" class Regulator : public Actor { diff --git a/src/actors/sensoractor.h b/src/actors/sensoractor.h index 720146e..6499dbe 100644 --- a/src/actors/sensoractor.h +++ b/src/actors/sensoractor.h @@ -1,6 +1,6 @@ #pragma once #include "actor.h" -#include "../sensors/sensor.h" +#include "src/sensors/sensor.h" class SensorActor : public Actor { diff --git a/src/items/auxitem.h b/src/items/auxitem.h index 512144f..b9347f9 100644 --- a/src/items/auxitem.h +++ b/src/items/auxitem.h @@ -1,7 +1,7 @@ #pragma once #include "item.h" -#include "../microcontroller.h" +#include "src/microcontroller.h" class AuxItem: public Item { diff --git a/src/items/itemstore.h b/src/items/itemstore.h index 44d8fd6..4ee9651 100644 --- a/src/items/itemstore.h +++ b/src/items/itemstore.h @@ -2,7 +2,7 @@ #include #include #include "item.h" -#include "../sensors/sensor.h" +#include "src/sensors/sensor.h" #include diff --git a/src/items/messageitem.cpp b/src/items/messageitem.cpp index 0174586..0f51c53 100644 --- a/src/items/messageitem.cpp +++ b/src/items/messageitem.cpp @@ -1,20 +1,18 @@ #include "messageitem.h" #include -#include - -BroadCast* MessageItem::broadCast = nullptr; +#include MessageItem::MessageItem(uint32_t itemIdIn, QString name, uint8_t value, QObject *parent): Item(itemIdIn, name, value, parent) { - + alertSound.setVolume(1.0); } MessageItem::MessageItem(const ItemData& itemData, QObject *parent): Item(itemData, parent) { - + alertSound.setVolume(1.0); } MessageItem::~MessageItem() @@ -27,8 +25,8 @@ void MessageItem::setValue(uint8_t value) Item::setValue(value); if(value && !messageBox_) { - if(broadCast) broadCast->sendMessage(name_, message_); - if(!alertSoundFileName.isEmpty()) QSound::play(alertSoundFileName); + if(!alertSoundFileName.isEmpty()) + alertSound.play(); messageBox_ = new QMessageBox(QMessageBox::NoIcon, name_, message_); messageBox_->setModal(false); connect(messageBox_, &QMessageBox::finished, this, &MessageItem::closeMessageBox); @@ -60,6 +58,7 @@ QString MessageItem::getAlert() void MessageItem::setAlert(const QString &in) { alertSoundFileName = in; + alertSound.setSource(QUrl::fromLocalFile(alertSoundFileName)); } void MessageItem::setMessage(const QString& in) @@ -77,7 +76,8 @@ void MessageItem::store(QJsonObject &json) json["Type"] = "Message"; Item::store(json); json["Message"] = message_; - if(!alertSoundFileName.isEmpty()) json["Alert"] = alertSoundFileName; + if(!alertSoundFileName.isEmpty()) + json["Alert"] = alertSoundFileName; } void MessageItem::load(const QJsonObject &json, const bool preserve) @@ -85,4 +85,6 @@ void MessageItem::load(const QJsonObject &json, const bool preserve) Item::load(json,preserve); message_ = json["Message"].toString("Invalid Message"); alertSoundFileName = json["Alert"].toString(""); + if(!alertSoundFileName.isEmpty()) + alertSound.setSource(QUrl::fromLocalFile(alertSoundFileName)); } diff --git a/src/items/messageitem.h b/src/items/messageitem.h index fadeda6..8b503c1 100644 --- a/src/items/messageitem.h +++ b/src/items/messageitem.h @@ -2,9 +2,9 @@ #define MESSAGEITEM_H #include +#include #include "item.h" -#include "../broadcast.h" class MessageItem : public Item { @@ -14,9 +14,7 @@ private: QString message_; QMessageBox* messageBox_ = nullptr; QString alertSoundFileName = ""; - -public: - static BroadCast* broadCast; + QSoundEffect alertSound; private slots: diff --git a/src/items/poweritem.h b/src/items/poweritem.h index dd13629..ff1f263 100644 --- a/src/items/poweritem.h +++ b/src/items/poweritem.h @@ -1,8 +1,8 @@ #pragma once #include "item.h" -#include "../sensors/sensor.h" -#include "../microcontroller.h" +#include "src/sensors/sensor.h" +#include "src/microcontroller.h" #include diff --git a/src/items/relay.h b/src/items/relay.h index 0ba4849..f0ae640 100644 --- a/src/items/relay.h +++ b/src/items/relay.h @@ -4,7 +4,7 @@ #include #include -#include "../sensors/sensor.h" +#include "src/sensors/sensor.h" #include "item.h" class Microcontroller; diff --git a/src/items/rgbitem.h b/src/items/rgbitem.h index 9aff188..a503406 100644 --- a/src/items/rgbitem.h +++ b/src/items/rgbitem.h @@ -1,6 +1,6 @@ #pragma once -#include "../microcontroller.h" +#include "src/microcontroller.h" #include "item.h" class RgbItem: public Item diff --git a/src/items/systemitem.h b/src/items/systemitem.h index 9fe7a11..778780a 100644 --- a/src/items/systemitem.h +++ b/src/items/systemitem.h @@ -1,7 +1,6 @@ #ifndef SYSTEMITEM_H #define SYSTEMITEM_H - #include "item.h" class SystemItem : public Item diff --git a/src/sensors/sunsensor.h b/src/sensors/sunsensor.h index bfbce04..dfb9a87 100644 --- a/src/sensors/sunsensor.h +++ b/src/sensors/sunsensor.h @@ -2,7 +2,7 @@ #include -#include "../sun.h" +#include "src/sun.h" #include "sensor.h" diff --git a/src/ui/actorwidgets/alarmwidget.ui b/src/ui/actorwidgets/alarmwidget.ui index 1b29275..3b99187 100644 --- a/src/ui/actorwidgets/alarmwidget.ui +++ b/src/ui/actorwidgets/alarmwidget.ui @@ -24,16 +24,16 @@ - QFormLayout::AllNonFixedFieldsGrow + QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow - QFormLayout::DontWrapRows + QFormLayout::RowWrapPolicy::DontWrapRows - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop 50 @@ -57,7 +57,7 @@ false - QDateTimeEdit::DaySection + QDateTimeEdit::Section::DaySection dd.MM.yyyy hh:mm diff --git a/src/ui/actorwidgets/polynomalactorwidget.ui b/src/ui/actorwidgets/polynomalactorwidget.ui index e1733df..4cf9fb2 100644 --- a/src/ui/actorwidgets/polynomalactorwidget.ui +++ b/src/ui/actorwidgets/polynomalactorwidget.ui @@ -132,7 +132,7 @@ SensorListWidget QListView -
../src/ui/sensorlistwidget.h
+
src/ui/sensorlistwidget.h
diff --git a/src/ui/actorwidgets/regulatorwdiget.ui b/src/ui/actorwidgets/regulatorwdiget.ui index a6784a3..7365523 100644 --- a/src/ui/actorwidgets/regulatorwdiget.ui +++ b/src/ui/actorwidgets/regulatorwdiget.ui @@ -110,7 +110,7 @@ SensorListWidget QListView -
../src/ui/sensorlistwidget.h
+
src/ui/sensorlistwidget.h
diff --git a/src/ui/actorwidgets/sensoractorwidget.ui b/src/ui/actorwidgets/sensoractorwidget.ui index 8e9d967..f3fddd2 100644 --- a/src/ui/actorwidgets/sensoractorwidget.ui +++ b/src/ui/actorwidgets/sensoractorwidget.ui @@ -89,7 +89,7 @@ SensorListWidget QListView -
../src/ui/sensorlistwidget.h
+
src/ui/sensorlistwidget.h
diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui index c44b0e9..510daa8 100644 --- a/src/ui/mainwindow.ui +++ b/src/ui/mainwindow.ui @@ -37,7 +37,7 @@
- Qt::LeftToRight + Qt::LayoutDirection::LeftToRight false @@ -46,12 +46,12 @@ - Qt::Horizontal + Qt::Orientation::Horizontal false - + @@ -62,13 +62,13 @@ - QFrame::Box + QFrame::Shape::Box SHinterface - Qt::AutoText + Qt::TextFormat::AutoText @@ -99,7 +99,7 @@ - QAbstractItemView::NoSelection + QAbstractItemView::SelectionMode::NoSelection false @@ -156,7 +156,7 @@
- + @@ -224,7 +224,7 @@ - Qt::RightToLeft + Qt::LayoutDirection::RightToLeft Quit @@ -245,12 +245,12 @@ SensorListWidget QListView -
../src/ui/sensorlistwidget.h
+
src/ui/sensorlistwidget.h
ItemScrollBox QWidget -
../src/ui/itemscrollbox.h
+
src/ui/itemscrollbox.h
1
diff --git a/src/ui/sensorlistwidget.h b/src/ui/sensorlistwidget.h index c963a05..d87bd30 100644 --- a/src/ui/sensorlistwidget.h +++ b/src/ui/sensorlistwidget.h @@ -1,7 +1,7 @@ #pragma once #include #include -#include "../sensors/sensor.h" +#include "src/sensors/sensor.h" class SensorListItem : public QTableWidgetItem {