X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/d241c425d3655cfdf0c9bc7b40150cad9df67707..44378b3654976b893daa96f44cea9fcb62092209:/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp index d2ad12b7..19d68f98 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp @@ -1,64 +1,21 @@ -#include #include -#include -#include "stgconfig.h" -#include "../../../tariffs.h" -#include "../../../admins.h" -#include "../../../users.h" - -class STGCONFIG_CREATOR -{ -private: - STG_CONFIG * stgconfig; +#include +#include -public: - STGCONFIG_CREATOR() - : stgconfig(new STG_CONFIG()) - { - }; - ~STGCONFIG_CREATOR() - { - delete stgconfig; - }; +#include "stg/tariffs.h" +#include "stg/admins.h" +#include "stg/users.h" +#include "stg/plugin_creator.h" +#include "stgconfig.h" - STG_CONFIG * GetPlugin() - { - return stgconfig; - }; -}; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -STGCONFIG_CREATOR stgc; +PLUGIN_CREATOR stgc; //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -STG_CONFIG_SETTINGS::STG_CONFIG_SETTINGS() - : port(0) -{ -} -//----------------------------------------------------------------------------- -const string& STG_CONFIG_SETTINGS::GetStrError() const -{ -return errorStr; -} -//----------------------------------------------------------------------------- -int STG_CONFIG_SETTINGS::ParseIntInRange(const string & str, int min, int max, int * val) -{ -if (str2x(str.c_str(), *val)) - { - errorStr = "Incorrect value \'" + str + "\'."; - return -1; - } -if (*val < min || *val > max) - { - errorStr = "Value \'" + str + "\' out of range."; - return -1; - } -return 0; -} -//----------------------------------------------------------------------------- int STG_CONFIG_SETTINGS::ParseSettings(const MODULE_SETTINGS & s) { int p; @@ -66,7 +23,7 @@ PARAM_VALUE pv; vector::const_iterator pvi; /////////////////////////// pv.param = "Port"; -pvi = find(s.moduleParams.begin(), s.moduleParams.end(), pv); +pvi = std::find(s.moduleParams.begin(), s.moduleParams.end(), pv); if (pvi == s.moduleParams.end()) { errorStr = "Parameter \'Port\' not found."; @@ -84,21 +41,16 @@ port = p; return 0; } //----------------------------------------------------------------------------- -uint16_t STG_CONFIG_SETTINGS::GetPort() const -{ -return port; -} -//----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -BASE_PLUGIN * GetPlugin() +PLUGIN * GetPlugin() { return stgc.GetPlugin(); } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -const string STG_CONFIG::GetVersion() const +const std::string STG_CONFIG::GetVersion() const { return "Stg configurator v.0.08"; } @@ -114,36 +66,6 @@ STG_CONFIG::STG_CONFIG() { } //----------------------------------------------------------------------------- -void STG_CONFIG::SetUsers(USERS * u) -{ -users = u; -} -//----------------------------------------------------------------------------- -void STG_CONFIG::SetTariffs(TARIFFS * t) -{ -tariffs = t; -} -//----------------------------------------------------------------------------- -void STG_CONFIG::SetAdmins(ADMINS * a) -{ -admins = a; -} -//----------------------------------------------------------------------------- -void STG_CONFIG::SetStore(BASE_STORE * s) -{ -store = s; -} -//----------------------------------------------------------------------------- -void STG_CONFIG::SetStgSettings(const SETTINGS * s) -{ -stgSettings = s; -} -//----------------------------------------------------------------------------- -void STG_CONFIG::SetSettings(const MODULE_SETTINGS & s) -{ -settings = s; -} -//----------------------------------------------------------------------------- int STG_CONFIG::ParseSettings() { int ret = stgConfigSettings.ParseSettings(settings); @@ -152,11 +74,6 @@ if (ret) return ret; } //----------------------------------------------------------------------------- -const string & STG_CONFIG::GetStrError() const -{ -return errorStr; -} -//----------------------------------------------------------------------------- int STG_CONFIG::Start() { if (isRunning) @@ -220,31 +137,14 @@ if (isRunning) return 0; } //----------------------------------------------------------------------------- -bool STG_CONFIG::IsRunning() -{ -return isRunning; -} -//----------------------------------------------------------------------------- void * STG_CONFIG::Run(void * d) { STG_CONFIG * stgConf = (STG_CONFIG *)d; stgConf->isRunning = true; -stgConf->config.Run(&stgConf->config); +stgConf->config.Run(); stgConf->isRunning = false; return NULL; } //----------------------------------------------------------------------------- -uint16_t STG_CONFIG::GetStartPosition() const -{ -return 220; -} -//----------------------------------------------------------------------------- -uint16_t STG_CONFIG::GetStopPosition() const -{ -return 220; -} -//----------------------------------------------------------------------------- - -