infrared-inspection-systems/fault-finder
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Config JSONs to Config Manager

Browse Source
This commit is contained in:
Grant Terris
2020-02-08 16:41:06 -08:00
parent 8ad4fa9012
commit e4ad57e3e4
2 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ConfigManager.cpp
View File

@@ -7,7 +7,7 @@
ConfigManager::ConfigManager(QObject *parent) : QObject(parent) ConfigManager::ConfigManager(QObject *parent) : QObject(parent)
{ {
new ConfigManagerAdaptor(this); new ConfigManagerAdaptor(this);
QDBusConnection dbus = QDBusConnection::sessionBus(); QDBusConnection dbus = QDBusConnection::sessionBus();
dbus.registerObject("/configuration", this); dbus.registerObject("/configuration", this);
dbus.registerService("com.infraredinspectionsystems.FaultFinder"); dbus.registerService("com.infraredinspectionsystems.FaultFinder");
@@ -26,6 +26,7 @@ bool ConfigManager::GetRecordingState()
void ConfigManager::SetRecordingState(bool enable) void ConfigManager::SetRecordingState(bool enable)
{ {
// if sensor is cold
qDebug() << "ConfigManager::SetRecordingState"; qDebug() << "ConfigManager::SetRecordingState";
if (this->recording != enable) { if (this->recording != enable) {
this->recording = enable; this->recording = enable;
@@ -61,4 +62,32 @@ void ConfigManager::SetEmissivity(double emissivity)
this->emissivity = emissivity; this->emissivity = emissivity;
emit NewEmissivity(this->emissivity); emit NewEmissivity(this->emissivity);
} }
}
QString ConfigManager::GetViewfinderConfig()
{
qDebug() << "ConfigManager::GetViewfinderConfig";
QJsonDocument doc(this->viewfinder_config);
return doc.toJson();
}
void ConfigManager::SetViewfinderConfig(QString config)
{
qDebug() << "ConfigManager::SetViewfinderConfig";
QJsonDocument doc = QJsonDocument::fromJson(config.toUtf8());
this->viewfinder_config = doc.object();
}
QString ConfigManager::GetTriggerConfig()
{
qDebug() << "ConfigManager::GetTriggerConfig";
QJsonDocument doc(this->trigger_config);
return doc.toJson();
}
void ConfigManager::SetTriggerConfig(QString config)
{
qDebug() << "ConfigManager::SetTriggerConfig";
QJsonDocument doc = QJsonDocument::fromJson(config.toUtf8());
this->trigger_config = doc.object();
} }

20
ConfigManager.hpp
View File

@@ -2,6 +2,7 @@
#define CONFIG_MANAGER_H #define CONFIG_MANAGER_H
#include <QObject> #include <QObject>
#include <QJsonObject>
class ConfigManager: public QObject class ConfigManager: public QObject
{ {
@@ -9,6 +10,8 @@ class ConfigManager: public QObject
Q_PROPERTY(bool recording READ GetRecordingState WRITE SetRecordingState) Q_PROPERTY(bool recording READ GetRecordingState WRITE SetRecordingState)
Q_PROPERTY(int frame_rate READ GetFrameRate WRITE SetFrameRate) Q_PROPERTY(int frame_rate READ GetFrameRate WRITE SetFrameRate)
Q_PROPERTY(double emissivity READ GetEmissivity WRITE SetEmissivity) Q_PROPERTY(double emissivity READ GetEmissivity WRITE SetEmissivity)
Q_PROPERTY(QString viewfinder_config READ GetViewfinderConfig WRITE SetViewfinderConfig)
Q_PROPERTY(QString trigger_config READ GetTriggerConfig WRITE SetTriggerConfig)
public: public:
ConfigManager(QObject *parent); ConfigManager(QObject *parent);
@@ -21,6 +24,10 @@ public slots:
void SetFrameRate(int frame_rate); void SetFrameRate(int frame_rate);
double GetEmissivity(); double GetEmissivity();
void SetEmissivity(double emissivity); void SetEmissivity(double emissivity);
QString GetViewfinderConfig();
void SetViewfinderConfig(QString config);
QString GetTriggerConfig();
void SetTriggerConfig(QString config);
signals: signals:
void NewRecordingState(bool enable); void NewRecordingState(bool enable);
@@ -31,7 +38,18 @@ private:
bool recording = false; bool recording = false;
int frame_rate = 5; int frame_rate = 5;
double emissivity = 0.95; double emissivity = 0.95;
QJsonObject viewfinder_config = QJsonObject(
{
qMakePair(QString("palette"), QJsonValue("rainbow")),
qMakePair(QString("low_temp"), QJsonValue(0)),
qMakePair(QString("high_temp"), QJsonValue(100))
});
QJsonObject trigger_config = QJsonObject(
{
qMakePair(QString("method"), QJsonValue("threshold")),
qMakePair(QString("min"), QJsonValue(50)),
qMakePair(QString("max"), QJsonValue(100))
});
}; };
#endif #endif