|
@@ -26,7 +26,7 @@ int DataId::Min()
|
|
|
|
|
|
|
|
int DataId::Max()
|
|
int DataId::Max()
|
|
|
{
|
|
{
|
|
|
- return 3;
|
|
|
|
|
|
|
+ return 4;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
int DataId::GetId(const std::string& dataName) const
|
|
int DataId::GetId(const std::string& dataName) const
|
|
@@ -35,7 +35,6 @@ int DataId::GetId(const std::string& dataName) const
|
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
|
|
if (StringAlgorithm::iequals(dataName, "gas") ||
|
|
if (StringAlgorithm::iequals(dataName, "gas") ||
|
|
|
- StringAlgorithm::iequals(dataName, "intensity") ||
|
|
|
|
|
StringAlgorithm::iequals(dataName, "power") ||
|
|
StringAlgorithm::iequals(dataName, "power") ||
|
|
|
StringAlgorithm::iequals(dataName, "pressure") ||
|
|
StringAlgorithm::iequals(dataName, "pressure") ||
|
|
|
StringAlgorithm::iequals(dataName, "state") ||
|
|
StringAlgorithm::iequals(dataName, "state") ||
|
|
@@ -43,6 +42,7 @@ int DataId::GetId(const std::string& dataName) const
|
|
|
return 1;
|
|
return 1;
|
|
|
|
|
|
|
|
if (StringAlgorithm::iequals(dataName, "humidity") ||
|
|
if (StringAlgorithm::iequals(dataName, "humidity") ||
|
|
|
|
|
+ StringAlgorithm::iequals(dataName, "intensity") ||
|
|
|
StringAlgorithm::iequals(dataName, "setpoint") ||
|
|
StringAlgorithm::iequals(dataName, "setpoint") ||
|
|
|
StringAlgorithm::iequals(dataName, "forecast"))
|
|
StringAlgorithm::iequals(dataName, "forecast"))
|
|
|
return 2;
|
|
return 2;
|
|
@@ -50,6 +50,9 @@ int DataId::GetId(const std::string& dataName) const
|
|
|
if (StringAlgorithm::iequals(dataName, "dewpoint"))
|
|
if (StringAlgorithm::iequals(dataName, "dewpoint"))
|
|
|
return 3;
|
|
return 3;
|
|
|
|
|
|
|
|
|
|
+ if (StringAlgorithm::iequals(dataName, "absolutehumidity"))
|
|
|
|
|
+ return 4;
|
|
|
|
|
+
|
|
|
return -1;
|
|
return -1;
|
|
|
}
|
|
}
|
|
|
|
|
|