martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aqhome-tool: improved diagram.

Browse Source
This commit is contained in:
Martin Preuss
2025-10-07 00:25:46 +02:00
parent 023cabbc1b
commit 9a379f12b2
1 changed files with 87 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

181
apps/aqhome-tool/data/imgperioddata.c
View File

@@ -56,9 +56,11 @@
* ------------------------------------------------------------------------------------------------
*/
static int _runCommand(AQH_DATACLIENT *dc);
static int _createImageFromDataPoints(AQH_DATACLIENT *dc, const char *valueName, const uint64_t *dataPoints, uint64_t recvdNum);
static int _createGraph(AQH_DATACLIENT *dc);
static AQDG_GRAPH_DATAPAIR_LIST *_createDataPairListFromDataPoints(const uint64_t *dataPoints, uint64_t numValues);
static AQDG_GRAPH_DATAPAIR_LIST *_requestDataPairList(AQH_DATACLIENT *dc, const char *valueName,
uint64_t num, uint64_t tsBegin, uint64_t tsEnd);
@@ -81,7 +83,6 @@ int AQH_Tool_ImgPeriodData(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
{ A_ARG, A_CHAR, "brokerClientId", 0, 1, "c", "clientid", I18S("Specify CLIENTID"), NULL},
{ A_ARG, A_CHAR, "userId", 0, 1, "u", "userid", I18S("Specify user id"), NULL},
{ A_ARG, A_CHAR, "password", 0, 1, "p", "password", I18S("Specify service password"), NULL},
{ A_ARG, A_CHAR, "valueName", 1, 1, "N", "valuename", I18S("Value name (e.g. server/temp/system)"), NULL},
{ A_ARG, A_INT, "numOfDatapoints", 0, 1, "n", NULL, I18S("Get up to n datapoints"), NULL},
{ A_ARG, A_CHAR, "tsBegin", 0, 1, "tb", "tsbegin", I18S("Timestamp range begin"), NULL},
{ A_ARG, A_CHAR, "tsEnd", 0, 1, "te", "tsend", I18S("Timestamp range end"), NULL},
@@ -90,10 +91,9 @@ int AQH_Tool_ImgPeriodData(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
{ A_ARG, A_INT, "imgHeight", 0, 1, "H", NULL, I18S("Image height"), NULL},
{ A_ARG, A_CHAR, "upperLimit", 0, 1, "U", NULL, I18S("Upper limit for y axis"), NULL},
{ A_ARG, A_CHAR, "lowerLimit", 0, 1, "L", NULL, I18S("Lower limit for y axis"), NULL},
{ 0, A_INT, "dayAverage", 0, 1, "da", NULL, I18S("Average data over days"), NULL},
{ A_ARG, A_INT, "minuteAverage", 0, 1, "ma", NULL, I18S("Average data over units of (NUM) minutes"), NULL},
{ A_ARG, A_INT, "floatingAverage", 0, 1, "fa", NULL, I18S("Floating average over data (num)"), NULL},
{ A_ARG, A_INT, "precision", 0, 1, "yp", NULL, I18S("Y axis Data Precision (default: 2)"), NULL},
{ A_ARG, A_CHAR, "graphTitle", 0, 1, "gt", NULL, I18S("Graph title"), NULL},
{ A_ARG, A_CHAR, "curveSpec", 1, 64, "G", NULL, I18S("Curve specification"), NULL},
{ A_END, A_INT, "help", 0, 0, "h", "help", I18S("Show this help screen"), NULL}
};
@@ -101,7 +101,7 @@ int AQH_Tool_ImgPeriodData(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
dc=AQH_DataClient_new(eventLoop, AQH_IPC_PROTOCOL_DATA_ID, AQH_IPC_PROTOCOL_DATA_VERSION);
rv=AQH_DataClient_ReadLocalArgs(dc, dbGlobalArgs, args, argc, argv);
if (rv<0) {
if (rv!=0) {
DBG_ERROR(NULL, "here (%d)", rv);
AQH_DataClient_free(dc);
AQH_EventLoop_free(eventLoop);
@@ -116,7 +116,7 @@ int AQH_Tool_ImgPeriodData(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
return 2;
}
rv=_runCommand(dc);
rv=_createGraph(dc);
if (rv<0) {
DBG_ERROR(NULL, "Error running (%d)", rv);
AQH_DataClient_free(dc);
@@ -131,18 +131,34 @@ int AQH_Tool_ImgPeriodData(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
int _runCommand(AQH_DATACLIENT *dc)
int _createGraph(AQH_DATACLIENT *dc)
{
GWEN_DB_NODE *dbLocalArgs;
const char *valueName;
uint64_t num;
int numDataPoints;
uint64_t tsBegin;
uint64_t tsEnd;
const char *imgFile;
int imgWidth;
int imgHeight;
int precision;
const char *s;
uint32_t tickFlags=0;
double upperLimit;
double lowerLimit;
const char *graphTitle;
AQDG_GRAPH *g;
AQDG_DRAW_CONTEXT *drawContext;
AQDG_OBJECT *graphObject;
int i;
dbLocalArgs=AQH_DataClient_GetDbLocalArgs(dc);
valueName=GWEN_DB_GetCharValue(dbLocalArgs, "valueName", 0, NULL);
numDataPoints=GWEN_DB_GetIntValue(dbLocalArgs, "numOfDatapoints", 0, 10000); /* remove later */
imgFile=GWEN_DB_GetCharValue(dbLocalArgs, "imgFile", 0, NULL);
imgWidth=GWEN_DB_GetIntValue(dbLocalArgs, "imgWidth", 0, 800);
imgHeight=GWEN_DB_GetIntValue(dbLocalArgs, "imgHeight", 0, 600);
precision=GWEN_DB_GetIntValue(dbLocalArgs, "precision", 0, 2);
graphTitle=GWEN_DB_GetCharValue(dbLocalArgs, "graphTitle", 0, NULL);
num=GWEN_DB_GetIntValue(dbLocalArgs, "numOfDatapoints", 0, 10000);
tsBegin=Utils_GetTimeStampFromString(GWEN_DB_GetCharValue(dbLocalArgs, "tsBegin", 0, NULL));
if (tsBegin==(uint64_t) (-1)) {
DBG_ERROR(NULL, "Bad begin timestamp");
@@ -154,58 +170,6 @@ int _runCommand(AQH_DATACLIENT *dc)
return 1;
}
if (num>0) {
uint64_t *dataPoints;
uint64_t recvdNum;
dataPoints=malloc(num*sizeof(uint64_t)*2);
recvdNum=AQH_DataClient_GetPeriodData(dc, valueName, dataPoints, num, tsBegin, tsEnd);
if (recvdNum>0) {
int rv;
rv=_createImageFromDataPoints(dc, valueName, dataPoints, recvdNum);
if (rv!=0) {
DBG_INFO(NULL, "here (%d)", rv);
return rv;
}
}
free(dataPoints);
}
return 0;
}
int _createImageFromDataPoints(AQH_DATACLIENT *dc, const char *valueName, const uint64_t *dataPoints, uint64_t recvdNum)
{
GWEN_DB_NODE *dbLocalArgs;
const char *imgFile;
int imgWidth;
int imgHeight;
int dayAverage;
int minuteAverage;
int floatingAvg;
int precision;
const char *s;
uint32_t tickFlags=0;
double upperLimit;
double lowerLimit;
AQDG_GRAPH *g;
AQDG_GRAPH_DATAPAIR_LIST *dpList;
AQDG_DRAW_CONTEXT *drawContext;
AQDG_OBJECT *graphObject;
dbLocalArgs=AQH_DataClient_GetDbLocalArgs(dc);
imgFile=GWEN_DB_GetCharValue(dbLocalArgs, "imgFile", 0, NULL);
imgWidth=GWEN_DB_GetIntValue(dbLocalArgs, "imgWidth", 0, 800);
imgHeight=GWEN_DB_GetIntValue(dbLocalArgs, "imgHeight", 0, 600);
dayAverage=GWEN_DB_GetIntValue(dbLocalArgs, "dayAverage", 0, 0);
minuteAverage=GWEN_DB_GetIntValue(dbLocalArgs, "minuteAverage", 0, 0);
floatingAvg=GWEN_DB_GetIntValue(dbLocalArgs, "floatingAverage", 0, 0);
precision=GWEN_DB_GetIntValue(dbLocalArgs, "precision", 0, 2);
s=GWEN_DB_GetCharValue(dbLocalArgs, "upperLimit", 0, NULL);
if (s && *s) {
if (1==sscanf(s, "%lf", &upperLimit))
@@ -226,38 +190,44 @@ int _createImageFromDataPoints(AQH_DATACLIENT *dc, const char *valueName, const
}
}
g=AQDG_TimeGraph_new(valueName, NULL, "Value", NULL, precision);
dpList=_createDataPairListFromDataPoints(dataPoints, recvdNum);
if (dpList && dayAverage) {
AQDG_GRAPH_DATAPAIR_LIST *newDp;
g=AQDG_TimeGraph_new(graphTitle?graphTitle:NULL, NULL, "Value", NULL, precision);
newDp=AQDG_Data_DayAverage(dpList);
AQDG_Graph_DataPair_List_free(dpList);
dpList=newDp;
AQDG_Graph_DataPair_List_SortByValueX(dpList, 1);
DBG_ERROR(NULL, "DataPair count now: %d", AQDG_Graph_DataPair_List_GetCount(dpList));
}
if (dpList && floatingAvg) {
AQDG_GRAPH_DATAPAIR_LIST *newDp;
for (i=0; i<16; i++) {
const char *curveSpec;
newDp=AQDG_Data_FloatingAverage(dpList, floatingAvg);
AQDG_Graph_DataPair_List_free(dpList);
dpList=newDp;
AQDG_Graph_DataPair_List_SortByValueX(dpList, 1);
DBG_ERROR(NULL, "DataPair count now: %d", AQDG_Graph_DataPair_List_GetCount(dpList));
curveSpec=GWEN_DB_GetCharValue(dbLocalArgs, "curveSpec", i, NULL);
if (curveSpec) {
GWEN_STRINGLIST *sl;
char delim[2];
delim[0]=curveSpec[0];
delim[1]=0;
sl=GWEN_StringList_fromString2(curveSpec+1, delim, 0, GWEN_TEXT_FLAGS_CHECK_BACKSLASH);
if (sl) {
const char *sValue;
const char *sLabel;
const char *sModifier;
sValue=GWEN_StringList_StringAt(sl, 0);
sLabel=GWEN_StringList_StringAt(sl, 1);
sModifier=GWEN_StringList_StringAt(sl, 2);
DBG_DEBUG(NULL, "Value: %s, Label: %s, Modifier: %s", sValue?sValue:"", sLabel?sLabel:"", sModifier?sModifier:"");
if (sValue && *sValue) {
AQDG_GRAPH_DATAPAIR_LIST *dpList;
DBG_DEBUG(NULL, "Requesting data for %s", sValue);
dpList=_requestDataPairList(dc, sValue, numDataPoints, tsBegin, tsEnd);
if (dpList)
AQDG_TimeGraph_ModifyDataAndAddCurve(g, sLabel?sLabel:sValue, sModifier, dpList);
}
GWEN_StringList_free(sl);
}
}
else
break;
}
if (dpList && minuteAverage){
AQDG_GRAPH_DATAPAIR_LIST *newDp;
newDp=AQDG_Data_MinutesAverage(dpList, minuteAverage);
AQDG_Graph_DataPair_List_free(dpList);
dpList=newDp;
AQDG_Graph_DataPair_List_SortByValueX(dpList, 1);
DBG_ERROR(NULL, "DataPair count now: %d", AQDG_Graph_DataPair_List_GetCount(dpList));
}
AQDG_TimeGraph_AddCurve(g, "Testdata", AQDG_GRAPH_TYPE_LINE, dpList);
AQDG_TimeGraph_SetupTicks(g, tickFlags, lowerLimit, upperLimit);
drawContext=AQDG_Draw_ContextCairo_Png_new(imgFile, imgWidth, imgHeight);
@@ -275,13 +245,36 @@ int _createImageFromDataPoints(AQH_DATACLIENT *dc, const char *valueName, const
AQDG_GRAPH_DATAPAIR_LIST *_requestDataPairList(AQH_DATACLIENT *dc, const char *valueName,
uint64_t num, uint64_t tsBegin, uint64_t tsEnd)
{
uint64_t *dataPoints;
uint64_t recvdNum;
dataPoints=malloc(num*sizeof(uint64_t)*2);
recvdNum=AQH_DataClient_GetPeriodData(dc, valueName, dataPoints, num, tsBegin, tsEnd);
if (recvdNum>0) {
AQDG_GRAPH_DATAPAIR_LIST *dpList;
dpList=_createDataPairListFromDataPoints(dataPoints, recvdNum);
free(dataPoints);
return dpList;
}
else {
free(dataPoints);
return NULL;
}
}
AQDG_GRAPH_DATAPAIR_LIST *_createDataPairListFromDataPoints(const uint64_t *dataPoints, uint64_t numValues)
{
AQDG_GRAPH_DATAPAIR_LIST *dpList;
uint64_t i;
DBG_ERROR(NULL, "Got %d datapoints", (int) numValues);
DBG_DEBUG(NULL, "Got %d datapoints", (int) numValues);
dpList=AQDG_Graph_DataPair_List_new();
for(i=0; i<numValues; i++) {
AQDG_GRAPH_DATAPAIR *dp;