Commit c98b733e authored by allens's avatar allens

added functionality for multiple iterations

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@20641 18c085ea-50e0-402c-830e-de6fd14e8384
parent c3b9dcbf
......@@ -75,6 +75,7 @@ avtTimeLoopFilter::avtTimeLoopFilter()
stride = -1;
nFrames = 0;
actualEnd = 0;
nIterations = 1;
parallelizingOverTime = false;
}
......@@ -178,7 +179,7 @@ avtTimeLoopFilter::Update(avtContract_p spec)
avtOriginatingSource *src = GetOriginatingSource();
src->SetNumberOfExecutions(numIters);
for (currentLoopIter = 0; currentLoopIter < numTimeLoopIterations; currentLoopIter++)
for (int currentLoopIter = 0; currentLoopIter < numTimeLoopIterations; currentLoopIter++)
{
debug4 << "Time loop filter updating with iteration # "<<currentLoopIter<<endl;
int curIter = 0;
......@@ -394,7 +395,7 @@ avtTimeLoopFilter::FinalizeTimeLoop()
EXCEPTION2(UnexpectedValueException, expected, startTime);
}
nFrames = (int) ceil((((float)endTime -startTime))/(float)stride) + 1;
nFrames = (int) ceil(((float) endTime - startTime) / (float) stride) + 1;
if (nFrames < 1)
{
......
......@@ -100,6 +100,7 @@ class PIPELINE_API avtTimeLoopFilter : virtual public avtFilter
{ stride = s; };
int GetStartTime() const {return startTime;}
int GetEndTime() const {return endTime;}
int GetNFrames() const {return nFrames;}
protected:
intVector validTimes;
......@@ -108,9 +109,11 @@ class PIPELINE_API avtTimeLoopFilter : virtual public avtFilter
avtSILRestriction_p currentSILR;
std::string errorMessage;
virtual void BeginIteration(int i) {}
virtual void BeginIteration(int i) { iteration = i; }
virtual void EndIteration(int i) {}
virtual int GetNumberOfIterations() {return 1;}
virtual int SetNumberOfIterations( int i) {nIterations = i;}
virtual int GetNumberOfIterations() {return nIterations;}
virtual int GetIteration() {return iteration;}
virtual bool NeedCurrentTimeSlice() {return true;}
virtual void CreateFinalOutput(void) = 0;
virtual bool ExecutionSuccessful(void) = 0;
......@@ -122,6 +125,8 @@ class PIPELINE_API avtTimeLoopFilter : virtual public avtFilter
int stride;
int nFrames;
int actualEnd;
int nIterations;
int iteration;
bool parallelizingOverTime;
virtual void InitializeTimeLoop(void) {};
......
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