speed-dreams/speed-dreams-code
7
1
Fork 1
Code Issues 9 Pull requests Projects Releases Packages Wiki Activity Actions

404_parameter_parsing

Browse source 
Added some smarts to the parameter parsing and some warning messages
for when the parameters are being fixed.

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@3717 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 119e440f0245403f81a6c0a93e45e64270114c4a
Former-commit-id: 3c81363b5fa8a1501650f0a7bb833db1b5f4111f
This commit is contained in:
mungewell 2011-07-13 03:21:52 +00:00
parent 2bbb09ccaa
commit 7b064913b2
1 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/libs/tgf/params.cpp
View file

@ -30,6 +30,7 @@
#include <cmath>
#include <ctime>
#include <sys/stat.h>
#include <float.h>
#ifdef WIN32
#include <io.h>
@ -821,16 +822,6 @@ static void xmlStartElement (void *userData , const char *name, const char **att
goto bailout;
}
if (!min)
{
min = val;
}
if (!max)
{
max = val;
}
curParam = addParam (conf, parmHandle->curSection, shortName, val);
if (!curParam)
{
@ -840,8 +831,20 @@ static void xmlStartElement (void *userData , const char *name, const char **att
curParam->type = P_NUM;
curParam->valnum = getValNumFromStr (val);
curParam->min = getValNumFromStr (min);
curParam->max = getValNumFromStr (max);
if (min)
curParam->min = getValNumFromStr (min);
else
curParam->min = -FLT_MAX;
if (max) {
curParam->max = getValNumFromStr (max);
if (curParam->min > curParam->max) {
curParam->max = curParam->min;
curParam->min = getValNumFromStr (max);
}
} else
curParam->max = FLT_MAX;
if (curParam->min > curParam->valnum)
{
@ -3455,23 +3458,34 @@ insertParamMerge (struct parmHandle *parmHandle, char *path, struct param *param
if (param->unit) {
paramNew->unit = strdup (param->unit);
}
if (param->min < paramRef->min) {
if (param->min <= paramRef->min && param->max >= paramRef->min) {
num = paramRef->min;
} else {
} else if (paramRef->min <= param->min && paramRef->max >= param->min) {
num = param->min;
} else {
num = paramRef->min;
GfLogError("insertParamMerge: Incompatible ranges \"%s\": using %f for min\n", paramNew->fullName, num);
}
paramNew->min = num;
if (param->max > paramRef->max) {
if (param->max >= paramRef->max && param->min <= paramRef->max) {
num = paramRef->max;
} else {
} else if (paramRef->max >= param->max && paramRef->min <= param->max) {
num = param->max;
} else {
num = paramRef->max;
GfLogError("insertParamMerge: Incompatible ranges \"%s\": using %f for max\n", paramNew->fullName, num);
}
paramNew->max = num;
num = param->valnum;
if (num < paramNew->min) {
GfLogError("insertParamMerge: Fixing parameter \"%s\": %f -> %f\n", paramNew->fullName, num, paramNew->min);
num = paramNew->min;
}
if (num > paramNew->max) {
GfLogError("insertParamMerge: Fixing parameter \"%s\": %f -> %f\n", paramNew->fullName, num, paramNew->max);
num = paramNew->max;
}
paramNew->valnum = num;