Commit f9031726 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

settaxis: added support for negativ time increment

parent fdfff5ae
2014-01-07 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* settaxis: added support for negativ time increment
2014-01-03 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de> 2014-01-03 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* Added test/test_Select.sh * Added test/test_Select.sh
......
...@@ -57,7 +57,7 @@ void *Ensstat3(void *argument) ...@@ -57,7 +57,7 @@ void *Ensstat3(void *argument)
int operatorID; int operatorID;
int operfunc, datafunc; int operfunc, datafunc;
int i,j; int i,j;
int nvars,nbins, nrecs = 0, nrecs0, nmiss, nens, nfiles;; int nvars,nbins, nrecs = 0, nrecs0, nmiss, nens, nfiles;
int cum; int cum;
int chksum; // for check of histogram population int chksum; // for check of histogram population
int levelID, varID, recID, tsID, binID = 0; int levelID, varID, recID, tsID, binID = 0;
......
...@@ -92,7 +92,8 @@ void *Inttime(void *argument) ...@@ -92,7 +92,8 @@ void *Inttime(void *argument)
if ( operatorArgc() == 3 ) if ( operatorArgc() == 3 )
{ {
const char *timeunits = operatorArgv()[2]; const char *timeunits = operatorArgv()[2];
incperiod = (int)strtol(timeunits, NULL, 10);; incperiod = (int)strtol(timeunits, NULL, 10);
if ( timeunits[0] == '-' || timeunits[0] == '+' ) timeunits++;
while ( isdigit((int) *timeunits) ) timeunits++; while ( isdigit((int) *timeunits) ) timeunits++;
get_tunits(timeunits, &incperiod, &incunit, &tunit); get_tunits(timeunits, &incperiod, &incunit, &tunit);
......
...@@ -182,7 +182,8 @@ void *Settime(void *argument) ...@@ -182,7 +182,8 @@ void *Settime(void *argument)
if ( operatorArgc() == 3 ) if ( operatorArgc() == 3 )
{ {
const char *timeunits = operatorArgv()[2]; const char *timeunits = operatorArgv()[2];
incperiod = (int)strtol(timeunits, NULL, 10);; incperiod = (int)strtol(timeunits, NULL, 10);
if ( timeunits[0] == '-' || timeunits[0] == '+' ) timeunits++;
while ( isdigit((int) *timeunits) ) timeunits++; while ( isdigit((int) *timeunits) ) timeunits++;
get_tunits(timeunits, &incperiod, &incunit, &tunit); get_tunits(timeunits, &incperiod, &incunit, &tunit);
...@@ -224,7 +225,7 @@ void *Settime(void *argument) ...@@ -224,7 +225,7 @@ void *Settime(void *argument)
else if ( operatorID == SHIFTTIME ) else if ( operatorID == SHIFTTIME )
{ {
const char *timeunits = operatorArgv()[0]; const char *timeunits = operatorArgv()[0];
incperiod = (int)strtol(timeunits, NULL, 10);; incperiod = (int)strtol(timeunits, NULL, 10);
if ( timeunits[0] == '-' || timeunits[0] == '+' ) timeunits++; if ( timeunits[0] == '-' || timeunits[0] == '+' ) timeunits++;
while ( isdigit((int) *timeunits) ) timeunits++; while ( isdigit((int) *timeunits) ) timeunits++;
......
...@@ -331,7 +331,7 @@ int ps_cval = -1; ...@@ -331,7 +331,7 @@ int ps_cval = -1;
void progressInit(void) void progressInit(void)
{ {
ps_lhead = FALSE; ps_lhead = FALSE;
ps_nch = 0;; ps_nch = 0;
ps_cval = -1; ps_cval = -1;
} }
......
Supports Markdown
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