From 08fa9aec3bdb454470fcb055a941fb0ac1c1aa27 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 18 Dec 2000 14:18:16 +0000
Subject: [PATCH] typos
---
Graphics/Geom.cpp | 20 +++++++++++++-------
Graphics/PostSimplex.cpp | 28 +++++++++++++++++-----------
2 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/Graphics/Geom.cpp b/Graphics/Geom.cpp
index 0954a8e7f7..25dad5ae9c 100644
--- a/Graphics/Geom.cpp
+++ b/Graphics/Geom.cpp
@@ -1,4 +1,4 @@
-/* $Id: Geom.cpp,v 1.6 2000-12-18 08:31:45 geuzaine Exp $ */
+/* $Id: Geom.cpp,v 1.7 2000-12-18 14:18:16 geuzaine Exp $ */
#include "Gmsh.h"
#include "GmshUI.h"
@@ -190,7 +190,9 @@ int isPointOnPlanarSurface (Surface *S, double X, double Y, double Z, double n[3
}
- if(fabs(Angle) > 6.0 && fabs(Angle) < 7.0)
+ //printf(" %d -> angle %g\n", S->Num, fabs(Angle));
+
+ if(fabs(Angle) > 6.0 && fabs(Angle) < 7.0) // Should be 2 * Pi or 0
return 1;
return 0;
@@ -220,8 +222,9 @@ void Plan_SurfPlane (void *data,void *dum){
for(i=0;i<List_Nbr(s->s.Generatrices);i++){
List_Read(s->s.Generatrices,i,&pC);
- for(j=0;j<List_Nbr(pC->Control_Points);j++)
+ for(j=0;j<List_Nbr(pC->Control_Points);j++){
List_Add(points,List_Pointer(pC->Control_Points,j));
+ }
}
N = List_Nbr(points);
@@ -293,6 +296,7 @@ void Plan_SurfPlane (void *data,void *dum){
/* by + cz = -x */
else if (!sys3x3_with_tol(sys,b,res,&det) ){
+
s->d = 0.0;
s2s[0][0] = sys[1][1];
s2s[0][1] = sys[1][2];
@@ -439,6 +443,7 @@ void Draw_Plane_Surface (Surface *s){
0.5 * (V[2].Pos.Y + V[3].Pos.Y);
vv.Pos.Z = t * 0.5 * (V[0].Pos.Z + V[1].Pos.Z) + (1.-t) *
0.5 * (V[2].Pos.Z + V[3].Pos.Z);
+
if(isPointOnPlanarSurface(s,vv.Pos.X,vv.Pos.Y,vv.Pos.Z,n)){
if(!k){
List_Add(s->Orientations,&vv);
@@ -475,7 +480,7 @@ void Draw_Plane_Surface (Surface *s){
}
if(k)List_Add(s->Orientations,&vv);
- Msg(INFO, "Surface %d (%d points)",s->Num,List_Nbr(s->Orientations));
+ Msg(INFO, "Plane Surface %d (%d points)",s->Num,List_Nbr(s->Orientations));
}
if(CTX.geom.surfaces){
@@ -824,16 +829,17 @@ void HighlightEntity(Vertex *v,Curve *c, Surface *s, int permanent){
List_Read(c->Control_Points,0,&v1);
List_Read(c->Control_Points,List_Nbr(c->Control_Points)-1,&v2);
- Msg(SELECT,"Line %d {%d->%d}",c->Num,v1->Num,v2->Num);
+ Msg(SELECT,"Curve %d {%d->%d}",c->Num,v1->Num,v2->Num);
}
else if(s){
if(permanent && s->Mat == 1) return;
if(permanent) s->Mat = 1;
if(CTX.geom.highlight) Draw_Surface(&s,NULL);
-
+ /*
if(s->Typ == MSH_SURF_PLAN)sprintf(Message,"Plan Surf %d {",s->Num);
else if(s->Typ == MSH_SURF_REGL)sprintf(Message,"Ruld Surf %d {",s->Num);
- else sprintf(Message,"Surf %d {",s->Num);
+ else*/
+ sprintf(Message,"Surface %d {",s->Num);
nbg = List_Nbr(s->s.Generatrices) ;
diff --git a/Graphics/PostSimplex.cpp b/Graphics/PostSimplex.cpp
index 9ceb31eabd..fb9672e36f 100644
--- a/Graphics/PostSimplex.cpp
+++ b/Graphics/PostSimplex.cpp
@@ -1,4 +1,4 @@
-/* $Id: PostSimplex.cpp,v 1.6 2000-12-18 08:31:45 geuzaine Exp $ */
+/* $Id: PostSimplex.cpp,v 1.7 2000-12-18 14:18:16 geuzaine Exp $ */
#include "Gmsh.h"
#include "GmshUI.h"
@@ -18,12 +18,18 @@ void Draw_ScalarPoint(Post_View *View,
double ValMin, double ValMax, double Raise[3][5],
double *X, double *Y, double *Z, double *V){
double d;
+ char Num[100];
d = V[View->TimeStep];
if(d>=ValMin && d<=ValMax){
RaiseFill(0, d, ValMin, Raise);
Palette(View,View->NbIso,View->GIFV(ValMin,ValMax,View->NbIso,d));
- Draw_Point(X,Y,Z,View->Offset,Raise);
+ if(View->IntervalsType == DRAW_POST_NUMERIC){
+ glRasterPos3d(X[0],Y[0],Z[0]);
+ Draw_String(Num);
+ }
+ else
+ Draw_Point(X,Y,Z,View->Offset,Raise);
}
}
@@ -100,7 +106,7 @@ void Draw_ScalarLine(Post_View *View,
d = (V[2*View->TimeStep]+V[2*View->TimeStep+1]) / 2.;
if(d >= ValMin && d <= ValMax){
RaiseFill(0, d, ValMin, Raise);
- Palette2(View,ValMin,ValMax,d);
+ Palette(View,View->NbIso,View->GIFV(ValMin,ValMax,View->NbIso,d));
sprintf(Num, "%g", d);
glRasterPos3d((X[0] + X[1])/2.,
(Y[0] + Y[1])/2.,
@@ -115,11 +121,11 @@ void Draw_ScalarLine(Post_View *View,
if(View->IntervalsType==DRAW_POST_CONTINUOUS){
glBegin(GL_LINES);
- Palette2(View,ValMin,ValMax,V[2*View->TimeStep]);
+ Palette(View,View->NbIso,View->GIFV(ValMin,ValMax,View->NbIso,V[2*View->TimeStep]));
glVertex3d(X[0]+View->Offset[0]+Raise[0][0],
Y[0]+View->Offset[1]+Raise[1][0],
Z[0]+View->Offset[2]+Raise[2][0]);
- Palette2(View,ValMin,ValMax,V[2*View->TimeStep+1]);
+ Palette(View,View->NbIso,View->GIFV(ValMin,ValMax,View->NbIso,V[2*View->TimeStep+1]));
glVertex3d(X[1]+View->Offset[0]+Raise[0][1],
Y[1]+View->Offset[1]+Raise[1][1],
Z[1]+View->Offset[2]+Raise[2][1]);
@@ -233,9 +239,9 @@ void Draw_ScalarTriangle(Post_View *View,
d = (V[3*View->TimeStep]+V[3*View->TimeStep+1]+V[3*View->TimeStep+2]) / 3.;
if(d >= ValMin && d <= ValMax){
- sprintf(Num, "%g", d);
RaiseFill(0, d, ValMin, Raise);
- Palette2(View,ValMin,ValMax,d);
+ Palette(View,View->NbIso,View->GIFV(ValMin,ValMax,View->NbIso,d));
+ sprintf(Num, "%g", d);
glRasterPos3d((X[0] + X[1] + X[2])/3.+Raise[0][0],
(Y[0] + Y[1] + Y[2])/3.+Raise[1][0],
(Z[0] + Z[1] + Z[2])/3.+Raise[2][0]);
@@ -277,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+2]>=ValMin && V[3*View->TimeStep+2]<=ValMax){
glBegin(GL_TRIANGLES);
- Palette2(View,ValMin,ValMax,V[3*View->TimeStep]);
+ Palette(View,View->NbIso,View->GIFV(ValMin,ValMax,View->NbIso,V[3*View->TimeStep]));
glVertex3d(X[0]+View->Offset[0]+Raise[0][0],
Y[0]+View->Offset[1]+Raise[1][0],
Z[0]+View->Offset[2]+Raise[2][0]);
- Palette2(View,ValMin,ValMax,V[3*View->TimeStep+1]);
+ Palette(View,View->NbIso,View->GIFV(ValMin,ValMax,View->NbIso,V[3*View->TimeStep+1]));
glVertex3d(X[1]+View->Offset[0]+Raise[0][1],
Y[1]+View->Offset[1]+Raise[1][1],
Z[1]+View->Offset[2]+Raise[2][1]);
- Palette2(View,ValMin,ValMax,V[3*View->TimeStep+2]);
+ Palette(View,View->NbIso,View->GIFV(ValMin,ValMax,View->NbIso,V[3*View->TimeStep+2]));
glVertex3d(X[2]+View->Offset[0]+Raise[0][2],
Y[2]+View->Offset[1]+Raise[1][2],
Z[2]+View->Offset[2]+Raise[2][2]);
@@ -298,7 +304,7 @@ void Draw_ScalarTriangle(Post_View *View,
if(nb >= 3){
glBegin(GL_POLYGON);
for(i=0 ; i<nb ; i++){
- Palette2(View,ValMin,ValMax,value[i]);
+ Palette(View,View->NbIso,View->GIFV(ValMin,ValMax,View->NbIso,value[i]));
RaiseFill(i,value[i],ValMin,Raise);
glVertex3d(Xp[i]+View->Offset[0]+Raise[0][i],
Yp[i]+View->Offset[1]+Raise[1][i],
--
GitLab