diff --git a/Graphics/Graph2D.cpp b/Graphics/Graph2D.cpp index 5ee9c3b62f739858f0dcf0bad5192e3886b04225..df9b70a3edb5cfdbc8995fb632328f5aaebd016a 100644 --- a/Graphics/Graph2D.cpp +++ b/Graphics/Graph2D.cpp @@ -1,4 +1,4 @@ -// $Id: Graph2D.cpp,v 1.4 2001-10-29 17:03:23 geuzaine Exp $ +// $Id: Graph2D.cpp,v 1.5 2001-10-29 17:12:59 geuzaine Exp $ #include "Gmsh.h" #include "GmshUI.h" @@ -137,7 +137,7 @@ void Draw_Graph2D(Post_View *v){ if(v->GraphType==DRAW_POST_2D_SPACE){ for(k=0;k<3;k++){ List_Read(v->SP,j+k,&p2[k]); - p1[k] = p2[k]-p1[k]; + if(i) p1[k] = p2[k]-p1[k]; } dist += sqrt (p1[0] * p1[0] + p1[1] * p1[1] + p1[2] * p1[2]); sprintf(label, v->Format, dist); diff --git a/benchmarks/2d/charts.geo b/benchmarks/2d/charts.geo new file mode 100644 index 0000000000000000000000000000000000000000..79eb2872be2a9563fb268156200739bd40145d04 --- /dev/null +++ b/benchmarks/2d/charts.geo @@ -0,0 +1,24 @@ + +View.GraphType=2; +View.Format="%.3g"; + +View "test" { + SP(0,2,0){1 ,0.2+1 ,0.26+1 ,0.2+1 ,0.26+1 ,0.2+1 ,0.26+1 ,0.2+1 ,0.26+1 }; + SP(1,0,0){1.2 ,0.2+1.2,0.24+1.2,0.2+1.2,0.24+1.2,0.2+1.2,0.24+1.2,0.2+1.2,0.24+1.2 }; + SP(2,1,0){1.8 ,0.2+1.8,0.28+1.8,0.2+1.8,0.28+1.8,0.2+1.8,0.28+1.8,0.2+1.8,0.28+1.8 }; + SP(3,0,0){2.1 ,0.2+2.1,0.29+2.1,0.2+2.1,0.29+2.1,0.2+2.1,0.29+2.1,0.2+2.1,0.29+2.1 }; + SP(4,2,0){1.6 ,0.2+1.6,0.3+1.6 ,0.2+1.6,0.3+1.6 ,0.2+1.6,0.3+1.6 ,0.2+1.6,0.3+1.6 }; + SP(5,3,0){1.1 ,0.1+1.1,0.11+1.1,0.1+1.1,0.11+1.1,0.1+1.1,0.11+1.1,0.1+1.1,0.11+1.1 }; + SP(6,0,0){0.6 ,0.1+0.6,0.1+0.6 ,0.1+0.6,0.1+0.6 ,0.1+0.6,0.1+0.6 ,0.1+0.6,0.1+0.6 }; + SP(6,0,0){-0.2,0.1-0.2,0.17-0.2,0.1-0.2,0.17-0.2,0.1-0.2,0.17-0.2,0.1-0.2,0.17-0.2}; + SP(8,0,0){-0.3,0.1-0.3,0.41-0.3,0.1-0.3,0.41-0.3,0.1-0.3,0.41-0.3,0.1-0.3,0.41-0.3}; + SP(9,0,0){0 ,0.2+0 ,0.42+0 ,0.2+0 ,0.42+0 ,0.2+0 ,0.42+0 ,0.2+0 ,0.42+0 }; +}; + +/* +View "annote" { + T2(0,0){ Sprintf("2D text: Time = %g!!!", View[0].Time) }; + T3(1,0,0){ Sprintf("3D text: Time = %g!!!", View[0].Time) }; +}; +*/ + diff --git a/benchmarks/extrude/hybrid.geo b/benchmarks/extrude/hybrid.geo index cd8eb7ec57c19a54ba26fefff12747c409a9e7a7..478eec10acb29bb988d24278a7dcaa873f63d089 100644 --- a/benchmarks/extrude/hybrid.geo +++ b/benchmarks/extrude/hybrid.geo @@ -26,6 +26,7 @@ Extrude Surface {45, {0,2,0.0}} Layers {{2,2,2},{111,222,111},{.3,.6,1.}}; } ; Coherence; -Extrude Surface {64, {-1,0,0}}; -Surface Loop(96) = {64,82,86,90,94,95}; -Volume(97) = {96}; +Extrude Surface {65, {-1,0,0}}; + +Surface Loop(97) = {65,83,87,91,95,96}; +Volume(98) = {97}; diff --git a/doc/VERSIONS b/doc/VERSIONS index 0c7e49a8e53dbbbcab031d160829a416d2193a02..0b404c8d99bfcffa5b05b56eadd2e18127737f71 100644 --- a/doc/VERSIONS +++ b/doc/VERSIONS @@ -1,10 +1,10 @@ -$Date: 2001-10-29 08:59:55 $ +$Date: 2001-10-29 17:14:50 $ New in 1.28: Corrected the 'Using Progression' attribute for tranfinite meshes to actually match a real progression; New -Triangulate plugin; New 2D graphs; Better performance of geometrical -transformations (Warning: the automatic numbering of some -automatically created entities has changed); +Triangulate plugin; New 2D graphs (space+time charts); Better +performance of geometrical transformations (Warning: the automatic +numbering of some automatically created entities has changed); New in 1.27: Added ability to extrude curves with Layers/Recombine attributes; New PointSize/LineWidth options; Fixed For/EndFor loops in diff --git a/tutorial/t2.geo b/tutorial/t2.geo index 95ec97fb16cf373986dcafef7dee5fe850a4a906..57387fb58762d4c8449b856dae9cb2f6afa97c3b 100644 --- a/tutorial/t2.geo +++ b/tutorial/t2.geo @@ -52,7 +52,7 @@ Extrude Surface { 11, {0, 0, h} } ; // manually a characteristic length for some of the automatically // created points: -Characteristic Length{6,22,2,3,16,12} = lc * 3 ; +Characteristic Length{6,2,52,3,16,12} = lc * 3 ; // If the transformation tools are handy to create complex geometries, // it is sometimes useful to generate the flat geometry, consisting