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

Palettes. pas encore parfait...

parent a640eaeb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Graphics/PostSimplex.cpp
+ 10
− 10
View file @ daf59f74
/* $Id: PostSimplex.cpp,v 1.7 2000-12-18 14:18:16 geuzaine Exp $ */ /* $Id: PostSimplex.cpp,v 1.8 2000-12-18 15:05:21 geuzaine Exp $ */
#include "Gmsh.h" #include "Gmsh.h"
#include "GmshUI.h" #include "GmshUI.h"
...@@ -23,7 +23,7 @@ void Draw_ScalarPoint(Post_View *View, ...@@ -23,7 +23,7 @@ void Draw_ScalarPoint(Post_View *View,
d = V[View->TimeStep]; d = V[View->TimeStep];
if(d>=ValMin && d<=ValMax){ if(d>=ValMin && d<=ValMax){
RaiseFill(0, d, ValMin, Raise); RaiseFill(0, d, ValMin, Raise);
Palette(View,View->NbIso,View->GIFV(ValMin,ValMax,View->NbIso,d)); Palette2(View,ValMin,ValMax,d);
if(View->IntervalsType == DRAW_POST_NUMERIC){ if(View->IntervalsType == DRAW_POST_NUMERIC){
glRasterPos3d(X[0],Y[0],Z[0]); glRasterPos3d(X[0],Y[0],Z[0]);
Draw_String(Num); Draw_String(Num);
...@@ -106,7 +106,7 @@ void Draw_ScalarLine(Post_View *View, ...@@ -106,7 +106,7 @@ void Draw_ScalarLine(Post_View *View,
d = (V[2*View->TimeStep]+V[2*View->TimeStep+1]) / 2.; d = (V[2*View->TimeStep]+V[2*View->TimeStep+1]) / 2.;
if(d >= ValMin && d <= ValMax){ if(d >= ValMin && d <= ValMax){
RaiseFill(0, d, ValMin, Raise); RaiseFill(0, d, ValMin, Raise);
Palette(View,View->NbIso,View->GIFV(ValMin,ValMax,View->NbIso,d)); Palette2(View,ValMin,ValMax,d);
sprintf(Num, "%g", d); sprintf(Num, "%g", d);
glRasterPos3d((X[0] + X[1])/2., glRasterPos3d((X[0] + X[1])/2.,
(Y[0] + Y[1])/2., (Y[0] + Y[1])/2.,
...@@ -121,11 +121,11 @@ void Draw_ScalarLine(Post_View *View, ...@@ -121,11 +121,11 @@ void Draw_ScalarLine(Post_View *View,
if(View->IntervalsType==DRAW_POST_CONTINUOUS){ if(View->IntervalsType==DRAW_POST_CONTINUOUS){
glBegin(GL_LINES); glBegin(GL_LINES);
Palette(View,View->NbIso,View->GIFV(ValMin,ValMax,View->NbIso,V[2*View->TimeStep])); Palette2(View,ValMin,ValMax,V[2*View->TimeStep]);
glVertex3d(X[0]+View->Offset[0]+Raise[0][0], glVertex3d(X[0]+View->Offset[0]+Raise[0][0],
Y[0]+View->Offset[1]+Raise[1][0], Y[0]+View->Offset[1]+Raise[1][0],
Z[0]+View->Offset[2]+Raise[2][0]); Z[0]+View->Offset[2]+Raise[2][0]);
Palette(View,View->NbIso,View->GIFV(ValMin,ValMax,View->NbIso,V[2*View->TimeStep+1])); Palette2(View,ValMin,ValMax,V[2*View->TimeStep+1]);
glVertex3d(X[1]+View->Offset[0]+Raise[0][1], glVertex3d(X[1]+View->Offset[0]+Raise[0][1],
Y[1]+View->Offset[1]+Raise[1][1], Y[1]+View->Offset[1]+Raise[1][1],
Z[1]+View->Offset[2]+Raise[2][1]); Z[1]+View->Offset[2]+Raise[2][1]);
...@@ -240,7 +240,7 @@ void Draw_ScalarTriangle(Post_View *View, ...@@ -240,7 +240,7 @@ void Draw_ScalarTriangle(Post_View *View,
d = (V[3*View->TimeStep]+V[3*View->TimeStep+1]+V[3*View->TimeStep+2]) / 3.; d = (V[3*View->TimeStep]+V[3*View->TimeStep+1]+V[3*View->TimeStep+2]) / 3.;
if(d >= ValMin && d <= ValMax){ if(d >= ValMin && d <= ValMax){
RaiseFill(0, d, ValMin, Raise); RaiseFill(0, d, ValMin, Raise);
Palette(View,View->NbIso,View->GIFV(ValMin,ValMax,View->NbIso,d)); Palette2(View,ValMin,ValMax,d);
sprintf(Num, "%g", d); sprintf(Num, "%g", d);
glRasterPos3d((X[0] + X[1] + X[2])/3.+Raise[0][0], glRasterPos3d((X[0] + X[1] + X[2])/3.+Raise[0][0],
(Y[0] + Y[1] + Y[2])/3.+Raise[1][0], (Y[0] + Y[1] + Y[2])/3.+Raise[1][0],
...@@ -283,15 +283,15 @@ void Draw_ScalarTriangle(Post_View *View, ...@@ -283,15 +283,15 @@ void Draw_ScalarTriangle(Post_View *View,
V[3*View->TimeStep+1]>=ValMin && V[3*View->TimeStep+1]<=ValMax && V[3*View->TimeStep+1]>=ValMin && V[3*View->TimeStep+1]<=ValMax &&
V[3*View->TimeStep+2]>=ValMin && V[3*View->TimeStep+2]<=ValMax){ V[3*View->TimeStep+2]>=ValMin && V[3*View->TimeStep+2]<=ValMax){
glBegin(GL_TRIANGLES); glBegin(GL_TRIANGLES);
Palette(View,View->NbIso,View->GIFV(ValMin,ValMax,View->NbIso,V[3*View->TimeStep])); Palette2(View,ValMin,ValMax,V[3*View->TimeStep]);
glVertex3d(X[0]+View->Offset[0]+Raise[0][0], glVertex3d(X[0]+View->Offset[0]+Raise[0][0],
Y[0]+View->Offset[1]+Raise[1][0], Y[0]+View->Offset[1]+Raise[1][0],
Z[0]+View->Offset[2]+Raise[2][0]); Z[0]+View->Offset[2]+Raise[2][0]);
Palette(View,View->NbIso,View->GIFV(ValMin,ValMax,View->NbIso,V[3*View->TimeStep+1])); Palette2(View,ValMin,ValMax,V[3*View->TimeStep+1]);
glVertex3d(X[1]+View->Offset[0]+Raise[0][1], glVertex3d(X[1]+View->Offset[0]+Raise[0][1],
Y[1]+View->Offset[1]+Raise[1][1], Y[1]+View->Offset[1]+Raise[1][1],
Z[1]+View->Offset[2]+Raise[2][1]); Z[1]+View->Offset[2]+Raise[2][1]);
Palette(View,View->NbIso,View->GIFV(ValMin,ValMax,View->NbIso,V[3*View->TimeStep+2])); Palette2(View,ValMin,ValMax,V[3*View->TimeStep+2]);
glVertex3d(X[2]+View->Offset[0]+Raise[0][2], glVertex3d(X[2]+View->Offset[0]+Raise[0][2],
Y[2]+View->Offset[1]+Raise[1][2], Y[2]+View->Offset[1]+Raise[1][2],
Z[2]+View->Offset[2]+Raise[2][2]); Z[2]+View->Offset[2]+Raise[2][2]);
...@@ -304,7 +304,7 @@ void Draw_ScalarTriangle(Post_View *View, ...@@ -304,7 +304,7 @@ void Draw_ScalarTriangle(Post_View *View,
if(nb >= 3){ if(nb >= 3){
glBegin(GL_POLYGON); glBegin(GL_POLYGON);
for(i=0 ; i<nb ; i++){ for(i=0 ; i<nb ; i++){
Palette(View,View->NbIso,View->GIFV(ValMin,ValMax,View->NbIso,value[i])); Palette2(View,ValMin,ValMax,value[i]);
RaiseFill(i,value[i],ValMin,Raise); RaiseFill(i,value[i],ValMin,Raise);
glVertex3d(Xp[i]+View->Offset[0]+Raise[0][i], glVertex3d(Xp[i]+View->Offset[0]+Raise[0][i],
Yp[i]+View->Offset[1]+Raise[1][i], Yp[i]+View->Offset[1]+Raise[1][i],
......
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