diff --git a/src/ATBAPP/ATBVMCPlugin.cpp b/src/ATBAPP/ATBVMCPlugin.cpp index 25b3ff0..9b0b61c 100644 --- a/src/ATBAPP/ATBVMCPlugin.cpp +++ b/src/ATBAPP/ATBVMCPlugin.cpp @@ -31,6 +31,13 @@ ATBVMCPlugin::~ATBVMCPlugin() { } } +QString const &ATBVMCPlugin::getPluginInfo() { + return m_pluginInfo; +} + +void ATBVMCPlugin::setPluginInfo(QString const &info) { + m_pluginInfo = info; +} // ---------------------------------------------------------------------------- // interface: @@ -38,45 +45,46 @@ PLUGIN_STATE ATBVMCPlugin::initVMCPlugin(QObject *appControl, QObject *atbSystem, QObject *hmiConfig, QSettings const &settings) { + if (appControl && atbSystem && hmiConfig) { + m_vmc = new VMC(appControl, &settings); - m_vmc = new VMC(appControl, &settings); + // -------------------- connect vmc -------------------------------------------- + connect(m_vmc, SIGNAL(VMCFormatedString(FormatedStringList)), appControl, SLOT(onVMCFormatedString(FormatedStringList)), Qt::QueuedConnection); + connect(m_vmc, SIGNAL(displayData(quint8,QString)), appControl, SLOT(onVMCSellData(quint8,QString)), Qt::QueuedConnection); + connect(m_vmc, SIGNAL(retriggerModeSell()), appControl, SLOT(restartSellModeTimeoutTimer()), Qt::QueuedConnection); + connect(m_vmc, SIGNAL(setVendingData(QString,QByteArray)), appControl, SLOT(onSetVendingData(QString,QByteArray)), Qt::QueuedConnection); - // -------------------- connect vmc -------------------------------------------- - connect(m_vmc, SIGNAL(VMCFormatedString(FormatedStringList)), appControl, SLOT(onVMCFormatedString(FormatedStringList)), Qt::QueuedConnection); - connect(m_vmc, SIGNAL(displayData(quint8,QString)), appControl, SLOT(onVMCSellData(quint8,QString)), Qt::QueuedConnection); - connect(m_vmc, SIGNAL(retriggerModeSell()), appControl, SLOT(restartSellModeTimeoutTimer()), Qt::QueuedConnection); - connect(m_vmc, SIGNAL(setVendingData(QString,QByteArray)), appControl, SLOT(onSetVendingData(QString,QByteArray)), Qt::QueuedConnection); + connect(m_vmc, SIGNAL(sysCommand(quint16, QByteArray)), atbSystem, SLOT(executeSystemCommand(quint16, QByteArray)), Qt::QueuedConnection); + connect(m_vmc, SIGNAL(newDateTime(QString)), atbSystem, SLOT(setDateTime(QString)), Qt::QueuedConnection); + connect(m_vmc, SIGNAL(wakeVMC()), atbSystem, SLOT(onWakeVMC())); - connect(m_vmc, SIGNAL(sysCommand(quint16, QByteArray)), atbSystem, SLOT(executeSystemCommand(quint16, QByteArray)), Qt::QueuedConnection); - connect(m_vmc, SIGNAL(newDateTime(QString)), atbSystem, SLOT(setDateTime(QString)), Qt::QueuedConnection); - connect(m_vmc, SIGNAL(wakeVMC()), atbSystem, SLOT(onWakeVMC())); + connect(m_vmc, SIGNAL(setCustNr(QString)), hmiConfig, SLOT(setCustNr(QString)), Qt::QueuedConnection); + connect(m_vmc, SIGNAL(setGroupNr(QString)), hmiConfig, SLOT(setGroupNr(QString)), Qt::QueuedConnection); + connect(m_vmc, SIGNAL(setZoneNr(QString)), hmiConfig, SLOT(setZoneNr(QString)), Qt::QueuedConnection); + connect(m_vmc, SIGNAL(setMachineNr(QString)), hmiConfig, SLOT(setMachineNr(QString)), Qt::QueuedConnection); + connect(m_vmc, SIGNAL(setDefaultLanguage(quint8)), hmiConfig, SLOT(setDefaultLanguage(quint8)), Qt::QueuedConnection); - connect(m_vmc, SIGNAL(setCustNr(QString)), hmiConfig, SLOT(setCustNr(QString)), Qt::QueuedConnection); - connect(m_vmc, SIGNAL(setGroupNr(QString)), hmiConfig, SLOT(setGroupNr(QString)), Qt::QueuedConnection); - connect(m_vmc, SIGNAL(setZoneNr(QString)), hmiConfig, SLOT(setZoneNr(QString)), Qt::QueuedConnection); - connect(m_vmc, SIGNAL(setMachineNr(QString)), hmiConfig, SLOT(setMachineNr(QString)), Qt::QueuedConnection); - connect(m_vmc, SIGNAL(setDefaultLanguage(quint8)), hmiConfig, SLOT(setDefaultLanguage(quint8)), Qt::QueuedConnection); + return PLUGIN_STATE::INITIALIZED; + } - return PLUGIN_STATE::INITIALIZED; + return PLUGIN_STATE::NOT_INITIALIZED; } // mandantory ATBAPP plugin methods: ------------------------------------------ PLUGIN_STATE ATBVMCPlugin::getState() { - return PLUGIN_STATE::NOT_INITIALIZED; + return m_pluginState; } QString ATBVMCPlugin::getLastError() { - return ""; + return m_errorCode; } QString ATBVMCPlugin::getLastErrorDescription() { - return ""; + return m_errorDescription; } -QString const &ATBVMCPlugin::getPluginInfo() { - static QString info; - return info; -} + +#if 0 // helpers e.g. for debug / log QString ATBVMCPlugin::getString(RESULT_STATE /*resultState*/) { @@ -114,3 +122,9 @@ void ATBVMCPlugin::reboot() { void ATBVMCPlugin::reset() { } + +#endif + +#if QT_VERSION < 0x050000 +Q_EXPORT_PLUGIN2(ATBVMCPlugin, ATBVMCPlugin) +#endif