added parameter mode to viewelement <devices>

This commit is contained in:
louis
2015-04-01 13:26:36 +02:00
parent 25505767d3
commit 7c9ad39e95
17 changed files with 61 additions and 14 deletions

View File

@@ -53,6 +53,8 @@ void cTemplateFunction::SetParameters(vector<pair<string, string> > params) {
p.first = ptCond;
} else if (!name.compare("name")) {
p.first = ptName;
} else if (!name.compare("mode")) {
p.first = ptMode;
} else if (!name.compare("x")) {
p.first = ptX;
} else if (!name.compare("y")) {
@@ -1488,6 +1490,9 @@ string cTemplateFunction::GetParamName(eParamType pt) {
case ptName:
name = "Name";
break;
case ptMode:
name = "Mode";
break;
case ptX:
name = "X";
break;

View File

@@ -40,6 +40,7 @@ enum eFuncType {
enum eParamType {
ptCond,
ptName,
ptMode,
ptX,
ptY,
ptWidth,

View File

@@ -229,6 +229,14 @@ bool cTemplateView::DetachViewElement(eViewElement ve) {
return viewElement->Detach();
}
string cTemplateView::GetViewElementMode(eViewElement ve) {
map < eViewElement, cTemplateViewElement* >::iterator hit = viewElements.find(ve);
if (hit == viewElements.end())
return "";
cTemplateViewElement *viewElement = hit->second;
return viewElement->GetMode();
}
int cTemplateView::GetNumListViewMenuItems(void) {
int numElements = 0;
cTemplateViewList *menuList = GetViewList(vlMenuItem);
@@ -626,6 +634,7 @@ void cTemplateView::SetFunctionDefinitions(void) {
attributes.insert("fadetime");
attributes.insert("name");
attributes.insert("condition");
attributes.insert("mode");
funcsAllowed.insert(pair< string, set<string> >(name, attributes));
name = "area";

View File

@@ -115,6 +115,7 @@ public:
bool HideView(void);
bool ExecuteView(eViewElement ve);
bool DetachViewElement(eViewElement ve);
string GetViewElementMode(eViewElement ve);
int GetNumListViewMenuItems(void);
bool GetScalingWindow(cRect &scalingWindow);
map<string,string> GetCustomStringTokens(void) { return globals->GetCustomStringTokens(); };

View File

@@ -133,6 +133,12 @@ bool cTemplateViewElement::Detach(void) {
return false;
}
string cTemplateViewElement::GetMode(void) {
if (!parameters)
return "";
return parameters->GetParameter(ptMode);
}
bool cTemplateViewElement::DebugTokens(void) {
if (!parameters)
return false;

View File

@@ -111,6 +111,7 @@ public:
cTemplateFunction *GetFunction(string name);
bool Execute(void);
bool Detach(void);
string GetMode(void);
bool DebugTokens(void);
virtual void Debug(void);
};