From e79a194fb1613ba3439339ddabebe9bb8eac61ee Mon Sep 17 00:00:00 2001
From: Franck Wajsburt <alliance-cvs@asim.lip6.fr>
Date: Wed, 22 May 2002 09:31:58 +0000
Subject: [PATCH] =?UTF-8?q?changement=20de=20version=20changement=20cocern?=
 =?UTF-8?q?ant=20la=20prise=20en=20compte=20de=20masque=20TALU.=20growstk?=
 =?UTF-8?q?=20fait=20l'hypoth=C3=A8se=20suivante=20concernant=20les=20rect?=
 =?UTF-8?q?angle=20TALU=20-=20il=20vient=20du=20fils=20alors=20il=20signif?=
 =?UTF-8?q?ie=20la=20presence=20d'1=20fil=20d'ALU=20-=20il=20vient=20du=20?=
 =?UTF-8?q?pere=20alors=20il=20signifie=20l'interdiction=20de=20passage=20?=
 =?UTF-8?q?pour=20les=20=20=20niveaux=20superieurs=20->=20growstk=20se=20p?=
 =?UTF-8?q?ermet=20de=20mettre=20des=20petits=20fils=20d'ALU=20sur=20les?=
 =?UTF-8?q?=20transparences=20=20=20du=20pere?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 alliance/src/growstk/src/growstk.c | 54 ++++++++++++++++++++++++++----
 1 file changed, 48 insertions(+), 6 deletions(-)

diff --git a/alliance/src/growstk/src/growstk.c b/alliance/src/growstk/src/growstk.c
index 45a172e2..0397d6cd 100644
--- a/alliance/src/growstk/src/growstk.c
+++ b/alliance/src/growstk/src/growstk.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-//#include <getopt.h>
 #include "hash.h"
 #include "mph.h"
 #include "mpu.h"
@@ -137,11 +136,17 @@ int main (int ac, char *av[])
   /* read files and buids mbk & rds structures */
   PhFig = getphfig (InFile, 'A');
   PhFig -> NAME = namealloc (OutFile);
-  RdsFig = addrdsfig (InFile, 0);
   for (PhSeg = PhFig->PHSEG; PhSeg; PhSeg = PhSeg->NEXT)
-    segmbkrds (RdsFig, PhSeg, 0);
-  for (PhVia = PhFig->PHVIA; PhVia; PhVia = PhVia->NEXT)
-    viambkrds (RdsFig, PhVia, 0);
+     switch (PhSeg->LAYER)
+     { 
+     case TALU2 : PhSeg->LAYER = ALU7; break;
+     case TALU3 : PhSeg->LAYER = ALU8; break;
+     case TALU4 : PhSeg->LAYER = ALU9; break;
+     case TALU5 : PhSeg->LAYER = TALU7; break;
+     case TALU6 : PhSeg->LAYER = TALU8; break;
+     };
+
+  RdsFig = figmbkrds (PhFig, 0, 0);
 
   RecNorth = allocrdsrec(0); 
   RecSouth = allocrdsrec(0); 
@@ -405,6 +410,16 @@ int main (int ac, char *av[])
   for (ScanRec=NewRec; ScanRec; ScanRec = ScanRec->NEXT)
   {
      char MbkLayer = rds2mbklayer(GetRdsLayer(ScanRec));
+     char MbkLayer_bis;
+      
+     switch (MbkLayer)
+     { 
+     case ALU2 : MbkLayer_bis = TALU2; break;
+     case ALU3 : MbkLayer_bis = TALU3; break;
+     case ALU4 : MbkLayer_bis = TALU4; break;
+     case ALU5 : MbkLayer_bis = TALU5; break;
+     case ALU6 : MbkLayer_bis = TALU6; break;
+     };
 
      if (MbkLayer==0)      
      {
@@ -422,14 +437,24 @@ int main (int ac, char *av[])
      }  
 
      if (ScanRec->DX < ScanRec->DY)
-       addphseg (PhFig, MbkLayer,
+     {
+      addphseg (PhFig, MbkLayer,
                  (SCALE_X * ScanRec->DX) / RDS_UNIT,
                  (SCALE_X * (ScanRec->X + ScanRec->DX / 2)) / RDS_UNIT , 
                  (SCALE_X * (ScanRec->Y + RDS_LAMBDA)) / RDS_UNIT , 
                  (SCALE_X * (ScanRec->X + ScanRec->DX / 2)) / RDS_UNIT , 
                  (SCALE_X * (ScanRec->Y + ScanRec->DY - RDS_LAMBDA)) / RDS_UNIT , 
                  NULL);
+      addphseg (PhFig, MbkLayer_bis,
+                 (SCALE_X * ScanRec->DX) / RDS_UNIT,
+                 (SCALE_X * (ScanRec->X + ScanRec->DX / 2)) / RDS_UNIT , 
+                 (SCALE_X * (ScanRec->Y + RDS_LAMBDA)) / RDS_UNIT , 
+                 (SCALE_X * (ScanRec->X + ScanRec->DX / 2)) / RDS_UNIT , 
+                 (SCALE_X * (ScanRec->Y + ScanRec->DY - RDS_LAMBDA)) / RDS_UNIT , 
+                 NULL);
+     }
      else  
+     {  
        addphseg (PhFig, MbkLayer,
                  (SCALE_X * ScanRec->DY) / RDS_UNIT,
                  (SCALE_X * (ScanRec->X + RDS_LAMBDA)) / RDS_UNIT , 
@@ -437,7 +462,24 @@ int main (int ac, char *av[])
                  (SCALE_X * (ScanRec->X + ScanRec->DX - RDS_LAMBDA)) / RDS_UNIT , 
                  (SCALE_X * (ScanRec->Y + ScanRec->DY / 2)) / RDS_UNIT , 
                  NULL);
+       addphseg (PhFig, MbkLayer_bis,
+                 (SCALE_X * ScanRec->DY) / RDS_UNIT,
+                 (SCALE_X * (ScanRec->X + RDS_LAMBDA)) / RDS_UNIT , 
+                 (SCALE_X * (ScanRec->Y + ScanRec->DY / 2)) / RDS_UNIT , 
+                 (SCALE_X * (ScanRec->X + ScanRec->DX - RDS_LAMBDA)) / RDS_UNIT , 
+                 (SCALE_X * (ScanRec->Y + ScanRec->DY / 2)) / RDS_UNIT , 
+                 NULL);
+    }
   }
+  for (PhSeg = PhFig->PHSEG; PhSeg; PhSeg = PhSeg->NEXT)
+     switch (PhSeg->LAYER)
+     { 
+     case ALU7  : PhSeg->LAYER = TALU2; break;
+     case ALU8  : PhSeg->LAYER = TALU3; break;
+     case ALU9  : PhSeg->LAYER = TALU4; break;
+     case TALU7 : PhSeg->LAYER = TALU5; break;
+     case TALU8 : PhSeg->LAYER = TALU6; break;
+     };
   savephfig (PhFig);
   return 0;
 }