From: Maxime Chupin (Ceremade) <chupin@ceremade.dauphine.fr>
Date: Wed, 23 Nov 2016 08:32:19 +0000 (+0100)
Subject: Nom de point de la bbox
X-Git-Url: https://melusine.eu.org/syracuse/G/git/?a=commitdiff_plain;h=879d59ce1be390214fb7c0364c44c3fc1acff916;p=delaunay.git

Nom de point de la bbox
---

diff --git a/luamesh.lua b/luamesh.lua
index 5227f86..ad6ec6f 100644
--- a/luamesh.lua
+++ b/luamesh.lua
@@ -289,9 +289,11 @@ function traceMeshMP(listPoints, triangulation,points)
       end
    end
    if(points=="points") then
+      j=1
       for i=1,#listPoints do
          if(listPoints[i].type == "bbox") then
-            output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolorBbox ;"
+            output = output .. "dotlabel.llft (btex $\\MeshPoint^{*}_{"..j.."}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolorBbox ;"
+            j=j+1
          else
             output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolor ;"
          end
@@ -309,9 +311,11 @@ function tracePointsMP(listPoints,points)
       output = output .. "MeshPoints[".. i .. "] = (" .. listPoints[i].x .. "," .. listPoints[i].y .. ");"
    end
    if(points=="points") then
+      j=1
       for i=1,#listPoints do
          if(listPoints[i].type == "bbox") then
-            output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolorBbox ;"
+            output = output .. "dotlabel.llft (btex $\\MeshPoint^{*}_{" .. j .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolorBbox ;"
+            j=j+1
          else
             output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolor ;"
          end
@@ -574,9 +578,11 @@ function TeXaddOnePointMPBW(listPoints,P,step,bbox)
          output = output .. "draw fullcircle scaled ("..radius .."*2u) shifted ("..center.x .. "*u," .. center.y .. "*u) dashed evenly withcolor \\luameshmpcolorCircle;"
       end
       -- mark the points
+      j=1
       for i=1,#listPoints do
          if(listPoints[i].type == "bbox") then
-            output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolorBbox ;"
+            output = output .. "dotlabel.llft (btex $\\MeshPoint^{*}_{" .. j .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolorBbox ;"
+            j=j+1
          else
             output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolor ;"
          end
@@ -610,9 +616,11 @@ function TeXaddOnePointMPBW(listPoints,P,step,bbox)
       output = output .. "fill " .. path .. "cycle withcolor \\luameshmpcolorBack;"
       output = output .. "draw " .. path .. "cycle withcolor \\luameshmpcolorNew  withpen pencircle scaled 1pt;"
       -- mark the points of the mesh
+      j=1
       for i=1,#listPoints do
          if(listPoints[i].type == "bbox") then
-            output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolorBbox ;"
+            output = output .. "dotlabel.llft (btex $\\MeshPoint^{*}_{" .. j .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolorBbox ;"
+            j=j+1
          else
             output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolor ;"
          end
@@ -651,9 +659,11 @@ function TeXaddOnePointMPBW(listPoints,P,step,bbox)
          output = output .. "draw".."(".. listPoints[polygon[i][2]].x .. "," .. listPoints[polygon[i][2]].y .. ")*u -- (" .. P.x .. "," .. P.y ..")*u withcolor \\luameshmpcolorNew withpen pencircle scaled 1pt;"
       end
       -- mark points
+      j=1
       for i=1,#listPoints do
          if(listPoints[i].type == "bbox") then
-            output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolorBbox ;"
+            output = output .. "dotlabel.llft (btex $\\MeshPoint^{*}_{" .. j .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolorBbox ;"
+            j=j+1
          else
             output = output .. "dotlabel.llft (btex $\\MeshPoint_{" .. i .. "}$ etex, (" .. listPoints[i].x ..",".. listPoints[i].y .. ")*u ) withcolor \\luameshmpcolor ;"
          end
diff --git a/test/animation-crop.pdf b/test/animation-crop.pdf
index 1167450..2ea7b9b 100644
Binary files a/test/animation-crop.pdf and b/test/animation-crop.pdf differ
diff --git a/test/animation.pdf b/test/animation.pdf
index 5f3dd51..a38a444 100644
Binary files a/test/animation.pdf and b/test/animation.pdf differ