Attached Files | vtkEnSightReader.cxx.patch [^] (2,505 bytes) 2007-11-04 05:26 [Show Content] [Hide Content]--- vtkEnSightReader.orig.cxx 2007-10-22 14:33:31.508910796 +0200
+++ vtkEnSightReader.cxx 2007-10-22 14:35:09.727049046 +0200
@@ -1216,7 +1216,7 @@
vtkDataArray *times;
float newTime;
vtkIdList *numStepsList, *filenameNumbers;
- //int fileNum;
+ int fileNum;
int validTime, filenameNum;
char* fileName, *fileName2;
@@ -1246,7 +1246,7 @@
timeStep = 0;
timeStepInFile = 1;
- //fileNum = 1;
+ fileNum = 0;
validTime = 1;
fileName = new char[strlen(this->VariableFileNames[i]) + 1];
strcpy(fileName, this->VariableFileNames[i]);
@@ -1302,13 +1302,14 @@
{
numSteps = numStepsList->GetId(0);
timeStepInFile -= numSteps;
- for (i = 1; i < numStepsList->GetNumberOfIds(); i++)
+ fileNum = 1;
+ for (j = 1; j < numStepsList->GetNumberOfIds(); j++)
{
- numSteps += numStepsList->GetId(i);
+ numSteps += numStepsList->GetId(j);
if (timeStep > numSteps)
{
- //fileNum++;
- timeStepInFile -= numStepsList->GetId(i);
+ fileNum++;
+ timeStepInFile -= numStepsList->GetId(j);
}
}
}
@@ -1320,7 +1321,7 @@
{
filenameNumbers = this->FileSetFileNameNumbers->
GetItem(collectionNum);
- filenameNum = filenameNumbers->GetId(timeStep-1);
+ filenameNum = filenameNumbers->GetId(fileNum);
this->ReplaceWildcards(fileName, filenameNum);
}
}
@@ -1388,7 +1389,7 @@
}
timeStep = 0;
timeStepInFile = 1;
- //fileNum = 1;
+ fileNum = 0;
validTime = 1;
fileName = new char[strlen(this->ComplexVariableFileNames[2*i]) + 1];
strcpy(fileName, this->ComplexVariableFileNames[2*i]);
@@ -1445,13 +1446,14 @@
{
numSteps = numStepsList->GetId(0);
timeStepInFile -= numSteps;
- for (i = 1; i < numStepsList->GetNumberOfIds(); i++)
+ fileNum = 1;
+ for (j = 1; j < numStepsList->GetNumberOfIds(); j++)
{
- numSteps += numStepsList->GetId(i);
+ numSteps += numStepsList->GetId(j);
if (timeStep > numSteps)
{
- //fileNum++;
- timeStepInFile -= numStepsList->GetId(i);
+ fileNum++;
+ timeStepInFile -= numStepsList->GetId(j);
}
}
}
|