Commit 151c3a2b authored by Leander Schulten's avatar Leander Schulten
Browse files

Small changes

parent d8bfa9ae
......@@ -18,6 +18,7 @@ public:
private:
Type type;
public:
ControlItemData(){}
explicit ControlItemData(Type t, QObject *parent = nullptr);
ControlItemData(const QJsonObject &o);
virtual void writeJsonObject(QJsonObject &o);
......
......@@ -40,7 +40,6 @@ namespace Driver {
DMXChannelFilter::initValues(values,size);
Programm::fill(values,size,time);
DMXChannelFilter::filterValues(values,size);
qDebug()<<"Hi";
});
if(driver){
......
......@@ -78,10 +78,11 @@ int main(int argc, char *argv[])
qmlRegisterType<ControlPanel>("custom.licht",1,0,"ControlPanel");
//qmlRegisterType<ErrorNotifier>("custom.licht",1,0,"ErrorNotifier");
qmlRegisterType<ControlItem>("custom.licht.template",1,0,"ControlItemTemplate");
qmlRegisterType<ControlItemData>("custom.licht.template",1,0,"ControlItemData");
qmlRegisterType<DimmerGroupControlItemData>("custom.licht",1,0,"DimmerGroupControlItemData");
qmlRegisterType<DMXChannelFilter>("custom.licht",1,0,"DMXChannelFilter");
qRegisterMetaType<DMXChannelFilter::Operation>("Operation");
qmlRegisterType<UserManagment>("custom.licht",1,0,"Permission");
qmlRegisterUncreatableType<UserManagment>("custom.licht",1,0,"Permission","Singletone in c++");
qRegisterMetaType<UserManagment::Permission>("Permission");
Settings settings;
settings.setJsonSettingsFilePath("QTJSONFile.json");
......@@ -139,6 +140,7 @@ int main(int argc, char *argv[])
if(!Driver::loadAndStartDriver(settings.getDriverFilePath())){
ErrorNotifier::showError("Cant start driver.");
}
Driver::getCurrentDriver()->setWaitTime(std::chrono::milliseconds(15));
#else
#include "test/DriverDummy.h"
......
......@@ -12,7 +12,7 @@ class DriverDummy : public AbstractHardwareInterface
public:
DriverDummy () {}
virtual bool init(){qDebug()<<"initDriver";}
virtual bool init(){qDebug()<<"initDriver";return true;}
virtual bool isFunctioning(){return true;}
protected:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment