Skip to content
Snippets Groups Projects
Commit 248b8f68 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

revert to "step in [0,numsteps-1]"

parent bca3490f
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 25 additions and 21 deletions
Graphics/drawScales.cpp
+ 25
− 21
View file @ 248b8f68
...@@ -172,57 +172,61 @@ static void drawScaleLabel(drawContext *ctx, PView *p, double xmin, double ymin, ...@@ -172,57 +172,61 @@ static void drawScaleLabel(drawContext *ctx, PView *p, double xmin, double ymin,
char label[1024]; char label[1024];
int nt = data->getNumTimeSteps(); int nt = data->getNumTimeSteps();
int n0 = data->getFirstNonEmptyTimeStep();
int n = (nt - n0 > 0) ? nt - n0 : 1;
char time[256]; char time[256];
sprintf(time, opt->format.c_str(), data->getTime(opt->timeStep)); sprintf(time, opt->format.c_str(), data->getTime(opt->timeStep));
int choice = opt->showTime; int choice = opt->showTime;
if(choice == 3){ // automatic if(choice == 3){ // automatic
if(nt == 1) choice = 0; // nothing if(n == 1) choice = 0; // nothing
else if(nt == 2) choice = 2; // harmonic else if(n == 2) choice = 2; // harmonic
else choice = 4; // multi-step data else choice = 4; // multi-step data
} }
switch(choice){ switch(choice){
case 1: // time series case 1: // time series
if(nt == 1) if(n == 1)
sprintf(label, "%s - time %s", data->getName().c_str(), time); sprintf(label, "%s - time %s", data->getName().c_str(), time);
else else
sprintf(label, "%s - time %s (%d/%d)", data->getName().c_str(), sprintf(label, "%s - time %s (step %d in [0,%d])", data->getName().c_str(),
time, opt->timeStep + 1, data->getNumTimeSteps()); time, opt->timeStep, data->getNumTimeSteps() - 1);
break; break;
case 2: // harmonic data case 2: // harmonic data
if(nt <= 2) if(n <= 2)
sprintf(label, "%s - %s part", data->getName().c_str(), sprintf(label, "%s - %s part", data->getName().c_str(),
(opt->timeStep % 2) ? "imaginary" : "real"); ((opt->timeStep - n0) % 2) ? "imaginary" : "real");
else else
sprintf(label, "%s - harmonic %s (%d/%d, %s part)", data->getName().c_str(), sprintf(label, "%s - harmonic %s (%s part, step %d in [0,%d])",
time, opt->timeStep / 2 + 1, data->getNumTimeSteps() / 2, data->getName().c_str(), time,
(opt->timeStep % 2) ? "imaginary" : "real"); ((opt->timeStep - n0) % 2) ? "imaginary" : "real",
opt->timeStep, data->getNumTimeSteps() - 1);
break; break;
case 3: // automatic case 3: // automatic
// never here // never here
break; break;
case 4: // multi-step data case 4: // multi-step data
if(nt == 1) if(n == 1)
sprintf(label, "%s - step %d", data->getName().c_str(), opt->timeStep); sprintf(label, "%s - step %d", data->getName().c_str(), opt->timeStep);
else else
sprintf(label, "%s - step %d (%d/%d)", data->getName().c_str(), sprintf(label, "%s - step %d in [0,%d]", data->getName().c_str(),
opt->timeStep, opt->timeStep + 1, data->getNumTimeSteps()); opt->timeStep, data->getNumTimeSteps() - 1);
break; break;
case 5: // real eigenvalues case 5: // real eigenvalues
if(nt == 1) if(n == 1)
sprintf(label, "%s - eigenvalue %s", data->getName().c_str(), sprintf(label, "%s - eigenvalue %s", data->getName().c_str(),
time); time);
else else
sprintf(label, "%s - eigenvalue %s (%d/%d)", data->getName().c_str(), sprintf(label, "%s - eigenvalue %s (step %d in [0,%d])", data->getName().c_str(),
time, opt->timeStep + 1, data->getNumTimeSteps()); time, opt->timeStep, data->getNumTimeSteps() - 1);
break; break;
case 6: // complex eigenvalues case 6: // complex eigenvalues
if(nt == 1) if(n == 1)
sprintf(label, "%s - eigenvalue %s (%s part)", data->getName().c_str(), sprintf(label, "%s - eigenvalue %s (%s part)", data->getName().c_str(),
time, (opt->timeStep % 2) ? "imaginary" : "real"); time, ((opt->timeStep - n0) % 2) ? "imaginary" : "real");
else else
sprintf(label, "%s - eigenvalue %s (%d/%d, %s part)", data->getName().c_str(), sprintf(label, "%s - eigenvalue %s (%s part, step %d in [0,%d])",
time, opt->timeStep / 2 + 1, data->getNumTimeSteps() / 2, data->getName().c_str(), time,
(opt->timeStep % 2) ? "imaginary" : "real"); ((opt->timeStep - n0) % 2) ? "imaginary" : "real",
opt->timeStep, data->getNumTimeSteps() - 1);
break; break;
default: default:
sprintf(label, "%s", data->getName().c_str()); sprintf(label, "%s", data->getName().c_str());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment