Interface LaTeX pour gmsh, et gmshVoronoi, résulat dans test

[delaunay.git] / luamesh.lua

diff --git a/luamesh.lua b/luamesh.lua
index fbcb645..bc961b7 100644 (file)
--- a/luamesh.lua
+++ b/luamesh.lua
@@ -420,12 +420,10 @@ function traceVoronoiTikZ(listPoints, triangulation,listVoronoi, points, tri,col
       j=1
       for i=1,#listPoints do
          if(listPoints[i].type == "bbox") then
-            if(listPoints[i].type == "bbox") then
-               output = output .. "\\draw[color="..colorBbox.."] (" .. listPoints[i].x ..",".. listPoints[i].y .. ") node {$\\bullet$} node[anchor=north east] {$\\MeshPoint^*_{" .. j .. "}$};"
-               j=j+1
-            else
-               output = output .. "\\draw[color="..color.."] (" .. listPoints[i].x ..",".. listPoints[i].y .. ") node {$\\bullet$} node[anchor=north east] {$\\MeshPoint_{" .. i .. "}$};"
-            end
+            output = output .. "\\draw[color="..colorBbox.."] (" .. listPoints[i].x ..",".. listPoints[i].y .. ") node {$\\bullet$} node[anchor=north east] {$\\MeshPoint^*_{" .. j .. "}$};"
+            j=j+1
+         else
+            output = output .. "\\draw[color="..color.."] (" .. listPoints[i].x ..",".. listPoints[i].y .. ") node {$\\bullet$} node[anchor=north east] {$\\MeshPoint_{" .. i .. "}$};"
          end
       end
       for i=1,#listCircumC do
@@ -1186,7 +1184,7 @@ end
 
 
 -- buildVoronoi with MP
-function buildGmshVoronoiMP(file,points,scale,tri)
+function gmshVoronoiMP(file,points,scale,tri)
    listPoints,triangulation = readGmsh(file)
    listVoronoi = buildVoronoi(listPoints, triangulation)
    output = traceVoronoiMP(listPoints,triangulation,listVoronoi,points,tri)
@@ -1196,7 +1194,7 @@ end
 
 
 -- buildVoronoi with TikZ
-function buildGmshVoronoiTikZ(file,points,scale,tri,color,colorVoronoi)
+function gmshVoronoiTikZ(file,points,scale,tri,color,colorVoronoi)
    listPoints,triangulation = readGmsh(file)
    listVoronoi = buildVoronoi(listPoints, triangulation)
    output = traceVoronoiTikZ(listPoints,triangulation,listVoronoi,points,tri,color,colorBbox,colorVoronoi)
@@ -1205,7 +1203,7 @@ end
 
 
 -- buildVoronoi with MP
-function buildGmshVoronoiMPinc(file,beginning, ending,points,scale,tri)
+function gmshVoronoiMPinc(file,beginning, ending,points,scale,tri)
    listPoints,triangulation = readGmsh(file)
    listVoronoi = buildVoronoi(listPoints, triangulation)
    output = traceVoronoiMP(listPoints,triangulation,listVoronoi,points,tri)
@@ -1215,7 +1213,7 @@ end
 
 
 -- buildVoronoi with TikZ
-function buildGmshVoronoiTikZinc(file,beginning, ending,points,scale,tri,color,colorVoronoi)
+function gmshVoronoiTikZinc(file,beginning, ending,points,scale,tri,color,colorVoronoi)
    listPoints,triangulation = readGmsh(file)
    listVoronoi = buildVoronoi(listPoints, triangulation)
    output = traceVoronoiTikZ(listPoints,triangulation,listVoronoi,points,tri,color,colorBbox,colorVoronoi)