From d596b051502f2b1b513fe90134aaf05a8ba8b53d Mon Sep 17 00:00:00 2001
From: Franck Wajsburt <alliance-cvs@asim.lip6.fr>
Date: Thu, 11 Jul 2002 16:53:52 +0000
Subject: [PATCH] ajout d'une nouvelle formule de transformation symbolique
 vers reel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  vws identique à vw hormis le fait que l'offset est interpreté comme une
  valeur à shrink qui s'applique dans les deux directions (X et Y) mais d'un
  seul cote.
---
 alliance/src/rds/src/rfmacces.c | 35 +++++++++++++++++++++++++++++++++
 alliance/src/rds/src/rpr.h      |  3 ++-
 alliance/src/rds/src/rprparse.c |  3 ++-
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/alliance/src/rds/src/rfmacces.c b/alliance/src/rds/src/rfmacces.c
index fc42428a..e475a6c9 100644
--- a/alliance/src/rds/src/rfmacces.c
+++ b/alliance/src/rds/src/rfmacces.c
@@ -136,6 +136,41 @@ rdsrec_list *segmbkrds( Figure, Segment, Lynx )
          ( ( USE == RDS_USE_EXTRACT ) && (   Lynx ) ) ||
          ( ( USE == RDS_USE_DRC     ) && ( ! Lynx ) ) )
     {
+      if ( TRANS == RDS_TRANS_VWS )
+      {
+        long SHRINK = OFFSET;
+        switch ( Segment->TYPE )
+        {
+          case LEFT   : X1R = X1 - DLR;
+                        Y1R = Y1 - ( ( WS + DWR ) >> 1 );
+                        X2R = X2 + DLR - abs(SHRINK);
+                        Y2R = Y2 + ( ( WS + DWR ) >> 1 ) - abs(SHRINK);
+
+                      break;
+
+          case RIGHT  : X1R = X1 - DLR;
+                        Y1R = Y1 - ( ( WS + DWR ) >> 1 );
+                        X2R = X2 + DLR - abs(SHRINK);
+                        Y2R = Y2 + ( ( WS + DWR ) >> 1 ) - abs(SHRINK); 
+
+                      break;
+
+          case DOWN   : X1R = X1 - ( ( WS + DWR ) >> 1 );
+                        Y1R = Y1 - DLR;
+                        X2R = X2 + ( ( WS + DWR ) >> 1 ) - abs(SHRINK);
+                        Y2R = Y2 + DLR - abs(SHRINK);
+
+                      break;
+
+          case UP     : X1R = X1 - ( ( WS + DWR ) >> 1 );
+                        Y1R = Y1 - DLR;
+                        X2R = X2 + ( ( WS + DWR ) >> 1 ) - abs(SHRINK);
+                        Y2R = Y2 + DLR - abs(SHRINK);
+
+                      break;
+        }
+      }
+      else
       if ( TRANS == RDS_TRANS_VW )
       {
         switch ( Segment->TYPE )
diff --git a/alliance/src/rds/src/rpr.h b/alliance/src/rds/src/rpr.h
index 1c3bc853..dacf96e2 100644
--- a/alliance/src/rds/src/rpr.h
+++ b/alliance/src/rds/src/rpr.h
@@ -79,8 +79,9 @@
 # define RDS_TRANS_VW         (unsigned char)0
 # define RDS_TRANS_LCW        (unsigned char)1
 # define RDS_TRANS_RCW        (unsigned char)2
+# define RDS_TRANS_VWS        (unsigned char)3
 
-# define RDS_MAX_TRANS        ( RDS_TRANS_RCW + 1 )
+# define RDS_MAX_TRANS        ( RDS_TRANS_VWS + 1 )
 
 # define MBK_REF_REF          0
 # define MBK_REF_CON          1
diff --git a/alliance/src/rds/src/rprparse.c b/alliance/src/rds/src/rprparse.c
index 1c441225..d2c2ed47 100644
--- a/alliance/src/rds/src/rprparse.c
+++ b/alliance/src/rds/src/rprparse.c
@@ -273,7 +273,8 @@
     { "tpoly",        TPOLY            },
     { "tpoly2",       TPOLY2           },
     { "treat",        S2R_TREAT        },
-    { "vw",           RDS_TRANS_VW     }
+    { "vw",           RDS_TRANS_VW     },
+    { "vws",          RDS_TRANS_VWS    }
   };
   
 /*------------------------------------------------------------\