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

rewrote Draw_Scale
parent b34fadbc
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Graphics/Graph2D.cpp
+ 13
− 8
View file @ 25287db5
// $Id: Graph2D.cpp,v 1.62 2007-08-31 16:55:52 geuzaine Exp $ // $Id: Graph2D.cpp,v 1.63 2007-09-01 09:20:00 geuzaine Exp $
// //
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
// //
...@@ -144,16 +144,21 @@ static void drawGraphAxes(PView *p, double xleft, double ytop, double width, ...@@ -144,16 +144,21 @@ static void drawGraphAxes(PView *p, double xleft, double ytop, double width,
glEnd(); glEnd();
// y label // y label
if(opt->Type == PViewOptions::Plot2DSpace && opt->ShowTime > 2){ if(opt->Type == PViewOptions::Plot2DSpace){
int nt = data->getNumTimeSteps();
if((opt->ShowTime == 1 && nt > 1) || opt->ShowTime == 2){
char tmp[256]; char tmp[256];
sprintf(tmp, opt->Format, data->getTime(opt->TimeStep)); sprintf(tmp, opt->Format, data->getTime(opt->TimeStep));
sprintf(label, "%s (%s)", p->getName().c_str(), tmp); sprintf(label, "%s (%s)", p->getName().c_str(), tmp);
} }
else if(opt->Type == PViewOptions::Plot2DSpace && opt->ShowTime > 0){ else if((opt->ShowTime == 3 && nt > 1) || opt->ShowTime == 4){
sprintf(label, "%s (%d)", p->getName().c_str(), opt->TimeStep); sprintf(label, "%s (%d)", p->getName().c_str(), opt->TimeStep);
} }
else else
sprintf(label, "%s", p->getName().c_str()); sprintf(label, "%s", p->getName().c_str());
}
else
sprintf(label, "%s", p->getName().c_str());
glRasterPos2d(xleft, ytop + font_h + tic); glRasterPos2d(xleft, ytop + font_h + tic);
Draw_String_Center(label); Draw_String_Center(label);
......
Graphics/Scale.cpp
+ 287
− 3
View file @ 25287db5
// $Id: Scale.cpp,v 1.65 2007-08-31 17:28:42 geuzaine Exp $ // $Id: Scale.cpp,v 1.66 2007-09-01 09:20:00 geuzaine Exp $
// //
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
// //
...@@ -21,13 +21,297 @@ ...@@ -21,13 +21,297 @@
#include "GmshUI.h" #include "GmshUI.h"
#include "Draw.h" #include "Draw.h"
#include "PView.h"
#include "Context.h" #include "Context.h"
#include "gl2ps.h" #include "gl2ps.h"
extern Context_T CTX; extern Context_T CTX;
static void drawScaleBar(PView *p, double xmin, double ymin, double width,
double height, double tic, int horizontal)
{
PViewOptions *opt = p->getOptions();
double box = (horizontal ? width : height) / (opt->NbIso ? opt->NbIso : 1);
for(int i = 0; i < opt->NbIso; i++) {
if(opt->IntervalsType == PViewOptions::Discrete){
unsigned int col = opt->getColor(i, opt->NbIso);
glColor4ubv((GLubyte *) &col);
glBegin(GL_QUADS);
if(horizontal){
glVertex2d(xmin + i * box, ymin);
glVertex2d(xmin + (i + 1) * box, ymin);
glVertex2d(xmin + (i + 1) * box, ymin + height);
glVertex2d(xmin + i * box, ymin + height);
}
else{
glVertex2d(xmin, ymin + i * box);
glVertex2d(xmin + width, ymin + i * box);
glVertex2d(xmin + width, ymin + (i + 1) * box);
glVertex2d(xmin, ymin + (i + 1) * box);
}
glEnd();
}
else if(opt->IntervalsType == PViewOptions::Continuous){
glBegin(GL_QUADS);
double dv = (opt->TmpMax - opt->TmpMin) / (opt->NbIso ? opt->NbIso : 1);
double v1 = opt->TmpMin + i * dv;
unsigned int col1 = opt->getColor(v1, opt->TmpMin, opt->TmpMax);
glColor4ubv((GLubyte *) &col1);
if(horizontal){
glVertex2d(xmin + i * box, ymin + height);
glVertex2d(xmin + i * box, ymin);
}
else{
glVertex2d(xmin, ymin + i * box);
glVertex2d(xmin + width, ymin + i * box);
}
double v2 = opt->TmpMin + (i + 1) * dv;
unsigned int col2 = opt->getColor(v2, opt->TmpMin, opt->TmpMax);
glColor4ubv((GLubyte *) &col2);
if(horizontal){
glVertex2d(xmin + (i + 1) * box, ymin);
glVertex2d(xmin + (i + 1) * box, ymin + height);
}
else{
glVertex2d(xmin + width, ymin + (i + 1) * box);
glVertex2d(xmin, ymin + (i + 1) * box);
}
glEnd();
}
else{
unsigned int col = opt->getColor(i, opt->NbIso);
glColor4ubv((GLubyte *) &col);
glBegin(GL_LINES);
if(horizontal){
glVertex2d(xmin + box / 2. + i * box, ymin);
glVertex2d(xmin + box / 2. + i * box, ymin + height);
}
else{
glVertex2d(xmin, ymin + box / 2. + i * box);
glVertex2d(xmin + width, ymin + box / 2. + i * box);
}
glEnd();
}
}
}
static void drawScaleValues(PView *p, double xmin, double ymin, double width,
double height, double tic, int horizontal)
{
PViewOptions *opt = p->getOptions();
if(!opt->NbIso) return;
gl_font(CTX.gl_font_enum, CTX.gl_fontsize);
double font_h = gl_height(); // total font height
double font_a = gl_height() - gl_descent(); // height above ref pt
char label[1024];
sprintf(label, opt->Format, -M_PI * 1.e-4);
double maxw = gl_width(label);
int nbv = opt->NbIso;
double f = (opt->IntervalsType == PViewOptions::Discrete ||
opt->IntervalsType == PViewOptions::Continuous) ? 2 : 2.5;
if(horizontal && width < nbv * maxw){
if(width < f * maxw) nbv = 1;
else nbv = 2;
}
else if(!horizontal && height < nbv * font_h){
if(height < f * font_h) nbv = 1;
else nbv = 2;
}
double box = (horizontal ? width : height) / opt->NbIso;
double vbox = (horizontal ? width : height) / nbv;
glColor4ubv((GLubyte *) & CTX.color.text);
if(opt->IntervalsType == PViewOptions::Discrete ||
opt->IntervalsType == PViewOptions::Continuous){
for(int i = 0; i < nbv + 1; i++) {
double v = opt->getScaleValue(i, nbv + 1, opt->TmpMin, opt->TmpMax);
sprintf(label, opt->Format, v);
if(horizontal){
glRasterPos2d(xmin + i * vbox, ymin + height + tic);
Draw_String_Center(label);
}
else{
glRasterPos2d(xmin + width + tic, ymin + i * vbox - font_a / 3.);
Draw_String(label);
}
}
}
else{
if(opt->NbIso > 2 && (nbv == 1 || nbv == 2)){
vbox = (vbox * nbv - box) / nbv;
nbv++;
}
for(int i = 0; i < nbv; i++) {
double v = opt->getScaleValue(i, nbv, opt->TmpMin, opt->TmpMax);
sprintf(label, opt->Format, v);
if(horizontal){
glRasterPos2d(xmin + box / 2. + i * vbox, ymin + height + tic);
Draw_String_Center(label);
}
else{
glRasterPos2d(xmin + width + tic, ymin + box / 2. + i * vbox - font_a / 3.);
Draw_String(label);
}
}
}
}
static void drawScaleLabel(PView *p, double xmin, double ymin, double width,
double height, double tic, int horizontal)
{
PViewData *data = p->getData();
PViewOptions *opt = p->getOptions();
gl_font(CTX.gl_font_enum, CTX.gl_fontsize);
double font_h = gl_height();
char label[1024];
int nt = data->getNumTimeSteps();
if((opt->ShowTime == 1 && nt > 1) || opt->ShowTime == 2){
char tmp[256];
sprintf(tmp, opt->Format, data->getTime(opt->TimeStep));
sprintf(label, "%s (%s)", p->getName().c_str(), tmp);
}
else if((opt->ShowTime == 3 && nt > 1) || opt->ShowTime == 4){
sprintf(label, "%s (%d)", p->getName().c_str(), opt->TimeStep);
}
else
sprintf(label, "%s", p->getName().c_str());
if(horizontal){
glRasterPos2d(xmin + width / 2., ymin + height + tic + 1.4 * font_h);
Draw_String_Center(label);
}
else{
glRasterPos2d(xmin, ymin - 2 * font_h);
Draw_String(label);
}
}
static void drawScale(PView *p, double xmin, double ymin, double width,
double height, double tic, int horizontal)
{
PViewData *data = p->getData();
PViewOptions *opt = p->getOptions();
if(opt->ExternalViewIndex >= 0){
opt->TmpMin = opt->ExternalMin;
opt->TmpMin = opt->ExternalMax;
}
else if(opt->RangeType == PViewOptions::Custom){
opt->TmpMin = opt->CustomMin;
opt->TmpMax = opt->CustomMax;
}
else if(opt->RangeType == PViewOptions::PerTimeStep){
opt->TmpMin = data->getMin(opt->TimeStep);
opt->TmpMax = data->getMax(opt->TimeStep);
}
else{
opt->TmpMin = data->getMin();
opt->TmpMax = data->getMax();
}
drawScaleBar(p, xmin, ymin, width, height, tic, horizontal);
drawScaleValues(p, xmin, ymin, width, height, tic, horizontal);
drawScaleLabel(p, xmin, ymin, width, height, tic, horizontal);
}
void Draw_Scales() void Draw_Scales()
{ {
printf("drawing scale!\n"); std::vector<PView*> scales;
for(unsigned int i = 0; i < PView::list.size(); i++){
PViewData *data = PView::list[i]->getData();
PViewOptions *opt = PView::list[i]->getOptions();
if(!data->getDirty() && opt->Visible && opt->ShowScale &&
opt->Type == PViewOptions::Plot3D && data->getNumElements())
scales.push_back(PView::list[i]);
} }
if(scales.empty()) return;
gl_font(CTX.gl_font_enum, CTX.gl_fontsize);
char label[1024];
double maxw = 0.;
for(unsigned int i = 0; i < scales.size(); i++) {
PViewOptions *opt = scales[i]->getOptions();
sprintf(label, opt->Format, -M_PI * 1.e-4);
maxw = std::max(maxw, gl_width(label));
}
const double tic = 10., bar_size = 16.;
double width = 0., width_prev = 0., width_total = 0.;
for(unsigned int i = 0; i < scales.size(); i++) {
PView *p = scales[i];
PViewData *data = p->getData();
PViewOptions *opt = p->getOptions();
if(!opt->AutoPosition) {
double w = opt->Size[0], h = opt->Size[1];
double x = opt->Position[0], y = opt->Position[1] - h;
int c = Fix2DCoordinates(&x, &y);
if(c & 1) x -= w / 2.;
if(c & 2) y += h / 2.;
drawScale(p, x, y, w, h, tic, CTX.post.horizontal_scales);
}
else if(CTX.post.horizontal_scales){
double ysep = 20.;
double xc = (CTX.viewport[2] - CTX.viewport[0]) / 2.;
if(scales.size() == 1){
double w = (CTX.viewport[2] - CTX.viewport[0]) / 2., h = bar_size;
double x = xc - w / 2., y = CTX.viewport[1] + ysep;
drawScale(p, x, y, w, h, tic, 1);
}
else{
double xsep = maxw / 4. + (CTX.viewport[2] - CTX.viewport[0]) / 10.;
double w = (CTX.viewport[2] - CTX.viewport[0] - 4 * xsep) / 2.;
if(w < 20.) w = 20.;
double h = bar_size;
double x = xc - (i % 2 ? -xsep / 1.5 : w + xsep / 1.5);
double y = CTX.viewport[1] + ysep +
(i / 2) * (bar_size + tic + 2 * gl_height() + ysep);
drawScale(p, x, y, w, h, tic, 1);
}
}
else{
double xsep = 20.;
double dy = 2. * gl_height();
if(scales.size() == 1){
double ysep = (CTX.viewport[3] - CTX.viewport[1]) / 6.;
double w = bar_size, h = CTX.viewport[3] - CTX.viewport[1] - 2 * ysep - dy;
double x = CTX.viewport[0] + xsep, y = CTX.viewport[1] + ysep + dy;
drawScale(p, x, y, w, h, tic, 0);
}
else{
double ysep = (CTX.viewport[3] - CTX.viewport[1]) / 15.;
double w = bar_size;
double h = (CTX.viewport[3] - CTX.viewport[1] - 3 * ysep - 2.5 * dy) / 2.;
double x = CTX.viewport[0] + xsep + width_total + (i / 2) * xsep;
double y = CTX.viewport[1] + ysep + dy + (1 - i % 2) * (h + 1.5 * dy + ysep);
drawScale(p, x, y, w, h, tic, 0);
}
// compute width
width_prev = width;
sprintf(label, opt->Format, -M_PI * 1.e-4);
width = bar_size + tic + gl_width(label);
if(opt->ShowTime){
char tmp[256];
sprintf(tmp, opt->Format, data->getTime(opt->TimeStep));
sprintf(label, "%s (%s)", p->getName().c_str(), tmp);
}
else
sprintf(label, "%s", p->getName().c_str());
width = std::max(width, gl_width(label));
if(i % 2) width_total += std::max(bar_size + width, bar_size + width_prev);
}
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment