Commit 44b8f6d9 authored by Claes Sjofors's avatar Claes Sjofors

Xtt eventlog window, exception for invalid times removed

parent 0170ae91
...@@ -615,7 +615,8 @@ int Hist::check_conditions(sEvent *evp) ...@@ -615,7 +615,8 @@ int Hist::check_conditions(sEvent *evp)
sts = time_FormAsciiToA(minTime_str, SWE, SECOND, &minTime); sts = time_FormAsciiToA(minTime_str, SWE, SECOND, &minTime);
if(EVEN(sts)) if(EVEN(sts))
return ERROR_TIME_CONVERT; return ERROR_TIME_CONVERT;
if(time_Acomp(&minTime, &(evp->EventTime)) > 0) sts = time_Acomp_NE(&minTime, &(evp->EventTime));
if( sts > 0 || sts == -2)
return 2; //evensts return 2; //evensts
} }
if(maxTime_str != NULL && (strlen(maxTime_str) != 0)) if(maxTime_str != NULL && (strlen(maxTime_str) != 0))
...@@ -623,7 +624,8 @@ int Hist::check_conditions(sEvent *evp) ...@@ -623,7 +624,8 @@ int Hist::check_conditions(sEvent *evp)
sts = time_FormAsciiToA(maxTime_str, SWE, SECOND, &maxTime); sts = time_FormAsciiToA(maxTime_str, SWE, SECOND, &maxTime);
if(EVEN(sts)) if(EVEN(sts))
return ERROR_TIME_CONVERT; return ERROR_TIME_CONVERT;
if(time_Acomp(&maxTime, &(evp->EventTime)) < 0) sts = time_Acomp(&maxTime, &(evp->EventTime));
if( sts < 0 || sts == -2)
return 2; //evensts return 2; //evensts
} }
bool ret = false; bool ret = false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment